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/06/18 10:41:12 UTC
[1/2] git commit: Upgraded to SI 2.2.4
Updated Branches:
refs/heads/camel-2.11.x dd602e77c -> 8221f2ce6
refs/heads/master 96a6bdf77 -> 1bb480f57
Upgraded to SI 2.2.4
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/1bb480f5
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/1bb480f5
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/1bb480f5
Branch: refs/heads/master
Commit: 1bb480f5782b93a971a2fe8be771fe91de3f7433
Parents: 96a6bdf
Author: Claus Ibsen <da...@apache.org>
Authored: Tue Jun 18 10:39:06 2013 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Jun 18 10:39:06 2013 +0200
----------------------------------------------------------------------
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/1bb480f5/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index abfae92..a5fd6e5 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -344,7 +344,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.3.RELEASE</spring-integration-version>
+ <spring-integration-version>2.2.4.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 to SI 2.2.4
Posted by da...@apache.org.
Upgraded to SI 2.2.4
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/8221f2ce
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/8221f2ce
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/8221f2ce
Branch: refs/heads/camel-2.11.x
Commit: 8221f2ce603951be1e1845d2f76102bbed1f8f0f
Parents: dd602e7
Author: Claus Ibsen <da...@apache.org>
Authored: Tue Jun 18 10:39:06 2013 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Jun 18 10:40:49 2013 +0200
----------------------------------------------------------------------
parent/pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/8221f2ce/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 6703b92..8766cc8 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -342,8 +342,8 @@
<spring-batch-version>2.1.9.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.3.RELEASE</spring-data-redis-version>
- <spring-integration-version>2.2.3.RELEASE</spring-integration-version>
+ <spring-data-redis-version>1.0.4.RELEASE</spring-data-redis-version>
+ <spring-integration-version>2.2.4.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>