From 649d10daba1acaedb283d9066f0b68c97e369b0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dariusz=20J=C4=99drzejczyk?= Date: Tue, 9 Apr 2024 08:29:57 +0200 Subject: [PATCH 1/5] [release] Prepare and release 3.4.37 --- README.md | 10 +++++----- gradle.properties | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 2602eb51d8..26ff1b82c0 100644 --- a/README.md +++ b/README.md @@ -33,15 +33,15 @@ repositories { } dependencies { - compile "io.projectreactor:reactor-core:3.4.36" - testCompile "io.projectreactor:reactor-test:3.4.36" + compile "io.projectreactor:reactor-core:3.4.37" + testCompile "io.projectreactor:reactor-test:3.4.37" // Alternatively, use the following for latest snapshot artifacts in this line - // compile "io.projectreactor:reactor-core:3.4.37-SNAPSHOT" - // testCompile "io.projectreactor:reactor-test:3.4.37-SNAPSHOT" + // compile "io.projectreactor:reactor-core:3.4.38-SNAPSHOT" + // testCompile "io.projectreactor:reactor-test:3.4.38-SNAPSHOT" // Optionally, use `reactor-tools` to help debugging reactor code - // implementation "io.projectreactor:reactor-tools:3.4.36" + // implementation "io.projectreactor:reactor-tools:3.4.37" } ``` diff --git a/gradle.properties b/gradle.properties index f0b5181023..4605e7e973 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -version=3.4.37-SNAPSHOT -bomVersion=2020.0.42 +version=3.4.37 +bomVersion=2020.0.43 -org.gradle.parallel=true \ No newline at end of file +org.gradle.parallel=true From 160db187edd3066ab5cfeb2b731515a561133d66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dariusz=20J=C4=99drzejczyk?= Date: Tue, 9 Apr 2024 09:38:52 +0200 Subject: [PATCH 2/5] [release] Re-release 3.4.37 skipping artifactory --- .github/workflows/publish.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 6270b08af5..d1567e7f09 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -100,7 +100,8 @@ jobs: ORG_GRADLE_PROJECT_sonatypeUsername: ${{secrets.SONATYPE_USERNAME}} ORG_GRADLE_PROJECT_sonatypePassword: ${{secrets.SONATYPE_PASSWORD}} run: | - ./gradlew assemble sign artifactoryPublish -Partifactory_publish_contextUrl=https://repo.spring.io -Partifactory_publish_repoKey=libs-release-local publishMavenJavaPublicationToSonatypeRepository + #./gradlew assemble sign artifactoryPublish -Partifactory_publish_contextUrl=https://repo.spring.io -Partifactory_publish_repoKey=libs-release-local publishMavenJavaPublicationToSonatypeRepository + ./gradlew assemble sign publishMavenJavaPublicationToSonatypeRepository tagMilestone: name: Tag milestone @@ -133,4 +134,4 @@ jobs: git push --tags # For Gradle configuration of signing, see https://docs.gradle.org/current/userguide/signing_plugin.html#sec:in-memory-keys -# publishMavenJavaPublicationToSonatypeRepository only sends to a staging repository \ No newline at end of file +# publishMavenJavaPublicationToSonatypeRepository only sends to a staging repository From 638247540f30ac252bd8498fab50fb33bf87c151 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dariusz=20J=C4=99drzejczyk?= Date: Tue, 9 Apr 2024 09:57:49 +0200 Subject: [PATCH 3/5] [release] Re-release 3.4.37 skipping artifactory --- .github/workflows/publish.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index d1567e7f09..c97bc0106a 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -93,14 +93,14 @@ jobs: java-version: 8 - name: deploy env: - ORG_GRADLE_PROJECT_artifactory_publish_username: ${{secrets.ARTIFACTORY_USERNAME}} - ORG_GRADLE_PROJECT_artifactory_publish_password: ${{secrets.ARTIFACTORY_PASSWORD}} + # ORG_GRADLE_PROJECT_artifactory_publish_username: ${{secrets.ARTIFACTORY_USERNAME}} + # ORG_GRADLE_PROJECT_artifactory_publish_password: ${{secrets.ARTIFACTORY_PASSWORD}} ORG_GRADLE_PROJECT_signingKey: ${{secrets.SIGNING_KEY}} ORG_GRADLE_PROJECT_signingPassword: ${{secrets.SIGNING_PASSPHRASE}} ORG_GRADLE_PROJECT_sonatypeUsername: ${{secrets.SONATYPE_USERNAME}} ORG_GRADLE_PROJECT_sonatypePassword: ${{secrets.SONATYPE_PASSWORD}} run: | - #./gradlew assemble sign artifactoryPublish -Partifactory_publish_contextUrl=https://repo.spring.io -Partifactory_publish_repoKey=libs-release-local publishMavenJavaPublicationToSonatypeRepository + # ./gradlew assemble sign artifactoryPublish -Partifactory_publish_contextUrl=https://repo.spring.io -Partifactory_publish_repoKey=libs-release-local publishMavenJavaPublicationToSonatypeRepository ./gradlew assemble sign publishMavenJavaPublicationToSonatypeRepository tagMilestone: From c8ff304d9255f3d2390e2d73ebdca794fb03aa58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dariusz=20J=C4=99drzejczyk?= Date: Tue, 9 Apr 2024 10:37:58 +0200 Subject: [PATCH 4/5] [release] Re-release 3.4.37 disabling parallel for publishing --- .github/workflows/publish.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index c97bc0106a..4a291a6706 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -54,7 +54,7 @@ jobs: ORG_GRADLE_PROJECT_artifactory_publish_username: ${{secrets.ARTIFACTORY_SNAPSHOT_USERNAME}} ORG_GRADLE_PROJECT_artifactory_publish_password: ${{secrets.ARTIFACTORY_PASSWORD}} run: | - ./gradlew assemble artifactoryPublish -Partifactory_publish_contextUrl=https://repo.spring.io -Partifactory_publish_repoKey=libs-snapshot-local + ./gradlew -Dorg.gradle.parallel=false assemble artifactoryPublish -Partifactory_publish_contextUrl=https://repo.spring.io -Partifactory_publish_repoKey=libs-snapshot-local #sign the milestone artifacts and deploy them to Artifactory deployMilestone: @@ -76,7 +76,7 @@ jobs: ORG_GRADLE_PROJECT_signingKey: ${{secrets.SIGNING_KEY}} ORG_GRADLE_PROJECT_signingPassword: ${{secrets.SIGNING_PASSPHRASE}} run: | - ./gradlew assemble sign artifactoryPublish -Partifactory_publish_contextUrl=https://repo.spring.io -Partifactory_publish_repoKey=libs-milestone-local + ./gradlew -Dorg.gradle.parallel=false assemble sign artifactoryPublish -Partifactory_publish_contextUrl=https://repo.spring.io -Partifactory_publish_repoKey=libs-milestone-local #sign the release artifacts and deploy them to Artifactory deployRelease: @@ -100,8 +100,8 @@ jobs: ORG_GRADLE_PROJECT_sonatypeUsername: ${{secrets.SONATYPE_USERNAME}} ORG_GRADLE_PROJECT_sonatypePassword: ${{secrets.SONATYPE_PASSWORD}} run: | - # ./gradlew assemble sign artifactoryPublish -Partifactory_publish_contextUrl=https://repo.spring.io -Partifactory_publish_repoKey=libs-release-local publishMavenJavaPublicationToSonatypeRepository - ./gradlew assemble sign publishMavenJavaPublicationToSonatypeRepository + # ./gradlew -Dorg.gradle.parallel=false assemble sign artifactoryPublish -Partifactory_publish_contextUrl=https://repo.spring.io -Partifactory_publish_repoKey=libs-release-local publishMavenJavaPublicationToSonatypeRepository + ./gradlew -Dorg.gradle.parallel=false assemble sign publishMavenJavaPublicationToSonatypeRepository tagMilestone: name: Tag milestone From 92c8ea05eaa4e009fe5459bd4a1fe51b244bcc52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dariusz=20J=C4=99drzejczyk?= Date: Tue, 9 Apr 2024 11:10:40 +0200 Subject: [PATCH 5/5] [release] Next development version 3.4.38-SNAPSHOT --- .github/workflows/publish.yml | 7 +++---- gradle.properties | 2 +- gradle/libs.versions.toml | 4 ++-- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 4a291a6706..47d49409ea 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -93,15 +93,14 @@ jobs: java-version: 8 - name: deploy env: - # ORG_GRADLE_PROJECT_artifactory_publish_username: ${{secrets.ARTIFACTORY_USERNAME}} - # ORG_GRADLE_PROJECT_artifactory_publish_password: ${{secrets.ARTIFACTORY_PASSWORD}} + ORG_GRADLE_PROJECT_artifactory_publish_username: ${{secrets.ARTIFACTORY_USERNAME}} + ORG_GRADLE_PROJECT_artifactory_publish_password: ${{secrets.ARTIFACTORY_PASSWORD}} ORG_GRADLE_PROJECT_signingKey: ${{secrets.SIGNING_KEY}} ORG_GRADLE_PROJECT_signingPassword: ${{secrets.SIGNING_PASSPHRASE}} ORG_GRADLE_PROJECT_sonatypeUsername: ${{secrets.SONATYPE_USERNAME}} 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 - ./gradlew -Dorg.gradle.parallel=false assemble sign publishMavenJavaPublicationToSonatypeRepository + ./gradlew -Dorg.gradle.parallel=false assemble sign artifactoryPublish -Partifactory_publish_contextUrl=https://repo.spring.io -Partifactory_publish_repoKey=libs-release-local publishMavenJavaPublicationToSonatypeRepository tagMilestone: name: Tag milestone diff --git a/gradle.properties b/gradle.properties index 4605e7e973..d71e02f8a3 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -version=3.4.37 +version=3.4.38-SNAPSHOT bomVersion=2020.0.43 org.gradle.parallel=true diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index d38308f6ec..c9cbd3e760 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.4.36" -baselinePerfCore = "3.4.36" +baseline-core-api = "3.4.37" +baselinePerfCore = "3.4.37" baselinePerfExtra = "3.4.10" # Other shared versions