Updated Branches: refs/heads/master 21611c2ed -> e7563a761
CAMEL-6567 Upgrade to Spring Batch 2.2.0 with thanks to David Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/e7563a76 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/e7563a76 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/e7563a76 Branch: refs/heads/master Commit: e7563a7611667fb9b449d8a7f8c3fa7e3a0524bd Parents: 21611c2 Author: Willem Jiang <[email protected]> Authored: Tue Jul 23 10:09:04 2013 +0800 Committer: Willem Jiang <[email protected]> Committed: Tue Jul 23 10:09:04 2013 +0800 ---------------------------------------------------------------------- .../camel/component/spring/batch/springBatchtestContext.xml | 4 ++-- .../component/spring/batch/springBatchtestJobLauncherContext.xml | 4 ++-- parent/pom.xml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/e7563a76/components/camel-spring-batch/src/test/resources/org/apache/camel/component/spring/batch/springBatchtestContext.xml ---------------------------------------------------------------------- diff --git a/components/camel-spring-batch/src/test/resources/org/apache/camel/component/spring/batch/springBatchtestContext.xml b/components/camel-spring-batch/src/test/resources/org/apache/camel/component/spring/batch/springBatchtestContext.xml index ee2e6ed..a4161e8 100644 --- a/components/camel-spring-batch/src/test/resources/org/apache/camel/component/spring/batch/springBatchtestContext.xml +++ b/components/camel-spring-batch/src/test/resources/org/apache/camel/component/spring/batch/springBatchtestContext.xml @@ -21,7 +21,7 @@ xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd - http://www.springframework.org/schema/batch http://www.springframework.org/schema/batch/spring-batch-2.1.xsd"> + http://www.springframework.org/schema/batch http://www.springframework.org/schema/batch/spring-batch.xsd"> <!-- Spring Batch task --> @@ -91,4 +91,4 @@ <constructor-arg value="mock:jobExecutionEventsQueue"/> </bean> -</beans> \ No newline at end of file +</beans> http://git-wip-us.apache.org/repos/asf/camel/blob/e7563a76/components/camel-spring-batch/src/test/resources/org/apache/camel/component/spring/batch/springBatchtestJobLauncherContext.xml ---------------------------------------------------------------------- diff --git a/components/camel-spring-batch/src/test/resources/org/apache/camel/component/spring/batch/springBatchtestJobLauncherContext.xml b/components/camel-spring-batch/src/test/resources/org/apache/camel/component/spring/batch/springBatchtestJobLauncherContext.xml index bebd40d..56c2ae6 100644 --- a/components/camel-spring-batch/src/test/resources/org/apache/camel/component/spring/batch/springBatchtestJobLauncherContext.xml +++ b/components/camel-spring-batch/src/test/resources/org/apache/camel/component/spring/batch/springBatchtestJobLauncherContext.xml @@ -21,7 +21,7 @@ xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd - http://www.springframework.org/schema/batch http://www.springframework.org/schema/batch/spring-batch-2.1.xsd"> + http://www.springframework.org/schema/batch http://www.springframework.org/schema/batch/spring-batch.xsd"> <!-- Spring Batch task --> @@ -95,4 +95,4 @@ <constructor-arg value="mock:jobExecutionEventsQueue"/> </bean> -</beans> \ No newline at end of file +</beans> http://git-wip-us.apache.org/repos/asf/camel/blob/e7563a76/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 7b05cba..f5fd691 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -347,7 +347,7 @@ <snmp4j-version>2.1.0_1</snmp4j-version> <solr-bundle-version>3.6.0_1</solr-bundle-version> <!-- FIXME cmueller: not in sync! --> <solr-version>3.6.2</solr-version> - <spring-batch-version>2.1.9.RELEASE</spring-batch-version> + <spring-batch-version>2.2.0.RELEASE</spring-batch-version> <spring-castor-bundle-version>1.2.0</spring-castor-bundle-version> <spring-data-commons-version>1.5.0.RELEASE</spring-data-commons-version> <spring-data-redis-version>1.0.4.RELEASE</spring-data-redis-version>
