jena-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a...@apache.org
Subject [1/2] jena git commit: JENA-1558: Make Guava optional and add exclusions
Date Fri, 08 Jun 2018 14:25:38 GMT
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 <andy@apache.org>
Authored: Thu Jun 7 21:42:19 2018 +0100
Committer: Andy Seaborne <andy@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


Mime
View raw message