From 52e22e98c438aa810ea0e03bf46c37f7441e6226 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Tue, 17 Jun 2025 10:20:55 +0200 Subject: [PATCH] Fix credentials --- Jenkinsfile | 2 +- .../org/springframework/data/release/build/MavenRuntime.java | 3 ++- .../data/release/deployment/MavenPublisher.java | 2 +- src/main/resources/application-jenkins.properties | 4 ++-- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 3bfafa0..aae8fca 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -59,7 +59,7 @@ pipeline { MAVEN_SIGNING_KEY_PASSWORD = credentials('spring-gpg-passphrase') GIT_SIGNING_KEY = credentials('spring-gpg-github-private-key-jenkins') GIT_SIGNING_KEY_PASSWORD = credentials('spring-gpg-github-passphrase-jenkins') - SONATYPE = credentials('oss-s01-token') + CENTRAL_TOKEN = credentials('central-token') } steps { diff --git a/src/main/java/org/springframework/data/release/build/MavenRuntime.java b/src/main/java/org/springframework/data/release/build/MavenRuntime.java index 153a8b9..d23b9b8 100644 --- a/src/main/java/org/springframework/data/release/build/MavenRuntime.java +++ b/src/main/java/org/springframework/data/release/build/MavenRuntime.java @@ -89,7 +89,8 @@ public class MavenRuntime extends MavenRuntimeSupport { mavenLogger.info(String.format("Executing: mvn %s", arguments)); CommandLine disabledGradleBuildCache = arguments.and(arg("gradle.cache.local.enabled=false")) - .and(arg("gradle.cache.remote.enabled=false")); + .and(arg("gradle.cache.remote.enabled=false")).and(arg("develocity.cache.local.enabled=false")) + .and(arg("develocity.cache.remote.enabled=false")); mvn.setGoals(disabledGradleBuildCache.toCommandLine(it -> properties.getFullyQualifiedPlugin(it.getGoal()))); }); diff --git a/src/main/java/org/springframework/data/release/deployment/MavenPublisher.java b/src/main/java/org/springframework/data/release/deployment/MavenPublisher.java index e204780..279ad4e 100644 --- a/src/main/java/org/springframework/data/release/deployment/MavenPublisher.java +++ b/src/main/java/org/springframework/data/release/deployment/MavenPublisher.java @@ -403,7 +403,7 @@ public class MavenPublisher { private final File file; LocalStagingRepository(File file) { - super(String.format("central-staging::default::file://%s", file.getAbsolutePath())); + super(String.format("central-staging::file://%s", file.getAbsolutePath())); this.file = file; } diff --git a/src/main/resources/application-jenkins.properties b/src/main/resources/application-jenkins.properties index f4f663a..81aec06 100644 --- a/src/main/resources/application-jenkins.properties +++ b/src/main/resources/application-jenkins.properties @@ -18,8 +18,8 @@ deployment.commercial.api-key=${COMMERCIAL_PSW} deployment.maven-central.gpg.keyname=003C0425 deployment.maven-central.gpg.passphrase=${MAVEN_SIGNING_KEY_PASSWORD} deployment.maven-central.gpg.executable=/usr/bin/gpg -deployment.maven-central.username=${CENTRAL_TOKEN_USERNAME} -deployment.maven-central.password=${CENTRAL_TOKEN_PASSWORD} +deployment.maven-central.username=${CENTRAL_TOKEN_USR} +deployment.maven-central.password=${CENTRAL_TOKEN_PSW} project-service.key=n/a