From 9a9609ef129a7cd15fe23015bce39632a0f6d2cc Mon Sep 17 00:00:00 2001
From: marko-bekhta <marko.prykladna@gmail.com>
Date: Mon, 23 Dec 2024 12:38:20 +0100
Subject: [PATCH 1/3] Use Maven 3.9 in the Jenkins job description

to match what we have in the pom
---
 .mvn/wrapper/maven-wrapper.properties |  2 +-
 Jenkinsfile                           |  2 +-
 ci/release/Jenkinsfile                |  2 +-
 pom.xml                               | 20 ++++++++++++++++++--
 4 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties
index 754bd26..9548abd 100644
--- a/.mvn/wrapper/maven-wrapper.properties
+++ b/.mvn/wrapper/maven-wrapper.properties
@@ -16,5 +16,5 @@
 # under the License.
 wrapperVersion=3.3.2
 distributionType=bin
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.6/apache-maven-3.9.6-bin.zip
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip
 wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.3.2/maven-wrapper-3.3.2.jar
diff --git a/Jenkinsfile b/Jenkinsfile
index ec12623..f5c42a1 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -7,7 +7,7 @@ pipeline {
         label 'Worker&&Containers'
     }
     tools {
-        maven 'Apache Maven 3.8'
+        maven 'Apache Maven 3.9'
         jdk 'OpenJDK 17 Latest'
     }
     options {
diff --git a/ci/release/Jenkinsfile b/ci/release/Jenkinsfile
index 8bfad4b..1c4a36b 100644
--- a/ci/release/Jenkinsfile
+++ b/ci/release/Jenkinsfile
@@ -7,7 +7,7 @@ pipeline {
         label 'Worker&&Containers'
     }
     tools {
-        maven 'Apache Maven 3.8'
+        maven 'Apache Maven 3.9'
         jdk 'OpenJDK 17 Latest'
     }
     options {
diff --git a/pom.xml b/pom.xml
index e8bdb98..81cd1ba 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,6 +12,11 @@
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
         <develocity-maven-extension.version>1.23</develocity-maven-extension.version>
+        <!--
+            When updating maven version:
+             - Adjust the Jenkins files to reference the same version
+             - Regenerate the maven wrapper with mvn wrapper:wrapper
+         -->
         <maven-core.version>3.9.9</maven-core.version>
         <plexus-component.version>2.2.0</plexus-component.version>
         <sisu-inject.version>0.3.5</sisu-inject.version>
@@ -26,7 +31,9 @@
         <maven-javadoc-plugin.version>3.11.2</maven-javadoc-plugin.version>
         <maven-source-plugin.version>3.3.1</maven-source-plugin.version>
         <maven-shade-plugin.version>3.6.0</maven-shade-plugin.version>
-        <version.gpg.plugin>3.2.7</version.gpg.plugin>
+        <maven-gpg-plugin.version>3.2.7</maven-gpg-plugin.version>
+        <!-- Run mvn wrapper:wrapper when updating the wrapper plugin version -->
+        <maven-wrapper-plugin.version>3.3.2</maven-wrapper-plugin.version>
 
         <gpg.sign.skip>true</gpg.sign.skip>
 
@@ -105,6 +112,15 @@
 
     <build>
         <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-wrapper-plugin</artifactId>
+                <version>${maven-wrapper-plugin.version}</version>
+                <configuration>
+                    <mavenVersion>${maven-core.version}</mavenVersion>
+                    <distributionType>bin</distributionType>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
@@ -157,7 +173,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-gpg-plugin</artifactId>
-                <version>${version.gpg.plugin}</version>
+                <version>${maven-gpg-plugin.version}</version>
                 <executions>
                     <execution>
                         <id>sign-artifacts</id>

From 2b25ecc24a7715b7db17efb0320bc769d26a0f78 Mon Sep 17 00:00:00 2001
From: marko-bekhta <marko.prykladna@gmail.com>
Date: Mon, 23 Dec 2024 12:38:43 +0100
Subject: [PATCH 2/3] Use the version of hibernate-jenkins-pipeline-helpers
 configured on CI

---
 Jenkinsfile            | 2 +-
 ci/release/Jenkinsfile | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index f5c42a1..19086b8 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,4 +1,4 @@
-@Library('hibernate-jenkins-pipeline-helpers@1.17') _
+@Library('hibernate-jenkins-pipeline-helpers') _
 
 import org.hibernate.jenkins.pipeline.helpers.version.Version
 
diff --git a/ci/release/Jenkinsfile b/ci/release/Jenkinsfile
index 1c4a36b..e31f3eb 100644
--- a/ci/release/Jenkinsfile
+++ b/ci/release/Jenkinsfile
@@ -1,4 +1,4 @@
-@Library('hibernate-jenkins-pipeline-helpers@1.17') _
+@Library('hibernate-jenkins-pipeline-helpers') _
 
 import org.hibernate.jenkins.pipeline.helpers.version.Version
 

From 9faf1e8cee0f40f910bf0d080b9adb2688a856a5 Mon Sep 17 00:00:00 2001
From: marko-bekhta <marko.prykladna@gmail.com>
Date: Mon, 23 Dec 2024 12:40:07 +0100
Subject: [PATCH 3/3] Use specific Jenkins nodes for releases

---
 ci/release/Jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ci/release/Jenkinsfile b/ci/release/Jenkinsfile
index e31f3eb..871a5f5 100644
--- a/ci/release/Jenkinsfile
+++ b/ci/release/Jenkinsfile
@@ -4,7 +4,7 @@ import org.hibernate.jenkins.pipeline.helpers.version.Version
 
 pipeline {
     agent {
-        label 'Worker&&Containers'
+        label 'Release'
     }
     tools {
         maven 'Apache Maven 3.9'