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/framework-platform/framework-platform.gradle b/framework-platform/framework-platform.gradle index dc8e30db1a4..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-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-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"))