You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@any23.apache.org by ha...@apache.org on 2018/07/12 20:00:39 UTC
[1/2] any23 git commit: ANY23-366 excluded commons-logging from
dependencies
Repository: any23
Updated Branches:
refs/heads/master 29bee074f -> 8d7b4fd67
ANY23-366 excluded commons-logging from dependencies
Project: http://git-wip-us.apache.org/repos/asf/any23/repo
Commit: http://git-wip-us.apache.org/repos/asf/any23/commit/8cd464be
Tree: http://git-wip-us.apache.org/repos/asf/any23/tree/8cd464be
Diff: http://git-wip-us.apache.org/repos/asf/any23/diff/8cd464be
Branch: refs/heads/master
Commit: 8cd464be02e701b8e5d05d6f12bc3e22a6f0b0b4
Parents: 29bee07
Author: Hans <fi...@gmail.com>
Authored: Thu Jul 12 14:38:09 2018 -0500
Committer: Hans <fi...@gmail.com>
Committed: Thu Jul 12 14:38:09 2018 -0500
----------------------------------------------------------------------
cli/pom.xml | 30 +++++++++++++++++++++++++++++-
core/pom.xml | 30 +++++++++++++++++++++++++++++-
encoding/pom.xml | 18 +++++++++++++++++-
mime/pom.xml | 18 +++++++++++++++++-
4 files changed, 92 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/any23/blob/8cd464be/cli/pom.xml
----------------------------------------------------------------------
diff --git a/cli/pom.xml b/cli/pom.xml
index 0f04c62..fdb4ca0 100644
--- a/cli/pom.xml
+++ b/cli/pom.xml
@@ -100,6 +100,12 @@
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
@@ -122,6 +128,16 @@
<dependency>
<groupId>org.apache.tika</groupId>
<artifactId>tika-parsers</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<!-- END: Tika -->
@@ -213,6 +229,12 @@
<dependency> <!-- used by RDF4J -->
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient-cache</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency> <!-- used by RDF4J -->
<groupId>org.apache.httpcomponents</groupId>
@@ -221,6 +243,12 @@
<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>
@@ -246,7 +274,7 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
- <dependency> <!-- used by Tika -->
+ <dependency> <!-- used by Tika, also replaces httpclient commons-logging dependency -->
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
</dependency>
http://git-wip-us.apache.org/repos/asf/any23/blob/8cd464be/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index 377a5ee..c7bc081 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -66,6 +66,12 @@
<dependency> <!-- used by RDF4J, Tika -->
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency> <!-- used by RDF4J, Tika -->
<groupId>org.apache.httpcomponents</groupId>
@@ -78,6 +84,12 @@
<dependency> <!-- used by RDF4J -->
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient-cache</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency> <!-- used by RDF4J -->
<groupId>org.apache.httpcomponents</groupId>
@@ -86,6 +98,12 @@
<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>
@@ -105,6 +123,16 @@
<dependency>
<groupId>org.apache.tika</groupId>
<artifactId>tika-parsers</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency> <!-- used by Tika -->
<groupId>org.apache.commons</groupId>
@@ -253,7 +281,7 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
- <dependency> <!-- used by Tika -->
+ <dependency> <!-- used by Tika, also replaces httpclient commons-logging dependency -->
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
</dependency>
http://git-wip-us.apache.org/repos/asf/any23/blob/8cd464be/encoding/pom.xml
----------------------------------------------------------------------
diff --git a/encoding/pom.xml b/encoding/pom.xml
index ab4b7af..a9903cc 100644
--- a/encoding/pom.xml
+++ b/encoding/pom.xml
@@ -51,6 +51,16 @@
<dependency>
<groupId>org.apache.tika</groupId>
<artifactId>tika-parsers</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<!-- ensure dependencies of tika-parsers match versions
specified in dependencyManagement section of parent pom -->
@@ -77,6 +87,12 @@
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
@@ -111,7 +127,7 @@
<artifactId>jul-to-slf4j</artifactId>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
+ <groupId>org.slf4j</groupId> <!-- also replaces httpclient commons-logging dependency -->
<artifactId>jcl-over-slf4j</artifactId>
</dependency>
<!-- END: Tika -->
http://git-wip-us.apache.org/repos/asf/any23/blob/8cd464be/mime/pom.xml
----------------------------------------------------------------------
diff --git a/mime/pom.xml b/mime/pom.xml
index 6e2b9ec..23ecb0f 100644
--- a/mime/pom.xml
+++ b/mime/pom.xml
@@ -88,6 +88,16 @@
<dependency>
<groupId>org.apache.tika</groupId>
<artifactId>tika-parsers</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<!-- ensure dependencies of tika-parsers match versions
specified in dependencyManagement section of parent pom -->
@@ -106,6 +116,12 @@
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
@@ -139,7 +155,7 @@
<groupId>org.slf4j</groupId>
<artifactId>jul-to-slf4j</artifactId>
</dependency>
- <dependency>
+ <dependency> <!-- also replaces httpclient commons-logging dependency -->
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
</dependency>
[2/2] any23 git commit: ANY23-366 changed 'name' to 'id' in
appassembler-maven-plugin
Posted by ha...@apache.org.
ANY23-366 changed 'name' to 'id' in appassembler-maven-plugin
Project: http://git-wip-us.apache.org/repos/asf/any23/repo
Commit: http://git-wip-us.apache.org/repos/asf/any23/commit/8d7b4fd6
Tree: http://git-wip-us.apache.org/repos/asf/any23/tree/8d7b4fd6
Diff: http://git-wip-us.apache.org/repos/asf/any23/diff/8d7b4fd6
Branch: refs/heads/master
Commit: 8d7b4fd67e26bc9ab07af0e26bc002c35b0c6176
Parents: 8cd464b
Author: Hans <fi...@gmail.com>
Authored: Thu Jul 12 14:41:46 2018 -0500
Committer: Hans <fi...@gmail.com>
Committed: Thu Jul 12 14:41:46 2018 -0500
----------------------------------------------------------------------
cli/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/any23/blob/8d7b4fd6/cli/pom.xml
----------------------------------------------------------------------
diff --git a/cli/pom.xml b/cli/pom.xml
index fdb4ca0..34af56f 100644
--- a/cli/pom.xml
+++ b/cli/pom.xml
@@ -332,7 +332,7 @@
<programs>
<program>
<mainClass>org.apache.any23.cli.ToolRunner</mainClass>
- <name>any23</name>
+ <id>any23</id>
<jvmSettings>
<maxMemorySize>6000m</maxMemorySize>
</jvmSettings>