Skip to content

Commit

Permalink
For some reason after the upgrade to Gradle, the core.jar file is no (#…
Browse files Browse the repository at this point in the history
…1730)

longer included in the generated WAR, even though the deploy_jar
configuration is specified as a dependency.

I could not figure out a way to tweak the configuration dependency to
have core.jar pulled into the .war, so I decided to just explicitly pick
it from its known location.

TESTED=deployed to alpha and verified that the instances can start.
  • Loading branch information
jianglai committed Aug 3, 2022
1 parent f6d2a7f commit c903ed4
Showing 1 changed file with 6 additions and 0 deletions.
6 changes: 6 additions & 0 deletions appengine_war.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ project.convention.plugins['war'].webAppDirName =
apply plugin: 'com.google.cloud.tools.appengine'

def coreResourcesDir = "${rootDir}/core/build/resources/main"
def coreLibsDir = "${rootDir}/core/build/libs"

// Get the web.xml file for the service.
war {
Expand All @@ -38,6 +39,10 @@ war {
from("${coreResourcesDir}/google/registry/ui/html") {
include "*.html"
}
from("${coreLibsDir}") {
include "core.jar"
into("WEB-INF/lib")
}
}

if (project.path == ":services:default") {
Expand Down Expand Up @@ -98,6 +103,7 @@ rootProject.deploy.dependsOn appengineDeployAll
rootProject.stage.dependsOn appengineStage
tasks['war'].dependsOn ':core:compileProdJS'
tasks['war'].dependsOn ':core:processResources'
tasks['war'].dependsOn ':core:jar'

// Impose verification for all of the deployment tasks. We haven't found a
// better way to do this other than to apply to each of them independently.
Expand Down

0 comments on commit c903ed4

Please sign in to comment.