Skip to content

Commit

Permalink
shade aopalliance to reduce the chance for conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
David Byron authored and rnorth committed Apr 6, 2017
1 parent 9319ada commit aa92c83
Showing 1 changed file with 5 additions and 0 deletions.
5 changes: 5 additions & 0 deletions core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,10 @@
<pattern>org.glassfish</pattern>
<shadedPattern>org.testcontainers.shaded.org.glassfish</shadedPattern>
</relocation>
<relocation>
<pattern>org.aopalliance</pattern>
<shadedPattern>org.testcontainers.shaded.org.aopalliance</shadedPattern>
</relocation>
<relocation>
<pattern>org.jvnet</pattern>
<shadedPattern>org.testcontainers.shaded.org.jvnet</shadedPattern>
Expand Down Expand Up @@ -169,6 +173,7 @@
<includes>
<include>org.apache.httpcomponents:*</include>
<include>org.glassfish.*:*</include>
<include>org.aopalliance.*:*</include>
<include>javax.annotation:*</include>
<include>javax.inject:*</include>
<include>javax.ws.rs:*</include>
Expand Down

0 comments on commit aa92c83

Please sign in to comment.