Skip to content

build(deps): bump spring-version from 6.2.19 to 7.0.8 #2102

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dependabot wants to merge 5 commits into
base: main
Choose a base branch
from
Open

build(deps): bump spring-version from 6.2.19 to 7.0.8 #2102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8256709
build(deps): bump spring-version from 6.2.19 to 7.0.8
dependabot[bot] Jul 3, 2026
15d2d33
Add Karaf features verification and Spring 7 support
jbonofre Jul 22, 2026
0c80a34
Run Karaf features verification in activemq-karaf-itest
jbonofre Jul 22, 2026
658923d
Use filtered properties for Jakarta versions and align to Jakarta EE 11
jbonofre Jul 23, 2026
dc1d789
Address review comments: use spring-version-range and narrow servlet …
jbonofre Jul 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion activemq-blueprint/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
org.apache.aries.blueprint.*;version="[1.0,2)",
*
</Import-Package>
<Fragment-Host>org.apache.activemq.activemq-osgi</Fragment-Host>
<Fragment-Host>org.apache.activemq.osgi</Fragment-Host>
<_noee>true</_noee>
</instructions>
</configuration>
Expand Down
38 changes: 38 additions & 0 deletions activemq-karaf-itest/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,44 @@
</systemPropertyVariables>
</configuration>
</plugin>
<!--
Statically verify that the ActiveMQ Karaf features resolve against the Karaf
distribution. This runs here (last in the reactor) so all referenced ActiveMQ
artifacts (activemq-osgi, activemq-blueprint, activemq-karaf, ...) are already
installed in the local repository.
-->
<plugin>
<groupId>org.apache.karaf.tooling</groupId>
<artifactId>karaf-maven-plugin</artifactId>
<version>${karaf-version}</version>
<executions>
<execution>
<id>verify-features</id>
<phase>verify</phase>
<goals>
<goal>verify</goal>
</goals>
<configuration>
<descriptors>
<descriptor>mvn:org.apache.karaf.features/framework/${karaf-version}/xml/features</descriptor>
<descriptor>mvn:org.apache.karaf.features/standard/${karaf-version}/xml/features</descriptor>
<descriptor>mvn:org.apache.karaf.features/spring/${karaf-version}/xml/features</descriptor>
<descriptor>mvn:org.apache.karaf.features/enterprise/${karaf-version}/xml/features</descriptor>
<descriptor>mvn:org.apache.activemq/activemq-karaf/${project.version}/xml/features-core</descriptor>
<descriptor>mvn:org.apache.activemq/activemq-karaf/${project.version}/xml/features</descriptor>
</descriptors>
<distribution>org.apache.karaf:apache-karaf:zip::${karaf-version}</distribution>
<javase>17</javase>
<framework>
<feature>framework</feature>
</framework>
<features>
<feature>activemq*</feature>
</features>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
<pluginManagement>
<plugins>
Expand Down
29 changes: 25 additions & 4 deletions activemq-karaf/src/main/resources/features-core.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,18 +20,39 @@

<features name="activemq-core-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.4.0">

<!--
Spring 7.x support. Apache Karaf only provides Spring up to 6.1.x and there are no
ServiceMix OSGi wrappers for Spring 7 yet, so the plain Spring Framework jars (which
no longer ship OSGi metadata) are wrapped on the fly with the pax-url wrap: protocol.
-->
<feature name="spring" description="Spring 7.x support" version="${spring-version}">
<bundle start-level="30">wrap:mvn:org.springframework/spring-core/${spring-version}$Bundle-SymbolicName=org.springframework.spring-core&amp;Bundle-Version=${spring-version}&amp;Export-Package=org.springframework.*;version=${spring-version}&amp;Import-Package=*;resolution:=optional</bundle>
<bundle start-level="30">wrap:mvn:org.springframework/spring-expression/${spring-version}$Bundle-SymbolicName=org.springframework.spring-expression&amp;Bundle-Version=${spring-version}&amp;Export-Package=org.springframework.*;version=${spring-version}&amp;Import-Package=*;resolution:=optional</bundle>
<bundle start-level="30">wrap:mvn:org.springframework/spring-beans/${spring-version}$Bundle-SymbolicName=org.springframework.spring-beans&amp;Bundle-Version=${spring-version}&amp;Export-Package=org.springframework.*;version=${spring-version}&amp;Import-Package=*;resolution:=optional</bundle>
<bundle start-level="30">wrap:mvn:org.springframework/spring-aop/${spring-version}$Bundle-SymbolicName=org.springframework.spring-aop&amp;Bundle-Version=${spring-version}&amp;Export-Package=org.springframework.*,org.aopalliance.*;version=${spring-version}&amp;Import-Package=*;resolution:=optional</bundle>
<bundle start-level="30">wrap:mvn:org.springframework/spring-context/${spring-version}$Bundle-SymbolicName=org.springframework.spring-context&amp;Bundle-Version=${spring-version}&amp;Export-Package=org.springframework.*;version=${spring-version}&amp;Import-Package=*;resolution:=optional</bundle>
<bundle start-level="30">wrap:mvn:org.springframework/spring-context-support/${spring-version}$Bundle-SymbolicName=org.springframework.spring-context-support&amp;Bundle-Version=${spring-version}&amp;Export-Package=org.springframework.*;version=${spring-version}&amp;Import-Package=*;resolution:=optional</bundle>
</feature>

