diff --git a/Jenkinsfile b/Jenkinsfile
index 0de4276..96932ef 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -47,7 +47,7 @@ pipeline {
environment {
GITHUB = credentials('3a20bcaa-d8ad-48e3-901d-9fbc941376ee')
GITHUB_TOKEN = credentials('7b3ebbea-7001-479b-8578-b8c464dab973')
- DEPLOYMENT_API_KEY = credentials('repo_spring_io-jenkins-release-token')
+ REPO_SPRING_IO = credentials('repo_spring_io-jenkins-release-token')
STAGING_PROFILE_ID = credentials('spring-data-release-deployment-maven-central-staging-profile-id')
MAVEN_SIGNING_KEY = credentials('spring-gpg-private-key')
MAVEN_SIGNING_KEY_PASSWORD = credentials('spring-gpg-passphrase')
diff --git a/ci/prepare-and-build.bash b/ci/prepare-and-build.bash
index 865297a..36ee4a7 100755
--- a/ci/prepare-and-build.bash
+++ b/ci/prepare-and-build.bash
@@ -39,8 +39,6 @@ else
mkdir -p ~/.gnupg
echo "${GIT_SIGNING_KEY_PASSWORD}" | /usr/bin/gpg --batch --yes --passphrase-fd 0 --import "${GIT_SIGNING_KEY}"
echo "${MAVEN_SIGNING_KEY_PASSWORD}" | /usr/bin/gpg --batch --yes --passphrase-fd 0 --import "${MAVEN_SIGNING_KEY}"
- ls -ld ~/.gnupg
- ls -lR ~/.gnupg
/usr/bin/gpg -k
function spring-data-release-shell {
diff --git a/ci/prepare-and-build.template b/ci/prepare-and-build.template
index 85c7cc1..6b18cb5 100644
--- a/ci/prepare-and-build.template
+++ b/ci/prepare-and-build.template
@@ -1,4 +1,5 @@
workspace cleanup
verify github
+verify deployment
release prepare ${VERSION}
release build ${VERSION}
diff --git a/pom.xml b/pom.xml
index a7a0372..d16bdc3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
org.springframework.boot
spring-boot-starter-parent
- 2.7.2
+ 2.7.6
diff --git a/src/main/java/org/springframework/data/release/deployment/ArtifactoryClient.java b/src/main/java/org/springframework/data/release/deployment/ArtifactoryClient.java
index 0f56c61..c9f2794 100644
--- a/src/main/java/org/springframework/data/release/deployment/ArtifactoryClient.java
+++ b/src/main/java/org/springframework/data/release/deployment/ArtifactoryClient.java
@@ -72,7 +72,7 @@ class ArtifactoryClient {
try {
- logger.log("Artifactory", "Verifying authentication using a GET call to %s.", verificationResource);
+ logger.log("Artifactory", "Verifying authentication using a GET call to %s (%s %s).", verificationResource);
template.getForEntity(verificationResource, String.class);
diff --git a/src/main/java/org/springframework/data/release/deployment/DeploymentProperties.java b/src/main/java/org/springframework/data/release/deployment/DeploymentProperties.java
index a76aa22..a6a1419 100644
--- a/src/main/java/org/springframework/data/release/deployment/DeploymentProperties.java
+++ b/src/main/java/org/springframework/data/release/deployment/DeploymentProperties.java
@@ -83,11 +83,7 @@ public class DeploymentProperties {
* @return
*/
public String getStagingRepositoryUrl() {
- return server.getUri().toString().concat("/").concat(stagingRepository);
- }
-
- public HttpBasicCredentials getCredentials() {
- return new HttpBasicCredentials(username, password);
+ return server.getUri().concat("/").concat(stagingRepository);
}
@Data
diff --git a/src/main/java/org/springframework/data/release/utils/HttpComponentsClientHttpRequestFactoryBuilder.java b/src/main/java/org/springframework/data/release/utils/HttpComponentsClientHttpRequestFactoryBuilder.java
index 967faf3..70099c3 100644
--- a/src/main/java/org/springframework/data/release/utils/HttpComponentsClientHttpRequestFactoryBuilder.java
+++ b/src/main/java/org/springframework/data/release/utils/HttpComponentsClientHttpRequestFactoryBuilder.java
@@ -29,7 +29,6 @@ import org.apache.http.impl.client.BasicAuthCache;
import org.apache.http.impl.client.BasicCredentialsProvider;
import org.apache.http.impl.client.CloseableHttpClient;
import org.apache.http.impl.client.HttpClientBuilder;
-
import org.springframework.data.util.Lazy;
import org.springframework.http.HttpMethod;
import org.springframework.http.client.ClientHttpRequest;
@@ -62,8 +61,8 @@ public class HttpComponentsClientHttpRequestFactoryBuilder {
*/
public HttpComponentsClientHttpRequestFactoryBuilder withAuthentication(String uri,
HttpBasicCredentials credentials) {
- addPreemptiveAuth(credsProvider, authCache, uri, credentials);
+ addPreemptiveAuth(credsProvider, authCache, uri, credentials);
return this;
}
@@ -96,6 +95,7 @@ public class HttpComponentsClientHttpRequestFactoryBuilder {
private static void addPreemptiveAuth(CredentialsProvider credsProvider, AuthCache authCache, String requestUrl,
HttpBasicCredentials credentials) {
+
HttpHost host = HttpHost.create(requestUrl);
credsProvider.setCredentials(new AuthScope(host),
diff --git a/src/main/resources/application-jenkins.properties b/src/main/resources/application-jenkins.properties
index c276d25..48bc647 100644
--- a/src/main/resources/application-jenkins.properties
+++ b/src/main/resources/application-jenkins.properties
@@ -3,13 +3,13 @@ git.author=Spring Builds
git.email=builds@springframework.org
git.password=${GITHUB_TOKEN}
-git.gpg.keyname=B3B6F3E392A8615C65A98FC51F33293B709FA3E2
-git.gpg.passphrase=${GIT_SIGNING_KEY_PASSWORD}
-git.gpg.executable=/usr/bin/gpg
+#git.gpg.keyname=B3B6F3E392A8615C65A98FC51F33293B709FA3E2
+#git.gpg.passphrase=${GIT_SIGNING_KEY_PASSWORD}
+#git.gpg.executable=/usr/bin/gpg
-deployment.username=${DEPLOYMENT_API_KEY_USR}
-deployment.password=${DEPLOYMENT_API_KEY_PSW}
-deployment.api-key=${DEPLOYMENT_API_KEY_PSW}
+deployment.username=${REPO_SPRING_IO_USR}
+deployment.password=${REPO_SPRING_IO_PSW}
+deployment.api-key=${REPO_SPRING_IO_PSW}
deployment.settings-xml=${SETTINGS_XML}
deployment.maven-central.stagingProfileId=${STAGING_PROFILE_ID}