This is an automated email from the ASF dual-hosted git repository. dblevins pushed a commit to branch redoparent in repository https://gitbox.apache.org/repos/asf/tomee-jakarta.git
commit b6957ddcddb27ae4346947835727bdbe66a5780a Author: David Blevins <[email protected]> AuthorDate: Mon Mar 22 22:50:04 2021 -0700 Use the webapps with the `transformed` qualifier --- tomee/apache-tomee/pom.xml | 23 ++++++++++++++++++---- .../src/main/groovy/commands/SetupCommand.groovy | 5 +++-- 2 files changed, 22 insertions(+), 6 deletions(-) diff --git a/tomee/apache-tomee/pom.xml b/tomee/apache-tomee/pom.xml index 5d72bcd..637e548 100644 --- a/tomee/apache-tomee/pom.xml +++ b/tomee/apache-tomee/pom.xml @@ -93,21 +93,32 @@ <dependency> <!-- to be sure to have it --> <groupId>${project.groupId}</groupId> <artifactId>tomee-plus-webapp</artifactId> - <version>${tomee.version}</version> + <version>${project.version}</version> + <classifier>transformed</classifier> <type>war</type> <scope>provided</scope> </dependency> <dependency> <!-- to be sure to have it --> <groupId>${project.groupId}</groupId> <artifactId>tomee-plume-webapp</artifactId> - <version>${tomee.version}</version> + <version>${project.version}</version> + <classifier>transformed</classifier> <type>war</type> <scope>provided</scope> </dependency> <dependency> <!-- to be sure to have it --> <groupId>${project.groupId}</groupId> <artifactId>tomee-microprofile-webapp</artifactId> - <version>${tomee.version}</version> + <version>${project.version}</version> + <classifier>transformed</classifier> + <type>war</type> + <scope>provided</scope> + </dependency> + <dependency> <!-- to be sure to have it --> + <groupId>${project.groupId}</groupId> + <artifactId>tomee-webprofile-webapp</artifactId> + <version>${project.version}</version> + <classifier>transformed</classifier> <type>war</type> <scope>provided</scope> </dependency> @@ -324,7 +335,8 @@ <configuration> <properties> <tomee.workdir>${webprofile.work-dir}</tomee.workdir> - <tomee.webapp>tomee-webapp</tomee.webapp> + <tomee.webapp>tomee-webprofile-webapp</tomee.webapp> + <tomee.version>${project.version}</tomee.version> </properties> <source> new commands.SetupCommand(pom: this, log: log, project: project, ant: ant, properties: properties).execute() @@ -341,6 +353,7 @@ <properties> <tomee.workdir>${plus.work-dir}</tomee.workdir> <tomee.webapp>tomee-plus-webapp</tomee.webapp> + <tomee.version>${project.version}</tomee.version> </properties> <source> new commands.SetupCommand(pom: this, log: log, project: project, ant: ant, properties: properties).execute() @@ -357,6 +370,7 @@ <properties> <tomee.workdir>${plume.work-dir}</tomee.workdir> <tomee.webapp>tomee-plume-webapp</tomee.webapp> + <tomee.version>${project.version}</tomee.version> </properties> <source> new commands.SetupCommand(pom: this, log: log, project: project, ant: ant, properties: properties).execute() @@ -373,6 +387,7 @@ <properties> <tomee.workdir>${microprofile.work-dir}</tomee.workdir> <tomee.webapp>tomee-microprofile-webapp</tomee.webapp> + <tomee.version>${project.version}</tomee.version> </properties> <source> new commands.SetupCommand(pom: this, log: log, project: project, ant: ant, properties: properties).execute() diff --git a/tomee/apache-tomee/src/main/groovy/commands/SetupCommand.groovy b/tomee/apache-tomee/src/main/groovy/commands/SetupCommand.groovy index bb66283..a399f58 100644 --- a/tomee/apache-tomee/src/main/groovy/commands/SetupCommand.groovy +++ b/tomee/apache-tomee/src/main/groovy/commands/SetupCommand.groovy @@ -86,9 +86,10 @@ class SetupCommand { log.info("extracting ${catalinaHome}") ant.unzip(src: dest, dest: "${workDir}") - log.info('Deploying the tomee war') def localRepo = pom.settings.localRepository - ant.unzip(src: "${localRepo}/org/apache/tomee/${webapp}/${tomeeVersion}/${webapp}-${tomeeVersion}.war", + def warFile = "${localRepo}/org/apache/tomee/${webapp}/${tomeeVersion}/${webapp}-${tomeeVersion}-transformed.war" + log.info("Deploying the tomee war ${warFile}") + ant.unzip(src: "${warFile}", dest: "${workDir}/apache-tomcat-${tomcatVersion}/webapps/tomee") log.info("Installing to: ${catalinaHome}")
