浏览代码

Fix build when upload properties are missing. Added missing hsql test dependency

Luke Taylor 15 年之前
父节点
当前提交
e156d5339a
共有 2 个文件被更改,包括 7 次插入2 次删除
  1. 6 2
      build.gradle
  2. 1 0
      web/web.gradle

+ 6 - 2
build.gradle

@@ -56,7 +56,9 @@ task apidocs(type: Javadoc) {
 }
 
 task docSiteLogin(type: Login) {
-    host = sshHost
+    if (hasProperty('sshHost')) {
+        host = property('sshHost')
+    }
 }
 
 // Define remoteSiteDir and sshHost in gradle.properties
@@ -93,7 +95,9 @@ task uploadDoc(type: TarUpload) {
 task uploadFaq(type: TarUpload) {
     dependsOn ':faq:docbookHtmlSingle'
     classifier = 'faq'
-    remoteDir = project.property('remoteSiteDir')
+    if (hasProperty('remoteSiteDir')) {
+        remoteDir = property('remoteSiteDir')
+    }
     login = docSiteLogin
 
     def faqDir = new File(project(':faq').buildDir, 'docs')

+ 1 - 0
web/web.gradle

@@ -16,4 +16,5 @@ dependencies {
     provided 'javax.servlet:servlet-api:2.5'
 
     testCompile 'commons-codec:commons-codec:1.3'
+    testRuntime "hsqldb:hsqldb:$hsqlVersion"
 }