This is an automated email from the ASF dual-hosted git repository. robertlazarski pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git
commit 262799957c382e40c888ac457bb7dd431ada7eb5 Author: Robert Lazarski <[email protected]> AuthorDate: Thu Apr 9 07:49:25 2026 -1000 Fix Tomcat 11 build: remove broken WAR unzip from prepare-package The antrun plugin at prepare-package tried to unzip the .war file into an exploded/ directory, but the WAR doesn't exist yet (created by maven-war-plugin at package phase). The deploy/ directory IS the exploded WAR (produced by maven-war-plugin's exploded goal) — no separate unzip step needed. Removed the duplicate exploded/ block (lines 376-397). The deploy/ directory at target/deploy/axis2-json-api/ is the canonical exploded WAR for Tomcat deployment. Tested: mvn clean package -DskipTests succeeds. Deployed as exploded WAR to Tomcat 11.0.20 + OpenJDK 21 — login, PV, MC, OpenAPI, Swagger all working over both HTTP 8080 and HTTPS 8443. Co-Authored-By: Claude Opus 4.6 (1M context) <[email protected]> --- .../src/userguide/springbootdemo-tomcat11/pom.xml | 25 +++------------------- 1 file changed, 3 insertions(+), 22 deletions(-) diff --git a/modules/samples/userguide/src/userguide/springbootdemo-tomcat11/pom.xml b/modules/samples/userguide/src/userguide/springbootdemo-tomcat11/pom.xml index cc3966d83c..bf6d88c7e7 100644 --- a/modules/samples/userguide/src/userguide/springbootdemo-tomcat11/pom.xml +++ b/modules/samples/userguide/src/userguide/springbootdemo-tomcat11/pom.xml @@ -373,28 +373,9 @@ <copy file="${settings.localRepository}/org/apache/axis2/axis2-openapi/${axis2.version}/axis2-openapi-${axis2.version}.jar" tofile="${project.build.directory}/deploy/axis2-json-api/WEB-INF/modules/openapi-${axis2.version}.mar" overwrite="true"/> - <unzip src="${project.build.directory}/axis2-json-api-0.0.1-SNAPSHOT.war" dest="${project.build.directory}/exploded"/> - <jar jarfile="${project.build.directory}/exploded/WEB-INF/services/Login.aar"> - <metainf file="resources-axis2/login_resources/services.xml"/> - </jar> - <jar jarfile="${project.build.directory}/exploded/WEB-INF/services/testws.aar"> - <metainf file="resources-axis2/test_service_resources/services.xml"/> - </jar> - <jar jarfile="${project.build.directory}/exploded/WEB-INF/services/BigDataH2Service.aar"> - <metainf file="resources-axis2/bigdata_h2_resources/services.xml"/> - </jar> - <jar jarfile="${project.build.directory}/exploded/WEB-INF/services/FinancialBenchmarkService.aar"> - <metainf file="resources-axis2/finbench_resources/services.xml"/> - </jar> - <copy todir="${project.build.directory}/exploded/WEB-INF/conf"> - <fileset dir="resources-axis2/conf"> - <include name="axis2.xml"/> - </fileset> - </copy> - <mkdir dir="${project.build.directory}/exploded/WEB-INF/modules"/> - <copy file="${settings.localRepository}/org/apache/axis2/axis2-openapi/${axis2.version}/axis2-openapi-${axis2.version}.jar" - tofile="${project.build.directory}/exploded/WEB-INF/modules/openapi-${axis2.version}.mar" - overwrite="true"/> + <!-- The exploded WAR is at target/deploy/axis2-json-api/ (produced by + maven-war-plugin's exploded goal). No separate unzip step needed. + For Tomcat deployment, copy this directory to webapps/axis2-json-api. --> </target> </configuration> <goals>
