This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/karaf.git
The following commit(s) were added to refs/heads/main by this push:
new 2b6b6afaa2 feat(features): use wrap instead of ServiceMix bundles
(#2305)
2b6b6afaa2 is described below
commit 2b6b6afaa2a5e663d9f41bc491c797fa45792b2d
Author: JB Onofré <[email protected]>
AuthorDate: Sun May 3 08:05:35 2026 +0200
feat(features): use wrap instead of ServiceMix bundles (#2305)
* feat(features): use wrap instead of ServiceMix bundles
* fix(cdi): provide JavaAnnotation osgi.contract via system capabilities
The javax.annotation-api jar is already an OSGi bundle and doesn't need
wrapping. The osgi.contract capability required by aries.cdi.extender is
now provided by the system bundle via karaf-capabilities in
config.properties, with javax.annotation packages exported as system
packages extra.
---
.../resources/etc/config.properties | 8 +-
.../features/specs/src/main/feature/feature.xml | 28 +-
.../spring-legacy/src/main/feature/feature.xml | 550 +++++++++++++++++++++
.../features/spring/src/main/feature/feature.xml | 50 +-
assemblies/features/standard/pom.xml | 10 +-
.../features/standard/src/main/feature/feature.xml | 6 +-
bom/pom.xml | 6 +-
.../src/main/feature/feature.xml | 4 +-
.../test/filtered-resources/etc/config.properties | 8 +-
.../src/test/filtered-resources/etc/feature.xml | 4 +-
jaas/blueprint/jasypt/pom.xml | 4 +-
jaas/jasypt/pom.xml | 4 +-
jaas/spring-security-crypto/pom.xml | 4 +-
pom.xml | 45 +-
14 files changed, 661 insertions(+), 70 deletions(-)
diff --git
a/assemblies/features/base/src/main/filtered-resources/resources/etc/config.properties
b/assemblies/features/base/src/main/filtered-resources/resources/etc/config.properties
index e012e02ace..f480c801be 100644
---
a/assemblies/features/base/src/main/filtered-resources/resources/etc/config.properties
+++
b/assemblies/features/base/src/main/filtered-resources/resources/etc/config.properties
@@ -91,7 +91,10 @@ org.osgi.framework.system.packages.extra= \
org.apache.karaf.branding, \
sun.misc, \
com.sun.jmx.remote.protocol, \
- com.sun.jmx.remote.protocol.jmxmp
+ com.sun.jmx.remote.protocol.jmxmp, \
+ javax.annotation;version="1.3", \
+ javax.annotation.security;version="1.3", \
+ javax.annotation.sql;version="1.3"
org.osgi.framework.system.capabilities= \
${eecap-${java.specification.version}}, \
@@ -99,7 +102,8 @@ org.osgi.framework.system.capabilities= \
${karaf-capabilities}
karaf-capabilities= \
- osgi.service;objectClass:List<String>=org.apache.karaf.info.ServerInfo
+ osgi.service;objectClass:List<String>=org.apache.karaf.info.ServerInfo, \
+
osgi.contract;osgi.contract=JavaAnnotation;uses:="javax.annotation,javax.annotation.security,javax.annotation.sql";version:List<Version>="1.3,1.2,1.1,1"
felix-capabilities= \
osgi.service;objectClass:List<String>=org.osgi.service.packageadmin.PackageAdmin,
\
diff --git a/assemblies/features/specs/src/main/feature/feature.xml
b/assemblies/features/specs/src/main/feature/feature.xml
index 95c071d967..e7dbbdcc00 100644
--- a/assemblies/features/specs/src/main/feature/feature.xml
+++ b/assemblies/features/specs/src/main/feature/feature.xml
@@ -61,12 +61,12 @@
<!-- jaxrs -->
<feature name="jaxrs" version="${spec.jaxrs.version}">
- <bundle start-level="10"
dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxrs-api-2.1/2.9.1</bundle>
+ <bundle start-level="10"
dependency="true">wrap:mvn:javax.ws.rs/javax.ws.rs-api/${jaxrs-api.version}</bundle>
</feature>
<!-- jaxws -->
<feature name="jaxws" version="${spec.jaxws.version}">
- <bundle
dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxws-api-2.3/2.3_3</bundle>
+ <bundle
dependency="true">wrap:mvn:javax.xml.ws/jaxws-api/${jaxws-api.version}</bundle>
</feature>
<!-- mail -->
@@ -110,7 +110,7 @@
<!-- stax -->
<feature name="stax" version="1.0">
- <bundle start-level="10"
dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.stax-api-1.0/2.9.0</bundle>
+ <bundle start-level="10"
dependency="true">wrap:mvn:javax.xml.stream/stax-api/${stax-api.version}</bundle>
</feature>
<!-- stax2 -->
@@ -121,7 +121,7 @@
<!-- saaj -->
<feature name="saaj" version="1.4">
- <bundle start-level="10"
dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.saaj-api-1.4/1.4_1</bundle>
+ <bundle start-level="10"
dependency="true">wrap:mvn:javax.xml.soap/javax.xml.soap-api/${saaj-api.version}</bundle>
</feature>
<!-- namespace -->
@@ -152,6 +152,26 @@
</feature>
+ <!-- cdi -->
+ <feature name="cdi" version="1.1.3">
+ <feature prerequisite="true">spifly</feature>
+ <bundle
dependency="true">mvn:javax.annotation/javax.annotation-api/${annotation-api.version}</bundle>
+ <bundle>mvn:org.apache.xbean/xbean-bundleutils/4.17</bundle>
+ <bundle>mvn:org.apache.xbean/xbean-asm8-shaded/4.17</bundle>
+ <bundle>mvn:org.apache.xbean/xbean-finder-shaded/4.17</bundle>
+
<bundle>mvn:org.apache.geronimo.specs/geronimo-atinject_1.0_spec/1.2</bundle>
+
<bundle>mvn:org.apache.geronimo.specs/geronimo-interceptor_1.2_spec/1.2</bundle>
+ <bundle>mvn:org.apache.geronimo.specs/geronimo-el_2.2_spec/1.1</bundle>
+
<bundle>mvn:org.apache.geronimo.specs/geronimo-jcdi_2.0_spec/1.2</bundle>
+ <bundle>mvn:org.osgi/org.osgi.service.cdi/1.0.1</bundle>
+ <bundle>mvn:org.apache.openwebbeans/openwebbeans-spi/2.0.17</bundle>
+ <bundle>mvn:org.apache.openwebbeans/openwebbeans-impl/2.0.17</bundle>
+
<bundle>mvn:org.apache.aries.cdi/org.apache.aries.cdi.spi/1.1.3</bundle>
+
<bundle>mvn:org.apache.aries.cdi/org.apache.aries.cdi.owb/1.1.3</bundle>
+ <bundle
start="true">mvn:org.apache.aries.cdi/org.apache.aries.cdi.extension.spi/1.1.3</bundle>
+ <bundle
start="true">mvn:org.apache.aries.cdi/org.apache.aries.cdi.extender/1.1.3</bundle>
+ </feature>
+
<!-- groovy -->
<feature name="groovy" version="${groovy.version}">
<feature prerequisite="true">spifly</feature>
diff --git a/assemblies/features/spring-legacy/src/main/feature/feature.xml
b/assemblies/features/spring-legacy/src/main/feature/feature.xml
new file mode 100644
index 0000000000..123d35fac7
--- /dev/null
+++ b/assemblies/features/spring-legacy/src/main/feature/feature.xml
@@ -0,0 +1,550 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<features name="spring-legacy-${project.version}"
xmlns="http://karaf.apache.org/xmlns/features/v1.3.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.3.0
http://karaf.apache.org/xmlns/features/v1.3.0";>
+
+
<repository>mvn:org.ops4j.pax.web/pax-web-features/${pax.web.version}/xml/features</repository>
+
<repository>mvn:org.apache.karaf.features/standard/${project.version}/xml/features</repository>
+
+ <!-- Spring DM support (deprecated, user should use blueprint instead -->
+
+ <feature name="spring-dm" description="Spring DM support"
version="${spring.osgi.version}">
+ <feature version="[2.5.6,4)">spring</feature>
+ <bundle dependency="true"
start-level="30">wrap:mvn:cglib/cglib-nodep/${cglib.version}</bundle>
+ <bundle
start-level="30">mvn:org.springframework.osgi/spring-osgi-io/${spring.osgi.version}</bundle>
+ <bundle
start-level="30">mvn:org.springframework.osgi/spring-osgi-core/${spring.osgi.version}</bundle>
+ <bundle
start-level="30">mvn:org.springframework.osgi/spring-osgi-extender/${spring.osgi.version}</bundle>
+ <bundle
start-level="30">mvn:org.springframework.osgi/spring-osgi-annotation/${spring.osgi.version}</bundle>
+ <conditional>
+ <condition>deployer</condition>
+ <bundle
start-level="30">mvn:org.apache.karaf.deployer/org.apache.karaf.deployer.spring/${project.version}</bundle>
+ </conditional>
+ <conditional>
+ <condition>bundle</condition>
+ <bundle
start-level="30">mvn:org.apache.karaf.bundle/org.apache.karaf.bundle.springstate/${project.version}</bundle>
+ </conditional>
+ </feature>
+
+ <feature name="spring-dm-web" description="Spring DM Web support"
version="${spring.osgi.version}">
+ <feature>spring-dm</feature>
+ <feature version="[2.5.6,4)">spring-web</feature>
+ <bundle
start-level="30">mvn:org.springframework.osgi/spring-osgi-web/${spring.osgi.version}</bundle>
+ </feature>
+
+ <!-- Spring 3.1.x support (required for spring-dm) -->
+
+ <feature name="spring" description="Spring 3.1.x support"
version="${spring31.version}">
+ <bundle dependency="true"
start-level="30">wrap:mvn:aopalliance/aopalliance/${aopalliance.version}$Export-Package=org.aopalliance.*;version=1.0</bundle>
+ <bundle
start-level="30">mvn:org.springframework/spring-core/${spring31.version}</bundle>
+ <bundle
start-level="30">mvn:org.springframework/spring-asm/${spring31.version}</bundle>
+ <bundle
start-level="30">mvn:org.springframework/spring-expression/${spring31.version}</bundle>
+ <bundle
start-level="30">mvn:org.springframework/spring-beans/${spring31.version}</bundle>
+ <bundle
start-level="30">mvn:org.springframework/spring-aop/${spring31.version}</bundle>
+ <bundle
start-level="30">mvn:org.springframework/spring-context/${spring31.version}</bundle>
+ <bundle
start-level="30">mvn:org.springframework/spring-context-support/${spring31.version}</bundle>
+ </feature>
+
+ <feature name="spring-aspects" description="Spring 3.1.x AOP support"
version="${spring31.version}">
+ <feature version="[${spring31.version},3.2)">spring</feature>
+ <bundle
start-level="30">mvn:org.springframework/spring-aspects/${spring31.version}</bundle>
+ </feature>
+
+ <feature name="spring-instrument" description="Spring 3.1.x Instrument
support" version="${spring31.version}">
+ <feature version="[${spring31.version},3.2)">spring</feature>
+ <bundle
start-level="30">mvn:org.springframework/spring-instrument/${spring31.version}</bundle>
+ </feature>
+
+ <feature name="spring-jdbc" description="Spring 3.1.x JDBC support"
version="${spring31.version}">
+ <feature version="[${spring31.version},3.2)">spring-tx</feature>
+ <bundle
start-level="30">mvn:org.springframework/spring-jdbc/${spring31.version}</bundle>
+ </feature>
+
+ <feature name="spring-jms" description="Spring 3.1.x JMS support"
version="${spring31.version}">
+ <feature version="[${spring31.version},3.2)">spring-tx</feature>
+ <bundle dependency="true"
start-level="10">mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo.jta-spec.version}</bundle>
+ <bundle dependency="true"
start-level="10">mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo.jms-spec.version}</bundle>
+ <bundle
start-level="30">mvn:org.springframework/spring-jms/${spring31.version}</bundle>
+ </feature>
+
+ <feature name="spring-struts" description="Spring 3.1.x Struts support"
version="${spring31.version}">
+ <feature version="[${spring31.version},3.2)">spring-web</feature>
+ <feature>pax-web-war</feature>
+ <bundle dependency="true"
start-level="30">mvn:commons-collections/commons-collections/3.2.2</bundle>
+ <bundle dependency="true"
start-level="30">mvn:commons-beanutils/commons-beanutils/${commons-beanutils.version}</bundle>
+ <bundle dependency="true"
start-level="30">wrap:mvn:org.apache.struts/struts-core/${struts.version}</bundle>
+ <bundle
start-level="30">mvn:org.springframework/spring-struts/${spring31.version}</bundle>
+ </feature>
+
+ <feature name="spring-test" description="Spring 3.1.x Test support"
version="${spring31.version}">
+ <feature version="[${spring31.version},3.2)">spring</feature>
+ <bundle
start-level="30">mvn:org.springframework/spring-test/${spring31.version}</bundle>
+ </feature>
+
+ <feature name="spring-orm" description="Spring 3.1.x ORM support"
version="${spring31.version}">
+ <feature version="[${spring31.version},3.2)">spring-jdbc</feature>
+ <bundle
start-level="30">mvn:org.springframework/spring-orm/${spring31.version}</bundle>
+ </feature>
+
+ <feature name="spring-oxm" description="Spring 3.1.x OXM support"
version="${spring31.version}">
+ <feature version="[${spring31.version},3.2)">spring</feature>
+ <bundle
start-level="30">mvn:org.springframework/spring-oxm/${spring31.version}</bundle>
+ </feature>
+
+ <feature name="spring-tx" description="Spring 3.1.x Transaction (TX)
support" version="${spring31.version}">
+ <feature version="[${spring31.version},3.2)">spring</feature>
+ <bundle
start-level="30">mvn:org.springframework/spring-tx/${spring31.version}</bundle>
+ </feature>
+
+ <feature name="spring-web" description="Spring 3.1.x Web support"
version="${spring31.version}">
+ <feature version="[${spring31.version},3.2)">spring</feature>
+ <bundle
dependency="true">mvn:javax.servlet/javax.servlet-api/3.1.0</bundle>
+ <bundle
start-level="30">mvn:org.springframework/spring-web/${spring31.version}</bundle>
+ <bundle
start-level="30">mvn:org.springframework/spring-webmvc/${spring31.version}</bundle>
+ </feature>
+
+ <feature name="spring-web-portlet" description="Spring 3.1.x Web Portlet
support" version="${spring31.version}">
+ <feature prerequisite="true">pax-url-wrap</feature>
+ <feature version="[${spring31.version},3.2)">spring-web</feature>
+ <bundle dependency="true"
start-level="30">wrap:mvn:javax.portlet/portlet-api/${portlet-api.version}$Export-Package=javax.portlet.*;version=2.0</bundle>
+ <bundle
start-level="30">mvn:org.springframework/spring-webmvc-portlet/${spring31.version}</bundle>
+ </feature>
+
+ <!-- Spring 4.3.x support -->
+
+ <feature name="spring" description="Spring 4.3.x support"
version="${spring43.version}">
+ <bundle dependency="true"
start-level="30">wrap:mvn:aopalliance/aopalliance/${aopalliance.version}$Export-Package=org.aopalliance.*;version=1.0</bundle>
+ <bundle
start-level="30">wrap:mvn:org.springframework/spring-core/${spring43.version}</bundle>
+ <bundle
start-level="30">wrap:mvn:org.springframework/spring-expression/${spring43.version}</bundle>
+ <bundle
start-level="30">wrap:mvn:org.springframework/spring-beans/${spring43.version}</bundle>
+ <bundle
start-level="30">wrap:mvn:org.springframework/spring-aop/${spring43.version}</bundle>
+ <bundle
start-level="30">wrap:mvn:org.springframework/spring-context/${spring43.version}</bundle>
+ <bundle
start-level="30">wrap:mvn:org.springframework/spring-context-support/${spring43.version}</bundle>
+ </feature>
+
+ <feature name="spring-aspects" description="Spring 4.3.x AOP support"
version="${spring43.version}">
+ <feature version="[${spring43.version},4.4)">spring</feature>
+ <bundle
start-level="30">wrap:mvn:org.springframework/spring-aspects/${spring43.version}</bundle>
+ </feature>
+
+ <feature name="spring-instrument" description="Spring 4.3.x Instrument
support" version="${spring43.version}">
+ <feature version="[${spring43.version},4.4)">spring</feature>
+ <bundle
start-level="30">wrap:mvn:org.springframework/spring-instrument/${spring43.version}</bundle>
+ </feature>
+
+ <feature name="spring-jdbc" description="Spring 4.3.x JDBC support"
version="${spring43.version}">
+ <feature version="[${spring43.version},4.4)">spring-tx</feature>
+ <bundle
start-level="30">wrap:mvn:org.springframework/spring-jdbc/${spring43.version}</bundle>
+ </feature>
+
+ <feature name="spring-jms" description="Spring 4.3.x JMS support"
version="${spring43.version}">
+ <feature version="[${spring43.version},4.4)">spring-tx</feature>
+ <bundle dependency="true"
start-level="10">mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo.jta-spec.version}</bundle>
+ <bundle dependency="true"
start-level="10">mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo.jms-spec.version}</bundle>
+ <bundle
start-level="30">wrap:mvn:org.springframework/spring-jms/${spring43.version}</bundle>
+ </feature>
+
+ <feature name="spring-messaging" description="Spring 4.3.x Messaging
support" version="${spring43.version}">
+ <feature version="[${spring43.version},4.4)">spring</feature>
+ <bundle
start-level="30">wrap:mvn:org.springframework/spring-messaging/${spring43.version}</bundle>
+ </feature>
+
+ <feature name="spring-test" description="Spring 4.3.x Test support"
version="${spring43.version}">
+ <feature version="[${spring43.version},4.4)">spring</feature>
+ <bundle
dependency="true">mvn:javax.websocket/javax.websocket-api/1.1</bundle>
+ <bundle
dependency="true">mvn:org.apache.httpcomponents/httpcore-osgi/4.4.6</bundle>
+ <bundle
dependency="true">mvn:org.apache.httpcomponents/httpclient-osgi/4.5.2</bundle>
+ <bundle
start-level="30">wrap:mvn:org.springframework/spring-test/${spring43.version}</bundle>
+ </feature>
+
+ <feature name="spring-orm" description="Spring 4.3.x ORM support"
version="${spring43.version}">
+ <feature version="[${spring43.version},4.4)">spring-jdbc</feature>
+ <bundle
start-level="30">wrap:mvn:org.springframework/spring-orm/${spring43.version}</bundle>
+ </feature>
+
+ <feature name="spring-oxm" description="Spring 4.3.x OXM support"
version="${spring43.version}">
+ <feature version="[${spring43.version},4.4)">spring</feature>
+ <bundle
start-level="30">wrap:mvn:org.springframework/spring-oxm/${spring43.version}</bundle>
+ </feature>
+
+ <feature name="spring-tx" description="Spring 4.3.x Transaction (TX)
support" version="${spring43.version}">
+ <feature version="[${spring43.version},4.4)">spring</feature>
+ <bundle
start-level="30">wrap:mvn:org.springframework/spring-tx/${spring43.version}</bundle>
+ </feature>
+
+ <feature name="spring-web" description="Spring 4.3.x Web support"
version="${spring43.version}">
+ <feature version="[${spring43.version},4.4)">spring</feature>
+ <bundle
dependency="true">mvn:javax.servlet/javax.servlet-api/3.1.0</bundle>
+ <bundle
start-level="30">wrap:mvn:org.springframework/spring-web/${spring43.version}</bundle>
+ <bundle
start-level="30">wrap:mvn:org.springframework/spring-webmvc/${spring43.version}</bundle>
+ </feature>
+
+ <feature name="spring-web-portlet" description="Spring 4.3.x Web Portlet
support" version="${spring43.version}">
+ <feature prerequisite="true">pax-url-wrap</feature>
+ <feature version="[${spring43.version},4.4)">spring-web</feature>
+ <bundle dependency="true"
start-level="30">wrap:mvn:javax.portlet/portlet-api/${portlet-api.version}$Export-Package=javax.portlet.*;version=2.0</bundle>
+ <bundle
start-level="30">wrap:mvn:org.springframework/spring-webmvc-portlet/${spring43.version}</bundle>
+ </feature>
+
+ <feature name="spring-websocket" description="Spring 4.3.x WebSocket
support" version="${spring43.version}">
+ <bundle
dependency="true">mvn:javax.websocket/javax.websocket-api/1.1</bundle>
+ <feature version="[${spring43.version},4.4)">spring-web</feature>
+ <bundle
start-level="30">wrap:mvn:org.springframework/spring-websocket/${spring43.version}</bundle>
+ </feature>
+
+ <!-- Spring 5.2.x support -->
+
+ <feature name="spring" description="Spring 5.2.x support"
version="${spring52.version}">
+ <bundle dependency="true"
start-level="30">wrap:mvn:aopalliance/aopalliance/${aopalliance.version}$Export-Package=org.aopalliance.*;version=1.0</bundle>
+ <bundle
start-level="30">wrap:mvn:org.springframework/spring-core/${spring52.version}</bundle>
+ <bundle
start-level="30">wrap:mvn:org.springframework/spring-expression/${spring52.version}</bundle>
+ <bundle
start-level="30">wrap:mvn:org.springframework/spring-beans/${spring52.version}</bundle>
+ <bundle
start-level="30">wrap:mvn:org.springframework/spring-aop/${spring52.version}</bundle>
+ <bundle
start-level="30">wrap:mvn:org.springframework/spring-context/${spring52.version}</bundle>
+ <bundle
start-level="30">wrap:mvn:org.springframework/spring-context-support/${spring52.version}</bundle>
+ </feature>
+
+ <feature name="spring-aspects" description="Spring 5.2.x AOP support"
version="${spring52.version}">
+ <feature version="[${spring52.version},5.3)">spring</feature>
+ <bundle
start-level="30">wrap:mvn:org.springframework/spring-aspects/${spring52.version}</bundle>
+ </feature>
+
+ <feature name="spring-instrument" description="Spring 5.2.x Instrument
support" version="${spring52.version}">
+ <feature version="[${spring52.version},5.3)">spring</feature>
+ <bundle
start-level="30">wrap:mvn:org.springframework/spring-instrument/${spring52.version}</bundle>
+ </feature>
+
+ <feature name="spring-jdbc" description="Spring 5.2.x JDBC support"
version="${spring52.version}">
+ <feature version="[${spring52.version},5.3)">spring-tx</feature>
+ <bundle
start-level="30">wrap:mvn:org.springframework/spring-jdbc/${spring52.version}</bundle>
+ </feature>
+
+ <feature name="spring-jms" description="Spring 5.2.x JMS support"
version="${spring52.version}">
+ <feature version="[${spring52.version},5.3)">spring-tx</feature>
+ <bundle dependency="true"
start-level="10">mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo.jta-spec.version}</bundle>
+ <bundle dependency="true"
start-level="10">mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo.jms-spec.version}</bundle>
+ <bundle
start-level="30">wrap:mvn:org.springframework/spring-jms/${spring52.version}</bundle>
+ </feature>
+
+ <feature name="spring-messaging" description="Spring 5.2.x Messaging
support" version="${spring52.version}">
+ <feature version="[${spring52.version},5.3)">spring</feature>
+ <bundle
start-level="30">wrap:mvn:org.springframework/spring-messaging/${spring52.version}</bundle>
+ </feature>
+
+ <feature name="spring-test" description="Spring 5.2.x Test support"
version="${spring52.version}">
+ <feature version="[${spring52.version},5.3)">spring</feature>
+ <bundle
dependency="true">mvn:javax.websocket/javax.websocket-api/1.1</bundle>
+ <bundle
dependency="true">mvn:org.apache.httpcomponents/httpcore-osgi/4.4.6</bundle>
+ <bundle
dependency="true">mvn:org.apache.httpcomponents/httpclient-osgi/4.5.2</bundle>
+ <bundle
start-level="30">wrap:mvn:org.springframework/spring-test/${spring52.version}</bundle>
+ </feature>
+
+ <feature name="spring-orm" description="Spring 5.2.x ORM support"
version="${spring52.version}">
+ <feature version="[${spring52.version},5.3)">spring-jdbc</feature>
+ <bundle
start-level="30">wrap:mvn:org.springframework/spring-orm/${spring52.version}</bundle>
+ </feature>
+
+ <feature name="spring-oxm" description="Spring 5.2.x OXM support"
version="${spring52.version}">
+ <feature version="[${spring52.version},5.3)">spring</feature>
+ <bundle
start-level="30">wrap:mvn:org.springframework/spring-oxm/${spring52.version}</bundle>
+ </feature>
+
+ <feature name="spring-tx" description="Spring 5.2.x Transaction (TX)
support" version="${spring52.version}">
+ <feature version="[${spring52.version},5.3)">spring</feature>
+ <bundle
start-level="30">wrap:mvn:org.springframework/spring-tx/${spring52.version}</bundle>
+ </feature>
+
+ <feature name="spring-web" description="Spring 5.2.x Web support"
version="${spring52.version}">
+ <feature version="[${spring52.version},5.3)">spring</feature>
+ <bundle
dependency="true">mvn:javax.servlet/javax.servlet-api/3.1.0</bundle>
+ <bundle
start-level="30">wrap:mvn:org.springframework/spring-web/${spring52.version}</bundle>
+ <bundle
start-level="30">wrap:mvn:org.springframework/spring-webmvc/${spring52.version}</bundle>
+ </feature>
+
+ <feature name="spring-websocket" description="Spring 5.2.x WebSocket
support" version="${spring52.version}">
+ <bundle
dependency="true">mvn:javax.websocket/javax.websocket-api/1.1</bundle>
+ <feature version="[${spring52.version},5.3)">spring-web</feature>
+ <bundle
start-level="30">wrap:mvn:org.springframework/spring-websocket/${spring52.version}</bundle>
+ </feature>
+
+ <!-- Spring 5.3.x support -->
+
+ <feature name="spring" description="Spring 5.3.x support"
version="${spring53.version}">
+ <bundle dependency="true"
start-level="30">wrap:mvn:aopalliance/aopalliance/${aopalliance.version}$Export-Package=org.aopalliance.*;version=1.0</bundle>
+ <bundle
start-level="30">wrap:mvn:org.springframework/spring-core/${spring53.version}</bundle>
+ <bundle
start-level="30">wrap:mvn:org.springframework/spring-expression/${spring53.version}</bundle>
+ <bundle
start-level="30">wrap:mvn:org.springframework/spring-beans/${spring53.version}</bundle>
+ <bundle
start-level="30">wrap:mvn:org.springframework/spring-aop/${spring53.version}</bundle>
+ <bundle
start-level="30">wrap:mvn:org.springframework/spring-context/${spring53.version}</bundle>
+ <bundle
start-level="30">wrap:mvn:org.springframework/spring-context-support/${spring53.version}</bundle>
+ </feature>
+
+ <feature name="spring-aspects" description="Spring 5.3.x AOP support"
version="${spring53.version}">
+ <feature version="[${spring53.version},5.4)">spring</feature>
+ <bundle
start-level="30">wrap:mvn:org.springframework/spring-aspects/${spring53.version}</bundle>
+ </feature>
+
+ <feature name="spring-instrument" description="Spring 5.3.x Instrument
support" version="${spring53.version}">
+ <feature version="[${spring53.version},5.4)">spring</feature>
+ <bundle
start-level="30">wrap:mvn:org.springframework/spring-instrument/${spring53.version}</bundle>
+ </feature>
+
+ <feature name="spring-jdbc" description="Spring 5.3.x JDBC support"
version="${spring53.version}">
+ <feature version="[${spring53.version},5.4)">spring-tx</feature>
+ <bundle
start-level="30">wrap:mvn:org.springframework/spring-jdbc/${spring53.version}</bundle>
+ </feature>
+
+ <feature name="spring-jms" description="Spring 5.3.x JMS support"
version="${spring53.version}">
+ <feature version="[${spring53.version},5.4)">spring-tx</feature>
+ <bundle dependency="true"
start-level="10">mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo.jta-spec.version}</bundle>
+ <bundle dependency="true"
start-level="10">mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo.jms-spec.version}</bundle>
+ <bundle
start-level="30">wrap:mvn:org.springframework/spring-jms/${spring53.version}</bundle>
+ </feature>
+
+ <feature name="spring-messaging" description="Spring 5.3.x Messaging
support" version="${spring53.version}">
+ <feature version="[${spring53.version},5.4)">spring</feature>
+ <bundle
start-level="30">wrap:mvn:org.springframework/spring-messaging/${spring53.version}</bundle>
+ </feature>
+
+ <feature name="spring-test" description="Spring 5.3.x Test support"
version="${spring53.version}">
+ <feature version="[${spring53.version},5.4)">spring</feature>
+ <bundle
dependency="true">mvn:javax.websocket/javax.websocket-api/1.1</bundle>
+ <bundle
dependency="true">mvn:org.apache.httpcomponents/httpcore-osgi/4.4.6</bundle>
+ <bundle
dependency="true">mvn:org.apache.httpcomponents/httpclient-osgi/4.5.2</bundle>
+ <bundle
start-level="30">wrap:mvn:org.springframework/spring-test/${spring53.version}</bundle>
+ </feature>
+
+ <feature name="spring-orm" description="Spring 5.3.x ORM support"
version="${spring53.version}">
+ <feature version="[${spring53.version},5.4)">spring-jdbc</feature>
+ <bundle
start-level="30">wrap:mvn:org.springframework/spring-orm/${spring53.version}</bundle>
+ </feature>
+
+ <feature name="spring-oxm" description="Spring 5.3.x OXM support"
version="${spring53.version}">
+ <feature version="[${spring53.version},5.4)">spring</feature>
+ <bundle
start-level="30">wrap:mvn:org.springframework/spring-oxm/${spring53.version}</bundle>
+ </feature>
+
+ <feature name="spring-tx" description="Spring 5.3.x Transaction (TX)
support" version="${spring53.version}">
+ <feature version="[${spring53.version},5.4)">spring</feature>
+ <bundle
start-level="30">wrap:mvn:org.springframework/spring-tx/${spring53.version}</bundle>
+ </feature>
+
+ <feature name="spring-web" description="Spring 5.3.x Web support"
version="${spring53.version}">
+ <feature version="[${spring53.version},5.4)">spring</feature>
+ <bundle
dependency="true">mvn:javax.servlet/javax.servlet-api/3.1.0</bundle>
+ <bundle
start-level="30">wrap:mvn:org.springframework/spring-web/${spring53.version}</bundle>
+ <bundle
start-level="30">wrap:mvn:org.springframework/spring-webmvc/${spring53.version}</bundle>
+ </feature>
+
+ <feature name="spring-websocket" description="Spring 5.3.x WebSocket
support" version="${spring53.version}">
+ <bundle
dependency="true">mvn:javax.websocket/javax.websocket-api/1.1</bundle>
+ <feature version="[${spring53.version},5.4)">spring-web</feature>
+ <bundle
start-level="30">wrap:mvn:org.springframework/spring-websocket/${spring53.version}</bundle>
+ </feature>
+
+ <!-- Spring 6.0.x support -->
+
+ <feature name="spring" description="Spring 6.0.x support"
version="${spring60.version}">
+ <bundle dependency="true"
start-level="30">wrap:mvn:aopalliance/aopalliance/${aopalliance.version}$Export-Package=org.aopalliance.*;version=1.0</bundle>
+ <bundle
start-level="30">wrap:mvn:org.springframework/spring-core/${spring60.version}</bundle>
+ <bundle
start-level="30">wrap:mvn:org.springframework/spring-expression/${spring60.version}</bundle>
+ <bundle
start-level="30">wrap:mvn:org.springframework/spring-beans/${spring60.version}</bundle>
+ <bundle
start-level="30">wrap:mvn:org.springframework/spring-aop/${spring60.version}</bundle>
+ <bundle
start-level="30">wrap:mvn:org.springframework/spring-context/${spring60.version}</bundle>
+ <bundle
start-level="30">wrap:mvn:org.springframework/spring-context-support/${spring60.version}</bundle>
+ </feature>
+
+ <feature name="spring-aspects" description="Spring 6.0.x AOP support"
version="${spring60.version}">
+ <feature version="[${spring60.version},6.1)">spring</feature>
+ <bundle
start-level="30">wrap:mvn:org.springframework/spring-aspects/${spring60.version}</bundle>
+ </feature>
+
+ <feature name="spring-instrument" description="Spring 6.0.x Instrument
support" version="${spring60.version}">
+ <feature version="[${spring60.version},6.1)">spring</feature>
+ <bundle
start-level="30">wrap:mvn:org.springframework/spring-instrument/${spring60.version}</bundle>
+ </feature>
+
+ <feature name="spring-jdbc" description="Spring 6.0.x JDBC support"
version="${spring60.version}">
+ <feature version="[${spring60.version},6.1)">spring-tx</feature>
+ <bundle
start-level="30">wrap:mvn:org.springframework/spring-jdbc/${spring60.version}</bundle>
+ </feature>
+
+ <feature name="spring-jms" description="Spring 6.0.x JMS support"
version="${spring60.version}">
+ <feature version="[${spring60.version},6.1)">spring-tx</feature>
+ <bundle
dependency="true">mvn:jakarta.jms/jakarta.jms-api/3.1.0</bundle>
+ <bundle
start-level="30">wrap:mvn:org.springframework/spring-jms/${spring60.version}</bundle>
+ </feature>
+
+ <feature name="spring-messaging" description="Spring 6.0.x Messaging
support" version="${spring60.version}">
+ <feature version="[${spring60.version},6.1)">spring</feature>
+ <bundle
start-level="30">wrap:mvn:org.springframework/spring-messaging/${spring60.version}</bundle>
+ </feature>
+
+ <feature name="spring-test" description="Spring 6.0.x Test support"
version="${spring60.version}">
+ <feature version="[${spring60.version},6.1)">spring</feature>
+ <bundle
dependency="true">mvn:javax.websocket/javax.websocket-api/1.1</bundle>
+ <bundle
dependency="true">mvn:org.apache.httpcomponents/httpcore-osgi/4.4.6</bundle>
+ <bundle
dependency="true">mvn:org.apache.httpcomponents/httpclient-osgi/4.5.2</bundle>
+ <bundle
start-level="30">wrap:mvn:org.springframework/spring-test/${spring60.version}</bundle>
+ </feature>
+
+ <feature name="spring-orm" description="Spring 6.0.x ORM support"
version="${spring60.version}">
+ <feature version="[${spring60.version},6.1)">spring-jdbc</feature>
+ <bundle
start-level="30">wrap:mvn:org.springframework/spring-orm/${spring60.version}</bundle>
+ </feature>
+
+ <feature name="spring-oxm" description="Spring 6.0.x OXM support"
version="${spring60.version}">
+ <feature version="[${spring60.version},6.1)">spring</feature>
+ <bundle
dependency="true">mvn:jakarta.xml.bind/jakarta.xml.bind-api/4.0.0</bundle>
+ <bundle
start-level="30">wrap:mvn:org.springframework/spring-oxm/${spring60.version}</bundle>
+ </feature>
+
+ <feature name="spring-tx" description="Spring 6.0.x Transaction (TX)
support" version="${spring60.version}">
+ <feature version="[${spring60.version},6.1)">spring</feature>
+ <bundle
start-level="30">wrap:mvn:org.springframework/spring-tx/${spring60.version}</bundle>
+ </feature>
+
+ <feature name="spring-web" description="Spring 6.0.x Web support"
version="${spring60.version}">
+ <feature version="[${spring60.version},6.1)">spring</feature>
+ <bundle
dependency="true">mvn:jakarta.servlet/jakarta.servlet-api/5.0.0</bundle>
+ <bundle
start-level="30">wrap:mvn:org.springframework/spring-web/${spring60.version}</bundle>
+ <bundle
start-level="30">wrap:mvn:org.springframework/spring-webmvc/${spring60.version}</bundle>
+ </feature>
+
+ <feature name="spring-websocket" description="Spring 6.0.x WebSocket
support" version="${spring60.version}">
+ <bundle
dependency="true">mvn:javax.websocket/javax.websocket-api/1.1</bundle>
+ <feature version="[${spring60.version},6.1)">spring-web</feature>
+ <bundle
start-level="30">wrap:mvn:org.springframework/spring-websocket/${spring60.version}</bundle>
+ </feature>
+
+ <!-- Spring Security support -->
+
+ <feature name="spring-security" description="Spring Security 3.1.x
support" version="${spring.security31.version}">
+ <feature>pax-web-jsp</feature>
+ <feature>pax-web-war</feature>
+ <feature version="[3,4)">spring-web</feature>
+ <bundle
dependency="true">wrap:mvn:org.aspectj/aspectjweaver/${aspectj.version}</bundle>
+ <bundle
start-level="30">mvn:org.springframework.security/spring-security-core/${spring.security31.version}</bundle>
+ <bundle
start-level="30">mvn:org.springframework.security/spring-security-config/${spring.security31.version}</bundle>
+ <bundle
start-level="30">mvn:org.springframework.security/spring-security-web/${spring.security31.version}</bundle>
+ <bundle
start-level="30">mvn:org.springframework.security/spring-security-acl/${spring.security31.version}</bundle>
+ <bundle
start-level="30">mvn:org.springframework.security/spring-security-taglibs/${spring.security31.version}</bundle>
+ </feature>
+
+ <feature name="spring-security" description="Spring Security 4.2.x
support" version="${spring.security42.version}">
+ <feature>pax-web-jsp</feature>
+ <feature>pax-web-war</feature>
+ <feature version="[4,5)">spring-web</feature>
+ <bundle
dependency="true">wrap:mvn:org.aspectj/aspectjweaver/${aspectj.version}</bundle>
+ <bundle
start-level="30">wrap:mvn:org.springframework.security/spring-security-core/${spring.security42.version}</bundle>
+ <bundle
start-level="30">wrap:mvn:org.springframework.security/spring-security-config/${spring.security42.version}</bundle>
+ <bundle
start-level="30">wrap:mvn:org.springframework.security/spring-security-web/${spring.security42.version}</bundle>
+ <bundle
start-level="30">wrap:mvn:org.springframework.security/spring-security-acl/${spring.security42.version}</bundle>
+ <bundle
start-level="30">wrap:mvn:org.springframework.security/spring-security-taglibs/${spring.security42.version}</bundle>
+ </feature>
+
+ <feature name="spring-security" description="Spring Security 5.3.x
support" version="${spring.security53.version}">
+ <feature>pax-web-jsp</feature>
+ <feature>pax-web-war</feature>
+ <feature version="[5.2,5.3)">spring-jdbc</feature>
+ <feature version="[5.2,5.3)">spring-tx</feature>
+ <feature version="[5.2,5.3)">spring-web</feature>
+ <bundle
dependency="true">mvn:javax.annotation/javax.annotation-api/1.3</bundle>
+ <bundle
dependency="true">mvn:com.fasterxml.jackson.core/jackson-core/${jackson.version}</bundle>
+ <bundle
dependency="true">mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson.annotations.version}</bundle>
+ <bundle
dependency="true">mvn:com.fasterxml.jackson.core/jackson-databind/${jackson.version}</bundle>
+ <bundle
dependency="true">wrap:mvn:org.aspectj/aspectjweaver/${aspectj.version}</bundle>
+ <bundle
start-level="30">wrap:mvn:org.springframework.security/spring-security-core/${spring.security53.version}</bundle>
+ <bundle
start-level="30">wrap:mvn:org.springframework.security/spring-security-config/${spring.security53.version}</bundle>
+ <bundle
start-level="30">wrap:mvn:org.springframework.security/spring-security-web/${spring.security53.version}</bundle>
+ <bundle
start-level="30">wrap:mvn:org.springframework.security/spring-security-acl/${spring.security53.version}</bundle>
+ <bundle
start-level="30">wrap:mvn:org.springframework.security/spring-security-taglibs/${spring.security53.version}</bundle>
+ </feature>
+
+ <feature name="spring-security" description="Spring Security 5.4.x
support" version="${spring.security54.version}">
+ <feature>pax-web-jsp</feature>
+ <feature>pax-web-war</feature>
+ <feature version="[5.2,5.3)">spring-jdbc</feature>
+ <feature version="[5.2,5.3)">spring-tx</feature>
+ <feature version="[5.2,5.3)">spring-web</feature>
+ <bundle
dependency="true">mvn:javax.annotation/javax.annotation-api/1.3</bundle>
+ <bundle
dependency="true">mvn:com.fasterxml.jackson.core/jackson-core/${jackson.version}</bundle>
+ <bundle
dependency="true">mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson.annotations.version}</bundle>
+ <bundle
dependency="true">mvn:com.fasterxml.jackson.core/jackson-databind/${jackson.version}</bundle>
+ <bundle
dependency="true">wrap:mvn:org.aspectj/aspectjweaver/${aspectj.version}</bundle>
+ <bundle
start-level="30">wrap:mvn:org.springframework.security/spring-security-core/${spring.security54.version}</bundle>
+ <bundle
start-level="30">wrap:mvn:org.springframework.security/spring-security-config/${spring.security54.version}</bundle>
+ <bundle
start-level="30">wrap:mvn:org.springframework.security/spring-security-web/${spring.security54.version}</bundle>
+ <bundle
start-level="30">wrap:mvn:org.springframework.security/spring-security-acl/${spring.security54.version}</bundle>
+ <bundle
start-level="30">wrap:mvn:org.springframework.security/spring-security-taglibs/${spring.security54.version}</bundle>
+ </feature>
+
+ <feature name="spring-security" description="Spring Security 5.5.x
support" version="${spring.security55.version}">
+ <feature>pax-web-jsp</feature>
+ <feature>pax-web-war</feature>
+ <feature version="[5.3,5.4)">spring-jdbc</feature>
+ <feature version="[5.3,5.4)">spring-tx</feature>
+ <feature version="[5.3,5.4)">spring-web</feature>
+ <bundle
dependency="true">mvn:javax.annotation/javax.annotation-api/${javax.annotation.version}</bundle>
+ <bundle
dependency="true">mvn:com.fasterxml.jackson.core/jackson-core/${jackson.version}</bundle>
+ <bundle
dependency="true">mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson.annotations.version}</bundle>
+ <bundle
dependency="true">mvn:com.fasterxml.jackson.core/jackson-databind/${jackson.version}</bundle>
+ <bundle
dependency="true">wrap:mvn:org.aspectj/aspectjweaver/${aspectj.version}</bundle>
+ <bundle
start-level="30">wrap:mvn:org.springframework.security/spring-security-core/${spring.security55.version}</bundle>
+ <bundle
start-level="30">wrap:mvn:org.springframework.security/spring-security-config/${spring.security55.version}</bundle>
+ <bundle
start-level="30">wrap:mvn:org.springframework.security/spring-security-web/${spring.security55.version}</bundle>
+ <bundle
start-level="30">wrap:mvn:org.springframework.security/spring-security-acl/${spring.security55.version}</bundle>
+ <bundle
start-level="30">wrap:mvn:org.springframework.security/spring-security-taglibs/${spring.security55.version}</bundle>
+ </feature>
+
+ <feature name="spring-security" description="Spring Security 5.6.x
support" version="${spring.security56.version}">
+ <feature>pax-web-jsp</feature>
+ <feature>pax-web-war</feature>
+ <feature version="[5.3,5.4)">spring-jdbc</feature>
+ <feature version="[5.3,5.4)">spring-tx</feature>
+ <feature version="[5.3,5.4)">spring-web</feature>
+ <bundle
dependency="true">mvn:javax.annotation/javax.annotation-api/${javax.annotation.version}</bundle>
+ <bundle
dependency="true">mvn:com.fasterxml.jackson.core/jackson-core/${jackson.version}</bundle>
+ <bundle
dependency="true">mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson.annotations.version}</bundle>
+ <bundle
dependency="true">mvn:com.fasterxml.jackson.core/jackson-databind/${jackson.version}</bundle>
+ <bundle
dependency="true">wrap:mvn:org.aspectj/aspectjweaver/${aspectj.version}</bundle>
+ <bundle
start-level="30">wrap:mvn:org.springframework.security/spring-security-core/${spring.security56.version}</bundle>
+ <bundle
start-level="30">wrap:mvn:org.springframework.security/spring-security-config/${spring.security56.version}</bundle>
+ <bundle
start-level="30">wrap:mvn:org.springframework.security/spring-security-web/${spring.security56.version}</bundle>
+ <bundle
start-level="30">wrap:mvn:org.springframework.security/spring-security-acl/${spring.security56.version}</bundle>
+ <bundle
start-level="30">wrap:mvn:org.springframework.security/spring-security-taglibs/${spring.security56.version}</bundle>
+ </feature>
+
+ <feature name="spring-security" description="Spring Security 5.7.x
support" version="${spring.security57.version}">
+ <feature>pax-web-jsp</feature>
+ <feature>pax-web-war</feature>
+ <feature version="[5.3,5.4)">spring-jdbc</feature>
+ <feature version="[5.3,5.4)">spring-tx</feature>
+ <feature version="[5.3,5.4)">spring-web</feature>
+ <bundle
dependency="true">mvn:javax.annotation/javax.annotation-api/${javax.annotation.version}</bundle>
+ <bundle
dependency="true">mvn:com.fasterxml.jackson.core/jackson-core/${jackson.version}</bundle>
+ <bundle
dependency="true">mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson.annotations.version}</bundle>
+ <bundle
dependency="true">mvn:com.fasterxml.jackson.core/jackson-databind/${jackson.version}</bundle>
+ <bundle
dependency="true">wrap:mvn:org.aspectj/aspectjweaver/${aspectj.version}</bundle>
+ <bundle
start-level="30">wrap:mvn:org.springframework.security/spring-security-core/${spring.security57.version}</bundle>
+ <bundle
start-level="30">wrap:mvn:org.springframework.security/spring-security-config/${spring.security57.version}</bundle>
+ <bundle
start-level="30">wrap:mvn:org.springframework.security/spring-security-web/${spring.security57.version}</bundle>
+ <bundle
start-level="30">wrap:mvn:org.springframework.security/spring-security-acl/${spring.security57.version}</bundle>
+ <bundle
start-level="30">wrap:mvn:org.springframework.security/spring-security-taglibs/${spring.security57.version}</bundle>
+ </feature>
+
+</features>
diff --git a/assemblies/features/spring/src/main/feature/feature.xml
b/assemblies/features/spring/src/main/feature/feature.xml
index 62a9da9131..27bb74ad39 100644
--- a/assemblies/features/spring/src/main/feature/feature.xml
+++ b/assemblies/features/spring/src/main/feature/feature.xml
@@ -25,28 +25,28 @@
<!-- Spring 6.1.x support -->
<feature name="spring" description="Spring 6.1.x support"
version="${spring61.version}">
- <bundle dependency="true"
start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.aopalliance/${aopalliance.bundle.version}</bundle>
- <bundle
start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-core/${spring61.version}</bundle>
- <bundle
start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-expression/${spring61.version}</bundle>
- <bundle
start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-beans/${spring61.version}</bundle>
- <bundle
start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-aop/${spring61.version}</bundle>
- <bundle
start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-context/${spring61.version}</bundle>
- <bundle
start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-context-support/${spring61.version}</bundle>
+ <bundle dependency="true"
start-level="30">wrap:mvn:aopalliance/aopalliance/${aopalliance.version}$Export-Package=org.aopalliance.*;version=1.0</bundle>
+ <bundle
start-level="30">wrap:mvn:org.springframework/spring-core/${spring61.version}</bundle>
+ <bundle
start-level="30">wrap:mvn:org.springframework/spring-expression/${spring61.version}</bundle>
+ <bundle
start-level="30">wrap:mvn:org.springframework/spring-beans/${spring61.version}</bundle>
+ <bundle
start-level="30">wrap:mvn:org.springframework/spring-aop/${spring61.version}</bundle>
+ <bundle
start-level="30">wrap:mvn:org.springframework/spring-context/${spring61.version}</bundle>
+ <bundle
start-level="30">wrap:mvn:org.springframework/spring-context-support/${spring61.version}</bundle>
</feature>
<feature name="spring-aspects" description="Spring 6.1.x AOP support"
version="${spring61.version}">
<feature version="[${spring61.version},6.2)">spring</feature>
- <bundle
start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-aspects/${spring61.version}</bundle>
+ <bundle
start-level="30">wrap:mvn:org.springframework/spring-aspects/${spring61.version}</bundle>
</feature>
<feature name="spring-instrument" description="Spring 6.1.x Instrument
support" version="${spring61.version}">
<feature version="[${spring61.version},6.2)">spring</feature>
- <bundle
start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-instrument/${spring61.version}</bundle>
+ <bundle
start-level="30">wrap:mvn:org.springframework/spring-instrument/${spring61.version}</bundle>
</feature>
<feature name="spring-jdbc" description="Spring 6.1.x JDBC support"
version="${spring61.version}">
<feature version="[${spring61.version},6.2)">spring-tx</feature>
- <bundle
start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-jdbc/${spring61.version}</bundle>
+ <bundle
start-level="30">wrap:mvn:org.springframework/spring-jdbc/${spring61.version}</bundle>
</feature>
<feature name="spring-jms" description="Spring 6.1.x JMS support"
version="${spring61.version}">
@@ -54,12 +54,12 @@
<bundle
dependency="true">mvn:jakarta.jms/jakarta.jms-api/3.1.0</bundle>
<bundle
dependency="true">mvn:io.micrometer/micrometer-commons/1.12.4</bundle>
<bundle
dependency="true">mvn:io.micrometer/micrometer-observation/1.12.4</bundle>
- <bundle
start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-jms/${spring61.version}</bundle>
+ <bundle
start-level="30">wrap:mvn:org.springframework/spring-jms/${spring61.version}</bundle>
</feature>
<feature name="spring-messaging" description="Spring 6.1.x Messaging
support" version="${spring61.version}">
<feature version="[${spring61.version},6.2)">spring</feature>
- <bundle
start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-messaging/${spring61.version}</bundle>
+ <bundle
start-level="30">wrap:mvn:org.springframework/spring-messaging/${spring61.version}</bundle>
</feature>
<feature name="spring-test" description="Spring 6.1.x Test support"
version="${spring61.version}">
@@ -67,36 +67,36 @@
<bundle
dependency="true">mvn:jakarta.websocket/jakarta.websocket-api/2.1.1</bundle>
<bundle
dependency="true">mvn:org.apache.httpcomponents/httpcore-osgi/4.4.6</bundle>
<bundle
dependency="true">mvn:org.apache.httpcomponents/httpclient-osgi/4.5.2</bundle>
- <bundle
start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-test/${spring61.version}</bundle>
+ <bundle
start-level="30">wrap:mvn:org.springframework/spring-test/${spring61.version}</bundle>
</feature>
<feature name="spring-orm" description="Spring 6.1.x ORM support"
version="${spring61.version}">
<feature version="[${spring61.version},6.2)">spring-jdbc</feature>
- <bundle
start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-orm/${spring61.version}</bundle>
+ <bundle
start-level="30">wrap:mvn:org.springframework/spring-orm/${spring61.version}</bundle>
</feature>
<feature name="spring-oxm" description="Spring 6.1.x OXM support"
version="${spring61.version}">
<feature version="[${spring61.version},6.2)">spring</feature>
<bundle
dependency="true">mvn:jakarta.xml.bind/jakarta.xml.bind-api/${spec.jaxb-api.version}</bundle>
- <bundle
start-level="30">wrap:mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-oxm/${spring61.version}</bundle>
+ <bundle
start-level="30">wrap:mvn:org.springframework/spring-oxm/${spring61.version}</bundle>
</feature>
<feature name="spring-tx" description="Spring 6.1.x Transaction (TX)
support" version="${spring61.version}">
<feature version="[${spring61.version},6.2)">spring</feature>
- <bundle
start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-tx/${spring61.version}</bundle>
+ <bundle
start-level="30">wrap:mvn:org.springframework/spring-tx/${spring61.version}</bundle>
</feature>
<feature name="spring-web" description="Spring 6.1.x Web support"
version="${spring61.version}">
<feature version="[${spring61.version},6.2)">spring</feature>
<bundle
dependency="true">mvn:jakarta.servlet/jakarta.servlet-api/5.0.0</bundle>
- <bundle
start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-web/${spring61.version}</bundle>
- <bundle
start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-webmvc/${spring61.version}</bundle>
+ <bundle
start-level="30">wrap:mvn:org.springframework/spring-web/${spring61.version}</bundle>
+ <bundle
start-level="30">wrap:mvn:org.springframework/spring-webmvc/${spring61.version}</bundle>
</feature>
<feature name="spring-websocket" description="Spring 6.1.x WebSocket
support" version="${spring61.version}">
<bundle
dependency="true">mvn:jakarta.websocket/jakarta.websocket-api/2.1.1</bundle>
<feature version="[${spring61.version},6.2)">spring-web</feature>
- <bundle
start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-websocket/${spring61.version}</bundle>
+ <bundle
start-level="30">wrap:mvn:org.springframework/spring-websocket/${spring61.version}</bundle>
</feature>
<!-- Spring Security -->
@@ -117,12 +117,12 @@
<bundle
dependency="true">mvn:jakarta.servlet/jakarta.servlet-api/6.0.0</bundle>
<bundle
dependency="true">mvn:jakarta.servlet.jsp/jakarta.servlet.jsp-api/3.1.1</bundle>
<bundle dependency="true">mvn:jakarta.el/jakarta.el-api/5.0.1</bundle>
- <bundle
dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.aspectj/${aspectj.bundle.version}</bundle>
- <bundle
start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-security-core/${spring.security62.version}</bundle>
- <bundle
start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-security-config/${spring.security62.version}</bundle>
- <bundle
start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-security-web/${spring.security62.version}</bundle>
- <bundle
start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-security-acl/${spring.security62.version}</bundle>
- <bundle
start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-security-taglibs/${spring.security62.version}</bundle>
+ <bundle
dependency="true">wrap:mvn:org.aspectj/aspectjweaver/${aspectj.version}</bundle>
+ <bundle
start-level="30">wrap:mvn:org.springframework.security/spring-security-core/${spring.security62.version}</bundle>
+ <bundle
start-level="30">wrap:mvn:org.springframework.security/spring-security-config/${spring.security62.version}</bundle>
+ <bundle
start-level="30">wrap:mvn:org.springframework.security/spring-security-web/${spring.security62.version}</bundle>
+ <bundle
start-level="30">wrap:mvn:org.springframework.security/spring-security-acl/${spring.security62.version}</bundle>
+ <bundle
start-level="30">wrap:mvn:org.springframework.security/spring-security-taglibs/${spring.security62.version}</bundle>
</feature>
<!-- Aries Blueprint Spring support -->
diff --git a/assemblies/features/standard/pom.xml
b/assemblies/features/standard/pom.xml
index 968b865465..540a5919c4 100644
--- a/assemblies/features/standard/pom.xml
+++ b/assemblies/features/standard/pom.xml
@@ -386,8 +386,8 @@
<!-- jasypt-encryption deps -->
<dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.jasypt</artifactId>
+ <groupId>org.jasypt</groupId>
+ <artifactId>jasypt</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
@@ -397,6 +397,12 @@
</dependency>
<!-- Spring Security Crypto encryption deps -->
+ <dependency>
+ <groupId>org.springframework.security</groupId>
+ <artifactId>spring-security-crypto</artifactId>
+ <version>${spring.security53.version}</version>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>org.apache.karaf.jaas</groupId>
<artifactId>org.apache.karaf.jaas.spring-security-crypto</artifactId>
diff --git a/assemblies/features/standard/src/main/feature/feature.xml
b/assemblies/features/standard/src/main/feature/feature.xml
index 5f71b19b24..220592b484 100644
--- a/assemblies/features/standard/src/main/feature/feature.xml
+++ b/assemblies/features/standard/src/main/feature/feature.xml
@@ -1444,7 +1444,7 @@ org.apache.felix.eventadmin.AddSubject=true
<feature>jaas</feature>
<bundle dependency="true"
start-level="30">mvn:commons-codec/commons-codec/${commons-codec.version}</bundle>
<bundle dependency="true"
start-level="30">mvn:org.apache.commons/commons-lang3/${commons-lang3.version}</bundle>
- <bundle dependency="true"
start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jasypt/${jasypt.bundle.version}</bundle>
+ <bundle dependency="true"
start-level="30">wrap:mvn:org.jasypt/jasypt/${jasypt.version}</bundle>
<bundle
start-level="30">mvn:org.apache.karaf.jaas/org.apache.karaf.jaas.jasypt/${project.version}</bundle>
<conditional>
<condition>aries-blueprint</condition>
@@ -1452,14 +1452,14 @@ org.apache.felix.eventadmin.AddSubject=true
</conditional>
<conditional>
<condition>spring</condition>
- <bundle
start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jasypt-spring31/${jasypt.bundle.version}</bundle>
+ <bundle
start-level="30">wrap:mvn:org.jasypt/jasypt-spring31/${jasypt.version}</bundle>
</conditional>
</feature>
<feature name="spring-security-crypto-encryption" description="Advanced
encryption support for Karaf security" version="${project.version}">
<feature>jaas</feature>
<bundle dependency="true"
start-level="30">mvn:org.bouncycastle/bcprov-jdk18on/${bouncycastle.version}</bundle>
- <bundle dependency="true"
start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-security-crypto/${spring.security53.version}</bundle>
+ <bundle dependency="true"
start-level="30">wrap:mvn:org.springframework.security/spring-security-crypto/${spring.security53.version}$Export-Package=org.springframework.security.crypto.*;version="${spring.security53.version}"</bundle>
<bundle
start-level="30">mvn:org.apache.karaf.jaas/org.apache.karaf.jaas.spring-security-crypto/${project.version}</bundle>
</feature>
diff --git a/bom/pom.xml b/bom/pom.xml
index 64cefbc71d..f25555da54 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -1196,9 +1196,9 @@
</dependency>
<dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.jasypt</artifactId>
- <version>${jasypt.bundle.version}</version>
+ <groupId>org.jasypt</groupId>
+ <artifactId>jasypt</artifactId>
+ <version>${jasypt.version}</version>
</dependency>
<dependency>
<groupId>org.awaitility</groupId>
diff --git
a/examples/karaf-rest-example/karaf-rest-example-features/src/main/feature/feature.xml
b/examples/karaf-rest-example/karaf-rest-example-features/src/main/feature/feature.xml
index 829378285e..ee0b85e33c 100644
---
a/examples/karaf-rest-example/karaf-rest-example-features/src/main/feature/feature.xml
+++
b/examples/karaf-rest-example/karaf-rest-example-features/src/main/feature/feature.xml
@@ -56,8 +56,8 @@
<feature>pax-web-http-whiteboard</feature>
<feature>aries-jax-rs-whiteboard</feature>
<feature>aries-jax-rs-whiteboard-jackson</feature>
- <bundle
dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxws-api-2.2/${servicemix-spec.version}</bundle>
- <bundle
dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.saaj-api-1.3/${servicemix-spec.version}</bundle>
+ <bundle
dependency="true">wrap:mvn:javax.xml.ws/jaxws-api/${jaxws-api22.version}</bundle>
+ <bundle
dependency="true">wrap:mvn:javax.xml.soap/saaj-api/${saaj-api13.version}</bundle>
<bundle>mvn:org.apache.karaf.examples/karaf-rest-example-whiteboard/${project.version}</bundle>
</feature>
diff --git a/itests/test/src/test/filtered-resources/etc/config.properties
b/itests/test/src/test/filtered-resources/etc/config.properties
index 73f73b4fc4..9db63e2fd1 100644
--- a/itests/test/src/test/filtered-resources/etc/config.properties
+++ b/itests/test/src/test/filtered-resources/etc/config.properties
@@ -91,14 +91,18 @@ org.osgi.framework.system.packages.extra= \
org.apache.karaf.branding, \
org.apache.karaf.jaas.boot.principal, \
org.apache.karaf.jaas.boot, \
- sun.misc
+ sun.misc, \
+ javax.annotation;version="1.3", \
+ javax.annotation.security;version="1.3", \
+ javax.annotation.sql;version="1.3"
org.osgi.framework.system.capabilities= \
${eecap-${java.specification.version}}, \
osgi.service;effective:=active;objectClass=org.osgi.service.packageadmin.PackageAdmin,
\
osgi.service;effective:=active;objectClass=org.osgi.service.resolver.Resolver, \
osgi.service;effective:=active;objectClass=org.osgi.service.startlevel.StartLevel,
\
- osgi.service;effective:=active;objectClass=org.osgi.service.url.URLHandlers
+ osgi.service;effective:=active;objectClass=org.osgi.service.url.URLHandlers, \
+
osgi.contract;osgi.contract=JavaAnnotation;uses:="javax.annotation,javax.annotation.security,javax.annotation.sql";version:List<Version>="1.3,1.2,1.1,1"
eecap-18 = osgi.ee; osgi.ee="OSGi/Minimum";
version:List<Version>="1.0,1.1,1.2", \
osgi.ee; osgi.ee="JavaSE";
version:List<Version>="1.0,1.1,1.2,1.3,1.4,1.5,1.6,1.7,1.8,9.0,10.0,11.0,13.0,14.0,15.0,16.0,17.0,18.0",
\
diff --git a/itests/test/src/test/filtered-resources/etc/feature.xml
b/itests/test/src/test/filtered-resources/etc/feature.xml
index 6da1786472..31c9fff502 100644
--- a/itests/test/src/test/filtered-resources/etc/feature.xml
+++ b/itests/test/src/test/filtered-resources/etc/feature.xml
@@ -891,7 +891,7 @@
<feature>jaas</feature>
<bundle dependency="true"
start-level="30">mvn:commons-codec/commons-codec/${commons-codec.version}</bundle>
<bundle dependency="true"
start-level="30">mvn:org.apache.commons/commons-lang3/${commons-lang3.version}</bundle>
- <bundle dependency="true"
start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jasypt/${jasypt.bundle.version}</bundle>
+ <bundle dependency="true"
start-level="30">wrap:mvn:org.jasypt/jasypt/${jasypt.version}</bundle>
<bundle
start-level="30">mvn:org.apache.karaf.jaas/org.apache.karaf.jaas.jasypt/${project.version}</bundle>
<conditional>
<condition>aries-blueprint</condition>
@@ -899,7 +899,7 @@
</conditional>
<conditional>
<condition>spring</condition>
- <bundle start-level="30"
start="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jasypt-spring31/${jasypt.bundle.version}</bundle>
+ <bundle start-level="30"
start="true">wrap:mvn:org.jasypt/jasypt-spring31/${jasypt.version}</bundle>
</conditional>
</feature>
diff --git a/jaas/blueprint/jasypt/pom.xml b/jaas/blueprint/jasypt/pom.xml
index c339b26908..8a41887446 100644
--- a/jaas/blueprint/jasypt/pom.xml
+++ b/jaas/blueprint/jasypt/pom.xml
@@ -56,8 +56,8 @@
</dependency>
<dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.jasypt</artifactId>
+ <groupId>org.jasypt</groupId>
+ <artifactId>jasypt</artifactId>
</dependency>
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
diff --git a/jaas/jasypt/pom.xml b/jaas/jasypt/pom.xml
index a882084896..b18b1574aa 100644
--- a/jaas/jasypt/pom.xml
+++ b/jaas/jasypt/pom.xml
@@ -67,8 +67,8 @@
</dependency>
<dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.jasypt</artifactId>
+ <groupId>org.jasypt</groupId>
+ <artifactId>jasypt</artifactId>
</dependency>
<dependency>
diff --git a/jaas/spring-security-crypto/pom.xml
b/jaas/spring-security-crypto/pom.xml
index 6dbc0211ec..3f5b6da5a9 100644
--- a/jaas/spring-security-crypto/pom.xml
+++ b/jaas/spring-security-crypto/pom.xml
@@ -67,8 +67,8 @@
</dependency>
<dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
-
<artifactId>org.apache.servicemix.bundles.spring-security-crypto</artifactId>
+ <groupId>org.springframework.security</groupId>
+ <artifactId>spring-security-crypto</artifactId>
<version>${spring.security53.version}</version>
</dependency>
diff --git a/pom.xml b/pom.xml
index de031acecc..80cafcbdb1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -165,14 +165,14 @@
<distributionManagement.snapshot.url>https://repository.apache.org/content/repositories/snapshots</distributionManagement.snapshot.url>
<activemq.version>6.2.5</activemq.version>
- <aopalliance.bundle.version>1.0_6</aopalliance.bundle.version>
- <aspectj.bundle.version>1.9.21.1_1</aspectj.bundle.version>
+ <aopalliance.version>1.0</aopalliance.version>
+ <aspectj.version>1.9.21.1</aspectj.version>
<asm.version>9.9.1</asm.version>
<jakarta.annotation.version>2.1.1</jakarta.annotation.version>
<awaitility.version>3.1.6</awaitility.version>
<bouncycastle.version>1.84</bouncycastle.version>
<camel.version>4.18.1</camel.version>
- <cglib.bundle.version>3.2.9_1</cglib.bundle.version>
+ <cglib.version>3.2.9</cglib.version>
<cxf.version>3.6.10</cxf.version>
<jackson.annotations.version>2.21</jackson.annotations.version>
<jackson.version>2.21.3</jackson.version>
@@ -187,7 +187,7 @@
<commons-pool2.version>2.12.0</commons-pool2.version>
<commons-io.version>2.22.0</commons-io.version>
<eclipselink.version>4.0.8</eclipselink.version>
- <jasypt.bundle.version>1.9.3_1</jasypt.bundle.version>
+ <jasypt.version>1.9.3</jasypt.version>
<jolokia.version>2.2.9</jolokia.version>
<servlet.spec.groupId>jakarta.servlet</servlet.spec.groupId>
<servlet.spec.artifactId>jakarta.servlet-api</servlet.spec.artifactId>
@@ -197,7 +197,14 @@
<geronimo.jms-spec.version>1.1.1</geronimo.jms-spec.version>
<geronimo.jta-spec.version>1.1.1</geronimo.jta-spec.version>
- <servicemix-spec.version>2.9.0</servicemix-spec.version>
+ <jaxb-api.version>2.2</jaxb-api.version>
+ <jaxrs-api.version>2.1.1</jaxrs-api.version>
+ <jaxws-api.version>2.3.1</jaxws-api.version>
+ <jaxws-api22.version>2.2.11</jaxws-api22.version>
+ <stax-api.version>1.0-2</stax-api.version>
+ <saaj-api.version>1.4.0</saaj-api.version>
+ <saaj-api13.version>1.3.5</saaj-api13.version>
+ <annotation-api.version>1.3.2</annotation-api.version>
<easymock.version>5.6.0</easymock.version>
<equinox.groupId>org.eclipse.platform</equinox.groupId>
@@ -347,24 +354,24 @@
<spring.osgi.version>1.2.1</spring.osgi.version>
<spring31.version>3.1.4.RELEASE</spring31.version>
- <spring43.version>4.3.30.RELEASE_1</spring43.version>
- <spring52.version>5.2.25.RELEASE_1</spring52.version>
- <spring53.version>5.3.39_2</spring53.version>
- <spring60.version>6.0.23_3</spring60.version>
- <spring61.version>6.1.21_1</spring61.version>
+ <spring43.version>4.3.30.RELEASE</spring43.version>
+ <spring52.version>5.2.25.RELEASE</spring52.version>
+ <spring53.version>5.3.39</spring53.version>
+ <spring60.version>6.0.23</spring60.version>
+ <spring61.version>6.1.21</spring61.version>
<spring.security31.version>3.1.4.RELEASE</spring.security31.version>
- <spring.security42.version>4.2.4.RELEASE_1</spring.security42.version>
- <spring.security51.version>5.1.10.RELEASE_1</spring.security51.version>
- <spring.security53.version>5.3.3.RELEASE_2</spring.security53.version>
- <spring.security54.version>5.4.6_1</spring.security54.version>
- <spring.security55.version>5.5.3_1</spring.security55.version>
- <spring.security56.version>5.6.3_1</spring.security56.version>
- <spring.security57.version>5.7.12_4</spring.security57.version>
- <spring.security62.version>6.2.7_3</spring.security62.version>
+ <spring.security42.version>4.2.4.RELEASE</spring.security42.version>
+ <spring.security51.version>5.1.10.RELEASE</spring.security51.version>
+ <spring.security53.version>5.3.3.RELEASE</spring.security53.version>
+ <spring.security54.version>5.4.6</spring.security54.version>
+ <spring.security55.version>5.5.3</spring.security55.version>
+ <spring.security56.version>5.6.3</spring.security56.version>
+ <spring.security57.version>5.7.12</spring.security57.version>
+ <spring.security62.version>6.2.7</spring.security62.version>
<sling.commons.johnzon.version>2.0.0</sling.commons.johnzon.version>
<sshd.version>2.17.1</sshd.version>
- <struts.bundle.version>1.3.10_1</struts.bundle.version>
+ <struts.version>1.3.10</struts.version>
<xbean.version>4.30</xbean.version>
<jakarta.mail.version>2.0.2</jakarta.mail.version>
