From 1707c2b7db9bd34eeba0764672fbe3ab5fb9a2ef Mon Sep 17 00:00:00 2001
From: marko-bekhta <marko.prykladna@gmail.com>
Date: Fri, 10 Jan 2025 10:44:39 +0100
Subject: [PATCH] HBX-2950 Use settings.localRepository instead of a custom
 property

---
 ci/release/Jenkinsfile | 1 -
 gradle/pom.xml         | 3 +--
 pom.xml                | 4 ----
 3 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/ci/release/Jenkinsfile b/ci/release/Jenkinsfile
index 5e257badb..1ded88763 100644
--- a/ci/release/Jenkinsfile
+++ b/ci/release/Jenkinsfile
@@ -84,7 +84,6 @@ 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 0bddb5bb7..79bee502f 100644
--- a/gradle/pom.xml
+++ b/gradle/pom.xml
@@ -42,7 +42,6 @@
        <deploy.skip>false</deploy.skip>
 
        <gradle.executable>./gradlew</gradle.executable>
-       <gradle.maven.local.path>${user.home}/.m2/repository</gradle.maven.local.path>
    </properties>
 
    <dependencies>
@@ -68,7 +67,7 @@
                                 <argument>clean</argument>
                                 <argument>build</argument>
                                 <argument>-Pversion=${project.version}</argument>
-                                <argument>-Dmaven.repo.local=${gradle.maven.local.path}</argument>
+                                <argument>-Dmaven.repo.local=${settings.localRepository}</argument>
                             </arguments>
                         </configuration>
                         <goals>
diff --git a/pom.xml b/pom.xml
index af4d2e4d6..bc360eb31 100644
--- a/pom.xml
+++ b/pom.xml
@@ -402,10 +402,6 @@
                     <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>