<feature name="spring-web" description="Spring 7.x Web support" version="${spring-version}">
<feature version="${spring-version-range}">spring</feature>
<bundle dependency="true">mvn:jakarta.servlet/jakarta.servlet-api/${jakarta-servlet-api-version}</bundle>
<bundle start-level="30">wrap:mvn:org.springframework/spring-web/${spring-version}$Bundle-SymbolicName=org.springframework.spring-web&amp;Bundle-Version=${spring-version}&amp;Export-Package=org.springframework.*;version=${spring-version}&amp;Import-Package=*;resolution:=optional</bundle>
<bundle start-level="30">wrap:mvn:org.springframework/spring-webmvc/${spring-version}$Bundle-SymbolicName=org.springframework.spring-webmvc&amp;Bundle-Version=${spring-version}&amp;Export-Package=org.springframework.*;version=${spring-version}&amp;Import-Package=*;resolution:=optional</bundle>
</feature>

<!-- Bundles needed if only client will be deployed in the container -->
<feature name="activemq-client" description="ActiveMQ client libraries" version="${project.version}">
<feature version="[5,7)">spring</feature>
<feature version="${spring-version-range}">spring</feature>
<feature>aries-blueprint</feature>
<feature>activemq-combined-jms-spec</feature>
<bundle>mvn:jakarta.activation/jakarta.activation-api/2.1.2</bundle>
<bundle>mvn:jakarta.xml.bind/jakarta.xml.bind-api/4.0.0</bundle>
<bundle>mvn:jakarta.jms/jakarta.jms-api/3.1.0</bundle>
<bundle>mvn:jakarta.jms/jakarta.jms-api/${jakarta-jms-api-version}</bundle>
<bundle>mvn:jakarta.activation/jakarta.activation-api/2.1.2</bundle>
<bundle>mvn:jakarta.annotation/jakarta.annotation-api/2.1.1</bundle>
<bundle>mvn:jakarta.annotation/jakarta.annotation-api/${jakarta-annotation-api-version}</bundle>
<bundle>mvn:jakarta.enterprise/jakarta.enterprise.lang-model/4.0.1</bundle>
<bundle>mvn:jakarta.el/jakarta.el-api/5.0.1</bundle>
<bundle>mvn:jakarta.el/jakarta.el-api/${jakarta-el-api-version}</bundle>
<bundle>mvn:jakarta.inject/jakarta.inject-api/2.0.1</bundle>
<bundle>mvn:jakarta.interceptor/jakarta.interceptor-api/2.1.0</bundle>
<bundle>mvn:jakarta.enterprise/jakarta.enterprise.cdi-api/4.0.1</bundle>
Expand Down
9 changes: 9 additions & 0 deletions activemq-karaf/src/main/resources/features.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@

<feature name="activemq-shell" version="${project.version}">
<feature>shell-compat</feature>
<feature version="${project.version}">activemq-client</feature>
<bundle>mvn:org.apache.activemq/activemq-karaf/${project.version}</bundle>
</feature>

Expand All @@ -49,6 +50,11 @@
<feature name="activemq-web-console" version="${project.version}">
<feature>war</feature>
<feature>eventadmin</feature>
<feature version="${spring-version-range}">spring-web</feature>
<bundle dependency="true">mvn:org.ow2.asm/asm/${asm-version}</bundle>
<bundle dependency="true">mvn:jakarta.servlet/jakarta.servlet-api/${jakarta-servlet-api-version}</bundle>
<bundle dependency="true">mvn:jakarta.el/jakarta.el-api/${jakarta-el-api-version}</bundle>
<bundle dependency="true">mvn:jakarta.servlet.jsp/jakarta.servlet.jsp-api/${jakarta-servlet-jsp-api-version}</bundle>
<configfile finalname="${karaf.etc}/org.apache.activemq.webconsole.cfg">mvn:org.apache.activemq/activemq-karaf/${project.version}/cfg/activemq-webconsole</configfile>
<bundle>mvn:org.apache.activemq/activemq-web-console/${project.version}/war</bundle>
</feature>
Expand All @@ -62,12 +68,15 @@
</feature>

