camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From acosent...@apache.org
Subject [2/2] camel git commit: Add a specific Guava version property for Swagger-java feature
Date Fri, 01 Jan 2016 09:43:40 GMT
Add a specific Guava version property for Swagger-java feature


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

Branch: refs/heads/master
Commit: 0b82cfbe3657494e20169a1d45eda1ab4046bbe1
Parents: 4ac4545
Author: Andrea Cosentino <ancosen@gmail.com>
Authored: Fri Jan 1 10:42:30 2016 +0100
Committer: Andrea Cosentino <ancosen@gmail.com>
Committed: Fri Jan 1 10:42:30 2016 +0100

----------------------------------------------------------------------
 parent/pom.xml                                           | 1 +
 platforms/karaf/features/src/main/resources/features.xml | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/0b82cfbe/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index ece7680..cbe4b15 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -504,6 +504,7 @@
     <swagger-scala-guava-version>15.0</swagger-scala-guava-version>
     <swagger-scala-bundle-version>1.3.12_1</swagger-scala-bundle-version>
     <swagger-java-version>1.5.5</swagger-java-version>
+    <swagger-java-guava-version>18.0</swagger-java-guava-version>
     <stax-api-version>1.0.1</stax-api-version>
     <stax2-api-bundle-version>3.1.4</stax2-api-bundle-version>
     <stringtemplate-bundle-version>4.0.8_1</stringtemplate-bundle-version>

http://git-wip-us.apache.org/repos/asf/camel/blob/0b82cfbe/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 e67aa5b..daef3e9 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -1552,7 +1552,7 @@
     <bundle dependency='true'>mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-json-provider/${jackson2-version}</bundle>
     <bundle dependency='true'>mvn:javax.validation/validation-api/${validation-api-version}</bundle>
     <bundle dependency='true'>mvn:org.apache.commons/commons-lang3/${commons-lang3-version}</bundle>
-    <bundle dependency='true'>mvn:com.google.guava/guava/${google-guava-version}</bundle>
+    <bundle dependency='true'>mvn:com.google.guava/guava/${swagger-java-guava-version}</bundle>
     <bundle dependency='true'>mvn:io.swagger/swagger-core/${swagger-java-version}</bundle>
     <bundle dependency='true'>mvn:io.swagger/swagger-annotations/${swagger-java-version}</bundle>
     <bundle dependency='true'>mvn:io.swagger/swagger-models/${swagger-java-version}</bundle>


Mime
View raw message