This is an automated email from the ASF dual-hosted git repository. nfilotto pushed a commit to branch essobedo/DPE-642/add-groovy-sub-projects in repository https://gitbox.apache.org/repos/asf/camel-karaf.git
commit 6f2d6a5573a3ad8ad24f342dba2b7050eb5181df Author: Andreas Mattes <andreasmat...@fastmail.de> AuthorDate: Wed Jan 15 17:06:33 2025 +0100 DPE-570 Spring update to 6.1.14. --- features/src/main/feature/camel-features.xml | 2 +- pom.xml | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/features/src/main/feature/camel-features.xml b/features/src/main/feature/camel-features.xml index e37b16165..e86cc358d 100644 --- a/features/src/main/feature/camel-features.xml +++ b/features/src/main/feature/camel-features.xml @@ -2912,7 +2912,7 @@ <feature name='camel-test-spring' version='${upstream.version}' start-level='50'> <feature version='${camel-osgi-version-range}'>camel-spring</feature> <feature version='${camel-osgi-version-range}'>camel-test</feature> - <bundle dependency='true'>wrap:mvn:org.springframework/spring-test/${spring-version}</bundle> + <bundle dependency='true'>wrap:mvn:org.springframework/spring-test/${spring.tesb.version}</bundle> <bundle>mvn:org.apache.camel.karaf/camel-test-spring/${upstream.version}</bundle> </feature> <feature name='camel-threadpoolfactory-vertx' version='${upstream.version}' start-level='50'> diff --git a/pom.xml b/pom.xml index 393878399..fd2f2a770 100644 --- a/pom.xml +++ b/pom.xml @@ -121,6 +121,7 @@ <paranamer.tesb.version>2.8</paranamer.tesb.version> <protobuf.tesb.version>3.25.5</protobuf.tesb.version> <pulsar.tesb.version>3.3.3</pulsar.tesb.version> + <spring.tesb.version>6.1.14</spring.tesb.version> <velocity.tesb.version>2.4.1</velocity.tesb.version> <wildfly-elytron.tesb.version>2.2.7.Final</wildfly-elytron.tesb.version> <zookeeper.tesb.version>3.9.3</zookeeper.tesb.version> @@ -765,6 +766,7 @@ <paranamer.tesb.version>${paranamer.tesb.version}</paranamer.tesb.version> <protobuf.tesb.version>${protobuf.tesb.version}</protobuf.tesb.version> <pulsar.tesb.version>${pulsar.tesb.version}</pulsar.tesb.version> + <spring.tesb.version>${spring.tesb.version}</spring.tesb.version> <velocity.tesb.version>${velocity.tesb.version}</velocity.tesb.version> <wildfly-elytron.tesb.version>${wildfly-elytron.tesb.version}</wildfly-elytron.tesb.version> <zookeeper.tesb.version>${zookeeper.tesb.version}</zookeeper.tesb.version>