[jena] branch main updated: Bump Caffeine 3.1.6 to 3.1.7, Guava 32.1.1 to 32.1.2. Fix convergence.

[andy]

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

andy pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/jena.git


The following commit(s) were added to refs/heads/main by this push:
     new f0ef84fdbe Bump Caffeine 3.1.6 to 3.1.7, Guava 32.1.1 to 32.1.2. Fix 
convergence.
     new fb41e79d97 Merge pull request #1984 from afs/dependency-clash
f0ef84fdbe is described below

commit f0ef84fdbe6fedab8488acb9c91be66c14d743a3
Author: Andy Seaborne <a...@apache.org>
AuthorDate: Wed Aug 2 20:29:12 2023 +0100

    Bump Caffeine 3.1.6 to 3.1.7, Guava 32.1.1 to 32.1.2. Fix convergence.
---
 pom.xml | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 0479e2e1f4..4174da896d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -92,9 +92,9 @@
     <ver.httpclient>4.5.14</ver.httpclient>
     <ver.httpcore>4.4.16</ver.httpcore>
 
-    <ver.caffeine>3.1.6</ver.caffeine>
+    <ver.caffeine>3.1.7</ver.caffeine>
     <!-- Most of Jena uses other libraries for equivalent functionality. -->
-    <ver.guava>32.1.1-jre</ver.guava>
+    <ver.guava>32.1.2-jre</ver.guava>
 
     <ver.gson>2.10.1</ver.gson>
     <ver.commonsio>2.11.0</ver.commonsio>
@@ -395,6 +395,17 @@
          <groupId>com.google.guava</groupId>
          <artifactId>guava</artifactId>
          <version>${ver.guava}</version>
+         <exclusions>
+           <!-- These sometimes cause a convergence error with Caffeine -->
+           <exclusion>
+             <groupId>org.checkerframework</groupId>
+             <artifactId>checker-qual</artifactId>
+           </exclusion>
+           <exclusion>
+             <groupId>com.google.errorprone</groupId>
+             <artifactId>error_prone_annotations</artifactId>
+           </exclusion>
+         </exclusions>
        </dependency>
 
        <!-- supports persistent data structures -->