spring/spring-framework
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-framework.git synced 2026-10-08 08:09:09 +00:00
Code Issues Projects Releases Wiki Activity

Merge commit 'v7.1.0-M2~1'

Browse Source
This commit is contained in:
Brian Clozel
2026-09-24 14:05:28 +02:00
parent bc45a6a511 0a80de753d
commit f935b8da24
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/build-and-deploy-snapshot.yml
+2 -1
View File
@@ -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
.github/workflows/ci.yml
+1 -1
View File
@@ -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 }}
framework-platform/framework-platform.gradle
+2 -2
View File
@@ -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"))