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 5799b2c3f88d1bc06d1e91b3dc9f8b5d5981ced2 Author: Robert Lazarski <[email protected]> AuthorDate: Sat Sep 5 05:29:32 2026 -1000 Complete the Spring exclusion list the WAR already had spring-beans, spring-context, spring-core and spring-web are excluded on purpose: a deployment using the Spring integration brings its own Spring. When Spring 7 moved spring-aop, spring-expression, micrometer-observation, micrometer-commons and jspecify behind spring-context and spring-core, the three lists that encode this were not updated, so ~870 KB shipped that cannot work without the four jars left out. The lists must agree or check-webapp-content fails, so both the WAR packaging and the binary assembly are updated. Co-Authored-By: Claude Opus 5 (1M context) <[email protected]> --- modules/distribution/src/main/assembly/bin-assembly.xml | 7 +++++++ modules/webapp/pom.xml | 8 ++++++++ src/site/markdown/release-notes/2.0.2.md | 9 +++++++++ 3 files changed, 24 insertions(+) diff --git a/modules/distribution/src/main/assembly/bin-assembly.xml b/modules/distribution/src/main/assembly/bin-assembly.xml index ada7550b58..7964bcd5c7 100755 --- a/modules/distribution/src/main/assembly/bin-assembly.xml +++ b/modules/distribution/src/main/assembly/bin-assembly.xml @@ -185,6 +185,13 @@ <exclude>org.springframework:spring-context:jar</exclude> <exclude>org.springframework:spring-core:jar</exclude> <exclude>org.springframework:spring-web:jar</exclude> + <!-- Transitive behind spring-context and spring-core in Spring 7; + useless without the four above, which are excluded on purpose. --> + <exclude>org.springframework:spring-aop:jar</exclude> + <exclude>org.springframework:spring-expression:jar</exclude> + <exclude>io.micrometer:micrometer-observation:jar</exclude> + <exclude>io.micrometer:micrometer-commons:jar</exclude> + <exclude>org.jspecify:jspecify:jar</exclude> <exclude>org.apache.ant:ant:jar</exclude> <exclude>org.apache.ant:ant-launcher:jar</exclude> <exclude>aopalliance:aopalliance:jar</exclude> diff --git a/modules/webapp/pom.xml b/modules/webapp/pom.xml index 13d950be02..5b73c1bc3f 100644 --- a/modules/webapp/pom.xml +++ b/modules/webapp/pom.xml @@ -323,6 +323,14 @@ WEB-INF/lib/spring-context-*.jar, WEB-INF/lib/spring-core-*.jar, WEB-INF/lib/spring-web-*.jar, + <!-- Spring 7 pulls these in behind spring-context and + spring-core. Without the four excluded above they + cannot work, so shipping them was accidental. --> + WEB-INF/lib/spring-aop-*.jar, + WEB-INF/lib/spring-expression-*.jar, + WEB-INF/lib/micrometer-observation-*.jar, + WEB-INF/lib/micrometer-commons-*.jar, + WEB-INF/lib/jspecify-*.jar, WEB-INF/lib/aopalliance-*.jar, WEB-INF/lib/js-*.jar </packagingExcludes> diff --git a/src/site/markdown/release-notes/2.0.2.md b/src/site/markdown/release-notes/2.0.2.md index e106031b2a..c8c1bd7b8f 100644 --- a/src/site/markdown/release-notes/2.0.2.md +++ b/src/site/markdown/release-notes/2.0.2.md @@ -5,6 +5,15 @@ Apache Axis2 2.0.2 Release Notes ## Distribution Changes +- **Five stray Spring jars dropped from `axis2.war` and the binary distribution.** + `spring-beans`, `spring-context`, `spring-core` and `spring-web` have always been + excluded on purpose -- a deployment using the Spring integration supplies its own + Spring. Spring 7 moved `spring-aop`, `spring-expression`, `micrometer-observation`, + `micrometer-commons` and `jspecify` behind `spring-context` and `spring-core`, and + the exclusion lists were never updated, so ~870 KB of Spring fragments shipped that + could not work without the four jars deliberately left out. Axis2's own + `axis2-spring` is unchanged and still shipped. + - **The JMS transport is no longer bundled in `axis2.war`.** `axis2-transport-jms` and `jakarta.jms-api` shipped in every WAR while no default `axis2.xml` enables a JMS listener or sender, so every deployment carried the transport -- and its JNDI