<feature name="activemq-amqp-client" version="${pom.version}" description="ActiveMQ AMQP protocol client libraries">
<bundle dependency="true">mvn:jakarta.jms/jakarta.jms-api/${jakarta-jms-api-version}</bundle>
<bundle>mvn:io.netty/netty-common/${netty-version}</bundle>
<bundle>mvn:io.netty/netty-transport/${netty-version}</bundle>
<bundle>mvn:io.netty/netty-transport-native-epoll/${netty-version}</bundle>
<bundle>mvn:io.netty/netty-transport-native-kqueue/${netty-version}</bundle>
<bundle>mvn:io.netty/netty-transport-native-unix-common/${netty-version}</bundle>
<bundle>mvn:io.netty/netty-buffer/${netty-version}</bundle>
<bundle>mvn:io.netty/netty-codec-base/${netty-version}</bundle>
<bundle>mvn:io.netty/netty-codec-compression/${netty-version}</bundle>
<bundle>mvn:io.netty/netty-codec/${netty-version}</bundle>
<bundle>mvn:io.netty/netty-codec-http/${netty-version}</bundle>
<bundle>mvn:io.netty/netty-handler/${netty-version}</bundle>
Expand Down
14 changes: 7 additions & 7 deletions activemq-web-console/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,12 +139,12 @@
javax.management.remote,
javax.naming,
org.w3c.dom,
jakarta.servlet;version="[5,6)",
jakarta.servlet.annotation;version="[5,6)",
jakarta.servlet.http;version="[5,6)",
jakarta.servlet.jsp,
jakarta.servlet.jsp.tagext,
jakarta.servlet.jsp.el,
jakarta.servlet;version="[6,7)",
jakarta.servlet.annotation;version="[6,7)",
jakarta.servlet.http;version="[6,7)",
jakarta.servlet.jsp;version="[3,5)",
jakarta.servlet.jsp.tagext;version="[3,5)",
jakarta.servlet.jsp.el;version="[3,5)",
javax.management,
javax.management.openmbean,
javax.net,
Expand All @@ -158,7 +158,7 @@
org.apache.log4j;version="[2,3)";resolution:=optional,
org.apache.log4j.spi;version="[2,3)";resolution:=optional,
org.eclipse.jetty*;resolution:=optional;version="${jetty-version-range}",
org.objectweb.asm*;version="[6,8)"
org.objectweb.asm*;version="[6,10)"
</Import-Package>
<_contract>!*</_contract>
<_noee>true</_noee>
Expand Down
24 changes: 17 additions & 7 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,11 @@
<jackson-version>2.22.1</jackson-version>
<jackson-annotations-version>2.22</jackson-annotations-version>
<jakarta-jms-api-version>3.1.0</jakarta-jms-api-version>
<jakarta-annotation-api-version>3.0.0</jakarta-annotation-api-version>
<jakarta-servlet-api-version>6.1.0</jakarta-servlet-api-version>
<jakarta-servlet-jsp-api-version>4.0.0</jakarta-servlet-jsp-api-version>
<jakarta-el-api-version>6.0.0</jakarta-el-api-version>
<asm-version>9.10.1</asm-version>
<jasypt-version>1.9.3</jasypt-version>
<jaxb-version>4.0.9</jaxb-version>
<jetty-version>12.1.11</jetty-version>
Expand All @@ -94,8 +99,8 @@
<rome-version>2.1.0</rome-version>
<shiro-version>2.2.1</shiro-version>
<slf4j-version>2.0.18</slf4j-version>
<spring-version>6.2.19</spring-version>
<spring-version-range>[6,7)</spring-version-range>
<spring-version>7.0.8</spring-version>
<spring-version-range>[7,8)</spring-version-range>
<taglibs-version>1.2.5</taglibs-version>
<xpp3-version>1.1.4c</xpp3-version>
<xstream-version>1.4.21</xstream-version>
Expand Down Expand Up @@ -448,19 +453,24 @@
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>
<version>9.10.1</version>
<version>${asm-version}</version>
</dependency>

<!-- Servlet 6.1 and JSP (Jakarta EE 11) -->
<!-- Servlet and JSP (Jakarta EE 11, required by Spring 7) -->
<dependency>
<groupId>jakarta.servlet.jsp</groupId>
<artifactId>jakarta.servlet.jsp-api</artifactId>
<version>4.0.0</version>
<version>${jakarta-servlet-jsp-api-version}</version>
</dependency>
<dependency>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<version>6.1.0</version>
<version>${jakarta-servlet-api-version}</version>
</dependency>
<dependency>
<groupId>jakarta.el</groupId>
<artifactId>jakarta.el-api</artifactId>
<version>${jakarta-el-api-version}</version>
</dependency>
<dependency>
<groupId>jakarta.websocket</groupId>
Expand Down Expand Up @@ -940,7 +950,7 @@
<dependency>
<groupId>jakarta.annotation</groupId>
<artifactId>jakarta.annotation-api</artifactId>
<version>3.0.0</version>
<version>${jakarta-annotation-api-version}</version>
</dependency>

<!-- JMH for micro-benchmarks -->
Expand Down
Loading