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 2017/04/27 09:33:00 UTC
[3/3] camel git commit: CAMEL-11208: camel-swagger-java - Should use
guava 20 and not 19
CAMEL-11208: camel-swagger-java - Should use guava 20 and not 19
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/bb998e38
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/bb998e38
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/bb998e38
Branch: refs/heads/master
Commit: bb998e38bef7cdc28297efb9b2b9e3013b415d07
Parents: d1177cd
Author: Claus Ibsen <da...@apache.org>
Authored: Thu Apr 27 11:19:03 2017 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu Apr 27 11:32:51 2017 +0200
----------------------------------------------------------------------
components/camel-swagger-java/pom.xml | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/bb998e38/components/camel-swagger-java/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-swagger-java/pom.xml b/components/camel-swagger-java/pom.xml
index 8f8ca9e..68bc4e1 100644
--- a/components/camel-swagger-java/pom.xml
+++ b/components/camel-swagger-java/pom.xml
@@ -76,7 +76,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>${google-guava-version}</version>
+ <version>${swagger-java-guava-version}</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
@@ -89,6 +89,12 @@
<groupId>io.swagger</groupId>
<artifactId>swagger-core</artifactId>
<version>${swagger-java-version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>io.swagger</groupId>
@@ -99,6 +105,12 @@
<groupId>io.swagger</groupId>
<artifactId>swagger-jaxrs</artifactId>
<version>${swagger-java-version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>io.swagger</groupId>