Merge pull request #1977 from dropwizard/hibernate_exclusions

Exclude duplicated JTA 1.1 from dropwizard-hibernate dependencies
dropwizard · Mar 27, 2017 · 45f4fc0 · 45f4fc0
2 parents 09bf108 + 7f640c8
commit 45f4fc0
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/dropwizard-bom/pom.xml b/dropwizard-bom/pom.xml
@@ -114,6 +114,10 @@
                         <groupId>org.joda</groupId>
                         <artifactId>joda-money</artifactId>
                     </exclusion>
+                    <exclusion>
+                        <groupId>org.apache.geronimo.specs</groupId>
+                        <artifactId>geronimo-jta_1.1_spec</artifactId>
+                    </exclusion>
                 </exclusions>
             </dependency>
             <dependency>

diff --git a/dropwizard-hibernate/pom.xml b/dropwizard-hibernate/pom.xml
@@ -31,6 +31,12 @@
         <dependency>
             <groupId>com.fasterxml.jackson.datatype</groupId>
             <artifactId>jackson-datatype-hibernate5</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>javax.transaction</groupId>
+                    <artifactId>jta</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.jadira.usertype</groupId>