From 8256709793a318ae01dd61ac62ac7265f648ce9f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 3 Jul 2026 13:07:58 +0000 Subject: [PATCH 1/5] build(deps): bump spring-version from 6.2.19 to 7.0.8 Bumps `spring-version` from 6.2.19 to 7.0.8. Updates `org.springframework:spring-aop` from 6.2.19 to 7.0.8 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v6.2.19...v7.0.8) Updates `org.springframework:spring-beans` from 6.2.19 to 7.0.8 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v6.2.19...v7.0.8) Updates `org.springframework:spring-context` from 6.2.19 to 7.0.8 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v6.2.19...v7.0.8) Updates `org.springframework:spring-core` from 6.2.19 to 7.0.8 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v6.2.19...v7.0.8) Updates `org.springframework:spring-expression` from 6.2.19 to 7.0.8 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v6.2.19...v7.0.8) Updates `org.springframework:spring-jms` from 6.2.19 to 7.0.8 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v6.2.19...v7.0.8) Updates `org.springframework:spring-tx` from 6.2.19 to 7.0.8 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v6.2.19...v7.0.8) Updates `org.springframework:spring-webmvc` from 6.2.19 to 7.0.8 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v6.2.19...v7.0.8) Updates `org.springframework:spring-web` from 6.2.19 to 7.0.8 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v6.2.19...v7.0.8) Updates `org.springframework:spring-test` from 6.2.19 to 7.0.8 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v6.2.19...v7.0.8) Updates `org.springframework:spring-oxm` from 6.2.19 to 7.0.8 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v6.2.19...v7.0.8) --- updated-dependencies: - dependency-name: org.springframework:spring-aop dependency-version: 7.0.8 dependency-type: direct:production update-type: version-update:semver-major - dependency-name: org.springframework:spring-beans dependency-version: 7.0.8 dependency-type: direct:production update-type: version-update:semver-major - dependency-name: org.springframework:spring-context dependency-version: 7.0.8 dependency-type: direct:production update-type: version-update:semver-major - dependency-name: org.springframework:spring-core dependency-version: 7.0.8 dependency-type: direct:production update-type: version-update:semver-major - dependency-name: org.springframework:spring-expression dependency-version: 7.0.8 dependency-type: direct:production update-type: version-update:semver-major - dependency-name: org.springframework:spring-jms dependency-version: 7.0.8 dependency-type: direct:production update-type: version-update:semver-major - dependency-name: org.springframework:spring-oxm dependency-version: 7.0.8 dependency-type: direct:production update-type: version-update:semver-major - dependency-name: org.springframework:spring-test dependency-version: 7.0.8 dependency-type: direct:production update-type: version-update:semver-major - dependency-name: org.springframework:spring-tx dependency-version: 7.0.8 dependency-type: direct:production update-type: version-update:semver-major - dependency-name: org.springframework:spring-web dependency-version: 7.0.8 dependency-type: direct:production update-type: version-update:semver-major - dependency-name: org.springframework:spring-webmvc dependency-version: 7.0.8 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 680727dfc7f..7e2a9c5538b 100644 --- a/pom.xml +++ b/pom.xml @@ -94,7 +94,7 @@ 2.1.0 2.2.1 2.0.18 - 6.2.19 + 7.0.8 [6,7) 1.2.5 1.1.4c From 15d2d331f96509c4969d3ca8a99dc64de2540cc2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?JB=20Onofr=C3=A9?= Date: Wed, 22 Jul 2026 23:17:50 +0200 Subject: [PATCH 2/5] Add Karaf features verification and Spring 7 support Add the karaf-maven-plugin verify goal to activemq-karaf to statically validate the ActiveMQ features against the Karaf 4.4 framework, standard, spring and enterprise descriptors on every build. Verification surfaced several pre-existing feature resolution problems, now fixed: - activemq-blueprint: correct the Fragment-Host header, which targeted org.apache.activemq.activemq-osgi while the host bundle's symbolic name is org.apache.activemq.osgi, so the fragment could never attach. - activemq-amqp-client: add the netty-codec-base and netty-codec-compression bundles (packages relocated in Netty 4.2) and the jakarta.jms-api bundle required by qpid-jms-client. - activemq-shell: pull the activemq-client feature so the org.apache.activemq.console package is available. - activemq-web-console: provide the Jakarta EE 9 servlet/JSP/EL API bundles the migrated WAR imports. Spring 7: Karaf only ships Spring 6.1 features and there are no ServiceMix OSGi wrappers for Spring 7, so add spring and spring-web features that wrap the plain Spring 7 jars via the pax-url wrap protocol, and point activemq-client and activemq-web-console at them ([7,8)). Also align spring-version-range with the 7.x import range. --- activemq-blueprint/pom.xml | 2 +- activemq-karaf/pom.xml | 32 +++++++++++++++++++ .../src/main/resources/features-core.xml | 23 ++++++++++++- .../src/main/resources/features.xml | 8 +++++ pom.xml | 2 +- 5 files changed, 64 insertions(+), 3 deletions(-) diff --git a/activemq-blueprint/pom.xml b/activemq-blueprint/pom.xml index a5b08eefdc3..c69489fcd6d 100644 --- a/activemq-blueprint/pom.xml +++ b/activemq-blueprint/pom.xml @@ -58,7 +58,7 @@ org.apache.aries.blueprint.*;version="[1.0,2)", * - org.apache.activemq.activemq-osgi + org.apache.activemq.osgi <_noee>true diff --git a/activemq-karaf/pom.xml b/activemq-karaf/pom.xml index f4d30f47c67..8fca7cb4655 100644 --- a/activemq-karaf/pom.xml +++ b/activemq-karaf/pom.xml @@ -218,6 +218,38 @@ + + org.apache.karaf.tooling + karaf-maven-plugin + ${karaf-version} + + + verify + verify + + verify + + + + mvn:org.apache.karaf.features/framework/${karaf-version}/xml/features + mvn:org.apache.karaf.features/standard/${karaf-version}/xml/features + mvn:org.apache.karaf.features/spring/${karaf-version}/xml/features + mvn:org.apache.karaf.features/enterprise/${karaf-version}/xml/features + file:${project.build.directory}/classes/features-core.xml + file:${project.build.directory}/classes/features.xml + + org.apache.karaf:apache-karaf:zip::${karaf-version} + 17 + + framework + + + activemq* + + + + + diff --git a/activemq-karaf/src/main/resources/features-core.xml b/activemq-karaf/src/main/resources/features-core.xml index 5a1748a99c7..4f80fa64c8a 100644 --- a/activemq-karaf/src/main/resources/features-core.xml +++ b/activemq-karaf/src/main/resources/features-core.xml @@ -20,9 +20,30 @@ + + + wrap:mvn:org.springframework/spring-core/${spring-version}$Bundle-SymbolicName=org.springframework.spring-core&Bundle-Version=${spring-version}&Export-Package=org.springframework.*;version=${spring-version}&Import-Package=*;resolution:=optional + wrap:mvn:org.springframework/spring-expression/${spring-version}$Bundle-SymbolicName=org.springframework.spring-expression&Bundle-Version=${spring-version}&Export-Package=org.springframework.*;version=${spring-version}&Import-Package=*;resolution:=optional + wrap:mvn:org.springframework/spring-beans/${spring-version}$Bundle-SymbolicName=org.springframework.spring-beans&Bundle-Version=${spring-version}&Export-Package=org.springframework.*;version=${spring-version}&Import-Package=*;resolution:=optional + wrap:mvn:org.springframework/spring-aop/${spring-version}$Bundle-SymbolicName=org.springframework.spring-aop&Bundle-Version=${spring-version}&Export-Package=org.springframework.*,org.aopalliance.*;version=${spring-version}&Import-Package=*;resolution:=optional + wrap:mvn:org.springframework/spring-context/${spring-version}$Bundle-SymbolicName=org.springframework.spring-context&Bundle-Version=${spring-version}&Export-Package=org.springframework.*;version=${spring-version}&Import-Package=*;resolution:=optional + wrap:mvn:org.springframework/spring-context-support/${spring-version}$Bundle-SymbolicName=org.springframework.spring-context-support&Bundle-Version=${spring-version}&Export-Package=org.springframework.*;version=${spring-version}&Import-Package=*;resolution:=optional + + + + spring + mvn:jakarta.servlet/jakarta.servlet-api/5.0.0 + wrap:mvn:org.springframework/spring-web/${spring-version}$Bundle-SymbolicName=org.springframework.spring-web&Bundle-Version=${spring-version}&Export-Package=org.springframework.*;version=${spring-version}&Import-Package=*;resolution:=optional + wrap:mvn:org.springframework/spring-webmvc/${spring-version}$Bundle-SymbolicName=org.springframework.spring-webmvc&Bundle-Version=${spring-version}&Export-Package=org.springframework.*;version=${spring-version}&Import-Package=*;resolution:=optional + + - spring + spring aries-blueprint activemq-combined-jms-spec mvn:jakarta.activation/jakarta.activation-api/2.1.2 diff --git a/activemq-karaf/src/main/resources/features.xml b/activemq-karaf/src/main/resources/features.xml index cd7eec644c8..16a8dd0fc7e 100644 --- a/activemq-karaf/src/main/resources/features.xml +++ b/activemq-karaf/src/main/resources/features.xml @@ -39,6 +39,7 @@ shell-compat + activemq-client mvn:org.apache.activemq/activemq-karaf/${project.version} @@ -49,6 +50,10 @@ war eventadmin + spring-web + mvn:jakarta.servlet/jakarta.servlet-api/5.0.0 + mvn:jakarta.el/jakarta.el-api/4.0.0 + mvn:jakarta.servlet.jsp/jakarta.servlet.jsp-api/3.0.0 mvn:org.apache.activemq/activemq-karaf/${project.version}/cfg/activemq-webconsole mvn:org.apache.activemq/activemq-web-console/${project.version}/war @@ -62,12 +67,15 @@ + mvn:jakarta.jms/jakarta.jms-api/3.1.0 mvn:io.netty/netty-common/${netty-version} mvn:io.netty/netty-transport/${netty-version} mvn:io.netty/netty-transport-native-epoll/${netty-version} mvn:io.netty/netty-transport-native-kqueue/${netty-version} mvn:io.netty/netty-transport-native-unix-common/${netty-version} mvn:io.netty/netty-buffer/${netty-version} + mvn:io.netty/netty-codec-base/${netty-version} + mvn:io.netty/netty-codec-compression/${netty-version} mvn:io.netty/netty-codec/${netty-version} mvn:io.netty/netty-codec-http/${netty-version} mvn:io.netty/netty-handler/${netty-version} diff --git a/pom.xml b/pom.xml index 7e2a9c5538b..ee2006e6e97 100644 --- a/pom.xml +++ b/pom.xml @@ -95,7 +95,7 @@ 2.2.1 2.0.18 7.0.8 - [6,7) + [7,8) 1.2.5 1.1.4c 1.4.21 From 0c80a349337b5ecefa42b4ebcd3358e4fd621523 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?JB=20Onofr=C3=A9?= Date: Wed, 22 Jul 2026 23:28:53 +0200 Subject: [PATCH 3/5] Run Karaf features verification in activemq-karaf-itest The karaf-maven-plugin verify goal resolves the feature bundles through pax-url from the local repository. When bound to the activemq-karaf module it fails in a clean reactor build because sibling SNAPSHOTs referenced by the features (activemq-osgi, activemq-blueprint, activemq-http and the activemq-karaf bundle itself) are not installed yet at that point in the reactor. Move the verification to activemq-karaf-itest, which is built last (after all referenced modules are installed) and already sets up the local repository for pax-url. The feature descriptors are now referenced as attached mvn: artifacts of activemq-karaf instead of local files. --- activemq-karaf-itest/pom.xml | 38 ++++++++++++++++++++++++++++++++++++ activemq-karaf/pom.xml | 32 ------------------------------ 2 files changed, 38 insertions(+), 32 deletions(-) diff --git a/activemq-karaf-itest/pom.xml b/activemq-karaf-itest/pom.xml index 076dba00fd2..5ca9c93792d 100644 --- a/activemq-karaf-itest/pom.xml +++ b/activemq-karaf-itest/pom.xml @@ -201,6 +201,44 @@ + + + org.apache.karaf.tooling + karaf-maven-plugin + ${karaf-version} + + + verify-features + verify + + verify + + + + mvn:org.apache.karaf.features/framework/${karaf-version}/xml/features + mvn:org.apache.karaf.features/standard/${karaf-version}/xml/features + mvn:org.apache.karaf.features/spring/${karaf-version}/xml/features + mvn:org.apache.karaf.features/enterprise/${karaf-version}/xml/features + mvn:org.apache.activemq/activemq-karaf/${project.version}/xml/features-core + mvn:org.apache.activemq/activemq-karaf/${project.version}/xml/features + + org.apache.karaf:apache-karaf:zip::${karaf-version} + 17 + + framework + + + activemq* + + + + + diff --git a/activemq-karaf/pom.xml b/activemq-karaf/pom.xml index 8fca7cb4655..f4d30f47c67 100644 --- a/activemq-karaf/pom.xml +++ b/activemq-karaf/pom.xml @@ -218,38 +218,6 @@ - - org.apache.karaf.tooling - karaf-maven-plugin - ${karaf-version} - - - verify - verify - - verify - - - - mvn:org.apache.karaf.features/framework/${karaf-version}/xml/features - mvn:org.apache.karaf.features/standard/${karaf-version}/xml/features - mvn:org.apache.karaf.features/spring/${karaf-version}/xml/features - mvn:org.apache.karaf.features/enterprise/${karaf-version}/xml/features - file:${project.build.directory}/classes/features-core.xml - file:${project.build.directory}/classes/features.xml - - org.apache.karaf:apache-karaf:zip::${karaf-version} - 17 - - framework - - - activemq* - - - - - From 658923d033e3843dfdc08facc1600c594591efb0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?JB=20Onofr=C3=A9?= Date: Thu, 23 Jul 2026 07:40:16 +0200 Subject: [PATCH 4/5] Use filtered properties for Jakarta versions and align to Jakarta EE 11 Reference the parent pom Jakarta versions from the Karaf features through filtered properties instead of hardcoded versions, as requested in review. Make the activemq-web-console bundle imports deterministic so feature verification is stable regardless of the transitively resolved API versions: pin jakarta.servlet to [5,7) and jakarta.servlet.jsp to [3,5), and widen the org.objectweb.asm import range to [6,10) to match the asm 9.x now used by the Jetty 12 based web console. Provide the org.objectweb.asm package (used in provided scope by the web console) through an asm bundle in the activemq-web-console feature. --- .../src/main/resources/features-core.xml | 8 ++++---- .../src/main/resources/features.xml | 9 +++++---- activemq-web-console/pom.xml | 14 ++++++------- pom.xml | 20 ++++++++++++++----- 4 files changed, 31 insertions(+), 20 deletions(-) diff --git a/activemq-karaf/src/main/resources/features-core.xml b/activemq-karaf/src/main/resources/features-core.xml index 4f80fa64c8a..4eece1ea027 100644 --- a/activemq-karaf/src/main/resources/features-core.xml +++ b/activemq-karaf/src/main/resources/features-core.xml @@ -36,7 +36,7 @@ spring - mvn:jakarta.servlet/jakarta.servlet-api/5.0.0 + mvn:jakarta.servlet/jakarta.servlet-api/${jakarta-servlet-api-version} wrap:mvn:org.springframework/spring-web/${spring-version}$Bundle-SymbolicName=org.springframework.spring-web&Bundle-Version=${spring-version}&Export-Package=org.springframework.*;version=${spring-version}&Import-Package=*;resolution:=optional wrap:mvn:org.springframework/spring-webmvc/${spring-version}$Bundle-SymbolicName=org.springframework.spring-webmvc&Bundle-Version=${spring-version}&Export-Package=org.springframework.*;version=${spring-version}&Import-Package=*;resolution:=optional @@ -48,11 +48,11 @@ activemq-combined-jms-spec mvn:jakarta.activation/jakarta.activation-api/2.1.2 mvn:jakarta.xml.bind/jakarta.xml.bind-api/4.0.0 - mvn:jakarta.jms/jakarta.jms-api/3.1.0 + mvn:jakarta.jms/jakarta.jms-api/${jakarta-jms-api-version} mvn:jakarta.activation/jakarta.activation-api/2.1.2 - mvn:jakarta.annotation/jakarta.annotation-api/2.1.1 + mvn:jakarta.annotation/jakarta.annotation-api/${jakarta-annotation-api-version} mvn:jakarta.enterprise/jakarta.enterprise.lang-model/4.0.1 - mvn:jakarta.el/jakarta.el-api/5.0.1 + mvn:jakarta.el/jakarta.el-api/${jakarta-el-api-version} mvn:jakarta.inject/jakarta.inject-api/2.0.1 mvn:jakarta.interceptor/jakarta.interceptor-api/2.1.0 mvn:jakarta.enterprise/jakarta.enterprise.cdi-api/4.0.1 diff --git a/activemq-karaf/src/main/resources/features.xml b/activemq-karaf/src/main/resources/features.xml index 16a8dd0fc7e..cb4886b5cc6 100644 --- a/activemq-karaf/src/main/resources/features.xml +++ b/activemq-karaf/src/main/resources/features.xml @@ -51,9 +51,10 @@ war eventadmin spring-web - mvn:jakarta.servlet/jakarta.servlet-api/5.0.0 - mvn:jakarta.el/jakarta.el-api/4.0.0 - mvn:jakarta.servlet.jsp/jakarta.servlet.jsp-api/3.0.0 + mvn:org.ow2.asm/asm/${asm-version} + mvn:jakarta.servlet/jakarta.servlet-api/${jakarta-servlet-api-version} + mvn:jakarta.el/jakarta.el-api/${jakarta-el-api-version} + mvn:jakarta.servlet.jsp/jakarta.servlet.jsp-api/${jakarta-servlet-jsp-api-version} mvn:org.apache.activemq/activemq-karaf/${project.version}/cfg/activemq-webconsole mvn:org.apache.activemq/activemq-web-console/${project.version}/war @@ -67,7 +68,7 @@ - mvn:jakarta.jms/jakarta.jms-api/3.1.0 + mvn:jakarta.jms/jakarta.jms-api/${jakarta-jms-api-version} mvn:io.netty/netty-common/${netty-version} mvn:io.netty/netty-transport/${netty-version} mvn:io.netty/netty-transport-native-epoll/${netty-version} diff --git a/activemq-web-console/pom.xml b/activemq-web-console/pom.xml index 65f2e6f7ecc..ded13015b3c 100644 --- a/activemq-web-console/pom.xml +++ b/activemq-web-console/pom.xml @@ -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="[5,7)", + jakarta.servlet.annotation;version="[5,7)", + jakarta.servlet.http;version="[5,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, @@ -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)" <_contract>!* <_noee>true diff --git a/pom.xml b/pom.xml index ee2006e6e97..fed7d07b28b 100644 --- a/pom.xml +++ b/pom.xml @@ -69,6 +69,11 @@ 2.22.1 2.22 3.1.0 + 3.0.0 + 6.1.0 + 4.0.0 + 6.0.0 + 9.10.1 1.9.3 4.0.9 12.1.11 @@ -448,19 +453,24 @@ org.ow2.asm asm - 9.10.1 + ${asm-version} - + jakarta.servlet.jsp jakarta.servlet.jsp-api - 4.0.0 + ${jakarta-servlet-jsp-api-version} jakarta.servlet jakarta.servlet-api - 6.1.0 + ${jakarta-servlet-api-version} + + + jakarta.el + jakarta.el-api + ${jakarta-el-api-version} jakarta.websocket @@ -940,7 +950,7 @@ jakarta.annotation jakarta.annotation-api - 3.0.0 + ${jakarta-annotation-api-version} From dc1d78946e108c322cb47ff9a666047c6f735442 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?JB=20Onofr=C3=A9?= Date: Thu, 23 Jul 2026 19:11:25 +0200 Subject: [PATCH 5/5] Address review comments: use spring-version-range and narrow servlet import to [6,7) --- activemq-karaf/src/main/resources/features-core.xml | 4 ++-- activemq-karaf/src/main/resources/features.xml | 2 +- activemq-web-console/pom.xml | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/activemq-karaf/src/main/resources/features-core.xml b/activemq-karaf/src/main/resources/features-core.xml index 4eece1ea027..1061ee30475 100644 --- a/activemq-karaf/src/main/resources/features-core.xml +++ b/activemq-karaf/src/main/resources/features-core.xml @@ -35,7 +35,7 @@ - spring + spring mvn:jakarta.servlet/jakarta.servlet-api/${jakarta-servlet-api-version} wrap:mvn:org.springframework/spring-web/${spring-version}$Bundle-SymbolicName=org.springframework.spring-web&Bundle-Version=${spring-version}&Export-Package=org.springframework.*;version=${spring-version}&Import-Package=*;resolution:=optional wrap:mvn:org.springframework/spring-webmvc/${spring-version}$Bundle-SymbolicName=org.springframework.spring-webmvc&Bundle-Version=${spring-version}&Export-Package=org.springframework.*;version=${spring-version}&Import-Package=*;resolution:=optional @@ -43,7 +43,7 @@ - spring + spring aries-blueprint activemq-combined-jms-spec mvn:jakarta.activation/jakarta.activation-api/2.1.2 diff --git a/activemq-karaf/src/main/resources/features.xml b/activemq-karaf/src/main/resources/features.xml index cb4886b5cc6..22a311d951b 100644 --- a/activemq-karaf/src/main/resources/features.xml +++ b/activemq-karaf/src/main/resources/features.xml @@ -50,7 +50,7 @@ war eventadmin - spring-web + spring-web mvn:org.ow2.asm/asm/${asm-version} mvn:jakarta.servlet/jakarta.servlet-api/${jakarta-servlet-api-version} mvn:jakarta.el/jakarta.el-api/${jakarta-el-api-version} diff --git a/activemq-web-console/pom.xml b/activemq-web-console/pom.xml index ded13015b3c..5edeb39c9f3 100644 --- a/activemq-web-console/pom.xml +++ b/activemq-web-console/pom.xml @@ -139,9 +139,9 @@ javax.management.remote, javax.naming, org.w3c.dom, - jakarta.servlet;version="[5,7)", - jakarta.servlet.annotation;version="[5,7)", - jakarta.servlet.http;version="[5,7)", + 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)",