Skip to content

Commit 1707c2b

Browse files
committed
HBX-2950 Use settings.localRepository instead of a custom property
1 parent 912ba8d commit 1707c2b

File tree

3 files changed

+1
-7
lines changed

3 files changed

+1
-7
lines changed

ci/release/Jenkinsfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,6 @@ pipeline {
8484
withCredentials([file(credentialsId: 'release.gpg.private-key', variable: 'RELEASE_GPG_PRIVATE_KEY_PATH'),
8585
string(credentialsId: 'release.gpg.passphrase', variable: 'MAVEN_GPG_PASSPHRASE')]) {
8686
sshagent(['ed25519.Hibernate-CI.github.com', 'hibernate.filemgmt.jboss.org', 'hibernate-ci.frs.sourceforge.net']) {
87-
sh 'export MAVEN_LOCAL_REPOSITORY='+env.WORKSPACE_TMP + '/.m2repository'
8887
sh 'cat $HOME/.ssh/config'
8988
sh 'git clone https://github.com/hibernate/hibernate-release-scripts.git'
9089
env.RELEASE_GPG_HOMEDIR = env.WORKSPACE_TMP + '/.gpg'

gradle/pom.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@
4242
<deploy.skip>false</deploy.skip>
4343

4444
<gradle.executable>./gradlew</gradle.executable>
45-
<gradle.maven.local.path>${user.home}/.m2/repository</gradle.maven.local.path>
4645
</properties>
4746

4847
<dependencies>
@@ -68,7 +67,7 @@
6867
<argument>clean</argument>
6968
<argument>build</argument>
7069
<argument>-Pversion=${project.version}</argument>
71-
<argument>-Dmaven.repo.local=${gradle.maven.local.path}</argument>
70+
<argument>-Dmaven.repo.local=${settings.localRepository}</argument>
7271
</arguments>
7372
</configuration>
7473
<goals>

pom.xml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -402,10 +402,6 @@
402402
<value>true</value>
403403
</property>
404404
</activation>
405-
<properties>
406-
<!-- The MAVEN_LOCAL_REPOSITORY env variable is set in the release Jenkins file -->
407-
<gradle.maven.local.path>${MAVEN_LOCAL_REPOSITORY}</gradle.maven.local.path>
408-
</properties>
409405
<build>
410406
<plugins>
411407
<plugin>

0 commit comments

Comments
 (0)