Use spring 4.1 or better as default spring version in karaf.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/82d9b763 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/82d9b763 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/82d9b763 Branch: refs/heads/master Commit: 82d9b7636ddfae37b1c2fb5bc27a5eae64196f87 Parents: 3fb521e Author: Claus Ibsen <davscl...@apache.org> Authored: Sat Mar 12 13:43:03 2016 +0100 Committer: Claus Ibsen <davscl...@apache.org> Committed: Sat Mar 12 13:43:03 2016 +0100 ---------------------------------------------------------------------- parent/pom.xml | 14 ++++++-------- .../features/src/main/resources/features.xml | 19 +++++++++---------- 2 files changed, 15 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/82d9b763/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index c1c8c38..613551a 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -502,14 +502,12 @@ <spring-ldap-bundle-version>2.0.3.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 4 can be used in OSGi, but not with spring-dm. Allow Spring 4 for the bundle imports. --> - <spring-version-range>[3.2,5)</spring-version-range> - <!-- However, spring-dm does not support spring 4.x so import-range must be 3.x for the --> - <!-- Karaf features file. --> - <!-- TODO: rename to spring-dm-version-range-karaf --> - <spring-version-range-karaf>[3.2,4)</spring-version-range-karaf> - <!-- for spring 4.x in karaf --> - <spring4-version-range-karaf>[4,5)</spring4-version-range-karaf> + <!-- spring-dm only supports spring 3.x --> + <spring-dm-version-range-karaf>[3.2,4)</spring-dm-version-range-karaf> + <!-- karaf 2.x supports spring 4.1 onwards --> + <spring-version-range-karaf>[4.1,5)</spring-version-range-karaf> + <!-- and for spring 4.2.x onwards--> + <spring42-version-range-karaf>[4.2,5)</spring42-version-range-karaf> <spring-version>${spring4-version}</spring-version> <spring32-version>3.2.15.RELEASE</spring32-version> <spring40-version>4.0.9.RELEASE</spring40-version> http://git-wip-us.apache.org/repos/asf/camel/blob/82d9b763/platforms/karaf/features/src/main/resources/features.xml ---------------------------------------------------------------------- diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml index f23dbd4..884882f 100644 --- a/platforms/karaf/features/src/main/resources/features.xml +++ b/platforms/karaf/features/src/main/resources/features.xml @@ -30,7 +30,6 @@ </feature> <feature name='camel' version='${project.version}' resolver='(obr)' start-level='50'> <feature version='${project.version}'>camel-core</feature> - <feature version='${project.version}'>camel-spring</feature> <feature version='${project.version}'>camel-blueprint</feature> </feature> <feature name='camel-core' version='${project.version}' resolver='(obr)' start-level='50'> @@ -53,9 +52,9 @@ </feature> <feature name='camel-spring' version='${project.version}' resolver='(obr)' start-level='50'> <bundle dependency='true'>mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo-jta-spec-version}</bundle> - <feature version='${spring-version-range-karaf}'>spring</feature> + <feature version='${spring-dm-version-range-karaf}'>spring</feature> <feature version='[1.2,2)'>spring-dm</feature> - <feature version='${spring-version-range-karaf}'>spring-tx</feature> + <feature version='${spring-dm-version-range-karaf}'>spring-tx</feature> <feature version='${project.version}'>camel-core</feature> <bundle>mvn:org.apache.camel/camel-spring/${project.version}</bundle> </feature> @@ -894,10 +893,10 @@ <feature name='camel-jms' version='${project.version}' resolver='(obr)' start-level='50'> <feature version='${project.version}'>camel-core</feature> <feature version='${spring-version-range-karaf}'>spring</feature> + <feature version='${spring-version-range-karaf}'>spring-jms</feature> <bundle dependency='true'>mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo-jta-spec-version}</bundle> <bundle dependency='true'>mvn:commons-pool/commons-pool/${commons-pool-version}</bundle> <bundle dependency='true'>mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo-jms-spec-version}</bundle> - <feature version='${spring-version-range-karaf}'>spring-jms</feature> <bundle>mvn:org.apache.camel/camel-jms/${project.version}</bundle> </feature> <feature name='camel-jmx' version='${project.version}' resolver='(obr)' start-level='50'> @@ -1515,8 +1514,8 @@ <feature name='camel-spring-security' version='${project.version}' resolver='(obr)' start-level='50'> <details>spring-security doesn't support importing spring 4.x </details> <feature>http</feature> - <feature>spring</feature> - <feature>spring-web</feature> + <feature version='${spring-version-range-karaf}'>spring</feature> + <feature version='${spring-version-range-karaf}'>spring-web</feature> <bundle dependency='true'>mvn:org.springframework.security/spring-security-core/${spring-security-version}</bundle> <bundle dependency='true'>mvn:org.springframework.security/spring-security-config/${spring-security-version}</bundle> <bundle dependency='true'>mvn:org.springframework.security/spring-security-web/${spring-security-version}</bundle> @@ -1525,10 +1524,10 @@ <feature name='camel-spring-ws' version='${project.version}' resolver='(obr)' start-level='50'> <details>camel-spring-ws requires spring 4.x</details> <feature>http</feature> - <feature>spring</feature> - <feature>spring-jms</feature> - <feature>spring-oxm</feature> - <feature>spring-web</feature> + <feature version='${spring4-version-range-karaf}'>spring</feature> + <feature version='${spring4-version-range-karaf}'>spring-jms</feature> + <feature version='${spring4-version-range-karaf}'>spring-oxm</feature> + <feature version='${spring4-version-range-karaf}'>spring-web</feature> <bundle dependency='true'>mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo-jms-spec-version}</bundle> <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.wsdl4j/${wsdl4j-bundle-version}</bundle> <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-ws-core/${spring-ws-bundle-version}</bundle>
