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 2013/10/17 12:48:46 UTC
[1/2] git commit: Upgraded SI
Updated Branches:
refs/heads/camel-2.12.x e4163c83e -> e275b5123
refs/heads/master 515a61217 -> c51feb42d
Upgraded SI
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/c51feb42
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/c51feb42
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/c51feb42
Branch: refs/heads/master
Commit: c51feb42d5b8f32180be076a23bf3d2d32a831e2
Parents: 515a612
Author: Claus Ibsen <da...@apache.org>
Authored: Thu Oct 17 12:46:51 2013 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu Oct 17 12:46:51 2013 +0200
----------------------------------------------------------------------
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/c51feb42/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 572293d..14f1690 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -368,7 +368,7 @@
<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.1.0.RELEASE</spring-data-redis-version>
- <spring-integration-version>2.2.5.RELEASE</spring-integration-version>
+ <spring-integration-version>2.2.6.RELEASE</spring-integration-version>
<spring-javaconfig-version>1.0.0-20090215</spring-javaconfig-version>
<spring-ldap-version>1.3.1.RELEASE</spring-ldap-version>
<spring-ldap-bundle-version>1.3.1.RELEASE_2</spring-ldap-bundle-version>
[2/2] git commit: Upgraded SI
Posted by da...@apache.org.
Upgraded SI
Conflicts:
parent/pom.xml
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/e275b512
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/e275b512
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/e275b512
Branch: refs/heads/camel-2.12.x
Commit: e275b5123b12f76ae0de28bd9d36b5c29df6c179
Parents: e4163c8
Author: Claus Ibsen <da...@apache.org>
Authored: Thu Oct 17 12:46:51 2013 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu Oct 17 12:48:48 2013 +0200
----------------------------------------------------------------------
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/e275b512/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index cb5eba7..f1bc66c 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -362,7 +362,7 @@
<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>
- <spring-integration-version>2.2.5.RELEASE</spring-integration-version>
+ <spring-integration-version>2.2.6.RELEASE</spring-integration-version>
<spring-javaconfig-version>1.0.0-20090215</spring-javaconfig-version>
<spring-ldap-version>1.3.1.RELEASE</spring-ldap-version>
<spring-ldap-bundle-version>1.3.1.RELEASE_2</spring-ldap-bundle-version>