From b674b5f2dd0ac674cde8516a1f0a74166a87e23f Mon Sep 17 00:00:00 2001
From: Koen Aers <koen.aers@gmail.com>
Date: Mon, 15 Sep 2025 20:20:10 +0200
Subject: [PATCH] HBX-3124: Create the 'gradle' folder containing the wrapper
 and the library on the fly

Signed-off-by: Koen Aers <koen.aers@gmail.com>
---
 gradle/.gitignore                             |   3 +
 gradle/gradle/libs.versions.toml              |   8 -
 gradle/pom.xml                                | 197 +++++++++++++++---
 .../wrapper => resources}/gradle-wrapper.jar  | Bin
 .../gradle-wrapper.properties                 |   2 +-
 gradle/resources/libs.versions.toml           |   5 +
 pom.xml                                       |   1 +
 7 files changed, 177 insertions(+), 39 deletions(-)
 delete mode 100644 gradle/gradle/libs.versions.toml
 rename gradle/{gradle/wrapper => resources}/gradle-wrapper.jar (100%)
 rename gradle/{gradle/wrapper => resources}/gradle-wrapper.properties (89%)
 create mode 100644 gradle/resources/libs.versions.toml

diff --git a/gradle/.gitignore b/gradle/.gitignore
index 1b6985c009..2295f429d7 100644
--- a/gradle/.gitignore
+++ b/gradle/.gitignore
@@ -3,3 +3,6 @@
 
 # Ignore Gradle build output directory
 build
+
+# Ignore the Gradle folder as this is constructed on the fly
+gradle
diff --git a/gradle/gradle/libs.versions.toml b/gradle/gradle/libs.versions.toml
deleted file mode 100644
index a008468ff8..0000000000
--- a/gradle/gradle/libs.versions.toml
+++ /dev/null
@@ -1,8 +0,0 @@
-# This file was generated by the Gradle 'init' task.
-# https://docs.gradle.org/current/userguide/platforms.html#sub::toml-dependencies-format
-
-[versions]
-junit-jupiter = "5.13.3"
-
-[libraries]
-junit-jupiter = { module = "org.junit.jupiter:junit-jupiter", version.ref = "junit-jupiter" }
diff --git a/gradle/pom.xml b/gradle/pom.xml
index 2aa1e533c3..d9491bd266 100644
--- a/gradle/pom.xml
+++ b/gradle/pom.xml
@@ -46,6 +46,124 @@
 
    <build>
       <plugins>
+          <plugin>
+              <artifactId>maven-resources-plugin</artifactId>
+              <executions>
+                  <execution>
+                      <id>validate-copy-libs-versions-toml</id>
+                      <phase>validate</phase>
+                      <goals>
+                          <goal>copy-resources</goal>
+                      </goals>
+                      <configuration>
+                          <outputDirectory>gradle</outputDirectory>
+                          <resources>
+                              <resource>
+                                  <directory>resources</directory>
+                                  <filtering>true</filtering>
+                                  <includes>
+                                      <include>libs.versions.toml</include>
+                                  </includes>
+                              </resource>
+                          </resources>
+                      </configuration>
+                  </execution>
+                  <execution>
+                      <id>pre-clean-copy-libs-versions-toml</id>
+                      <phase>pre-clean</phase>
+                      <goals>
+                          <goal>copy-resources</goal>
+                      </goals>
+                      <configuration>
+                          <outputDirectory>gradle</outputDirectory>
+                          <resources>
+                              <resource>
+                                  <directory>resources</directory>
+                                  <filtering>true</filtering>
+                                  <includes>
+                                      <include>libs.versions.toml</include>
+                                  </includes>
+                              </resource>
+                          </resources>
+                      </configuration>
+                  </execution>
+                  <execution>
+                      <id>validate-copy-gradle-wrapper-jar</id>
+                      <phase>validate</phase>
+                      <goals>
+                          <goal>copy-resources</goal>
+                      </goals>
+                      <configuration>
+                          <outputDirectory>gradle/wrapper</outputDirectory>
+                          <resources>
+                              <resource>
+                                  <directory>resources</directory>
+                                  <includes>
+                                      <include>gradle-wrapper.jar</include>
+                                  </includes>
+                              </resource>
+                          </resources>
+                      </configuration>
+                  </execution>
+                  <execution>
+                      <id>pre-clean-copy-gradle-wrapper-jar</id>
+                      <phase>pre-clean</phase>
+                      <goals>
+                          <goal>copy-resources</goal>
+                      </goals>
+                      <configuration>
+                          <outputDirectory>gradle/wrapper</outputDirectory>
+                          <resources>
+                              <resource>
+                                  <directory>resources</directory>
+                                  <includes>
+                                      <include>gradle-wrapper.jar</include>
+                                  </includes>
+                              </resource>
+                          </resources>
+                      </configuration>
+                  </execution>
+                  <execution>
+                      <id>validate-copy-gradle-wrapper-properties</id>
+                      <phase>validate</phase>
+                      <goals>
+                          <goal>copy-resources</goal>
+                      </goals>
+                      <configuration>
+                          <outputDirectory>gradle/wrapper</outputDirectory>
+                          <resources>
+                              <resource>
+                                  <directory>resources</directory>
+                                  <filtering>true</filtering>
+                                  <includes>
+                                      <include>gradle-wrapper.properties</include>
+                                  </includes>
+                              </resource>
+                          </resources>
+                      </configuration>
+                  </execution>
+                  <execution>
+                      <id>pre-clean-copy-gradle-wrapper-properties</id>
+                      <phase>pre-clean</phase>
+                      <goals>
+                          <goal>copy-resources</goal>
+                      </goals>
+                      <configuration>
+                          <outputDirectory>gradle/wrapper</outputDirectory>
+                          <resources>
+                              <resource>
+                                  <directory>resources</directory>
+                                  <filtering>true</filtering>
+                                  <includes>
+                                      <include>gradle-wrapper.properties</include>
+                                  </includes>
+                              </resource>
+                          </resources>
+                      </configuration>
+                  </execution>
+              </executions>
+          </plugin>
+
           <!-- Maven deploy is skipped on purpose as Gradle build will stage the artifact itself. -->
           <plugin>
               <groupId>org.apache.maven.plugins</groupId>
