diff --git a/assemblies/features/spring/src/main/feature/feature.xml b/assemblies/features/spring/src/main/feature/feature.xml index 1365f7debc3..68288ef69af 100644 --- a/assemblies/features/spring/src/main/feature/feature.xml +++ b/assemblies/features/spring/src/main/feature/feature.xml @@ -24,42 +24,42 @@ - + mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.aopalliance/${aopalliance.bundle.version} - mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-core/${spring61.tesb.version} - mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-expression/${spring61.tesb.version} - mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-beans/${spring61.tesb.version} - mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-aop/${spring61.tesb.version} - mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-context/${spring61.tesb.version} - mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-context-support/${spring61.tesb.version} + mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-core/${spring62.tesb.version} + mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-expression/${spring62.tesb.version} + mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-beans/${spring62.tesb.version} + mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-aop/${spring62.tesb.version} + mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-context/${spring62.tesb.version} + mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-context-support/${spring62.tesb.version} - - spring - mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-aspects/${spring61.tesb.version} + + spring + mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-aspects/${spring62.tesb.version} - - spring - mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-instrument/${spring61.tesb.version} + + spring + mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-instrument/${spring62.tesb.version} - - spring-tx - mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-jdbc/${spring61.tesb.version} + + spring-tx + mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-jdbc/${spring62.tesb.version} - - spring-tx - mvn:io.micrometer/micrometer-commons/1.13.11 - mvn:io.micrometer/micrometer-observation/1.13.11 + + spring-tx + mvn:io.micrometer/micrometer-commons/${micrometer.tesb.version} + mvn:io.micrometer/micrometer-observation/${micrometer.tesb.version} mvn:jakarta.jms/jakarta.jms-api/3.1.0 - mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-jms/${spring61.tesb.version} + mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-jms/${spring62.tesb.version} - - spring - mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-messaging/${spring61.tesb.version} + + spring + mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-messaging/${spring62.tesb.version} - - spring-jdbc - mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-orm/${spring61.tesb.version} + + spring-jdbc + mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-orm/${spring62.tesb.version} - - spring - mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-tx/${spring61.tesb.version} + + spring + mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-tx/${spring62.tesb.version} - spring + spring mvn:jakarta.servlet/jakarta.servlet-api/${servlet.spec.tesb.version} mvn:org.ops4j.pax.web/pax-web-compatibility-servlet/${pax.web.tesb.version} - mvn:io.micrometer/micrometer-commons/1.13.11 - mvn:io.micrometer/micrometer-observation/1.13.11 + mvn:io.micrometer/micrometer-commons/${micrometer.tesb.version} + mvn:io.micrometer/micrometer-observation/${micrometer.tesb.version} wrap:mvn:org.springframework/spring-web/${springbundle62.tesb.version}$Bundle-SymbolicName=spring-web&Bundle-Version=${springbundle62.tesb.version}&Export-Package=org.springframework.*;version=${springbundle62.tesb.version} wrap:mvn:org.springframework/spring-webmvc/${springbundle62.tesb.version}$Bundle-SymbolicName=spring-webmvc&Bundle-Version=${springbundle62.tesb.version}&Export-Package=org.springframework.*;version=${springbundle62.tesb.version} - + mvn:javax.websocket/javax.websocket-api/1.1 - spring-web - mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-websocket/${spring61.tesb.version} + spring-web + mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-websocket/${spring62.tesb.version} @@ -114,15 +114,15 @@ pax-web-jsp pax-web-war - spring-jdbc - spring-tx + spring-jdbc + spring-tx spring-web mvn:jakarta.annotation/jakarta.annotation-api/${javax.annotation.tesb.version} mvn:com.fasterxml.jackson.core/jackson-core/${jackson.tesb.version}.spiprov mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson-annotations.tesb.version} mvn:com.fasterxml.jackson.core/jackson-databind/${jackson-databind.tesb.version}.spiprov - mvn:io.micrometer/micrometer-commons/1.13.11 - mvn:io.micrometer/micrometer-observation/1.13.11 + mvn:io.micrometer/micrometer-commons/${micrometer.tesb.version} + mvn:io.micrometer/micrometer-observation/${micrometer.tesb.version} mvn:jakarta.annotation/jakarta.annotation-api/3.0.0 mvn:jakarta.servlet/jakarta.servlet-api/6.1.0 mvn:jakarta.servlet.jsp/jakarta.servlet.jsp-api/3.1.1 diff --git a/assemblies/features/standard/src/main/feature/feature.xml b/assemblies/features/standard/src/main/feature/feature.xml index 0618353d247..dcb06119adf 100644 --- a/assemblies/features/standard/src/main/feature/feature.xml +++ b/assemblies/features/standard/src/main/feature/feature.xml @@ -1480,7 +1480,7 @@ org.apache.felix.eventadmin.AddSubject=true jaas mvn:org.bouncycastle/bcprov-jdk18on/${bouncycastle.tesb.version} mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-security-crypto/${spring.security63.tesb.version} - mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-core/${spring61.tesb.version} + mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-core/${spring62.tesb.version} mvn:org.apache.karaf.jaas/org.apache.karaf.jaas.spring-security-crypto/${karaf.jaas.spring-security-crypto.tesb.version} diff --git a/pom.xml b/pom.xml index 5950fda9e03..feabab26803 100644 --- a/pom.xml +++ b/pom.xml @@ -152,12 +152,12 @@ 4.4.6 4.4.6.20250420 - 4.4.6.20260512 - 4.4.6.20260512 + 4.4.6.20260601 + 4.4.6.20260601 4.4.6.20260601 - 4.4.6.20260323 - 4.4.6.20260512 - 4.4.6.20260323 + 4.4.6.20260601 + 4.4.6.20260601 + 4.4.6.20260601 4.4.6.20240820 4.4.6.20250320 ${upstream.version} @@ -177,7 +177,7 @@ 1.0-alpha-2 1.0.0.tp20240209 2.3.1.tesb2 - 11.0.1 + 11.1.0 2.6.17 2.6.17.tesb2 @@ -190,15 +190,14 @@ 1.9.21.1_1 1.84 5.3.39 - 6.1.21_1 6.2.8_1 - 6.1.21 6.2.18 ${spring53.tesb.version} 5.7.14 5.8.16 6.2.7_1 6.3.9_2 + 1.15.10 2.21.2 2.21 ${jackson.tesb.version} @@ -213,11 +212,11 @@ 4.5.14 1.0.10 1.0.2 - 1.20.0 + 1.21.0 1.6.0 2.21.0 2.13.1 - 3.19.0 + 3.20.0 4.30 jakarta.servlet jakarta.servlet-api @@ -585,6 +584,7 @@ ${spring.security58.tesb.version} ${spring.security62.tesb.version} ${spring.security63.tesb.version} + ${micrometer.tesb.version} ${jackson.tesb.version} ${jackson-annotations.tesb.version} ${jackson-databind.tesb.version}