This is an automated email from the ASF dual-hosted git repository.
robbie pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
The following commit(s) were added to refs/heads/main by this push:
new 4ff5d95b2c ARTEMIS-3752 Upgrade Spring Framework to 5.3.18 for
examples and tests
4ff5d95b2c is described below
commit 4ff5d95b2cab3dd3928a490e90459cba5176f5b5
Author: Domenico Francesco Bruscino <[email protected]>
AuthorDate: Mon Apr 4 10:59:14 2022 +0200
ARTEMIS-3752 Upgrade Spring Framework to 5.3.18 for examples and tests
---
examples/features/standard/camel/camel-war/pom.xml | 7 ++++++-
examples/features/standard/spring-boot-integration/pom.xml | 2 +-
tests/activemq5-unit-tests/pom.xml | 9 ++++++++-
tests/integration-tests/pom.xml | 6 ++++++
tests/karaf-client-integration-tests/pom.xml | 6 ++++++
5 files changed, 27 insertions(+), 3 deletions(-)
diff --git a/examples/features/standard/camel/camel-war/pom.xml
b/examples/features/standard/camel/camel-war/pom.xml
index fe68651ebc..85897feb32 100644
--- a/examples/features/standard/camel/camel-war/pom.xml
+++ b/examples/features/standard/camel/camel-war/pom.xml
@@ -41,6 +41,11 @@ under the License.
<artifactId>spring-web</artifactId>
<version>${spring.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-tx</artifactId>
+ <version>${spring.version}</version>
+ </dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
@@ -48,7 +53,7 @@ under the License.
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-spring</artifactId>
- <version>2.20.0</version>
+ <version>3.16.0</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
diff --git a/examples/features/standard/spring-boot-integration/pom.xml
b/examples/features/standard/spring-boot-integration/pom.xml
index 703b5f1e4c..ca12135f66 100644
--- a/examples/features/standard/spring-boot-integration/pom.xml
+++ b/examples/features/standard/spring-boot-integration/pom.xml
@@ -27,7 +27,7 @@
<activemq.basedir>${project.basedir}/../../../..</activemq.basedir>
<!-- AMQP Spring Starter -->
- <amqp-10-jms-spring.version>2.0.1</amqp-10-jms-spring.version>
+ <amqp-10-jms-spring.version>2.5.7</amqp-10-jms-spring.version>
</properties>
<dependencies>
diff --git a/tests/activemq5-unit-tests/pom.xml
b/tests/activemq5-unit-tests/pom.xml
index 884f8ef76b..b96c3c878b 100644
--- a/tests/activemq5-unit-tests/pom.xml
+++ b/tests/activemq5-unit-tests/pom.xml
@@ -32,7 +32,7 @@
<jmdns-version>3.4.1</jmdns-version>
<ftpserver-version>1.0.6</ftpserver-version>
<jmock-version>2.5.1</jmock-version>
- <spring-version>3.2.11.RELEASE</spring-version>
+ <spring-version>5.3.18</spring-version>
<org-apache-derby-version>10.11.1.1</org-apache-derby-version>
<commons-net-version>3.3</commons-net-version>
<xbean-version>3.18</xbean-version>
@@ -226,6 +226,13 @@
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ <version>${spring-version}</version>
+ <scope>test</scope>
+ </dependency>
+
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
diff --git a/tests/integration-tests/pom.xml b/tests/integration-tests/pom.xml
index 0a8d52a468..91d6fddf07 100644
--- a/tests/integration-tests/pom.xml
+++ b/tests/integration-tests/pom.xml
@@ -352,6 +352,12 @@
<version>${karaf.version}</version>
<type>tar.gz</type>
<scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.karaf.features</groupId>
+ <artifactId>spring</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.karaf.shell</groupId>
diff --git a/tests/karaf-client-integration-tests/pom.xml
b/tests/karaf-client-integration-tests/pom.xml
index 609a4c2aa2..3bcd22b33f 100644
--- a/tests/karaf-client-integration-tests/pom.xml
+++ b/tests/karaf-client-integration-tests/pom.xml
@@ -113,6 +113,12 @@
<version>${karaf.version}</version>
<scope>test</scope>
<type>tar.gz</type>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.karaf.features</groupId>
+ <artifactId>spring</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.karaf.shell</groupId>