@@ -54,43 +172,62 @@
                   <skip>true</skip>
               </configuration>
           </plugin>
-          <!-- execute Gradle command -->
+        <!-- execute Gradle command -->
+        <plugin>
+            <groupId>org.codehaus.mojo</groupId>
+			<artifactId>exec-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>gradle-package</id>
+                        <phase>prepare-package</phase>
+                        <configuration>
+                            <executable>${gradle.executable}</executable>
+                            <arguments>
+                                <argument>clean</argument>
+                                <argument>build</argument>
+                                <argument>-PprojectVersion=${project.version}</argument>
+                                <argument>-Ph2Version=${h2.version}</argument>
+                                <argument>-Dmaven.repo.local=${settings.localRepository}</argument>
+                                <argument>-PmavenRootDirectory=${rootProject.directory}</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>
+                            <goal>exec</goal>
+                        </goals>
+                    </execution>
+                </executions>
+		 </plugin>
           <plugin>
-              <groupId>org.codehaus.mojo</groupId>
-              <artifactId>exec-maven-plugin</artifactId>
+              <artifactId>maven-clean-plugin</artifactId>
               <executions>
                   <execution>
-                      <id>gradle-package</id>
-                      <phase>prepare-package</phase>
-                      <configuration>
-                          <executable>${gradle.executable}</executable>
-                          <arguments>
-                              <argument>clean</argument>
-                              <argument>build</argument>
-                              <argument>-PprojectVersion=${project.version}</argument>
-                              <argument>-Ph2Version=${h2.version}</argument>
-                              <argument>-Dmaven.repo.local=${settings.localRepository}</argument>
-                              <argument>-PmavenRootDirectory=${rootProject.directory}</argument>
-                          </arguments>
-                      </configuration>
+                      <id>delete-gradle-wrapper</id>
+                      <phase>clean</phase>
                       <goals>
-                          <goal>exec</goal>
+                          <goal>clean</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>
+                          <filesets>
+                              <fileset>
+                                  <directory>gradle</directory>
+                              </fileset>
+                          </filesets>
                       </configuration>
-                      <goals>
-                          <goal>exec</goal>
-                      </goals>
                   </execution>
               </executions>
           </plugin>
diff --git a/gradle/gradle/wrapper/gradle-wrapper.jar b/gradle/resources/gradle-wrapper.jar
similarity index 100%
rename from gradle/gradle/wrapper/gradle-wrapper.jar
rename to gradle/resources/gradle-wrapper.jar
diff --git a/gradle/gradle/wrapper/gradle-wrapper.properties b/gradle/resources/gradle-wrapper.properties
similarity index 89%
rename from gradle/gradle/wrapper/gradle-wrapper.properties
rename to gradle/resources/gradle-wrapper.properties
index d4081da476..49078eeabe 100644
--- a/gradle/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/resources/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-${gradle.version}-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/gradle/resources/libs.versions.toml b/gradle/resources/libs.versions.toml
new file mode 100644
index 0000000000..273c4b799e
--- /dev/null
+++ b/gradle/resources/libs.versions.toml
@@ -0,0 +1,5 @@
+[versions]
+junit-jupiter = "${junit-jupiter.version}"
+
+[libraries]
+junit-jupiter = { module = "org.junit.jupiter:junit-jupiter", version.ref = "junit-jupiter" }
diff --git a/pom.xml b/pom.xml
index 64f6b3bb55..b0327c15c4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -98,6 +98,7 @@
     <properties>
 
         <maven.version>3.9.11</maven.version>
+        <gradle.version>8.14.3</gradle.version>
 
         <ant.version>1.10.15</ant.version>
         <antlr.version>4.13.2</antlr.version>