Repository: camel Updated Branches: refs/heads/master eccccefc5 -> f20302131
CAMEL-6803: Upgraded camel-cdi to deltaspike 0.5 Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/f2030213 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/f2030213 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/f2030213 Branch: refs/heads/master Commit: f20302131f0a2470becd221f1e886e1c1d067db8 Parents: eccccef Author: Claus Ibsen <davscl...@apache.org> Authored: Sun Mar 2 11:24:15 2014 +0100 Committer: Claus Ibsen <davscl...@apache.org> Committed: Sun Mar 2 11:24:15 2014 +0100 ---------------------------------------------------------------------- parent/pom.xml | 1 - 1 file changed, 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/f2030213/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 11b8f23..c37b6c8 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -160,7 +160,6 @@ <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>16.0.1</google-guava-version> <groovy-version>2.2.2</groovy-version> <gson-version>2.2.4</gson-version>