From 81c662ebd00908d76b5a01a206677881fee8bccc Mon Sep 17 00:00:00 2001 From: Brian Clozel Date: Wed, 9 Sep 2026 11:32:06 +0200 Subject: [PATCH 1/3] Switch to 7.1.0-INTERNAL-SNAPSHOT --- .github/workflows/build-and-deploy-snapshot.yml | 3 ++- .github/workflows/ci.yml | 2 +- gradle.properties | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-and-deploy-snapshot.yml b/.github/workflows/build-and-deploy-snapshot.yml index 43df57a7a3f..19d5c09ea31 100644 --- a/.github/workflows/build-and-deploy-snapshot.yml +++ b/.github/workflows/build-and-deploy-snapshot.yml @@ -3,6 +3,7 @@ on: push: branches: - 'main' + - 'main-internal' concurrency: group: ${{ github.workflow }}-${{ github.ref }} jobs: @@ -22,7 +23,7 @@ jobs: commercial-repository-password: ${{ secrets.COMMERCIAL_ARTIFACTORY_PASSWORD }} commercial-repository-username: ${{ secrets.COMMERCIAL_ARTIFACTORY_USERNAME }} commercial-snapshot-repository-url: ${{ vars.COMMERCIAL_SNAPSHOT_REPO_URL }} - develocity-access-key: ${{ secrets.DEVELOCITY_ACCESS_KEY }} + develocity-access-key: ${{ vars.COMMERCIAL && secrets.DEVELOCITY_ACCESS_KEY }} publish: true - name: Deploy uses: spring-io/artifactory-deploy-action@aba148f1541e09adcf5735af90029fac9a6d3083 # v0.0.5 diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 99689494921..aa7b488cddd 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -46,7 +46,7 @@ jobs: commercial-repository-password: ${{ secrets.COMMERCIAL_ARTIFACTORY_PASSWORD }} commercial-repository-username: ${{ secrets.COMMERCIAL_ARTIFACTORY_USERNAME }} commercial-snapshot-repository-url: ${{ vars.COMMERCIAL_SNAPSHOT_REPO_URL }} - develocity-access-key: ${{ secrets.DEVELOCITY_ACCESS_KEY }} + develocity-access-key: ${{ vars.COMMERCIAL && secrets.DEVELOCITY_ACCESS_KEY }} java-early-access: ${{ matrix.java.early-access || 'false' }} java-distribution: ${{ matrix.java.distribution }} java-toolchain: ${{ matrix.java.toolchain }} diff --git a/gradle.properties b/gradle.properties index a5fb6a5f5ef..d1600ac3c74 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -version=7.1.0-SNAPSHOT +version=7.1.0-INTERNAL-SNAPSHOT org.gradle.caching=true org.gradle.jvmargs=-Xmx2048m From b3951be094d86aced69d73929819b97cd6ddd0eb Mon Sep 17 00:00:00 2001 From: Brian Clozel Date: Wed, 9 Sep 2026 11:40:32 +0200 Subject: [PATCH 2/3] Switch to INTERNAL-SNAPSHOT versions --- framework-platform/framework-platform.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/framework-platform/framework-platform.gradle b/framework-platform/framework-platform.gradle index dc8e30db1a4..3d27cb3ddff 100644 --- a/framework-platform/framework-platform.gradle +++ b/framework-platform/framework-platform.gradle @@ -8,9 +8,9 @@ javaPlatform { dependencies { api(platform("com.fasterxml.jackson:jackson-bom:2.21.6")) - api(platform("io.micrometer:micrometer-bom:1.18.0-SNAPSHOT")) + api(platform("io.micrometer:micrometer-bom:1.18.0-INTERNAL-SNAPSHOT")) api(platform("io.netty:netty-bom:4.2.18.Final")) - api(platform("io.projectreactor:reactor-bom:2026.0.0-SNAPSHOT")) + api(platform("io.projectreactor:reactor-bom:2026.0.0-INTERNAL-SNAPSHOT")) api(platform("io.rsocket:rsocket-bom:1.1.5")) api(platform("org.apache.groovy:groovy-bom:5.1.2")) api(platform("org.apache.logging.log4j:log4j-bom:2.26.1")) From 0a80de753d2fe660649ff72e0fcb867774dd4934 Mon Sep 17 00:00:00 2001 From: Brian Clozel Date: Wed, 9 Sep 2026 11:41:42 +0200 Subject: [PATCH 3/3] Switch to released versions --- framework-platform/framework-platform.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/framework-platform/framework-platform.gradle b/framework-platform/framework-platform.gradle index 3d27cb3ddff..0b515dd4258 100644 --- a/framework-platform/framework-platform.gradle +++ b/framework-platform/framework-platform.gradle @@ -8,9 +8,9 @@ javaPlatform { dependencies { api(platform("com.fasterxml.jackson:jackson-bom:2.21.6")) - api(platform("io.micrometer:micrometer-bom:1.18.0-INTERNAL-SNAPSHOT")) + api(platform("io.micrometer:micrometer-bom:1.18.0-M2")) api(platform("io.netty:netty-bom:4.2.18.Final")) - api(platform("io.projectreactor:reactor-bom:2026.0.0-INTERNAL-SNAPSHOT")) + api(platform("io.projectreactor:reactor-bom:2026.0.0-M2")) api(platform("io.rsocket:rsocket-bom:1.1.5")) api(platform("org.apache.groovy:groovy-bom:5.1.2")) api(platform("org.apache.logging.log4j:log4j-bom:2.26.1"))