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 62e7879 CAMEL-16508: Upgrade leveldb. Fixed failing test due to wrong
guava version used.
62e7879 is described below
commit 62e7879ff085601ba5a8387467ba296b116392af
Author: Claus Ibsen <[email protected]>
AuthorDate: Wed Apr 14 16:59:16 2021 +0200
CAMEL-16508: Upgrade leveldb. Fixed failing test due to wrong guava version
used.
---
components/camel-leveldb-legacy/pom.xml | 11 +++++++++++
components/camel-leveldb/pom.xml | 11 +++++++++++
parent/pom.xml | 4 ++--
3 files changed, 24 insertions(+), 2 deletions(-)
diff --git a/components/camel-leveldb-legacy/pom.xml
b/components/camel-leveldb-legacy/pom.xml
index 970ba55..b7a0af5 100644
--- a/components/camel-leveldb-legacy/pom.xml
+++ b/components/camel-leveldb-legacy/pom.xml
@@ -62,6 +62,17 @@
<groupId>org.iq80.leveldb</groupId>
<artifactId>leveldb</artifactId>
<version>${leveldb-version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>${leveldb-guava-version}</version>
</dependency>
<dependency>
<groupId>org.fusesource.hawtbuf</groupId>
diff --git a/components/camel-leveldb/pom.xml b/components/camel-leveldb/pom.xml
index b490e6e..07c98e3 100644
--- a/components/camel-leveldb/pom.xml
+++ b/components/camel-leveldb/pom.xml
@@ -62,6 +62,17 @@
<groupId>org.iq80.leveldb</groupId>
<artifactId>leveldb</artifactId>
<version>${leveldb-version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>${leveldb-guava-version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
diff --git a/parent/pom.xml b/parent/pom.xml
index 8e6ae2a..5469245 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -362,8 +362,8 @@
<kubernetes-model-version>5.3.0</kubernetes-model-version>
<kudu-version>1.14.0</kudu-version>
<leveldbjni-version>1.8</leveldbjni-version>
- <leveldb-api-version>0.10</leveldb-api-version>
- <leveldb-version>0.10</leveldb-version>
+ <leveldb-api-version>0.12</leveldb-api-version>
+ <leveldb-version>0.12</leveldb-version>
<leveldb-guava-version>21.0</leveldb-guava-version>
<libphonenumber-version>8.12.20</libphonenumber-version>
<!-- virtual dependency only used by Eclipse m2e -->
