From 1578506475ad517cdefd2f0526fc0574e35a676b Mon Sep 17 00:00:00 2001
From: Alex Szczuczko <aszczucz@redhat.com>
Date: Thu, 18 May 2023 08:37:55 -0600
Subject: [PATCH] Seperate version properties for hibernate-enhance and
 quarkus-maven (#20264)

This will allow them to be defined seperately from aligned dependency
versions suitable for product

Closes #20261
---
 model/map-jpa/pom.xml          | 2 +-
 operator/pom.xml               | 6 +++---
 pom.xml                        | 2 ++
 quarkus/deployment/pom.xml     | 2 +-
 quarkus/runtime/pom.xml        | 4 ++--
 quarkus/server/pom.xml         | 2 +-
 quarkus/set-quarkus-version.sh | 4 ++--
 7 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/model/map-jpa/pom.xml b/model/map-jpa/pom.xml
index acc61c1a61..e47356b281 100644
--- a/model/map-jpa/pom.xml
+++ b/model/map-jpa/pom.xml
@@ -51,7 +51,7 @@
             <plugin>
                 <groupId>org.hibernate.orm.tooling</groupId>
                 <artifactId>hibernate-enhance-maven-plugin</artifactId>
-                <version>${hibernate-orm.version}</version>
+                <version>${hibernate-orm.plugin.version}</version>
                 <executions>
                     <execution>
                         <configuration>
diff --git a/operator/pom.xml b/operator/pom.xml
index e359e4b085..11e570b5ee 100644
--- a/operator/pom.xml
+++ b/operator/pom.xml
@@ -36,7 +36,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <quarkus.operator.sdk.version>6.0.1</quarkus.operator.sdk.version>
-        <quarkus.version>3.0.0.Final</quarkus.version>
+        <quarkus.operator.build.version>3.0.0.Final</quarkus.operator.build.version>
         <quarkus.container-image.group>keycloak</quarkus.container-image.group>
     </properties>
     
@@ -160,7 +160,7 @@
             <plugin>
                 <groupId>io.quarkus</groupId>
                 <artifactId>quarkus-maven-plugin</artifactId>
-                <version>${quarkus.version}</version>
+                <version>${quarkus.operator.build.version}</version>
             </plugin>
             <plugin>
                 <artifactId>maven-compiler-plugin</artifactId>
@@ -172,7 +172,7 @@
             <plugin>
                 <groupId>io.quarkus</groupId>
                 <artifactId>quarkus-maven-plugin</artifactId>
-                <version>${quarkus.version}</version>
+                <version>${quarkus.operator.build.version}</version>
                 <executions>
                     <execution>
                     <goals>
diff --git a/pom.xml b/pom.xml
index 1ac12c144f..942a871471 100644
--- a/pom.xml
+++ b/pom.xml
@@ -44,6 +44,7 @@
         <jboss.snapshots.repo.url>https://s01.oss.sonatype.org/content/repositories/snapshots/</jboss.snapshots.repo.url>
 
         <quarkus.version>3.0.2.Final</quarkus.version>
+        <quarkus.build.version>3.0.2.Final</quarkus.build.version>
 
         <project.build-time>${timestamp}</project.build-time>
 
@@ -81,6 +82,7 @@
         <dom4j.version>2.1.3</dom4j.version>
         <h2.version>2.1.214</h2.version>
         <hibernate-orm.version>6.2.1.Final</hibernate-orm.version>
+        <hibernate-orm.plugin.version>6.2.1.Final</hibernate-orm.plugin.version>
         <hibernate.c3p0.version>${hibernate-orm.version}</hibernate.c3p0.version>
         <infinispan.version>14.0.8.Final</infinispan.version>
         <infinispan.protostream.processor.version>4.6.2.Final</infinispan.protostream.processor.version>
diff --git a/quarkus/deployment/pom.xml b/quarkus/deployment/pom.xml
index 06ce5f6398..6da59fc425 100644
--- a/quarkus/deployment/pom.xml
+++ b/quarkus/deployment/pom.xml
@@ -118,7 +118,7 @@
                         <path>
                             <groupId>io.quarkus</groupId>
                             <artifactId>quarkus-extension-processor</artifactId>
-                            <version>${quarkus.version}</version>
+                            <version>${quarkus.build.version}</version>
                         </path>
                     </annotationProcessorPaths>
                 </configuration>
diff --git a/quarkus/runtime/pom.xml b/quarkus/runtime/pom.xml
index 7c84297b1a..a44d89d2fb 100644
--- a/quarkus/runtime/pom.xml
+++ b/quarkus/runtime/pom.xml
@@ -691,7 +691,7 @@
             <plugin>
                 <groupId>io.quarkus</groupId>
                 <artifactId>quarkus-extension-maven-plugin</artifactId>
-                <version>${quarkus.version}</version>
+                <version>${quarkus.build.version}</version>
                 <executions>
                     <execution>
                         <goals>
@@ -712,7 +712,7 @@
                         <path>
                             <groupId>io.quarkus</groupId>
                             <artifactId>quarkus-extension-processor</artifactId>
-                            <version>${quarkus.version}</version>
+                            <version>${quarkus.build.version}</version>
                         </path>
                     </annotationProcessorPaths>
                 </configuration>
diff --git a/quarkus/server/pom.xml b/quarkus/server/pom.xml
index a0e49c160d..8fa8ef0fb9 100644
--- a/quarkus/server/pom.xml
+++ b/quarkus/server/pom.xml
@@ -42,7 +42,7 @@
             <plugin>
                 <groupId>io.quarkus</groupId>
                 <artifactId>quarkus-maven-plugin</artifactId>
-                <version>${quarkus.version}</version>
+                <version>${quarkus.build.version}</version>
                 <configuration>
                     <finalName>keycloak</finalName>
                     <systemProperties>
diff --git a/quarkus/set-quarkus-version.sh b/quarkus/set-quarkus-version.sh
index e571404a51..146176f703 100755
--- a/quarkus/set-quarkus-version.sh
+++ b/quarkus/set-quarkus-version.sh
@@ -49,7 +49,7 @@ fi
 QUARKUS_BOM=$(curl -s "$QUARKUS_BOM_URL")
 
 echo "Setting Quarkus version: $QUARKUS_VERSION"
-$(mvn versions:set-property -f ../pom.xml -Dproperty=quarkus.version -DnewVersion="$QUARKUS_VERSION" 1> /dev/null)
+$(mvn versions:set-property -f ../pom.xml -Dproperty=quarkus.version,quarkus.build.version -DnewVersion="$QUARKUS_VERSION" 1> /dev/null)
 
 DEPENDENCIES_LIST="resteasy jackson-bom hibernate-orm mysql-jdbc postgresql-jdbc microprofile-metrics-api wildfly-common wildfly-elytron"
 
@@ -68,4 +68,4 @@ for dependency in $DEPENDENCIES_LIST; do
 done
 
 echo ""
-echo "Done!"
\ No newline at end of file
+echo "Done!"