Skip to content

Commit 7ef748e

Browse files
dekobondekobon
committed
Fixes #270. Added proper exclusions for shaded dependencies to module pom.xml files.
1 parent 84dc9bb commit 7ef748e

File tree

6 files changed

+222
-5
lines changed

6 files changed

+222
-5
lines changed

‎CHANGELOG.md

+2
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ This project aims to adhere to [Semantic Versioning](http://semver.org/).
88
- The heuristics for guessing heuristics have been adjusted to give
99
[more consistent](https://github.com/joyent/java-manta/issues/276)
1010
results across platforms.
11+
### Fixed
12+
- [`mvn integration-test site` fails enforce-ban-duplicate-classes](https://github.com/joyent/java-manta/issues/270)
1113

1214
## [3.1.3] - 2017-06-29
1315
### Fixed

‎java-manta-benchmark/pom.xml

+55
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,61 @@
2828
<groupId>com.joyent.manta</groupId>
2929
<artifactId>java-manta-client</artifactId>
3030
<version>3.1.4-SNAPSHOT</version>
31+
32+
<!-- If you add a dependency to java-manta-client that is shaded,
33+
you will have to add it as an exclusion below because the
34+
Maven enforcer plugin is simpleminded and it will detect
35+
the shaded class and the dependency jar as conflicting. -->
36+
<exclusions>
37+
<exclusion>
38+
<groupId>com.joyent.http-signature</groupId>
39+
<artifactId>apache-http-client-signature</artifactId>
40+
</exclusion>
41+
<exclusion>
42+
<groupId>org.apache.httpcomponents</groupId>
43+
<artifactId>httpclient</artifactId>
44+
</exclusion>
45+
<exclusion>
46+
<groupId>org.apache.commons</groupId>
47+
<artifactId>commons-lang3</artifactId>
48+
</exclusion>
49+
<exclusion>
50+
<groupId>org.apache.commons</groupId>
51+
<artifactId>commons-collections4</artifactId>
52+
</exclusion>
53+
<exclusion>
54+
<groupId>commons-io</groupId>
55+
<artifactId>commons-io</artifactId>
56+
</exclusion>
57+
<exclusion>
58+
<groupId>commons-codec</groupId>
59+
<artifactId>commons-codec</artifactId>
60+
</exclusion>
61+
<exclusion>
62+
<groupId>com.fasterxml.uuid</groupId>
63+
<artifactId>java-uuid-generator</artifactId>
64+
</exclusion>
65+
<exclusion>
66+
<groupId>com.fasterxml.jackson.core</groupId>
67+
<artifactId>jackson-core</artifactId>
68+
</exclusion>
69+
<exclusion>
70+
<groupId>com.fasterxml.jackson.core</groupId>
71+
<artifactId>jackson-databind</artifactId>
72+
</exclusion>
73+
<exclusion>
74+
<groupId>com.fasterxml.jackson.datatype</groupId>
75+
<artifactId>jackson-datatype-jsr310</artifactId>
76+
</exclusion>
77+
<exclusion>
78+
<groupId>com.squareup.jnagmp</groupId>
79+
<artifactId>bouncycastle-rsa</artifactId>
80+
</exclusion>
81+
<exclusion>
82+
<groupId>com.twmacinta</groupId>
83+
<artifactId>fast-md5</artifactId>
84+
</exclusion>
85+
</exclusions>
3186
</dependency>
3287
<dependency>
3388
<groupId>ch.qos.logback</groupId>

‎java-manta-cli/pom.xml

+55
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,61 @@
2222
<groupId>com.joyent.manta</groupId>
2323
<artifactId>java-manta-client</artifactId>
2424
<version>3.1.4-SNAPSHOT</version>
25+
26+
<!-- If you add a dependency to java-manta-client that is shaded,
27+
you will have to add it as an exclusion below because the
28+
Maven enforcer plugin is simpleminded and it will detect
29+
the shaded class and the dependency jar as conflicting. -->
30+
<exclusions>
31+
<exclusion>
32+
<groupId>com.joyent.http-signature</groupId>
33+
<artifactId>apache-http-client-signature</artifactId>
34+
</exclusion>
35+
<exclusion>
36+
<groupId>org.apache.httpcomponents</groupId>
37+
<artifactId>httpclient</artifactId>
38+
</exclusion>
39+
<exclusion>
40+
<groupId>org.apache.commons</groupId>
41+
<artifactId>commons-lang3</artifactId>
42+
</exclusion>
43+
<exclusion>
44+
<groupId>org.apache.commons</groupId>
45+
<artifactId>commons-collections4</artifactId>
46+
</exclusion>
47+
<exclusion>
48+
<groupId>commons-io</groupId>
49+
<artifactId>commons-io</artifactId>
50+
</exclusion>
51+
<exclusion>
52+
<groupId>commons-codec</groupId>
53+
<artifactId>commons-codec</artifactId>
54+
</exclusion>
55+
<exclusion>
56+
<groupId>com.fasterxml.uuid</groupId>
57+
<artifactId>java-uuid-generator</artifactId>
58+
</exclusion>
59+
<exclusion>
60+
<groupId>com.fasterxml.jackson.core</groupId>
61+
<artifactId>jackson-core</artifactId>
62+
</exclusion>
63+
<exclusion>
64+
<groupId>com.fasterxml.jackson.core</groupId>
65+
<artifactId>jackson-databind</artifactId>
66+
</exclusion>
67+
<exclusion>
68+
<groupId>com.fasterxml.jackson.datatype</groupId>
69+
<artifactId>jackson-datatype-jsr310</artifactId>
70+
</exclusion>
71+
<exclusion>
72+
<groupId>com.squareup.jnagmp</groupId>
73+
<artifactId>bouncycastle-rsa</artifactId>
74+
</exclusion>
75+
<exclusion>
76+
<groupId>com.twmacinta</groupId>
77+
<artifactId>fast-md5</artifactId>
78+
</exclusion>
79+
</exclusions>
2580
</dependency>
2681
<dependency>
2782
<groupId>ch.qos.logback</groupId>

‎java-manta-client-kryo-serialization/pom.xml

-5
Original file line numberDiff line numberDiff line change
@@ -158,10 +158,5 @@
158158
</exclusion>
159159
</exclusions>
160160
</dependency>
161-
<dependency>
162-
<groupId>com.twmacinta</groupId>
163-
<artifactId>fast-md5</artifactId>
164-
<version>2.7.1</version>
165-
</dependency>
166161
</dependencies>
167162
</project>

‎java-manta-examples/pom.xml

+55
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,61 @@
2222
<artifactId>java-manta-client</artifactId>
2323
<version>3.1.4-SNAPSHOT</version>
2424
<scope>compile</scope>
25+
26+
<!-- If you add a dependency to java-manta-client that is shaded,
27+
you will have to add it as an exclusion below because the
28+
Maven enforcer plugin is simpleminded and it will detect
29+
the shaded class and the dependency jar as conflicting. -->
30+
<exclusions>
31+
<exclusion>
32+
<groupId>com.joyent.http-signature</groupId>
33+
<artifactId>apache-http-client-signature</artifactId>
34+
</exclusion>
35+
<exclusion>
36+
<groupId>org.apache.httpcomponents</groupId>
37+
<artifactId>httpclient</artifactId>
38+
</exclusion>
39+
<exclusion>
40+
<groupId>org.apache.commons</groupId>
41+
<artifactId>commons-lang3</artifactId>
42+
</exclusion>
43+
<exclusion>
44+
<groupId>org.apache.commons</groupId>
45+
<artifactId>commons-collections4</artifactId>
46+
</exclusion>
47+
<exclusion>
48+
<groupId>commons-io</groupId>
49+
<artifactId>commons-io</artifactId>
50+
</exclusion>
51+
<exclusion>
52+
<groupId>commons-codec</groupId>
53+
<artifactId>commons-codec</artifactId>
54+
</exclusion>
55+
<exclusion>
56+
<groupId>com.fasterxml.uuid</groupId>
57+
<artifactId>java-uuid-generator</artifactId>
58+
</exclusion>
59+
<exclusion>
60+
<groupId>com.fasterxml.jackson.core</groupId>
61+
<artifactId>jackson-core</artifactId>
62+
</exclusion>
63+
<exclusion>
64+
<groupId>com.fasterxml.jackson.core</groupId>
65+
<artifactId>jackson-databind</artifactId>
66+
</exclusion>
67+
<exclusion>
68+
<groupId>com.fasterxml.jackson.datatype</groupId>
69+
<artifactId>jackson-datatype-jsr310</artifactId>
70+
</exclusion>
71+
<exclusion>
72+
<groupId>com.squareup.jnagmp</groupId>
73+
<artifactId>bouncycastle-rsa</artifactId>
74+
</exclusion>
75+
<exclusion>
76+
<groupId>com.twmacinta</groupId>
77+
<artifactId>fast-md5</artifactId>
78+
</exclusion>
79+
</exclusions>
2580
</dependency>
2681
<dependency>
2782
<groupId>org.apache.commons</groupId>

‎java-manta-it/pom.xml

+55
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,61 @@
2828
<artifactId>java-manta-client</artifactId>
2929
<version>3.1.4-SNAPSHOT</version>
3030
<scope>compile</scope>
31+
32+
<!-- If you add a dependency to java-manta-client that is shaded,
33+
you will have to add it as an exclusion below because the
34+
Maven enforcer plugin is simpleminded and it will detect
35+
the shaded class and the dependency jar as conflicting. -->
36+
<exclusions>
37+
<exclusion>
38+
<groupId>com.joyent.http-signature</groupId>
39+
<artifactId>apache-http-client-signature</artifactId>
40+
</exclusion>
41+
<exclusion>
42+
<groupId>org.apache.httpcomponents</groupId>
43+
<artifactId>httpclient</artifactId>
44+
</exclusion>
45+
<exclusion>
46+
<groupId>org.apache.commons</groupId>
47+
<artifactId>commons-lang3</artifactId>
48+
</exclusion>
49+
<exclusion>
50+
<groupId>org.apache.commons</groupId>
51+
<artifactId>commons-collections4</artifactId>
52+
</exclusion>
53+
<exclusion>
54+
<groupId>commons-io</groupId>
55+
<artifactId>commons-io</artifactId>
56+
</exclusion>
57+
<exclusion>
58+
<groupId>commons-codec</groupId>
59+
<artifactId>commons-codec</artifactId>
60+
</exclusion>
61+
<exclusion>
62+
<groupId>com.fasterxml.uuid</groupId>
63+
<artifactId>java-uuid-generator</artifactId>
64+
</exclusion>
65+
<exclusion>
66+
<groupId>com.fasterxml.jackson.core</groupId>
67+
<artifactId>jackson-core</artifactId>
68+
</exclusion>
69+
<exclusion>
70+
<groupId>com.fasterxml.jackson.core</groupId>
71+
<artifactId>jackson-databind</artifactId>
72+
</exclusion>
73+
<exclusion>
74+
<groupId>com.fasterxml.jackson.datatype</groupId>
75+
<artifactId>jackson-datatype-jsr310</artifactId>
76+
</exclusion>
77+
<exclusion>
78+
<groupId>com.squareup.jnagmp</groupId>
79+
<artifactId>bouncycastle-rsa</artifactId>
80+
</exclusion>
81+
<exclusion>
82+
<groupId>com.twmacinta</groupId>
83+
<artifactId>fast-md5</artifactId>
84+
</exclusion>
85+
</exclusions>
3186
</dependency>
3287

3388
<dependency>

0 commit comments

Comments
 (0)