You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2018/06/08 14:25:38 UTC
[1/2] jena git commit: JENA-1558: Make Guava optional and add
exclusions
Repository: jena
Updated Branches:
refs/heads/master 2934c5506 -> 30d093414
JENA-1558: Make Guava optional and add exclusions
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/2459b077
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/2459b077
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/2459b077
Branch: refs/heads/master
Commit: 2459b077714cc36b7dec780bb1907f2af0ba73a7
Parents: 2934c55
Author: Andy Seaborne <an...@apache.org>
Authored: Thu Jun 7 21:42:19 2018 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Thu Jun 7 21:42:19 2018 +0100
----------------------------------------------------------------------
jena-shaded-guava/pom.xml | 42 ++++++++++++++++++++++++++++++++++++++++--
1 file changed, 40 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/2459b077/jena-shaded-guava/pom.xml
----------------------------------------------------------------------
diff --git a/jena-shaded-guava/pom.xml b/jena-shaded-guava/pom.xml
index 733305c..d80703c 100644
--- a/jena-shaded-guava/pom.xml
+++ b/jena-shaded-guava/pom.xml
@@ -40,14 +40,49 @@
</description>
<dependencies>
+
<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. -->
+ 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>24.1-jre</version>
+ <optional>true</optional>
+ <!-- These make the excluded parts clean for dependency:tree in the module directory -->
+ <exclusions>
+ <exclusion>
+ <groupId>org.checkerframework</groupId>
+ <artifactId>checker-qual</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.checkerframework</groupId>
+ <artifactId>checker-compat-qual</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.google.errorprone</groupId>
+ <artifactId>error_prone_annotations</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.google.j2objc</groupId>
+ <artifactId>j2objc-annotations</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.google.code.findbugs</groupId>
+ <artifactId>jsr305</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>animal-sniffer-annotations</artifactId>
+ </exclusion>
+ </exclusions>
+
</dependency>
+
</dependencies>
<properties>
<automatic.module.name>org.apache.jena.ext.com.google</automatic.module.name>
@@ -90,6 +125,9 @@
<include>com/google/common/**</include>
<include>com/google/thirdparty/**</include>
</includes>
+ <excludes>
+ <exclude>META-INF/maven/**</exclude>
+ </excludes>
</filter>
</filters>
@@ -116,4 +154,4 @@
</plugins>
</build>
-</project>
+</project>
\ No newline at end of file
[2/2] jena git commit: JENA-1558: Merge commit 'refs/pull/429/head'
of https://github.com/apache/jena
Posted by an...@apache.org.
JENA-1558: Merge commit 'refs/pull/429/head' of https://github.com/apache/jena
This closes #429.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/30d09341
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/30d09341
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/30d09341
Branch: refs/heads/master
Commit: 30d093414ad8e7b9282e9cc890af5960ea3d41f8
Parents: 2934c55 2459b07
Author: Andy Seaborne <an...@apache.org>
Authored: Fri Jun 8 15:22:21 2018 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Fri Jun 8 15:22:21 2018 +0100
----------------------------------------------------------------------
jena-shaded-guava/pom.xml | 42 ++++++++++++++++++++++++++++++++++++++++--
1 file changed, 40 insertions(+), 2 deletions(-)
----------------------------------------------------------------------