any23-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hansbre...@apache.org
Subject any23 git commit: ANY23-369 Resolved overlapping dependencies
Date Wed, 18 Jul 2018 19:26:28 GMT
Repository: any23
Updated Branches:
  refs/heads/master 04dd94253 -> 0259c695c


ANY23-369 Resolved overlapping dependencies


Project: http://git-wip-us.apache.org/repos/asf/any23/repo
Commit: http://git-wip-us.apache.org/repos/asf/any23/commit/0259c695
Tree: http://git-wip-us.apache.org/repos/asf/any23/tree/0259c695
Diff: http://git-wip-us.apache.org/repos/asf/any23/diff/0259c695

Branch: refs/heads/master
Commit: 0259c695cc9e75fd0156018976391bab04d4d3c1
Parents: 04dd942
Author: Hans <firedrake93@gmail.com>
Authored: Wed Jul 18 14:11:32 2018 -0500
Committer: Hans <firedrake93@gmail.com>
Committed: Wed Jul 18 14:11:32 2018 -0500

----------------------------------------------------------------------
 cli/pom.xml      | 52 ++++++++++++++++++++++++++++-----------------------
 core/pom.xml     | 52 ++++++++++++++++++++++++++++-----------------------
 encoding/pom.xml |  6 ++++++
 mime/pom.xml     |  6 ++++++
 pom.xml          | 20 --------------------
 5 files changed, 70 insertions(+), 66 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/any23/blob/0259c695/cli/pom.xml
----------------------------------------------------------------------
diff --git a/cli/pom.xml b/cli/pom.xml
index 34af56f..573646e 100644
--- a/cli/pom.xml
+++ b/cli/pom.xml
@@ -185,6 +185,28 @@
     <dependency>
       <groupId>com.github.jsonld-java</groupId>
       <artifactId>jsonld-java</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>org.apache.httpcomponents</groupId>
+          <artifactId>fluent-hc</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.httpcomponents</groupId>
+          <artifactId>httpcore-nio</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.httpcomponents</groupId>
+          <artifactId>httpcore-osgi</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.httpcomponents</groupId>
+          <artifactId>httpclient-osgi</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.httpcomponents</groupId>
+          <artifactId>httpmime</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.semarglproject</groupId>
@@ -222,7 +244,7 @@
     <!-- BEGIN: additional dependencies used by RDF4J or Tika
      (include to ensure versions match those specified in
      dependencyManagement section of parent pom) -->
-    <dependency> <!-- used by RDF4J, Tika -->
+    <dependency> <!-- used by Tika -->
       <groupId>org.apache.httpcomponents</groupId>
       <artifactId>httpmime</artifactId>
     </dependency>
@@ -236,28 +258,6 @@
         </exclusion>
       </exclusions>
     </dependency>
-    <dependency> <!-- used by RDF4J -->
-      <groupId>org.apache.httpcomponents</groupId>
-      <artifactId>httpclient-osgi</artifactId>
-    </dependency>
-    <dependency> <!-- used by RDF4J -->
-      <groupId>org.apache.httpcomponents</groupId>
-      <artifactId>fluent-hc</artifactId>
-      <exclusions>
-        <exclusion>
-          <groupId>commons-logging</groupId>
-          <artifactId>commons-logging</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency> <!-- used by RDF4J -->
-      <groupId>org.apache.httpcomponents</groupId>
-      <artifactId>httpcore-osgi</artifactId>
-    </dependency>
-    <dependency> <!-- used by RDF4J -->
-      <groupId>org.apache.httpcomponents</groupId>
-      <artifactId>httpcore-nio</artifactId>
-    </dependency>
     <dependency> <!-- used by Tika -->
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-compress</artifactId>
@@ -293,6 +293,12 @@
     <dependency> <!-- used by Tika -->
       <groupId>org.apache.poi</groupId>
       <artifactId>poi-ooxml</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>stax</groupId>
+          <artifactId>stax-api</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <!-- END: additional dependencies used by RDF4J or Tika -->
 

http://git-wip-us.apache.org/repos/asf/any23/blob/0259c695/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index c7bc081..12cc6ae 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -77,7 +77,7 @@
       <groupId>org.apache.httpcomponents</groupId>
       <artifactId>httpcore</artifactId>
     </dependency>
