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

orudyy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git

commit d9299c15ee95637fa11be3f7576f499972371e3d
Author: Alex Rudyy <[email protected]>
AuthorDate: Thu Feb 20 23:13:54 2020 +0000

    QPID-8420: [Broker-J] Upgrade guava
---
 .../assembly/dependency-verification/DEPENDENCIES_REFERENCE    |  4 +++-
 .../assembly/dependency-verification/DEPENDENCIES_REFERENCE    |  4 +++-
 pom.xml                                                        | 10 +---------
 3 files changed, 7 insertions(+), 11 deletions(-)

diff --git 
a/apache-qpid-broker-j/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE
 
b/apache-qpid-broker-j/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE
index bea4726..ec3254e 100644
--- 
a/apache-qpid-broker-j/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE
+++ 
b/apache-qpid-broker-j/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE
@@ -25,8 +25,10 @@ Apache Qpid Broker-J Bundles
 
 
 From: 'an unknown organization'
-  - Guava: Google Core Libraries for Java 
(https://github.com/google/guava/guava) com.google.guava:guava:bundle:27.0-jre
+  - Guava InternalFutureFailureAccess and InternalFutures 
(https://github.com/google/guava/failureaccess) 
com.google.guava:failureaccess:bundle:1.0.1
     License: The Apache Software License, Version 2.0  
(http://www.apache.org/licenses/LICENSE-2.0.txt)
+  - Guava: Google Core Libraries for Java 
(https://github.com/google/guava/guava) com.google.guava:guava:bundle:28.2-jre
+    License: Apache License, Version 2.0  
(http://www.apache.org/licenses/LICENSE-2.0.txt)
   - dgrid (http://webjars.org) org.webjars.bower:dgrid:jar:1.2.1
     License: BSD 3-Clause  (https://spdx.org/licenses/BSD 3-Clause#licenseText)
   - dstore (http://webjars.org) org.webjars.bower:dstore:jar:1.1.2
diff --git 
a/perftests/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE 
b/perftests/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE
index 58a6606..77b2d7e 100644
--- a/perftests/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE
+++ b/perftests/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE
@@ -25,8 +25,10 @@ Apache Qpid Broker-J Performance Tests
 
 
 From: 'an unknown organization'
-  - Guava: Google Core Libraries for Java 
(https://github.com/google/guava/guava) com.google.guava:guava:bundle:27.0-jre
+  - Guava InternalFutureFailureAccess and InternalFutures 
(https://github.com/google/guava/failureaccess) 
com.google.guava:failureaccess:bundle:1.0.1
     License: The Apache Software License, Version 2.0  
(http://www.apache.org/licenses/LICENSE-2.0.txt)
+  - Guava: Google Core Libraries for Java 
(https://github.com/google/guava/guava) com.google.guava:guava:bundle:28.2-jre
+    License: Apache License, Version 2.0  
(http://www.apache.org/licenses/LICENSE-2.0.txt)
 
 From: 'Apache Software Foundation' (http://www.apache.org)
   - JMS 1.1 (http://geronimo.apache.org/specs/geronimo-jms_1.1_spec) 
org.apache.geronimo.specs:geronimo-jms_1.1_spec:jar:1.1.1
diff --git a/pom.xml b/pom.xml
index 83efdb6..f8d28e2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -104,7 +104,7 @@
     <bdb-version>7.4.5</bdb-version>
     <derby-version>10.14.2.0</derby-version>
     <logback-version>1.2.3</logback-version>
-    <guava-version>27.0-jre</guava-version>
+    <guava-version>28.2-jre</guava-version>
     <fasterxml-jackson-version>2.10.2</fasterxml-jackson-version>
     
<fasterxml-jackson-databind-version>2.10.2</fasterxml-jackson-databind-version>
     <slf4j-version>1.7.30</slf4j-version>
@@ -522,19 +522,11 @@
             <artifactId>error_prone_annotations</artifactId>
           </exclusion>
           <exclusion>
-            <groupId>org.codehaus.mojo</groupId>
-            <artifactId>animal-sniffer-annotations</artifactId>
-          </exclusion>
-          <exclusion>
             <groupId>com.google.code.findbugs</groupId>
             <artifactId>jsr305</artifactId>
           </exclusion>
           <exclusion>
             <groupId>com.google.guava</groupId>
-            <artifactId>failureaccess</artifactId>
-          </exclusion>
-          <exclusion>
-            <groupId>com.google.guava</groupId>
             <artifactId>listenablefuture</artifactId>
           </exclusion>
           <exclusion>


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to