From 97456e762b9ed835c652773f72b3eaa750b25a65 Mon Sep 17 00:00:00 2001
From: Joe DiPol <joe.dipol@oracle.com>
Date: Wed, 17 Mar 2021 15:45:45 -0700
Subject: [PATCH] =?UTF-8?q?Upgrade=20Hibernate=20and=20jaxb-runtime=20used?=
 =?UTF-8?q?=20by=20maven-jaxb2-plugin.=20For=20JD=E2=80=A6=20(#2862)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* 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>