HBX-2950 Make adjustments for the release on CI

hibernate · Jan 9, 2025 · 336eefc · 336eefc
1 parent 6e614f4
commit 336eefc
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 20 deletions.
diff --git a/ci/release/Jenkinsfile b/ci/release/Jenkinsfile
@@ -84,6 +84,7 @@ pipeline {
 							withCredentials([file(credentialsId: 'release.gpg.private-key', variable: 'RELEASE_GPG_PRIVATE_KEY_PATH'),
 											 string(credentialsId: 'release.gpg.passphrase', variable: 'MAVEN_GPG_PASSPHRASE')]) {
 								sshagent(['ed25519.Hibernate-CI.github.com', 'hibernate.filemgmt.jboss.org', 'hibernate-ci.frs.sourceforge.net']) {
+									sh 'export MAVEN_LOCAL_REPOSITORY='+env.WORKSPACE_TMP + '/.m2repository'
 									sh 'cat $HOME/.ssh/config'
 									sh 'git clone https://github.com/hibernate/hibernate-release-scripts.git'
 									env.RELEASE_GPG_HOMEDIR = env.WORKSPACE_TMP + '/.gpg'

diff --git a/gradle/pom.xml b/gradle/pom.xml
@@ -42,6 +42,7 @@
        <deploy.skip>false</deploy.skip>
 
        <gradle.executable>./gradlew</gradle.executable>
+       <gradle.maven.local.path>${user.home}/.m2/repository</gradle.maven.local.path>
    </properties>
 
    <dependencies>
@@ -67,6 +68,7 @@
                                 <argument>clean</argument>
                                 <argument>build</argument>
                                 <argument>-Pversion=${project.version}</argument>
+                                <argument>-Dmaven.repo.local=${gradle.maven.local.path}</argument>
                             </arguments>
                         </configuration>
                         <goals>

diff --git a/pom.xml b/pom.xml
@@ -251,25 +251,6 @@
          </dependencies>
     </dependencyManagement>
 
-    <repositories>
-        <repository>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-            <id>${ossrh.releases.repo.id}</id>
-            <name>${ossrh.releases.repo.name}</name>
-            <url>${ossrh.releases.repo.url}</url>
-        </repository>
-       <repository>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-            <id>${ossrh.snapshots.repo.id}</id>
-            <name>${ossrh.snapshots.repo.name}</name>
-            <url>${ossrh.snapshots.repo.url}</url>
-        </repository>
-    </repositories>
-
     <distributionManagement>
       <repository>
         <id>${ossrh.releases.repo.id}</id>
@@ -386,6 +367,29 @@
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>flatten-maven-plugin</artifactId>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-enforcer-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>enforce-java-version</id>
+                        <goals>
+                            <goal>enforce</goal>
+                        </goals>
+                        <configuration>
+                            <!--
+                                We want to override the rules for this configuration to remove the bannedRepositories rule from the JBoss parent.
+                            -->
+                            <rules combine.self="override">
+                                <requireJavaVersion>
+                                    <message>To build this project JDK ${jdk.min.version} (or greater) is required. Please install it.</message>
+                                    <version>${jdk.min.version}</version>
+                                </requireJavaVersion>
+                            </rules>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
 
@@ -398,6 +402,10 @@
                     <value>true</value>
                 </property>
             </activation>
+            <properties>
+                <!-- The MAVEN_LOCAL_REPOSITORY env variable is set in the release Jenkins file -->
+                <gradle.maven.local.path>${MAVEN_LOCAL_REPOSITORY}</gradle.maven.local.path>
+            </properties>
             <build>
                 <plugins>
                     <plugin>

diff --git a/test/utils/src/main/java/org/hibernate/tools/test/util/JavaUtil.java b/test/utils/src/main/java/org/hibernate/tools/test/util/JavaUtil.java
@@ -20,6 +20,7 @@
 package org.hibernate.tools.test.util;
 
 import java.io.File;
+import java.net.URISyntaxException;
 import java.net.URL;
 import java.security.CodeSource;
 import java.util.ArrayList;
@@ -72,7 +73,12 @@ public static String resolvePathToJarFileFor(Class<?> clazz) {
 		if (codeSource != null) {
 			URL url = codeSource.getLocation();
 			if (url != null) {
-				result = url.getPath();
+				try {
+					result = url.toURI().getPath();
+				}
+				catch (URISyntaxException e) {
+					throw new IllegalArgumentException( "Unexpected path to a Jar file: " + url, e );
+				}
 			}
 		}
 		return result;