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 2019/08/06 18:53:02 UTC
[camel] branch master updated: CAMEL-13083: Upgrade to newer guava
version.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new 976ed37 CAMEL-13083: Upgrade to newer guava version.
976ed37 is described below
commit 976ed37dca0b28a08ad70cc7d203424f35dc36b7
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Tue Aug 6 20:52:32 2019 +0200
CAMEL-13083: Upgrade to newer guava version.
---
parent/pom.xml | 4 ++--
platforms/karaf/features/src/main/resources/features.xml | 2 ++
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 0594656..143c0ed 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -603,9 +603,9 @@
<squareup-retrofit2-bundle-version>2.5.0_2</squareup-retrofit2-bundle-version>
<sshd-version>2.0.0</sshd-version>
<stompjms-version>1.19</stompjms-version>
- <swagger-java-version>1.5.21</swagger-java-version>
+ <swagger-java-version>1.5.22</swagger-java-version>
<swagger-java-parser-version>1.0.37</swagger-java-parser-version>
- <swagger-java-guava-version>20.0</swagger-java-guava-version>
+ <swagger-java-guava-version>27.1-jre</swagger-java-guava-version>
<stax-api-version>1.0.1</stax-api-version>
<stax2-api-bundle-version>3.1.4</stax2-api-bundle-version>
<stax2v4-api-bundle-version>4.2</stax2v4-api-bundle-version>
diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml
index 536d795..b39fbdd 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -2134,6 +2134,7 @@
<bundle dependency='true'>mvn:com.fasterxml.jackson.module/jackson-module-jsonSchema/${jackson2-version}</bundle>
<bundle dependency='true'>mvn:org.apache.commons/commons-lang3/${commons-lang3-version}</bundle>
<bundle dependency='true'>mvn:com.google.guava/guava/${swagger-java-guava-version}</bundle>
+ <bundle dependency='true'>mvn:com.google.guava/failureaccess/1.0.1</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>
@@ -2480,6 +2481,7 @@
<bundle dependency='true'>mvn:javax.validation/validation-api/${validation-1-api-version}</bundle>
<bundle dependency='true'>mvn:org.apache.commons/commons-lang3/${commons-lang3-version}</bundle>
<bundle dependency='true'>mvn:com.google.guava/guava/${swagger-java-guava-version}</bundle>
+ <bundle dependency='true'>mvn:com.google.guava/failureaccess/1.0.1</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>