From 860b7a007598450ae5793e366eed7d751b41b037 Mon Sep 17 00:00:00 2001 From: Violeta Georgieva Date: Tue, 15 Nov 2022 10:38:53 +0200 Subject: [PATCH 1/4] [release] Back to snapshots, next is 3.4.10-SNAPSHOT --- gradle.properties | 2 +- gradle/libs.versions.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index 5033b141d..a88ed424c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1 +1 @@ -version=3.4.9 \ No newline at end of file +version=3.4.10-SNAPSHOT \ No newline at end of file diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 42e6794ea..e0a5107ba 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,5 +1,5 @@ [versions] -reactorCore = "3.4.25" +reactorCore = "3.4.26-SNAPSHOT" # Other shared versions kotlin = "1.5.32" reactiveStreams = "1.0.3" From 1143abf47e6ac4005abd6ab4d8d94d9e0c03d5bf Mon Sep 17 00:00:00 2001 From: Violeta Georgieva Date: Wed, 18 Jan 2023 13:50:11 +0200 Subject: [PATCH 2/4] Use new `GitHub Actions` API for setting output (#290) Related to reactor/reactor#727 --- gradle/setup.gradle | 31 +++++++++++++++++++++++++++---- 1 file changed, 27 insertions(+), 4 deletions(-) diff --git a/gradle/setup.gradle b/gradle/setup.gradle index e09402829..dfe877961 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-2023 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. @@ -50,16 +50,39 @@ static def qualifyVersion(String v) { return "BAD" } +static def outputToGha(String versionType, String fullVersion) { + def ghaFilename = System.getenv("GITHUB_OUTPUT") + if (ghaFilename == null) { + println "::set-output name=versionType::$versionType" + println "::set-output name=fullVersion::$fullVersion" + } + else { + println "using GITHUB_OUTPUT file" + def ghaFile = new File(ghaFilename) + ghaFile.withWriterAppend { + it.newLine() + it.append("versionType=$versionType") + it.newLine() + it.append("fullVersion=$fullVersion") + } + } +} + task qualifyVersionGha() { doLast { def versionType = qualifyVersion("$version") - - println "::set-output name=versionType::$versionType" - println "::set-output name=fullVersion::$version" + //we ensure that if at least _one_ submodule version is BAD, we only output versionType=BAD + job fails if (versionType == "BAD") { + outputToGha(versionType, version) println "::error ::Unable to parse $version to a VersionNumber with recognizable qualifier" throw new TaskExecutionException(tasks.getByName("qualifyVersionGha"), new IllegalArgumentException("Unable to parse $version to a VersionNumber with recognizable qualifier")) } + println "Recognized $version as $versionType" + + //only output the versionType and fullVersion for the main artifact + if (project.name == 'reactor-adapter') { + outputToGha(versionType, version) + } } } From 5a1fee1b03aadf368d2583ab417ac4607e420d30 Mon Sep 17 00:00:00 2001 From: Violeta Georgieva Date: Wed, 18 Jan 2023 14:50:22 +0200 Subject: [PATCH 3/4] Bump versions for actions/checkout and actions/setup-java This fixes warnings about deprecated output style and deprecated Node version being still in use by these actions. --- .github/workflows/publish.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index d8a78951b..ff5eec0bb 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -18,9 +18,9 @@ jobs: versionType: ${{ steps.version.outputs.versionType }} fullVersion: ${{ steps.version.outputs.fullVersion }} steps: - - uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579 # renovate: tag=v2 + - uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # tag=v3 - name: setup java - uses: actions/setup-java@f0bb91606209742fe3ea40199be2f3ef195ecabf # renovate: tag=v2 + uses: actions/setup-java@de1bb2b0c5634f0fc4438d7aa9944e68f9bf86cc # tag=v3 with: distribution: 'temurin' java-version: 8 @@ -42,8 +42,8 @@ jobs: if: needs.prepare.outputs.versionType == 'SNAPSHOT' environment: snapshots steps: - - uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579 # renovate: tag=v2 - - uses: actions/setup-java@f0bb91606209742fe3ea40199be2f3ef195ecabf # renovate: tag=v2 + - uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # tag=v3 + - uses: actions/setup-java@de1bb2b0c5634f0fc4438d7aa9944e68f9bf86cc # tag=v3 with: distribution: 'temurin' java-version: 8 @@ -62,8 +62,8 @@ jobs: if: needs.prepare.outputs.versionType == 'MILESTONE' environment: releases steps: - - uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579 # renovate: tag=v2 - - uses: actions/setup-java@f0bb91606209742fe3ea40199be2f3ef195ecabf # renovate: tag=v2 + - uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # tag=v3 + - uses: actions/setup-java@de1bb2b0c5634f0fc4438d7aa9944e68f9bf86cc # tag=v3 with: distribution: 'temurin' java-version: 8 @@ -84,8 +84,8 @@ jobs: if: needs.prepare.outputs.versionType == 'RELEASE' environment: releases steps: - - uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579 # renovate: tag=v2 - - uses: actions/setup-java@f0bb91606209742fe3ea40199be2f3ef195ecabf # renovate: tag=v2 + - uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # tag=v3 + - uses: actions/setup-java@de1bb2b0c5634f0fc4438d7aa9944e68f9bf86cc # tag=v3 with: distribution: 'temurin' java-version: 8 @@ -107,7 +107,7 @@ jobs: permissions: contents: write steps: - - uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579 # renovate: tag=v2 + - uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # tag=v3 - name: tag run: | git config --local user.name 'reactorbot' @@ -122,7 +122,7 @@ jobs: permissions: contents: write steps: - - uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579 # renovate: tag=v2 + - uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # tag=v3 - name: tag run: | git config --local user.name 'reactorbot' From b4c1b7a49d5423506db3554db8ed60a5f6ddb2ed Mon Sep 17 00:00:00 2001 From: Violeta Georgieva Date: Tue, 14 Mar 2023 11:12:07 +0200 Subject: [PATCH 4/4] [release] Prepare and release 3.4.10 --- README.md | 2 +- gradle.properties | 2 +- gradle/libs.versions.toml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index ba7ce9469..1446bdca2 100644 --- a/README.md +++ b/README.md @@ -36,7 +36,7 @@ Snapshot and pre-release Maven artifacts are provided in the SpringSource snapsh To add this repo to your Gradle build, specify the URL like the following: ext { - reactorAddonsVersion = '3.4.9' + reactorAddonsVersion = '3.4.10' } repositories { diff --git a/gradle.properties b/gradle.properties index a88ed424c..4e239767c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1 +1 @@ -version=3.4.10-SNAPSHOT \ No newline at end of file +version=3.4.10 \ No newline at end of file diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index e0a5107ba..bad609c01 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,5 +1,5 @@ [versions] -reactorCore = "3.4.26-SNAPSHOT" +reactorCore = "3.4.28" # Other shared versions kotlin = "1.5.32" reactiveStreams = "1.0.3"