From 3bc89187c26e270b22dc54aeca6bb0ef2ad7ebab Mon Sep 17 00:00:00 2001
From: Koen Aers <koen.aers@gmail.com>
Date: Wed, 20 Aug 2025 18:35:34 +0200
Subject: [PATCH] HBX-3096: Add execution to 'exec-maven-plugin' to perform
 clean for the Gradle plugin subproject   - Restore '-Dmaven.repo.local'
 argument for the 'gradle-package' execution   - Remove the unneeded
 dependencies section in the 'gradle/pom.xml'   - Correct typo in Jenkinsfile

Signed-off-by: Koen Aers <koen.aers@gmail.com>
---
 ci/release/Jenkinsfile |  2 +-
 gradle/pom.xml         | 26 ++++++++++++++++++--------
 2 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/ci/release/Jenkinsfile b/ci/release/Jenkinsfile
index 9e590cd240..e74c9705bd 100644
--- a/ci/release/Jenkinsfile
+++ b/ci/release/Jenkinsfile
@@ -38,7 +38,7 @@ pipeline {
 		)
 		string(
 				name: 'DEVELOPMENT_VERSION',
-				defaultValue: '7.1.1-SNAPSHOT',
+				defaultValue: '7.1.2-SNAPSHOT',
 				description: 'The next version to be used after the release, e.g. 7.1.2-SNAPSHOT.',
 				trim: true
 		)
diff --git a/gradle/pom.xml b/gradle/pom.xml
index fdeb4fd66a..1c8e6c1aeb 100644
--- a/gradle/pom.xml
+++ b/gradle/pom.xml
@@ -44,13 +44,6 @@
        <gradle.executable>./gradlew</gradle.executable>
    </properties>
 
-   <dependencies>
-       <dependency>
-           <groupId>org.hibernate.tool</groupId>
-           <artifactId>hibernate-tools-orm</artifactId>
-       </dependency>
-   </dependencies>
-
    <build>
       <plugins>
           <!-- Maven deploy is skipped on purpose as Gradle build will stage the artifact itself. -->
@@ -67,7 +60,7 @@
 			<artifactId>exec-maven-plugin</artifactId>
                 <executions>
                     <execution>
-                        <id>gradle</id>
+                        <id>gradle-package</id>
                         <phase>prepare-package</phase>
                         <configuration>
                             <executable>${gradle.executable}</executable>
@@ -76,6 +69,22 @@
                                 <argument>build</argument>
                                 <argument>-PprojectVersion=${project.version}</argument>
                                 <argument>-Ph2Version=${h2.version}</argument>
+                                <argument>-Dmaven.repo.local=${settings.localRepository}</argument>
+                            </arguments>
+                        </configuration>
+                        <goals>
+                            <goal>exec</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>gradle-clean</id>
+                        <phase>clean</phase>
+                        <configuration>
+                            <executable>${gradle.executable}</executable>
+                            <arguments>
+                                <argument>clean</argument>
+                                <argument>-PprojectVersion=${project.version}</argument>
+                                <argument>-Ph2Version=${h2.version}</argument>
                             </arguments>
                         </configuration>
                         <goals>
@@ -112,6 +121,7 @@
                                         <argument>publishPluginMavenPublicationToStagingRepository</argument>
                                         <argument>-PprojectVersion=${project.version}</argument>
                                         <argument>-Ph2Version=${h2.version}</argument>
+                                        <argument>-Dmaven.repo.local=${settings.localRepository}</argument>
                                         <argument>-PmavenStagingDirectory=${local.staging.releases.repo.url}</argument>
                                     </arguments>
                                 </configuration>