[accumulo] branch master updated: Include Guava's failureaccess in assembly (#1097)

[ct...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

ctubbsii pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/accumulo.git


The following commit(s) were added to refs/heads/master by this push:
     new 8b58543  Include Guava's failureaccess in assembly (#1097)
8b58543 is described below

commit 8b5854336c32fba8c1d041c491c14e13e0c32a8c
Author: Christopher Tubbs <ct...@apache.org>
AuthorDate: Wed Apr 17 13:41:31 2019 -0400

    Include Guava's failureaccess in assembly (#1097)
    
    Include Guava's only runtime dependency in the binary tarball assembly.
    failureaccess was separated from Guava's main jar and updated to include
    OSGi stuffs for Android, and is no longer bundled with Guava in 27.1 and
    later.
---
 assemble/pom.xml                           | 5 +++++
 assemble/src/main/assemblies/component.xml | 1 +
 pom.xml                                    | 6 ++++++
 3 files changed, 12 insertions(+)

diff --git a/assemble/pom.xml b/assemble/pom.xml
index b113a2f..40f8c50 100644
--- a/assemble/pom.xml
+++ b/assemble/pom.xml
@@ -79,6 +79,11 @@
     </dependency>
     <dependency>
       <groupId>com.google.guava</groupId>
+      <artifactId>failureaccess</artifactId>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
       <optional>true</optional>
     </dependency>
diff --git a/assemble/src/main/assemblies/component.xml b/assemble/src/main/assemblies/component.xml
index d799ce0..84a7cb2 100644
--- a/assemble/src/main/assemblies/component.xml
+++ b/assemble/src/main/assemblies/component.xml
@@ -39,6 +39,7 @@
         <include>com.fasterxml:classmate</include>
         <include>com.github.ben-manes.caffeine:caffeine</include>
         <include>com.google.code.gson:gson</include>
+        <include>com.google.guava:failureaccess</include>
         <include>com.google.guava:guava</include>
         <include>com.google.protobuf:protobuf-java</include>
         <include>com.sun.xml.bind:jaxb-core</include>
diff --git a/pom.xml b/pom.xml
index cebb3d7..f792d3f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -216,6 +216,12 @@
         <version>2.8.5</version>
       </dependency>
       <dependency>
+        <!-- this is a runtime dependency of guava, no longer included with guava as of 27.1 -->
+        <groupId>com.google.guava</groupId>
+        <artifactId>failureaccess</artifactId>
+        <version>1.0.1</version>
+      </dependency>
+      <dependency>
         <groupId>com.google.guava</groupId>
         <artifactId>guava</artifactId>
         <version>27.1-jre</version>