From 6453a1b0ffd60785b4ed340f8dc653dc0e8d7298 Mon Sep 17 00:00:00 2001 From: Spring Builds Date: Sat, 15 Jan 2022 10:18:50 +0000 Subject: [PATCH 1/4] Next development version (v2.0.7.BUILD-SNAPSHOT) --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index a5a0f970..6d16ba98 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -version=2.0.6.BUILD-SNAPSHOT +version=2.0.7.BUILD-SNAPSHOT org.gradle.jvmargs=-Xmx2g -Dfile.encoding=UTF-8 org.gradle.parallel=true From 7c65ae6e7204cc8a4b872f57c799b1365e6c6b4f Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Sat, 15 Jan 2022 19:54:17 +0000 Subject: [PATCH 2/4] Fix Sonatype credentials in CI pipeline --- ci/pipeline.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/pipeline.yml b/ci/pipeline.yml index 2b302dcd..878c7c2a 100644 --- a/ci/pipeline.yml +++ b/ci/pipeline.yml @@ -22,8 +22,8 @@ anchors: GITHUB_USERNAME: ((github-username)) MILESTONE: ((milestone)) sontatype-task-params: &sonatype-task-params - SONATYPE_USER_TOKEN: ((sonatype-username)) - SONATYPE_PASSWORD_TOKEN: ((sonatype-password)) + SONATYPE_USERNAME: ((s01-user-token)) + SONATYPE_PASSWORD: ((s01-user-token-password)) SONATYPE_URL: ((sonatype-url)) SONATYPE_STAGING_PROFILE_ID: ((sonatype-staging-profile-id)) artifactory-task-params: &artifactory-task-params From ba6d3b87c4cddb929943535eb0777ed42cc6b624 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Sat, 15 Jan 2022 19:54:47 +0000 Subject: [PATCH 3/4] Exclude entire spring-restdocs module from Maven Central --- ci/config/release-scripts.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/config/release-scripts.yml b/ci/config/release-scripts.yml index 6de87395..5199d181 100644 --- a/ci/config/release-scripts.yml +++ b/ci/config/release-scripts.yml @@ -7,4 +7,4 @@ spring: sonatype: exclude: - 'build-info\.json' - - '.*\.zip' \ No newline at end of file + - 'org/springframework/restdocs/spring-restdocs/.*' From eb41797676b037f42ed43520d4c03ea9c3394c9d Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Sat, 15 Jan 2022 20:16:28 +0000 Subject: [PATCH 4/4] Make registry mirror parameters available to generate-changelog task --- ci/pipeline.yml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/ci/pipeline.yml b/ci/pipeline.yml index 878c7c2a..d5fa4852 100644 --- a/ci/pipeline.yml +++ b/ci/pipeline.yml @@ -69,6 +69,10 @@ anchors: silent: true icon_emoji: ":concourse:" username: concourse-ci + registry-mirror-vars: ®istry-mirror-vars + registry-mirror-host: ((registry-mirror-host)) + registry-mirror-username: ((registry-mirror-username)) + registry-mirror-password: ((registry-mirror-password)) resource_types: - name: artifactory-resource type: registry-image @@ -180,9 +184,7 @@ jobs: image: ci-image vars: ci-image-name: ci-image - registry-mirror-host: ((registry-mirror-host)) - registry-mirror-username: ((registry-mirror-username)) - registry-mirror-password: ((registry-mirror-password)) + <<: *registry-mirror-vars - put: ci-image params: image: ci-image/image.tar @@ -428,6 +430,8 @@ jobs: RELEASE_TYPE: RELEASE GITHUB_USERNAME: ((github-username)) GITHUB_TOKEN: ((github-ci-release-token)) + vars: + <<: *registry-mirror-vars - put: github-release params: name: generated-changelog/tag