diff --git a/buildSrc/src/main/groovy/org/opendatakit/aggregate/gradle/gae/Rollback.groovy b/buildSrc/src/main/groovy/org/opendatakit/aggregate/gradle/gae/Rollback.groovy index 5fedfd689b..859ec6e318 100644 --- a/buildSrc/src/main/groovy/org/opendatakit/aggregate/gradle/gae/Rollback.groovy +++ b/buildSrc/src/main/groovy/org/opendatakit/aggregate/gradle/gae/Rollback.groovy @@ -29,7 +29,7 @@ class Rollback extends JavaExec { } String getSDKHome() { - return "${getWorkingDir()}/appengine-java-sdk-1.9.54".toString() + return "${getWorkingDir()}/appengine-java-sdk-1.9.63".toString() } String getDummyAppPath() { diff --git a/buildSrc/src/main/groovy/org/opendatakit/aggregate/gradle/gae/Update.groovy b/buildSrc/src/main/groovy/org/opendatakit/aggregate/gradle/gae/Update.groovy index 16fc839932..1cd5eb1b41 100644 --- a/buildSrc/src/main/groovy/org/opendatakit/aggregate/gradle/gae/Update.groovy +++ b/buildSrc/src/main/groovy/org/opendatakit/aggregate/gradle/gae/Update.groovy @@ -18,7 +18,7 @@ class Update extends JavaExec { } String getSDKHome() { - return "${getWorkingDir()}/appengine-java-sdk-1.9.54".toString() + return "${getWorkingDir()}/appengine-java-sdk-1.9.63".toString() } String getEarPath() { diff --git a/gae.gradle b/gae.gradle index 3d8f6eaf1b..ae4b0ce59e 100644 --- a/gae.gradle +++ b/gae.gradle @@ -8,9 +8,9 @@ import static org.opendatakit.aggregate.gradle.Util.truncate task gaeDownloadSDK() { doLast { if (!file('installer/appEngineSDK.zip').exists()) { - println("Downloading App Engine SDK 1.9.54") + println("Downloading App Engine SDK 1.9.63") download { - src 'https://storage.googleapis.com/appengine-sdks/featured/appengine-java-sdk-1.9.54.zip' + src 'https://storage.googleapis.com/appengine-sdks/featured/appengine-java-sdk-1.9.63.zip' dest 'installer/appEngineSDK.zip' } } else diff --git a/installer.gradle b/installer.gradle index be783fa362..c64ec62b9f 100644 --- a/installer.gradle +++ b/installer.gradle @@ -34,6 +34,16 @@ task installerBuild(dependsOn: [installerClean, gaeDownloadSDK], type: Copy) { doLast { setXmlValue("${buildDir}/installer/buildWar.xml", "version", version) file("${buildDir}/installer/files/${archivesBaseName}-${version}.war").renameTo(file("build/installer/files/ODKAggregate.war")) - file("${buildDir}/installer/files/appengine-java-sdk-1.9.54").renameTo(file("build/installer/files/appengine-java-sdk")) + file("${buildDir}/installer/files/appengine-java-sdk-1.9.63").renameTo(file("build/installer/files/appengine-java-sdk")) + delete "${buildDir}/installer/files/appengine-java-sdk/demos" + delete "${buildDir}/installer/files/appengine-java-sdk/docs/endpoints" + delete "${buildDir}/installer/files/appengine-java-sdk/docs/javadoc" + delete "${buildDir}/installer/files/appengine-java-sdk/docs/remoteapi" + delete "${buildDir}/installer/files/appengine-java-sdk/docs/spi" + delete "${buildDir}/installer/files/appengine-java-sdk/docs/testing" + delete "${buildDir}/installer/files/appengine-java-sdk/docs/tools" + delete "${buildDir}/installer/files/appengine-java-sdk/jetty93" + delete "${buildDir}/installer/files/appengine-java-sdk/jetty93-base" + delete "${buildDir}/installer/files/appengine-java-sdk/src" } } \ No newline at end of file