-    <dependency> <!-- used by RDF4J, Tika -->
+    <dependency> <!-- used by Tika -->
       <groupId>org.apache.httpcomponents</groupId>
       <artifactId>httpmime</artifactId>
     </dependency>
@@ -91,28 +91,6 @@
         </exclusion>
       </exclusions>
     </dependency>
-    <dependency> <!-- used by RDF4J -->
-      <groupId>org.apache.httpcomponents</groupId>
-      <artifactId>httpclient-osgi</artifactId>
-    </dependency>
-    <dependency> <!-- used by RDF4J -->
-      <groupId>org.apache.httpcomponents</groupId>
-      <artifactId>fluent-hc</artifactId>
-      <exclusions>
-        <exclusion>
-          <groupId>commons-logging</groupId>
-          <artifactId>commons-logging</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency> <!-- used by RDF4J -->
-      <groupId>org.apache.httpcomponents</groupId>
-      <artifactId>httpcore-osgi</artifactId>
-    </dependency>
-    <dependency> <!-- used by RDF4J -->
-      <groupId>org.apache.httpcomponents</groupId>
-      <artifactId>httpcore-nio</artifactId>
-    </dependency>
     <!-- END: httpcomponents -->
 
     <!-- BEGIN: Tika -->
@@ -213,6 +191,28 @@
     <dependency> <!-- used by RDF4J: must include to force v. 0.12.0 -->
       <groupId>com.github.jsonld-java</groupId>
       <artifactId>jsonld-java</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>org.apache.httpcomponents</groupId>
+          <artifactId>fluent-hc</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.httpcomponents</groupId>
+          <artifactId>httpcore-nio</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.httpcomponents</groupId>
+          <artifactId>httpcore-osgi</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.httpcomponents</groupId>
+          <artifactId>httpclient-osgi</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.httpcomponents</groupId>
+          <artifactId>httpmime</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.semarglproject</groupId>
@@ -303,6 +303,12 @@
     <dependency> <!-- used by Tika -->
       <groupId>org.apache.poi</groupId>
       <artifactId>poi-ooxml</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>stax</groupId>
+          <artifactId>stax-api</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <!-- END: POI -->
 

http://git-wip-us.apache.org/repos/asf/any23/blob/0259c695/encoding/pom.xml
----------------------------------------------------------------------
diff --git a/encoding/pom.xml b/encoding/pom.xml
index a9903cc..873c3de 100644
--- a/encoding/pom.xml
+++ b/encoding/pom.xml
@@ -113,6 +113,12 @@
     <dependency>
       <groupId>org.apache.poi</groupId>
       <artifactId>poi-ooxml</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>stax</groupId>
+          <artifactId>stax-api</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.jsoup</groupId>

http://git-wip-us.apache.org/repos/asf/any23/blob/0259c695/mime/pom.xml
----------------------------------------------------------------------
diff --git a/mime/pom.xml b/mime/pom.xml
index 23ecb0f..e4caf5e 100644
--- a/mime/pom.xml
+++ b/mime/pom.xml
@@ -142,6 +142,12 @@
     <dependency>
       <groupId>org.apache.poi</groupId>
       <artifactId>poi-ooxml</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>stax</groupId>
+          <artifactId>stax-api</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.jsoup</groupId>

http://git-wip-us.apache.org/repos/asf/any23/blob/0259c695/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 21ac9f7..1bc9045 100644
--- a/pom.xml
+++ b/pom.xml
@@ -343,35 +343,15 @@
       </dependency>
       <dependency>
         <groupId>org.apache.httpcomponents</groupId>
-        <artifactId>fluent-hc</artifactId>
-        <version>${httpclient.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.httpcomponents</groupId>
-        <artifactId>httpclient-osgi</artifactId>
-        <version>${httpclient.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.httpcomponents</groupId>
         <artifactId>httpmime</artifactId>
         <version>${httpclient.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.httpcomponents</groupId>
-        <artifactId>httpcore-osgi</artifactId>
-        <version>${httpcore.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.httpcomponents</groupId>
         <artifactId>httpcore</artifactId>
         <version>${httpcore.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.httpcomponents</groupId>
-        <artifactId>httpcore-nio</artifactId>
-        <version>${httpcore.version}</version>
-      </dependency>
-      <dependency>
         <groupId>commons-codec</groupId>
         <artifactId>commons-codec</artifactId>
         <version>1.11</version>


Mime
View raw message