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 2014/04/29 07:44:25 UTC
[1/2] git commit: Upgraded spring4
Repository: camel
Updated Branches:
refs/heads/master a5a2f750f -> d906885f5
Upgraded spring4
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/4a352501
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/4a352501
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/4a352501
Branch: refs/heads/master
Commit: 4a352501e1dbbeb8825b8cf17378ecd57692ea45
Parents: a5a2f75
Author: Claus Ibsen <da...@apache.org>
Authored: Tue Apr 29 07:35:31 2014 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Apr 29 07:35:31 2014 +0200
----------------------------------------------------------------------
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/4a352501/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 78668d3..c2c31e9 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -381,7 +381,7 @@
<spring-version-range>[3.2,4)</spring-version-range>
<spring-version>${spring32-version}</spring-version>
<spring32-version>3.2.8.RELEASE</spring32-version>
- <spring4-version>4.0.2.RELEASE</spring4-version>
+ <spring4-version>4.0.3.RELEASE</spring4-version>
<spring-osgi-version>1.2.1</spring-osgi-version>
<spring-security-version>3.1.4.RELEASE</spring-security-version>
<spring-ws-version>2.1.4.RELEASE</spring-ws-version>
[2/2] git commit: CAMEL-7386: camel-openshift component.
Posted by da...@apache.org.
CAMEL-7386: camel-openshift component.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/d906885f
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/d906885f
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/d906885f
Branch: refs/heads/master
Commit: d906885f528ee63023c78293407da2d7f28e195d
Parents: 4a35250
Author: Claus Ibsen <da...@apache.org>
Authored: Tue Apr 29 07:44:13 2014 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Apr 29 07:44:13 2014 +0200
----------------------------------------------------------------------
apache-camel/src/main/release/NOTICE.txt | 7 +++++++
1 file changed, 7 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/d906885f/apache-camel/src/main/release/NOTICE.txt
----------------------------------------------------------------------
diff --git a/apache-camel/src/main/release/NOTICE.txt b/apache-camel/src/main/release/NOTICE.txt
index d566c1e..c089123 100644
--- a/apache-camel/src/main/release/NOTICE.txt
+++ b/apache-camel/src/main/release/NOTICE.txt
@@ -34,3 +34,10 @@ endorse or promote products derived from this software without
prior written permission. For written permission, please contact
rod.johnson@interface21.com or juergen.hoeller@interface21.com.
+=========================================================================
+== OpenShift Notice ==
+=========================================================================
+
+This product includes software developed by
+the OpenShift Project (https://github.com/openshift/openshift-java-client/).
+