camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject [3/3] camel git commit: Upgraded spring batch
Date Sat, 07 Feb 2015 07:27:05 GMT
Upgraded spring batch


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/2a488dee
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/2a488dee
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/2a488dee

Branch: refs/heads/master
Commit: 2a488deee6656bef788fbf5fb72440a929d38e07
Parents: eedd211
Author: Claus Ibsen <davsclaus@apache.org>
Authored: Sat Feb 7 07:59:52 2015 +0100
Committer: Claus Ibsen <davsclaus@apache.org>
Committed: Sat Feb 7 07:59:52 2015 +0100

----------------------------------------------------------------------
 components/camel-spring-batch/pom.xml                    | 2 +-
 parent/pom.xml                                           | 5 +++--
 platforms/karaf/features/src/main/resources/features.xml | 6 +++---
 3 files changed, 7 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/2a488dee/components/camel-spring-batch/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-spring-batch/pom.xml b/components/camel-spring-batch/pom.xml
index b8d24f4..1890cf8 100644
--- a/components/camel-spring-batch/pom.xml
+++ b/components/camel-spring-batch/pom.xml
@@ -30,7 +30,7 @@
 
     <properties>
         <camel.osgi.export.pkg>org.apache.camel.component.spring.batch.*</camel.osgi.export.pkg>
-        <camel.osgi.import.before.defaults>org.springframework.batch.*;version="[2,3)"
+        <camel.osgi.import.before.defaults>org.springframework.batch.*;version="[3,4)"
         </camel.osgi.import.before.defaults>
         <camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=spring-batch</camel.osgi.export.service>
     </properties>

http://git-wip-us.apache.org/repos/asf/camel/blob/2a488dee/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index da1f558..2cc2422 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -417,7 +417,8 @@
     <solr-version-range>[4.9,5)</solr-version-range>
     <spark-rest-version>2.0.0</spark-rest-version>
     <splunk-version>1.3.0_1</splunk-version>
-    <spring-batch-version>2.2.7.RELEASE</spring-batch-version>
+    <spring-batch-version>3.0.3.RELEASE</spring-batch-version>
+    <spring-batch-bundle-version>3.0.2.RELEASE_1</spring-batch-bundle-version>
     <spring-boot-version>1.2.1.RELEASE</spring-boot-version>
     <spring-castor-bundle-version>1.2.0</spring-castor-bundle-version>
     <spring-data-commons-version>1.6.1.RELEASE</spring-data-commons-version>
@@ -426,7 +427,7 @@
     <spring-javaconfig-version>1.0.0-20090215</spring-javaconfig-version>
     <spring-ldap-version>2.0.2.RELEASE</spring-ldap-version>
     <spring-ldap-bundle-version>2.0.2.RELEASE_1</spring-ldap-bundle-version>
-    <spring-retry-version>1.0.3.RELEASE</spring-retry-version>
+    <spring-retry-version>1.1.0.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 -->

http://git-wip-us.apache.org/repos/asf/camel/blob/2a488dee/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 5b4fb2a..55364ab 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -1286,9 +1286,9 @@
     <bundle>mvn:org.apache.camel/camel-splunk/${project.version}</bundle>
   </feature>
   <feature name='camel-spring-batch' version='${project.version}' resolver='(obr)' start-level='50'>
-    <details>spring-batch doesn't support importing spring 4.x </details>
-    <bundle dependency='true'>mvn:org.springframework.batch/spring-batch-core/${spring-batch-version}</bundle>
-    <bundle dependency='true'>mvn:org.springframework.batch/spring-batch-infrastructure/${spring-batch-version}</bundle>
+    <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.spring-batch-core/${spring-batch-bundle-version}</bundle>
+    <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-batch-infrastructure/${spring-batch-bundle-version}</bundle>
     <feature version='${project.version}'>camel-spring</feature>
     <bundle>mvn:org.apache.camel/camel-spring-batch/${project.version}</bundle>
   </feature>


Mime
View raw message