From aa92c8382dd14f33f9b8326b653a83c07cf7381e Mon Sep 17 00:00:00 2001
From: David Byron <david.byron@locationlabs.com>
Date: Wed, 15 Mar 2017 17:06:19 -0700
Subject: [PATCH] shade aopalliance to reduce the chance for conflicts

---
 core/pom.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/core/pom.xml b/core/pom.xml
index 0cb5a0c37f6..6ac4598ce06 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -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>
@@ -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>