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 0f0cddb JENA-2226: Update Guava version. Manage with a version
property.
new 92719c3 Merge pull request #1138 from afs/guava-version
0f0cddb is described below
commit 0f0cddbbbfabb26b97b1f16ec08aa7f45eb09d8d
Author: Andy Seaborne <a...@apache.org>
AuthorDate: Sun Dec 19 18:54:33 2021 +0000
JENA-2226: Update Guava version. Manage with a version property.
---
jena-shaded-guava/pom.xml | 11 ++++-------
pom.xml | 1 +
2 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/jena-shaded-guava/pom.xml b/jena-shaded-guava/pom.xml
index 11ead45..4388bd0 100644
--- a/jena-shaded-guava/pom.xml
+++ b/jena-shaded-guava/pom.xml
@@ -47,14 +47,11 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <!-- Version number specified explicitly and not in jena-project,
- as it should only be used here, and further shadowing/bundle/NOTICE
- consideration might be needed on upgrade.
- The shading step takes only the
com.google.commons/com.google.thirdparty
- This is important because Guava itself (at v24 at least) has tools
dependencies
- with various licenses.
+ <!-- Version number specified in parent POM but no dependency management
there.
+ Some part of the system could use guava directly. The shading step
takes
+ only the com.google.commons and com.google.thirdparty packages.
-->
- <version>30.1.1-jre</version>
+ <version>${ver.shaded-guava}</version>
<optional>true</optional>
<!-- These are also affected by the artifactSet and filters of the shade
plugin. -->
diff --git a/pom.xml b/pom.xml
index 383e6b0..75739a6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -74,6 +74,7 @@
<ver.jsonldjava>0.13.3</ver.jsonldjava>
<ver.jackson>2.13.0</ver.jackson>
+ <ver.shaded-guava>31.0.1-jre</ver.shaded-guava>
<ver.commonsio>2.11.0</ver.commonsio>
<ver.commonscli>1.5.0</ver.commonscli>
<ver.commonslang3>3.12.0</ver.commonslang3>
