camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From acosent...@apache.org
Subject camel git commit: CAMEL-9615 - Upgrade Olingo2 and related bundle to version 2.0.6
Date Sat, 20 Feb 2016 10:45:09 GMT
Repository: camel
Updated Branches:
  refs/heads/master 2894ec4a3 -> 110c8d2f4


CAMEL-9615 - Upgrade Olingo2 and related bundle to version 2.0.6


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/110c8d2f
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/110c8d2f
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/110c8d2f

Branch: refs/heads/master
Commit: 110c8d2f4567617e03fbf003c2a7c1af50f2438d
Parents: 2894ec4
Author: Andrea Cosentino <ancosen@gmail.com>
Authored: Sat Feb 20 11:43:28 2016 +0100
Committer: Andrea Cosentino <ancosen@gmail.com>
Committed: Sat Feb 20 11:44:47 2016 +0100

----------------------------------------------------------------------
 parent/pom.xml                                           | 5 +++--
 platforms/karaf/features/src/main/resources/features.xml | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/110c8d2f/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 13e2963..87a8f61 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -413,8 +413,9 @@
     <openwebbeans1-version>1.2.7</openwebbeans1-version>
     <openwebbeans-version>1.6.2</openwebbeans-version>
     <oauth-provider-bundle-version>20100527_1</oauth-provider-bundle-version>
-    <olingo2-version>2.0.5</olingo2-version>
-    <olingo-odata2-core-bundle-version>2.0.5_1</olingo-odata2-core-bundle-version>
+    <olingo2-version>2.0.6</olingo2-version>
+    <olingo-odata2-core-bundle-version>2.0.6_1</olingo-odata2-core-bundle-version>
+    <olingo2-gson-version>2.4</olingo2-gson-version>
     <ognl-version>3.1.2</ognl-version>
     <ognl-bundle-version>3.1.2_1</ognl-bundle-version>
     <oncrpc-version>1.1.2</oncrpc-version>

http://git-wip-us.apache.org/repos/asf/camel/blob/110c8d2f/platforms/karaf/features/src/main/resources/features.xml
----------------------------------------------------------------------
diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml
index b3e89d7..e28cfd9 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -1151,7 +1151,7 @@
     <bundle dependency='true'>mvn:org.apache.httpcomponents/httpasyncclient-osgi/${httpasyncclient-version}</bundle>
     <bundle dependency='true'>mvn:commons-codec/commons-codec/${commons-codec-version}</bundle>
     <bundle dependency='true'>mvn:commons-lang/commons-lang/${commons-lang-version}</bundle>
-    <bundle dependency='true'>wrap:mvn:com.google.code.gson/gson/${gson-version}</bundle>
+    <bundle dependency='true'>mvn:com.google.code.gson/gson/${olingo2-gson-version}</bundle>
     <bundle dependency='true'>mvn:org.apache.olingo/olingo-odata2-api/${olingo2-version}</bundle>
     <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.olingo-odata2-core/${olingo-odata2-core-bundle-version}</bundle>
     <bundle dependency='true'>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jsr311-api-1.1.1/${servicemix-specs-version}</bundle>


Mime
View raw message