diff --git a/ci/release/Jenkinsfile b/ci/release/Jenkinsfile
index 1ded887638..5e257badb5 100644
--- 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
index a020bf21bc..0bddb5bb71 100644
--- a/gradle/pom.xml
+++ b/gradle/pom.xml
@@ -42,6 +42,7 @@
false
./gradlew
+ ${user.home}/.m2/repository
@@ -67,6 +68,7 @@
clean
build
-Pversion=${project.version}
+ -Dmaven.repo.local=${gradle.maven.local.path}
diff --git a/pom.xml b/pom.xml
index 313aefda5e..c648b43267 100644
--- a/pom.xml
+++ b/pom.xml
@@ -251,25 +251,6 @@
-
-
-
- false
-
- ${ossrh.releases.repo.id}
- ${ossrh.releases.repo.name}
- ${ossrh.releases.repo.url}
-
-
-
- true
-
- ${ossrh.snapshots.repo.id}
- ${ossrh.snapshots.repo.name}
- ${ossrh.snapshots.repo.url}
-
-
-
${ossrh.releases.repo.id}
@@ -386,6 +367,29 @@
org.codehaus.mojo
flatten-maven-plugin
+
+ org.apache.maven.plugins
+ maven-enforcer-plugin
+
+
+ enforce-java-version
+
+ enforce
+
+
+
+
+
+ To build this project JDK ${jdk.min.version} (or greater) is required. Please install it.
+ ${jdk.min.version}
+
+
+
+
+
+
@@ -398,6 +402,10 @@
true
+
+
+ ${MAVEN_LOCAL_REPOSITORY}
+
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
index 952ebe1e22..67f8493309 100644
--- 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;