You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@curator.apache.org by ra...@apache.org on 2019/03/03 04:17:17 UTC
[curator] branch CURATOR-503 updated: CURATOR-503 guava has been
broken into multiple JARs it seems. Our shading needs to reflect that
This is an automated email from the ASF dual-hosted git repository.
randgalt pushed a commit to branch CURATOR-503
in repository https://gitbox.apache.org/repos/asf/curator.git
The following commit(s) were added to refs/heads/CURATOR-503 by this push:
new 6c07104 CURATOR-503 guava has been broken into multiple JARs it seems. Our shading needs to reflect that
6c07104 is described below
commit 6c0710429cc4767be207073e182eb7a27ee4edc5
Author: randgalt <ra...@apache.org>
AuthorDate: Sat Mar 2 23:16:44 2019 -0500
CURATOR-503 guava has been broken into multiple JARs it seems. Our shading needs to reflect that
---
curator-client/pom.xml | 2 ++
curator-test/pom.xml | 2 ++
pom.xml | 26 ++++++++++++++++++++++++++
3 files changed, 30 insertions(+)
diff --git a/curator-client/pom.xml b/curator-client/pom.xml
index 35b14a5..5cc63ec 100644
--- a/curator-client/pom.xml
+++ b/curator-client/pom.xml
@@ -100,6 +100,8 @@
<artifactSet>
<includes>
<include>com.google.guava:guava</include>
+ <include>com.google.guava:listenablefuture</include>
+ <include>com.google.guava:failureaccess</include>
</includes>
</artifactSet>
<filters>
diff --git a/curator-test/pom.xml b/curator-test/pom.xml
index 3e6fd89..ddb773d 100644
--- a/curator-test/pom.xml
+++ b/curator-test/pom.xml
@@ -74,6 +74,8 @@
<artifactSet>
<includes>
<include>com.google.guava:guava</include>
+ <include>com.google.guava:listenablefuture</include>
+ <include>com.google.guava:failureaccess</include>
</includes>
</artifactSet>
<relocations>
diff --git a/pom.xml b/pom.xml
index 1401db6..1c56b84 100644
--- a/pom.xml
+++ b/pom.xml
@@ -80,6 +80,8 @@
<!-- resteasy-jaxrs dependency cannot be higher than 2.x for compatibility with Jersey 1.x -->
<resteasy-jaxrs-version>2.3.5.Final</resteasy-jaxrs-version>
<guava-version>27.0.1-jre</guava-version>
+ <guava-listenablefuture-version>1.0</guava-listenablefuture-version>
+ <guava-failureaccess-version>1.0.1</guava-failureaccess-version>
<testng-version>6.14.3</testng-version>
<swift-version>0.23.1</swift-version>
<dropwizard-version>1.3.7</dropwizard-version>
@@ -518,6 +520,18 @@
</dependency>
<dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>listenablefuture</artifactId>
+ <version>${guava-listenablefuture-version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>failureaccess</artifactId>
+ <version>${guava-failureaccess-version}</version>
+ </dependency>
+
+ <dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
<version>${testng-version}</version>
@@ -879,6 +893,18 @@
<exclude>META-INF/**</exclude>
</excludes>
</filter>
+ <filter>
+ <artifact>com.google.guava:listenablefuture</artifact>
+ <excludes>
+ <exclude>META-INF/**</exclude>
+ </excludes>
+ </filter>
+ <filter>
+ <artifact>com.google.guava:failureaccess</artifact>
+ <excludes>
+ <exclude>META-INF/**</exclude>
+ </excludes>
+ </filter>
</filters>
</configuration>
</execution>