You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by pa...@apache.org on 2018/10/06 10:12:16 UTC

[camel] branch master updated (40177eb -> 183c4c6)

This is an automated email from the ASF dual-hosted git repository.

pascalschumacher pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.


    from 40177eb  CAMEL-12698 - conflict resolution after merging #2454
     new fea2548  Upgrade Spring Web Services to version 3.0.4.RELEASE
     new 183c4c6  Upgrade Spring Integration to version 5.0.8.RELEASE

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 parent/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


[camel] 01/02: Upgrade Spring Web Services to version 3.0.4.RELEASE

Posted by pa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

pascalschumacher pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git

commit fea25485c46b1d8b9a6b4bf742864599ea62c6d6
Author: Pascal Schumacher <pa...@gmx.net>
AuthorDate: Sat Oct 6 12:09:52 2018 +0200

    Upgrade Spring Web Services to version 3.0.4.RELEASE
---
 parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/parent/pom.xml b/parent/pom.xml
index 0eb9901..37d1be8 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -657,7 +657,7 @@
     <spring-security-bundle-version>5.0.4.RELEASE_1</spring-security-bundle-version>
     <spring-ws-bundle-version>2.4.2.RELEASE_1</spring-ws-bundle-version>
     <spring-xml-bundle-version>2.4.2.RELEASE_1</spring-xml-bundle-version>
-    <spring-ws-version>3.0.3.RELEASE</spring-ws-version>
+    <spring-ws-version>3.0.4.RELEASE</spring-ws-version>
     <spymemcached-bundle-version>2.5_2</spymemcached-bundle-version> <!-- FIXME cmueller: not in sync! -->
     <spymemcached-version>2.12.0</spymemcached-version>
     <squareup-okhttp-version>2.7.5</squareup-okhttp-version>


[camel] 02/02: Upgrade Spring Integration to version 5.0.8.RELEASE

Posted by pa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

pascalschumacher pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git

commit 183c4c6ad95ca4fe7a48363d57d36c01926abcfe
Author: Pascal Schumacher <pa...@gmx.net>
AuthorDate: Sat Oct 6 12:12:04 2018 +0200

    Upgrade Spring Integration to version 5.0.8.RELEASE
---
 parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/parent/pom.xml b/parent/pom.xml
index 37d1be8..c133bd8 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -645,7 +645,7 @@
     <spring-data-keyvalue-bundle-version>2.0.10.RELEASE_1</spring-data-keyvalue-bundle-version>
     <spring-data-redis-version>2.0.10.RELEASE</spring-data-redis-version>
     <spring-data-redis-bundle-version>2.0.10.RELEASE_1</spring-data-redis-bundle-version>
-    <spring-integration-version>5.0.3.RELEASE</spring-integration-version>
+    <spring-integration-version>5.0.8.RELEASE</spring-integration-version>
     <spring-ldap-version>2.3.2.RELEASE</spring-ldap-version>
     <spring-ldap-bundle-version>2.3.2.RELEASE_1</spring-ldap-bundle-version>
     <!-- karaf 4.1.x supports spring 4.x and karaf 4.2.x supports spring 5 -->