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/06/10 13:59:28 UTC
[5/6] git commit: Upgrade AWS
Upgrade AWS
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/7bcf45ef
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/7bcf45ef
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/7bcf45ef
Branch: refs/heads/camel-2.13.x
Commit: 7bcf45efc6ea34d5aac0161522f2cc8c36f9095a
Parents: e7c6a8e
Author: Claus Ibsen <da...@apache.org>
Authored: Tue Jun 10 13:35:47 2014 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Jun 10 13:58:39 2014 +0200
----------------------------------------------------------------------
parent/pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/7bcf45ef/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 5914b59..a107097 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -59,8 +59,8 @@
<avalon-version>4.3.1</avalon-version>
<avro-version>1.7.6</avro-version>
<avro-bundle-version>1.7.6_1</avro-bundle-version>
- <aws-java-sdk-bundle-version>1.7.1_1</aws-java-sdk-bundle-version>
- <aws-java-sdk-version>1.7.1</aws-java-sdk-version>
+ <aws-java-sdk-bundle-version>1.7.12_1</aws-java-sdk-bundle-version>
+ <aws-java-sdk-version>1.7.12</aws-java-sdk-version>
<axiom-version>1.2.14</axiom-version>
<backport-util-concurrent-version>3.1</backport-util-concurrent-version>
<bcel-bundle-version>5.2_4</bcel-bundle-version>