From 08b96be364db428e12ca308379f2f82ded734550 Mon Sep 17 00:00:00 2001 From: Elijah Zupancic Date: Tue, 11 Jul 2017 11:07:53 -0700 Subject: [PATCH 1/3] Updated the pom.xml files to latest enforcer version and cleaned up exclusions. --- java-manta-client-kryo-serialization/pom.xml | 14 ++++++++++++++ pom.xml | 2 +- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/java-manta-client-kryo-serialization/pom.xml b/java-manta-client-kryo-serialization/pom.xml index 8aa7966c..6ac7984e 100644 --- a/java-manta-client-kryo-serialization/pom.xml +++ b/java-manta-client-kryo-serialization/pom.xml @@ -20,6 +20,11 @@ com.joyent.manta java-manta-client 3.1.4-SNAPSHOT + + com.joyent.http-signature @@ -65,6 +70,10 @@ com.squareup.jnagmp bouncycastle-rsa + + com.twmacinta + fast-md5 + @@ -149,5 +158,10 @@ + + com.twmacinta + fast-md5 + 2.7.1 + diff --git a/pom.xml b/pom.xml index 977444fc..be74bca2 100644 --- a/pom.xml +++ b/pom.xml @@ -113,7 +113,7 @@ 2.10 2.8.2 1.4.1 - 1.0-beta-5 + 1.0-beta-6 1.6 2.5.2 3.0.2 From 7ef748e06340738f8cd43111beaaebc34b7d3956 Mon Sep 17 00:00:00 2001 From: Elijah Zupancic Date: Wed, 12 Jul 2017 10:31:46 -0700 Subject: [PATCH 2/3] Fixes #270. Added proper exclusions for shaded dependencies to module pom.xml files. --- CHANGELOG.md | 2 + java-manta-benchmark/pom.xml | 55 ++++++++++++++++++++ java-manta-cli/pom.xml | 55 ++++++++++++++++++++ java-manta-client-kryo-serialization/pom.xml | 5 -- java-manta-examples/pom.xml | 55 ++++++++++++++++++++ java-manta-it/pom.xml | 55 ++++++++++++++++++++ 6 files changed, 222 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 84f2a996..e9711ccc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,8 @@ This project aims to adhere to [Semantic Versioning](http://semver.org/). - The heuristics for guessing heuristics have been adjusted to give [more consistent](https://github.com/joyent/java-manta/issues/276) results across platforms. +### Fixed + - [`mvn integration-test site` fails enforce-ban-duplicate-classes](https://github.com/joyent/java-manta/issues/270) ## [3.1.3] - 2017-06-29 ### Fixed diff --git a/java-manta-benchmark/pom.xml b/java-manta-benchmark/pom.xml index 86dcc770..64c93263 100644 --- a/java-manta-benchmark/pom.xml +++ b/java-manta-benchmark/pom.xml @@ -28,6 +28,61 @@ com.joyent.manta java-manta-client 3.1.4-SNAPSHOT + + + + + com.joyent.http-signature + apache-http-client-signature + + + org.apache.httpcomponents + httpclient + + + org.apache.commons + commons-lang3 + + + org.apache.commons + commons-collections4 + + + commons-io + commons-io + + + commons-codec + commons-codec + + + com.fasterxml.uuid + java-uuid-generator + + + com.fasterxml.jackson.core + jackson-core + + + com.fasterxml.jackson.core + jackson-databind + + + com.fasterxml.jackson.datatype + jackson-datatype-jsr310 + + + com.squareup.jnagmp + bouncycastle-rsa + + + com.twmacinta + fast-md5 + + ch.qos.logback diff --git a/java-manta-cli/pom.xml b/java-manta-cli/pom.xml index cadc3e52..152c21dd 100644 --- a/java-manta-cli/pom.xml +++ b/java-manta-cli/pom.xml @@ -22,6 +22,61 @@ com.joyent.manta java-manta-client 3.1.4-SNAPSHOT + + + + + com.joyent.http-signature + apache-http-client-signature + + + org.apache.httpcomponents + httpclient + + + org.apache.commons + commons-lang3 + + + org.apache.commons + commons-collections4 + + + commons-io + commons-io + + + commons-codec + commons-codec + + + com.fasterxml.uuid + java-uuid-generator + + + com.fasterxml.jackson.core + jackson-core + + + com.fasterxml.jackson.core + jackson-databind + + + com.fasterxml.jackson.datatype + jackson-datatype-jsr310 + + + com.squareup.jnagmp + bouncycastle-rsa + + + com.twmacinta + fast-md5 + + ch.qos.logback diff --git a/java-manta-client-kryo-serialization/pom.xml b/java-manta-client-kryo-serialization/pom.xml index 6ac7984e..49064b1d 100644 --- a/java-manta-client-kryo-serialization/pom.xml +++ b/java-manta-client-kryo-serialization/pom.xml @@ -158,10 +158,5 @@ - - com.twmacinta - fast-md5 - 2.7.1 - diff --git a/java-manta-examples/pom.xml b/java-manta-examples/pom.xml index dc1ac2e0..b1bdd74f 100644 --- a/java-manta-examples/pom.xml +++ b/java-manta-examples/pom.xml @@ -22,6 +22,61 @@ java-manta-client 3.1.4-SNAPSHOT compile + + + + + com.joyent.http-signature + apache-http-client-signature + + + org.apache.httpcomponents + httpclient + + + org.apache.commons + commons-lang3 + + + org.apache.commons + commons-collections4 + + + commons-io + commons-io + + + commons-codec + commons-codec + + + com.fasterxml.uuid + java-uuid-generator + + + com.fasterxml.jackson.core + jackson-core + + + com.fasterxml.jackson.core + jackson-databind + + + com.fasterxml.jackson.datatype + jackson-datatype-jsr310 + + + com.squareup.jnagmp + bouncycastle-rsa + + + com.twmacinta + fast-md5 + + org.apache.commons diff --git a/java-manta-it/pom.xml b/java-manta-it/pom.xml index 675ef631..5ca7de9f 100644 --- a/java-manta-it/pom.xml +++ b/java-manta-it/pom.xml @@ -28,6 +28,61 @@ java-manta-client 3.1.4-SNAPSHOT compile + + + + + com.joyent.http-signature + apache-http-client-signature + + + org.apache.httpcomponents + httpclient + + + org.apache.commons + commons-lang3 + + + org.apache.commons + commons-collections4 + + + commons-io + commons-io + + + commons-codec + commons-codec + + + com.fasterxml.uuid + java-uuid-generator + + + com.fasterxml.jackson.core + jackson-core + + + com.fasterxml.jackson.core + jackson-databind + + + com.fasterxml.jackson.datatype + jackson-datatype-jsr310 + + + com.squareup.jnagmp + bouncycastle-rsa + + + com.twmacinta + fast-md5 + + From 65b2500499a78ccd517cca9e6b32dbe6be0b20c9 Mon Sep 17 00:00:00 2001 From: Elijah Zupancic Date: Wed, 12 Jul 2017 16:44:49 -0700 Subject: [PATCH 3/3] Solved the build issue with a better fix than the previous fix. --- java-manta-benchmark/pom.xml | 55 ----------------- java-manta-client-kryo-serialization/pom.xml | 64 +++++--------------- java-manta-examples/pom.xml | 55 ----------------- java-manta-it/pom.xml | 55 ----------------- pom.xml | 14 +++++ 5 files changed, 30 insertions(+), 213 deletions(-) diff --git a/java-manta-benchmark/pom.xml b/java-manta-benchmark/pom.xml index 64c93263..86dcc770 100644 --- a/java-manta-benchmark/pom.xml +++ b/java-manta-benchmark/pom.xml @@ -28,61 +28,6 @@ com.joyent.manta java-manta-client 3.1.4-SNAPSHOT - - - - - com.joyent.http-signature - apache-http-client-signature - - - org.apache.httpcomponents - httpclient - - - org.apache.commons - commons-lang3 - - - org.apache.commons - commons-collections4 - - - commons-io - commons-io - - - commons-codec - commons-codec - - - com.fasterxml.uuid - java-uuid-generator - - - com.fasterxml.jackson.core - jackson-core - - - com.fasterxml.jackson.core - jackson-databind - - - com.fasterxml.jackson.datatype - jackson-datatype-jsr310 - - - com.squareup.jnagmp - bouncycastle-rsa - - - com.twmacinta - fast-md5 - - ch.qos.logback diff --git a/java-manta-client-kryo-serialization/pom.xml b/java-manta-client-kryo-serialization/pom.xml index 49064b1d..75e1a987 100644 --- a/java-manta-client-kryo-serialization/pom.xml +++ b/java-manta-client-kryo-serialization/pom.xml @@ -21,55 +21,12 @@ java-manta-client 3.1.4-SNAPSHOT - + - - com.joyent.http-signature - apache-http-client-signature - - - org.apache.httpcomponents - httpclient - - - org.apache.commons - commons-lang3 - - - org.apache.commons - commons-collections4 - - - commons-io - commons-io - - - commons-codec - commons-codec - - - com.fasterxml.uuid - java-uuid-generator - - - com.fasterxml.jackson.core - jackson-core - - - com.fasterxml.jackson.core - jackson-databind - - - com.fasterxml.jackson.datatype - jackson-datatype-jsr310 - - - com.squareup.jnagmp - bouncycastle-rsa - com.twmacinta fast-md5 @@ -132,6 +89,17 @@ compile + + + com.twmacinta + fast-md5 + ${dependency.fast-md5.version} + provided + + diff --git a/java-manta-examples/pom.xml b/java-manta-examples/pom.xml index b1bdd74f..dc1ac2e0 100644 --- a/java-manta-examples/pom.xml +++ b/java-manta-examples/pom.xml @@ -22,61 +22,6 @@ java-manta-client 3.1.4-SNAPSHOT compile - - - - - com.joyent.http-signature - apache-http-client-signature - - - org.apache.httpcomponents - httpclient - - - org.apache.commons - commons-lang3 - - - org.apache.commons - commons-collections4 - - - commons-io - commons-io - - - commons-codec - commons-codec - - - com.fasterxml.uuid - java-uuid-generator - - - com.fasterxml.jackson.core - jackson-core - - - com.fasterxml.jackson.core - jackson-databind - - - com.fasterxml.jackson.datatype - jackson-datatype-jsr310 - - - com.squareup.jnagmp - bouncycastle-rsa - - - com.twmacinta - fast-md5 - - org.apache.commons diff --git a/java-manta-it/pom.xml b/java-manta-it/pom.xml index 5ca7de9f..675ef631 100644 --- a/java-manta-it/pom.xml +++ b/java-manta-it/pom.xml @@ -28,61 +28,6 @@ java-manta-client 3.1.4-SNAPSHOT compile - - - - - com.joyent.http-signature - apache-http-client-signature - - - org.apache.httpcomponents - httpclient - - - org.apache.commons - commons-lang3 - - - org.apache.commons - commons-collections4 - - - commons-io - commons-io - - - commons-codec - commons-codec - - - com.fasterxml.uuid - java-uuid-generator - - - com.fasterxml.jackson.core - jackson-core - - - com.fasterxml.jackson.core - jackson-databind - - - com.fasterxml.jackson.datatype - jackson-datatype-jsr310 - - - com.squareup.jnagmp - bouncycastle-rsa - - - com.twmacinta - fast-md5 - - diff --git a/pom.xml b/pom.xml index 325d1397..d09deddd 100644 --- a/pom.xml +++ b/pom.xml @@ -356,6 +356,20 @@ true + + + com.twmacinta.util.MD5State + com.twmacinta.util.MD5InputStream + com.twmacinta.util.MD5 + true