You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by cm...@apache.org on 2013/10/08 23:19:35 UTC
[1/2] git commit: Revert "update com.google.guava:guava 14.0.1 to
15.0"
Updated Branches:
refs/heads/master 67aa3b3a9 -> 8fe10ab57
Revert "update com.google.guava:guava 14.0.1 to 15.0"
This reverts commit 31ebf4d5f76f7eb3dc148c29e523a6b6590fae37.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/feabe25b
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/feabe25b
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/feabe25b
Branch: refs/heads/master
Commit: feabe25b0efce4b2d1596c524b41a22740007139
Parents: 67aa3b3
Author: cmueller <cm...@apache.org>
Authored: Tue Oct 8 23:14:34 2013 +0200
Committer: cmueller <cm...@apache.org>
Committed: Tue Oct 8 23:14:34 2013 +0200
----------------------------------------------------------------------
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/feabe25b/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index d9a2bcc..4461647 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -160,7 +160,7 @@
<google-app-engine-bundle-version>1.8.3_1</google-app-engine-bundle-version>
<google-gdata-version>1.41.5.w1</google-gdata-version>
<google-gdata-bundle-version>1.41.1_1</google-gdata-bundle-version>
- <google-guava-version>15.0</google-guava-version>
+ <google-guava-version>14.0.1</google-guava-version>
<groovy-version>2.1.7</groovy-version>
<gson-version>2.2.4</gson-version>
<guice-bundle-version>3.0_1</guice-bundle-version>
[2/2] git commit: add a comment about the unsuccessful Guava upgrade
Posted by cm...@apache.org.
add a comment about the unsuccessful Guava upgrade
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/8fe10ab5
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/8fe10ab5
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/8fe10ab5
Branch: refs/heads/master
Commit: 8fe10ab57bead542ab71578ddba5dd5078ce37c4
Parents: feabe25
Author: cmueller <cm...@apache.org>
Authored: Tue Oct 8 23:19:25 2013 +0200
Committer: cmueller <cm...@apache.org>
Committed: Tue Oct 8 23:19:25 2013 +0200
----------------------------------------------------------------------
parent/pom.xml | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/8fe10ab5/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 4461647..96311d1 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -160,6 +160,7 @@
<google-app-engine-bundle-version>1.8.3_1</google-app-engine-bundle-version>
<google-gdata-version>1.41.5.w1</google-gdata-version>
<google-gdata-bundle-version>1.41.1_1</google-gdata-bundle-version>
+ <!-- camel-cdi doesn't work with Guava 15.0.0 at present -->
<google-guava-version>14.0.1</google-guava-version>
<groovy-version>2.1.7</groovy-version>
<gson-version>2.2.4</gson-version>