Spring/spring-data-release
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix property names to not clash with env variables.

Browse Source
This commit is contained in:
Mark Paluch
2022-11-29 09:51:46 +01:00
parent dc2ad33af7
commit 129a54c87d
8 changed files with 13 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Jenkinsfile vendored
View File

@@ -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')

2
ci/prepare-and-build.bash
View File

@@ -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 {

1
ci/prepare-and-build.template
View File

@@ -1,4 +1,5 @@
workspace cleanup
verify github
verify deployment
release prepare ${VERSION}
release build ${VERSION}

2
pom.xml
View File

@@ -9,7 +9,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.7.2</version>
<version>2.7.6</version>
</parent>
<properties>

2
src/main/java/org/springframework/data/release/deployment/ArtifactoryClient.java
View File

@@ -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);

6
src/main/java/org/springframework/data/release/deployment/DeploymentProperties.java
View File

@@ -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

4
src/main/java/org/springframework/data/release/utils/HttpComponentsClientHttpRequestFactoryBuilder.java
View File

@@ -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),

12
src/main/resources/application-jenkins.properties
View File

@@ -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}