From 9198ec9e05956253bc3ec162d544e1801d7bb134 Mon Sep 17 00:00:00 2001
From: Joe Di Pol <joe.dipol@oracle.com>
Date: Wed, 5 Oct 2022 12:25:35 -0700
Subject: [PATCH] Upgrade EclipseLink to 3.0.3 and Hibernate to 6.1.4.Final

---
 applications/mp/pom.xml                    |  8 --------
 dependencies/pom.xml                       | 11 ++---------
 examples/integrations/cdi/pokemons/pom.xml | 11 -----------
 pom.xml                                    |  8 --------
 4 files changed, 2 insertions(+), 36 deletions(-)

diff --git a/applications/mp/pom.xml b/applications/mp/pom.xml
index 04bd6379db9..db4f079f344 100644
--- a/applications/mp/pom.xml
+++ b/applications/mp/pom.xml
@@ -72,14 +72,6 @@
                     <groupId>org.hibernate.orm.tooling</groupId>
                     <artifactId>hibernate-enhance-maven-plugin</artifactId>
                     <version>${version.plugin.hibernate.enhance}</version>
-                    <dependencies>
-                        <dependency>
-                            <!-- used by hibernate plugin - requires update for Java 17 -->
-                            <groupId>net.bytebuddy</groupId>
-                            <artifactId>byte-buddy</artifactId>
-                            <version>${version.lib.byte-buddy}</version>
-                        </dependency>
-                    </dependencies>
                 </plugin>
             </plugins>
         </pluginManagement>
diff --git a/dependencies/pom.xml b/dependencies/pom.xml
index 1419b69899d..18a5dca6b79 100644
--- a/dependencies/pom.xml
+++ b/dependencies/pom.xml
@@ -40,12 +40,11 @@
         <version.lib.animal-sniffer>1.18</version.lib.animal-sniffer>
         <version.lib.annotation-api>1.3.5</version.lib.annotation-api>
         <version.lib.brave-opentracing>1.0.0</version.lib.brave-opentracing>
-        <version.lib.byte-buddy>1.12.13</version.lib.byte-buddy>
         <version.lib.reactivestreams>1.0.4</version.lib.reactivestreams>
         <version.lib.commons-logging>1.2</version.lib.commons-logging>
         <version.lib.cron-utils>9.1.6</version.lib.cron-utils>
         <version.lib.dropwizard.metrics>4.1.2</version.lib.dropwizard.metrics>
-        <version.lib.eclipselink>3.0.3-RC2</version.lib.eclipselink>
+        <version.lib.eclipselink>3.0.3</version.lib.eclipselink>
         <version.lib.el-impl>4.0.2</version.lib.el-impl>
         <version.lib.etcd4j>2.18.0</version.lib.etcd4j>
         <version.lib.failsafe>2.3.1</version.lib.failsafe>
@@ -61,7 +60,7 @@
         <version.lib.guava>30.0-jre</version.lib.guava>
         <version.lib.h2>2.1.212</version.lib.h2>
         <version.lib.hamcrest>1.3</version.lib.hamcrest>
-        <version.lib.hibernate>6.1.1.Final</version.lib.hibernate>
+        <version.lib.hibernate>6.1.4.Final</version.lib.hibernate>
         <version.lib.hibernate-validator>7.0.2.Final</version.lib.hibernate-validator>
         <version.lib.hikaricp>5.0.1</version.lib.hikaricp>
         <version.lib.hystrix>1.5.18</version.lib.hystrix>
@@ -188,12 +187,6 @@
                 <artifactId>javax.ws.rs-api</artifactId>
                 <version>2.1.1</version>
             </dependency>
-            <dependency>
-                <!-- used by hibernate plugin -->
-                <groupId>net.bytebuddy</groupId>
-                <artifactId>byte-buddy</artifactId>
-                <version>${version.lib.byte-buddy}</version>
-            </dependency>
 
             <!-- Section 1: direct third party dependencies -->
             <dependency>
diff --git a/examples/integrations/cdi/pokemons/pom.xml b/examples/integrations/cdi/pokemons/pom.xml
index bbcf22c096d..6289a76b2cc 100644
--- a/examples/integrations/cdi/pokemons/pom.xml
+++ b/examples/integrations/cdi/pokemons/pom.xml
@@ -174,17 +174,6 @@
                         </goals>
                     </execution>
                 </executions>
-                <dependencies>
-                    <dependency>
-                        <!--
-                         3.0.0-JAKARTA
-                         used by hibernate plugin
-                         -->
-                        <groupId>net.bytebuddy</groupId>
-                        <artifactId>byte-buddy</artifactId>
-                        <version>${version.lib.byte-buddy}</version>
-                    </dependency>
-                </dependencies>
             </plugin>
         </plugins>
     </build>
diff --git a/pom.xml b/pom.xml
index a25cb230746..17265044097 100644
--- a/pom.xml
+++ b/pom.xml
@@ -618,14 +618,6 @@
                     <groupId>org.hibernate.orm.tooling</groupId>
                     <artifactId>hibernate-enhance-maven-plugin</artifactId>
                     <version>${version.plugin.hibernate-enhance}</version>
-                    <dependencies>
-                        <dependency>
-                            <!-- used by hibernate plugin - requires update for Java 17 -->
-                            <groupId>net.bytebuddy</groupId>
-                            <artifactId>byte-buddy</artifactId>
-                            <version>${version.lib.byte-buddy}</version>
-                        </dependency>
-                    </dependencies>
                 </plugin>
                 <plugin>
                     <groupId>org.codehaus.mojo</groupId>