You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2018/04/11 08:14:13 UTC
[camel] 01/41: CAMEL-11956: Upgrade to Spring 5.x
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 91b8f39db779fe0c07ddd9375d8e0488a6181cbf
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Sat Mar 17 15:57:09 2018 +0100
CAMEL-11956: Upgrade to Spring 5.x
---
components/camel-spring-boot/pom.xml | 2 ++
components/camel-test-spring/pom.xml | 2 +-
parent/pom.xml | 12 ++++--------
.../components-starter/camel-spring-starter/pom.xml | 8 --------
4 files changed, 7 insertions(+), 17 deletions(-)
diff --git a/components/camel-spring-boot/pom.xml b/components/camel-spring-boot/pom.xml
index 9beba8d..8d57400 100644
--- a/components/camel-spring-boot/pom.xml
+++ b/components/camel-spring-boot/pom.xml
@@ -37,6 +37,8 @@
<label>spring,microservice</label>
<camel.osgi.export.pkg/>
+ <!-- spring boot 1 uses spring 4 -->
+ <spring-version>${spring4-version}</spring-version>
</properties>
<dependencies>
diff --git a/components/camel-test-spring/pom.xml b/components/camel-test-spring/pom.xml
index 3b6ad14..2409fc4 100644
--- a/components/camel-test-spring/pom.xml
+++ b/components/camel-test-spring/pom.xml
@@ -38,7 +38,7 @@
<label>testing,java,spring</label>
<camel.osgi.export.pkg>org.apache.camel.test.spring.*</camel.osgi.export.pkg>
- <spring-version>${spring4-version}</spring-version>
+ <spring-version>${spring5-version}</spring-version>
</properties>
<dependencies>
diff --git a/parent/pom.xml b/parent/pom.xml
index 6342dcd..a8375e7 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -650,19 +650,15 @@
<spring-ldap-bundle-version>2.3.2.RELEASE_1</spring-ldap-bundle-version>
<!-- spring 1.1.0 is not OSGi bundle any more -->
<spring-retry-version>1.0.3.RELEASE</spring-retry-version>
- <spring-all-version-range>[3.2,5)</spring-all-version-range>
- <!-- karaf 3.x/4.x supports spring 4.1 onwards -->
- <spring-version-range>[4.1,5)</spring-version-range>
- <!-- and special for only spring 4.0.x -->
- <spring40-version-range>[4.0,4.1)</spring40-version-range>
- <!-- and for spring 4.2.x onwards-->
- <spring42-version-range>[4.2,5)</spring42-version-range>
- <spring-version>${spring4-version}</spring-version>
+ <!-- karaf 4.1.x supports spring 4.x and karaf 4.2.x supports spring 5 -->
+ <spring-version-range>[4.3,6)</spring-version-range>
+ <spring-version>${spring5-version}</spring-version>
<spring40-version>4.0.9.RELEASE</spring40-version>
<spring41-version>4.1.9.RELEASE</spring41-version>
<spring42-version>4.2.9.RELEASE</spring42-version>
<spring43-version>4.3.15.RELEASE</spring43-version>
<spring4-version>4.3.15.RELEASE</spring4-version>
+ <spring5-version>5.0.4.RELEASE</spring5-version>
<spring-osgi-version>1.2.1</spring-osgi-version>
<spring-security-version>4.2.4.RELEASE</spring-security-version>
<spring-security-bundle-version>4.2.4.RELEASE_1</spring-security-bundle-version>
diff --git a/platforms/spring-boot/components-starter/camel-spring-starter/pom.xml b/platforms/spring-boot/components-starter/camel-spring-starter/pom.xml
index ec6c2b8..d0bacad 100644
--- a/platforms/spring-boot/components-starter/camel-spring-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-spring-starter/pom.xml
@@ -38,14 +38,6 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-spring</artifactId>
<version>${project.version}</version>
- <!--START OF GENERATED CODE-->
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
- <!--END OF GENERATED CODE-->
</dependency>
<!--START OF GENERATED CODE-->
<dependency>
--
To stop receiving notification emails like this one, please contact
davsclaus@apache.org.