diff --git a/CHANGELOG.md b/CHANGELOG.md index 9080e55e..6e28c0e9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ This project aims to adhere to [Semantic Versioning](http://semver.org/). - Object content verification of standard PUT requests was being skipped if the server [omitted the computed MD5](https://github.com/joyent/java-manta/issues/298) from the response. + - [`mvn integration-test site` fails enforce-ban-duplicate-classes](https://github.com/joyent/java-manta/issues/270) ## [3.1.5] - 2017-07-28 ### Fixed diff --git a/java-manta-cli/pom.xml b/java-manta-cli/pom.xml index f2cc6db9..70be2ae5 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.7-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 322e79de..f415cbaa 100644 --- a/java-manta-client-kryo-serialization/pom.xml +++ b/java-manta-client-kryo-serialization/pom.xml @@ -20,50 +20,16 @@ com.joyent.manta java-manta-client 3.1.7-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 @@ -120,6 +86,24 @@ + + org.objenesis + objenesis + ${dependency.objenesis.version} + compile + + + + + com.twmacinta + fast-md5 + ${dependency.fast-md5.version} + provided + + diff --git a/pom.xml b/pom.xml index c47a9d5f..9221a432 100644 --- a/pom.xml +++ b/pom.xml @@ -120,7 +120,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 @@ -351,6 +351,20 @@ true + + + com.twmacinta.util.MD5State + com.twmacinta.util.MD5InputStream + com.twmacinta.util.MD5 + true