From 0265bc0aa1312728ed8fea1af3e493289254d8f2 Mon Sep 17 00:00:00 2001
From: Joe Di Pol <joe.dipol@oracle.com>
Date: Wed, 17 Mar 2021 09:35:26 -0700
Subject: [PATCH 1/3] Upgrade Hibernate and jaxb-runtime used by
 maven-jaxb2-plugin. For JDK 16 support

---
 applications/mp/pom.xml | 8 ++++++++
 dependencies/pom.xml    | 4 +++-
 pom.xml                 | 8 ++++++++
 3 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/applications/mp/pom.xml b/applications/mp/pom.xml
index 7b205d21c73..3457c0bd638 100644
--- a/applications/mp/pom.xml
+++ b/applications/mp/pom.xml
@@ -79,6 +79,14 @@
                     <groupId>org.jvnet.jaxb2.maven2</groupId>
                     <artifactId>maven-jaxb2-plugin</artifactId>
                     <version>${version.plugin.jaxb2}</version>
+                    <dependencies>
+                        <!-- Force upgrade version. Needed to support Java 16 -->
+                        <dependency>
+                            <groupId>org.glassfish.jaxb</groupId>
+                            <artifactId>jaxb-runtime</artifactId>
+                            <version>${version.lib.jaxb-runtime}</version>
+                        </dependency>
+                    </dependencies>
                 </plugin>
                 <plugin>
                     <groupId>org.hibernate.orm.tooling</groupId>
diff --git a/dependencies/pom.xml b/dependencies/pom.xml
index 7ed2ffcfcb6..040e7720415 100644
--- a/dependencies/pom.xml
+++ b/dependencies/pom.xml
@@ -59,7 +59,7 @@
         <version.lib.guava>30.0-jre</version.lib.guava>
         <version.lib.h2>1.4.199</version.lib.h2>
         <version.lib.hamcrest>1.3</version.lib.hamcrest>
-        <version.lib.hibernate>5.4.25.Final</version.lib.hibernate>
+        <version.lib.hibernate>5.4.29.Final</version.lib.hibernate>
         <version.lib.hikaricp>3.4.1</version.lib.hikaricp>
         <version.lib.hystrix>1.5.18</version.lib.hystrix>
         <version.lib.inject>1.0</version.lib.inject>
@@ -75,6 +75,8 @@
         <version.lib.jboss.logging>3.2.1.Final</version.lib.jboss.logging>
         <version.lib.jboss.transaction-api>1.0.0.Final</version.lib.jboss.transaction-api>
         <version.lib.jboss.transaction-spi>7.6.0.Final</version.lib.jboss.transaction-spi>
+        <!-- Force upgrade version used by maven-jaxb2-plugin. Needed to support Java 16 -->
+        <version.lib.jaxb-runtime>2.3.3</version.lib.jaxb-runtime>
         <version.lib.jedis>3.1.0</version.lib.jedis>
         <version.lib.jersey>2.33</version.lib.jersey>
         <version.lib.jms-api>2.0</version.lib.jms-api>
diff --git a/pom.xml b/pom.xml
index cd515531ab5..d1d91c8af63 100644
--- a/pom.xml
+++ b/pom.xml
@@ -578,6 +578,14 @@
                     <groupId>org.jvnet.jaxb2.maven2</groupId>
                     <artifactId>maven-jaxb2-plugin</artifactId>
                     <version>${version.plugin.jaxb}</version>
+                    <dependencies>
+                        <!-- Force upgrade version. Needed to support Java 16 -->
+                        <dependency>
+                            <groupId>org.glassfish.jaxb</groupId>
+                            <artifactId>jaxb-runtime</artifactId>
+                            <version>${version.lib.jaxb-runtime}</version>
+                        </dependency>
+                    </dependencies>
                 </plugin>
                 <plugin>
                     <groupId>org.codehaus.mojo</groupId>

