From c818de6e458fea6214fa10c7cef16e9a317c9214 Mon Sep 17 00:00:00 2001
From: Aaron Klish <aklish@gmail.com>
Date: Thu, 7 May 2020 20:37:41 -0500
Subject: [PATCH] Fixing Dom4J Owasp Build Failure (by upgrading hibernate 5)
 (#1309)

* Fixing Dom4J Owasp Build Failure (by upgrading hibernate 5)

* Fixed typo in pom

* Fixing build issues

* Fixed hibernate search build issue

* Fixed elide spring autoconfigure build by upgrading to latest spring

* Fixing build for spring starter

Co-authored-by: Aaron Klish <klish@verizonmedia.com>
Co-authored-by: William Cekan <wcekan@oath.com>
---
 .../elide-datastore-hibernate3/pom.xml           |  2 +-
 .../elide-datastore-hibernate5/pom.xml           | 16 ----------------
 elide-datastore/elide-datastore-search/pom.xml   | 12 +++++++++++-
 elide-datastore/pom.xml                          | 12 +-----------
 .../elide-blog-example-resteasy/pom.xml          |  8 +-------
 elide-integration-tests/pom.xml                  | 12 +-----------
 .../elide-spring-boot-autoconfigure/pom.xml      |  2 +-
 elide-spring/elide-spring-boot-starter/pom.xml   |  2 +-
 elide-standalone/pom.xml                         | 12 ------------
 pom.xml                                          |  2 +-
 10 files changed, 18 insertions(+), 62 deletions(-)

diff --git a/elide-datastore/elide-datastore-hibernate3/pom.xml b/elide-datastore/elide-datastore-hibernate3/pom.xml
index 3c29fac4f9..adac434aea 100644
--- a/elide-datastore/elide-datastore-hibernate3/pom.xml
+++ b/elide-datastore/elide-datastore-hibernate3/pom.xml
@@ -109,7 +109,7 @@
         <dependency>
             <groupId>org.dom4j</groupId>
             <artifactId>dom4j</artifactId>
-            <version>2.1.1</version>
+            <version>2.1.3</version>
         </dependency>
         <!-- For proper serialization in elide-core -->
         <dependency>
diff --git a/elide-datastore/elide-datastore-hibernate5/pom.xml b/elide-datastore/elide-datastore-hibernate5/pom.xml
index 528872809b..06d508f839 100644
--- a/elide-datastore/elide-datastore-hibernate5/pom.xml
+++ b/elide-datastore/elide-datastore-hibernate5/pom.xml
@@ -109,27 +109,12 @@
                     <artifactId>jasper-compiler</artifactId>
                     <groupId>tomcat</groupId>
                 </exclusion>
-                <exclusion>
-                    <groupId>dom4j</groupId>
-                    <artifactId>dom4j</artifactId>
-                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-entitymanager</artifactId>
             <version>${hibernate5.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>dom4j</groupId>
-                    <artifactId>dom4j</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.dom4j</groupId>
-            <artifactId>dom4j</artifactId>
-            <version>2.1.1</version>
         </dependency>
         <!-- For proper serialization in elide-core -->
         <dependency>
@@ -178,7 +163,6 @@
         <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-validator</artifactId>
-            <version>${hibernate5.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/elide-datastore/elide-datastore-search/pom.xml b/elide-datastore/elide-datastore-search/pom.xml
index 3396c43f60..f7f827f697 100644
--- a/elide-datastore/elide-datastore-search/pom.xml
+++ b/elide-datastore/elide-datastore-search/pom.xml
@@ -46,8 +46,18 @@
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-search-orm</artifactId>
             <version>5.11.5.Final</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>dom4j</groupId>
+                    <artifactId>dom4j</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.dom4j</groupId>
+            <artifactId>dom4j</artifactId>
+            <version>2.1.3</version>
         </dependency>
-
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
diff --git a/elide-datastore/pom.xml b/elide-datastore/pom.xml
index e8197c8d27..b31f658af9 100644
--- a/elide-datastore/pom.xml
+++ b/elide-datastore/pom.xml
@@ -64,17 +64,7 @@
             <dependency>
                 <groupId>org.hibernate</groupId>
                 <artifactId>hibernate-validator</artifactId>
-                <version>5.3.3.Final</version>
-                <exclusions>
-                    <exclusion>
-                        <artifactId>slf4j-api</artifactId>
-                        <groupId>org.slf4j</groupId>
-                    </exclusion>
-                    <exclusion>
-                        <artifactId>validation-api</artifactId>
-                        <groupId>javax.validation</groupId>
-                    </exclusion>
-                </exclusions>
+                <version>5.4.3.Final</version>
                 <scope>test</scope>
             </dependency>
         </dependencies>
diff --git a/elide-example/elide-blog-example-resteasy/pom.xml b/elide-example/elide-blog-example-resteasy/pom.xml
index 188fba2129..a14c51c9bd 100644
--- a/elide-example/elide-blog-example-resteasy/pom.xml
+++ b/elide-example/elide-blog-example-resteasy/pom.xml
@@ -31,13 +31,7 @@
         <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-entitymanager</artifactId>
-            <version>5.0.2.Final</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>dom4j</groupId>
-                    <artifactId>dom4j</artifactId>
-                </exclusion>
-            </exclusions>
+            <version>${hibernate5.version}</version>
         </dependency>
         <dependency>
             <groupId>mysql</groupId>
diff --git a/elide-integration-tests/pom.xml b/elide-integration-tests/pom.xml
index 27c20d6c70..0263808fab 100644
--- a/elide-integration-tests/pom.xml
+++ b/elide-integration-tests/pom.xml
@@ -100,17 +100,7 @@
         <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-validator</artifactId>
-            <version>5.4.0.Final</version>
-            <exclusions>
-                <exclusion>
-                    <artifactId>slf4j-api</artifactId>
-                    <groupId>org.slf4j</groupId>
-                </exclusion>
-                <exclusion>
-                    <artifactId>validation-api</artifactId>
-                    <groupId>javax.validation</groupId>
-                </exclusion>
-            </exclusions>
+            <version>5.4.3.Final</version>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/elide-spring/elide-spring-boot-autoconfigure/pom.xml b/elide-spring/elide-spring-boot-autoconfigure/pom.xml
index 59859680d6..af9457b999 100644
--- a/elide-spring/elide-spring-boot-autoconfigure/pom.xml
+++ b/elide-spring/elide-spring-boot-autoconfigure/pom.xml
@@ -40,7 +40,7 @@
     </scm>
 
     <properties>
-        <spring.boot.version>2.2.5.RELEASE</spring.boot.version>
+        <spring.boot.version>2.2.7.RELEASE</spring.boot.version>
         <tomcat.version>9.0.34</tomcat.version>
         <project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
         <min_jdk_version>1.8</min_jdk_version>
diff --git a/elide-spring/elide-spring-boot-starter/pom.xml b/elide-spring/elide-spring-boot-starter/pom.xml
index dc42d68b3c..cd72e0b880 100644
--- a/elide-spring/elide-spring-boot-starter/pom.xml
+++ b/elide-spring/elide-spring-boot-starter/pom.xml
@@ -40,7 +40,7 @@
     </scm>
 
     <properties>
-        <spring.boot.version>2.2.5.RELEASE</spring.boot.version>
+        <spring.boot.version>2.2.7.RELEASE</spring.boot.version>
     </properties>
 
     <dependencies>
diff --git a/elide-standalone/pom.xml b/elide-standalone/pom.xml
index c6e0b0314d..34734aaaa0 100644
--- a/elide-standalone/pom.xml
+++ b/elide-standalone/pom.xml
@@ -86,19 +86,7 @@
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-core</artifactId>
             <version>${hibernate5.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>dom4j</groupId>
-                    <artifactId>dom4j</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
-        <dependency>
-            <groupId>org.dom4j</groupId>
-            <artifactId>dom4j</artifactId>
-            <version>2.1.1</version>
-        </dependency>
-
         <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-hikaricp</artifactId>
diff --git a/pom.xml b/pom.xml
index a1ed3f98f1..1cda5c3e06 100644
--- a/pom.xml
+++ b/pom.xml
@@ -86,7 +86,7 @@
         <version.junit>5.6.2</version.junit>
         <hibernate3.version>3.6.10.Final</hibernate3.version>
         <version.mysql>8.0.19</version.mysql>
-        <hibernate5.version>5.4.2.Final</hibernate5.version>
+        <hibernate5.version>5.4.15.Final</hibernate5.version>
 
         <!-- TODO: Need to update locations to be relative to the projects using them -->
         <parent.pom.dir>${project.basedir}/..</parent.pom.dir>