From 264d689ba1aea9c7bf4536f9c92ddade6eb3b8e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dariusz=20J=C4=99drzejczyk?= Date: Tue, 13 May 2025 11:38:05 +0200 Subject: [PATCH 1/8] [release] Next development version 3.6.18-SNAPSHOT MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Dariusz Jędrzejczyk --- gradle.properties | 4 ++-- gradle/libs.versions.toml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gradle.properties b/gradle.properties index 0ea97b836f..f3048d36fa 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ -version=3.6.17 +version=3.6.18-SNAPSHOT bomVersion=2023.0.18 -metricsMicrometerVersion=1.1.17 +metricsMicrometerVersion=1.1.18-SNAPSHOT org.gradle.parallel=true diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 8434f18b07..b59e68e80e 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -7,8 +7,8 @@ [versions] # Baselines, should be updated on every release -baseline-core-api = "3.6.16" -baselinePerfCore = "3.6.16" +baseline-core-api = "3.6.17" +baselinePerfCore = "3.6.17" baselinePerfExtra = "3.5.2" # Other shared versions From ed23c7473e79babe07df57f9903e17afc8e8f60e Mon Sep 17 00:00:00 2001 From: Violeta Georgieva <696661+violetagg@users.noreply.github.com> Date: Tue, 27 May 2025 15:21:23 +0300 Subject: [PATCH 2/8] Use Portal OSSRH Staging API for publishing Signed-off-by: Violeta Georgieva <696661+violetagg@users.noreply.github.com> --- .github/workflows/publish.yml | 15 +++++++++++++++ gradle/setup.gradle | 2 +- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 9a06fb27cb..bb8f1da17e 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -181,6 +181,21 @@ jobs: ORG_GRADLE_PROJECT_sonatypePassword: ${{secrets.SONATYPE_PASSWORD}} run: | ./gradlew -Dorg.gradle.parallel=false assemble sign artifactoryPublish -Partifactory_publish_contextUrl=https://repo.spring.io -Partifactory_publish_repoKey=libs-release-local publishMavenJavaPublicationToSonatypeRepository + - name: Stage the release + env: + ORG_GRADLE_PROJECT_sonatypeUsername: ${{secrets.SONATYPE_USERNAME}} + ORG_GRADLE_PROJECT_sonatypePassword: ${{secrets.SONATYPE_PASSWORD}} + run: | + GRADLE_PUBLISH_MAVEN_AUTHORIZATION=$(echo "${ORG_GRADLE_PROJECT_sonatypeUsername}:${ORG_GRADLE_PROJECT_sonatypePassword}" | base64) + echo "Searching for opened repository..." + REPOSITORY_RESPONSE=$(curl -s -X GET \ + -H "Authorization: Bearer ${GRADLE_PUBLISH_MAVEN_AUTHORIZATION}" \ + "https://ossrh-staging-api.central.sonatype.com/manual/search/repositories?state=open") + REPOSITORY_KEY=$(echo "${REPOSITORY_RESPONSE}" | grep -o '"key":"[^"]*"' | head -1 | cut -d':' -f2 | tr -d '"') + echo "Triggering uploading..." + curl -s -X POST \ + -H "Authorization: Bearer ${GRADLE_PUBLISH_MAVEN_AUTHORIZATION}" \ + "https://ossrh-staging-api.central.sonatype.com/manual/upload/repository/${REPOSITORY_KEY}?publishing_type=user_managed" tagMilestone: name: Tag milestone diff --git a/gradle/setup.gradle b/gradle/setup.gradle index 5b6f72584f..ee1a57bcd8 100644 --- a/gradle/setup.gradle +++ b/gradle/setup.gradle @@ -96,7 +96,7 @@ publishing { if (qualifyVersion("$version") == "RELEASE") { maven { name = "sonatype" - url = "https://s01.oss.sonatype.org/service/local/staging/deploy/maven2" + url = "https://ossrh-staging-api.central.sonatype.com/service/local/staging/deploy/maven2/" credentials { username findProperty("sonatypeUsername") password findProperty("sonatypePassword") From 2f5f866eb301326ab42d35688f0d9f3842401a1f Mon Sep 17 00:00:00 2001 From: Violeta Georgieva <696661+violetagg@users.noreply.github.com> Date: Tue, 27 May 2025 15:42:37 +0300 Subject: [PATCH 3/8] Update copyright end year Signed-off-by: Violeta Georgieva <696661+violetagg@users.noreply.github.com> --- gradle/setup.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/setup.gradle b/gradle/setup.gradle index ee1a57bcd8..4e69c4ed75 100644 --- a/gradle/setup.gradle +++ b/gradle/setup.gradle @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2021 VMware Inc. or its affiliates, All Rights Reserved. + * Copyright (c) 2011-2025 VMware Inc. or its affiliates, All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. From ba6841fab8d410a86b494d9f67154b206f888965 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 5 Jun 2025 11:33:54 +0200 Subject: [PATCH 4/8] Bump gradle/actions from 4.3.1 to 4.4.0 in /.github/workflows (#4028) Bumps [gradle/actions](https://github.com/gradle/actions) from 4.3.1 to 4.4.0. - [Release notes](https://github.com/gradle/actions/releases) - [Commits](https://github.com/gradle/actions/compare/06832c7b30a0129d7fb559bcc6e43d26f6374244...8379f6a1328ee0e06e2bb424dadb7b159856a326) --- updated-dependencies: - dependency-name: gradle/actions dependency-version: 4.4.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/ci.yml | 4 ++-- .github/workflows/full.yml | 2 +- .github/workflows/gradle-wrapper-validation.yml | 2 +- .github/workflows/publish.yml | 2 +- .github/workflows/snapshots.yml | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 14c02be940..99c238b527 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -33,7 +33,7 @@ jobs: distribution: 'temurin' java-version: 21 - name: Setup Gradle - uses: gradle/actions/setup-gradle@06832c7b30a0129d7fb559bcc6e43d26f6374244 + uses: gradle/actions/setup-gradle@8379f6a1328ee0e06e2bb424dadb7b159856a326 - name: spotless (license header) if: always() run: ./gradlew spotlessCheck -PspotlessFrom=origin/${{ github.base_ref }} @@ -96,6 +96,6 @@ jobs: distribution: 'temurin' java-version: 21 - name: Setup Gradle - uses: gradle/actions/setup-gradle@06832c7b30a0129d7fb559bcc6e43d26f6374244 + uses: gradle/actions/setup-gradle@8379f6a1328ee0e06e2bb424dadb7b159856a326 - name: Run Gradle Tests run: ./gradlew ${{ matrix.test-type.arguments }} diff --git a/.github/workflows/full.yml b/.github/workflows/full.yml index aacd732c37..b257dcc968 100644 --- a/.github/workflows/full.yml +++ b/.github/workflows/full.yml @@ -54,6 +54,6 @@ jobs: distribution: 'temurin' java-version: 21 - name: Setup Gradle - uses: gradle/actions/setup-gradle@06832c7b30a0129d7fb559bcc6e43d26f6374244 + uses: gradle/actions/setup-gradle@8379f6a1328ee0e06e2bb424dadb7b159856a326 - name: Run Gradle Tests run: ./gradlew ${{ matrix.test-type.arguments }} diff --git a/.github/workflows/gradle-wrapper-validation.yml b/.github/workflows/gradle-wrapper-validation.yml index 793d5cf116..b5af076934 100644 --- a/.github/workflows/gradle-wrapper-validation.yml +++ b/.github/workflows/gradle-wrapper-validation.yml @@ -7,4 +7,4 @@ jobs: runs-on: ubuntu-22.04 steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # tag=v4 - - uses: gradle/actions/wrapper-validation@06832c7b30a0129d7fb559bcc6e43d26f6374244 + - uses: gradle/actions/wrapper-validation@8379f6a1328ee0e06e2bb424dadb7b159856a326 diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index bb8f1da17e..ee1e324be1 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -52,7 +52,7 @@ jobs: distribution: 'temurin' java-version: 21 - name: Setup Gradle - uses: gradle/actions/setup-gradle@06832c7b30a0129d7fb559bcc6e43d26f6374244 + uses: gradle/actions/setup-gradle@8379f6a1328ee0e06e2bb424dadb7b159856a326 - name: interpret version id: version #we only run the qualifyVersionGha task so that no other console printing can hijack this step's output diff --git a/.github/workflows/snapshots.yml b/.github/workflows/snapshots.yml index 1d8c1bac6d..e323971d06 100644 --- a/.github/workflows/snapshots.yml +++ b/.github/workflows/snapshots.yml @@ -52,6 +52,6 @@ jobs: distribution: 'temurin' java-version: 21 - name: Setup Gradle - uses: gradle/actions/setup-gradle@06832c7b30a0129d7fb559bcc6e43d26f6374244 + uses: gradle/actions/setup-gradle@8379f6a1328ee0e06e2bb424dadb7b159856a326 - name: Run Gradle Tests run: ./gradlew ${{ matrix.test-type.arguments }} \ No newline at end of file From 0360f36515afd632e4d3c6ccc4d450cc6c5c9001 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 5 Jun 2025 12:09:44 +0200 Subject: [PATCH 5/8] Bump org.gradle.toolchains.foojay-resolver-convention from 0.10.0 to 1.0.0 (#4029) Bump org.gradle.toolchains.foojay-resolver-convention Bumps org.gradle.toolchains.foojay-resolver-convention from 0.10.0 to 1.0.0. --- updated-dependencies: - dependency-name: org.gradle.toolchains.foojay-resolver-convention dependency-version: 1.0.0 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- settings.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/settings.gradle b/settings.gradle index 869ae89a3a..ec9e67b58f 100644 --- a/settings.gradle +++ b/settings.gradle @@ -14,7 +14,7 @@ * limitations under the License. */ plugins { - id "org.gradle.toolchains.foojay-resolver-convention" version "0.10.0" + id "org.gradle.toolchains.foojay-resolver-convention" version "1.0.0" } rootProject.name = 'reactor' From 0610f5574a65f866d47e50f4bb5ab3cb8f2fb11a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 5 Jun 2025 12:13:56 +0200 Subject: [PATCH 6/8] Bump io.projectreactor.tools:blockhound from 1.0.11.RELEASE to 1.0.13.RELEASE (#4030) Bump io.projectreactor.tools:blockhound Bumps [io.projectreactor.tools:blockhound](https://github.com/reactor/BlockHound) from 1.0.11.RELEASE to 1.0.13.RELEASE. - [Release notes](https://github.com/reactor/BlockHound/releases) - [Commits](https://github.com/reactor/BlockHound/compare/1.0.11.RELEASE...1.0.13.RELEASE) --- updated-dependencies: - dependency-name: io.projectreactor.tools:blockhound dependency-version: 1.0.13.RELEASE dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- gradle/dependencies.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle index bf3956ce4a..19b0eb262d 100644 --- a/gradle/dependencies.gradle +++ b/gradle/dependencies.gradle @@ -4,7 +4,7 @@ ext { archUnitVersion = "0.23.1" assertjVersion = "3.27.3" awaitilityVersion = "4.3.0" - blockhoundVersion = "1.0.11.RELEASE" + blockhoundVersion = "1.0.13.RELEASE" byteBuddyVersion = "1.17.5" cglibVersion = "3.3.0" javaObjectLayoutVersion = "0.17" From 9d2a52e7a7b9bac23f94e349cdabe70a666d8054 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 5 Jun 2025 12:18:17 +0200 Subject: [PATCH 7/8] Bump org.junit:junit-bom from 5.12.2 to 5.13.0 (#4032) Bumps [org.junit:junit-bom](https://github.com/junit-team/junit5) from 5.12.2 to 5.13.0. - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](https://github.com/junit-team/junit5/compare/r5.12.2...r5.13.0) --- updated-dependencies: - dependency-name: org.junit:junit-bom dependency-version: 5.13.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- gradle/dependencies.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle index 19b0eb262d..4255b1f0e5 100644 --- a/gradle/dependencies.gradle +++ b/gradle/dependencies.gradle @@ -9,7 +9,7 @@ ext { cglibVersion = "3.3.0" javaObjectLayoutVersion = "0.17" jmhVersion = "1.37" - junitVersion = "5.12.2" + junitVersion = "5.13.0" logbackVersion = "1.2.13" mockitoVersion = "4.11.0" slf4jVersion = "1.7.36" From 7b20f49580f26434752a35c4349d3fef4ea8891d Mon Sep 17 00:00:00 2001 From: Violeta Georgieva <696661+violetagg@users.noreply.github.com> Date: Tue, 10 Jun 2025 08:41:00 +0300 Subject: [PATCH 8/8] [release] Prepare and release 3.6.18 Signed-off-by: Violeta Georgieva <696661+violetagg@users.noreply.github.com> --- README.md | 10 +++++----- gradle.properties | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 9ed47a9dfd..e1c81ec865 100644 --- a/README.md +++ b/README.md @@ -28,15 +28,15 @@ repositories { } dependencies { - compile "io.projectreactor:reactor-core:3.6.17" - testCompile "io.projectreactor:reactor-test:3.6.17" + compile "io.projectreactor:reactor-core:3.6.18" + testCompile "io.projectreactor:reactor-test:3.6.18" // Alternatively, use the following for latest snapshot artifacts in this line - // compile "io.projectreactor:reactor-core:3.6.18-SNAPSHOT" - // testCompile "io.projectreactor:reactor-test:3.6.18-SNAPSHOT" + // compile "io.projectreactor:reactor-core:3.6.19-SNAPSHOT" + // testCompile "io.projectreactor:reactor-test:3.6.19-SNAPSHOT" // Optionally, use `reactor-tools` to help debugging reactor code - // implementation "io.projectreactor:reactor-tools:3.6.17" + // implementation "io.projectreactor:reactor-tools:3.6.18" } ``` diff --git a/gradle.properties b/gradle.properties index f3048d36fa..ac62319b64 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ -version=3.6.18-SNAPSHOT -bomVersion=2023.0.18 -metricsMicrometerVersion=1.1.18-SNAPSHOT +version=3.6.18 +bomVersion=2023.0.19 +metricsMicrometerVersion=1.1.18 org.gradle.parallel=true