From e6e04c51f5a7983239991284c5a4cc9d6047f00c Mon Sep 17 00:00:00 2001
From: Joe Di Pol <joe.dipol@oracle.com>
Date: Wed, 17 Mar 2021 10:46:24 -0700
Subject: [PATCH 2/3] Do not manage groovy-all since we do not use it

---
 dependencies/pom.xml | 6 ------
 pom.xml              | 1 -
 2 files changed, 7 deletions(-)

diff --git a/dependencies/pom.xml b/dependencies/pom.xml
index 040e7720415..8be511d93c2 100644
--- a/dependencies/pom.xml
+++ b/dependencies/pom.xml
@@ -1188,12 +1188,6 @@
                 <artifactId>jboss-transaction-api_1.2_spec</artifactId>
                 <version>${version.lib.jboss.transaction-api}</version>
             </dependency>
-            <dependency>
-                <!-- if needed (as excluded from weld) -->
-                <groupId>org.codehaus.groovy</groupId>
-                <artifactId>groovy-all</artifactId>
-                <version>${version.lib.groovy-all}</version>
-            </dependency>
             <dependency>
                 <!-- required for dependency convergence, transitive dependency of both
                 commons-configuration (through hystrix-core)
diff --git a/pom.xml b/pom.xml
index d1d91c8af63..22c26d75767 100644
--- a/pom.xml
+++ b/pom.xml
@@ -57,7 +57,6 @@
         <version.lib.asciidoctor.diagram>1.5.4.1</version.lib.asciidoctor.diagram>
         <version.lib.asm>6.0</version.lib.asm>
         <version.lib.checkstyle>8.29</version.lib.checkstyle>
-        <version.lib.groovy-all>2.4.14</version.lib.groovy-all>
         <version.lib.jgit>4.9.9.201903122025-r</version.lib.jgit>
         <version.lib.jsch>0.1.55</version.lib.jsch>
         <version.lib.kafka-junit5>3.2.1</version.lib.kafka-junit5>

From f6929d0ba47e5bdcf880c61e4c12e839dc32de81 Mon Sep 17 00:00:00 2001
From: Joe Di Pol <joe.dipol@oracle.com>
Date: Wed, 17 Mar 2021 12:02:52 -0700
Subject: [PATCH 3/3] Revert "Do not manage groovy-all since we do not use it"

This reverts commit e6e04c51f5a7983239991284c5a4cc9d6047f00c.
---
 dependencies/pom.xml | 6 ++++++
 pom.xml              | 1 +
 2 files changed, 7 insertions(+)

diff --git a/dependencies/pom.xml b/dependencies/pom.xml
index 8be511d93c2..040e7720415 100644
--- a/dependencies/pom.xml
+++ b/dependencies/pom.xml
@@ -1188,6 +1188,12 @@
                 <artifactId>jboss-transaction-api_1.2_spec</artifactId>
                 <version>${version.lib.jboss.transaction-api}</version>
             </dependency>
+            <dependency>
+                <!-- if needed (as excluded from weld) -->
+                <groupId>org.codehaus.groovy</groupId>
+                <artifactId>groovy-all</artifactId>
+                <version>${version.lib.groovy-all}</version>
+            </dependency>
             <dependency>
                 <!-- required for dependency convergence, transitive dependency of both
                 commons-configuration (through hystrix-core)
diff --git a/pom.xml b/pom.xml
index 22c26d75767..d1d91c8af63 100644
--- a/pom.xml
+++ b/pom.xml
@@ -57,6 +57,7 @@
         <version.lib.asciidoctor.diagram>1.5.4.1</version.lib.asciidoctor.diagram>
         <version.lib.asm>6.0</version.lib.asm>
         <version.lib.checkstyle>8.29</version.lib.checkstyle>
+        <version.lib.groovy-all>2.4.14</version.lib.groovy-all>
         <version.lib.jgit>4.9.9.201903122025-r</version.lib.jgit>
         <version.lib.jsch>0.1.55</version.lib.jsch>
         <version.lib.kafka-junit5>3.2.1</version.lib.kafka-junit5>