Skip to content

Commit 124df57

Browse files
committed
Merge remote-tracking branch 'origin/main' into draft-interface-clients-autoconfiguration
# Conflicts: # spring-boot-project/spring-boot-dependencies/build.gradle
2 parents 3a84f4f + 6031d04 commit 124df57

File tree

89 files changed

+914
-316
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

89 files changed

+914
-316
lines changed

.github/actions/build/action.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ inputs:
55
required: false
66
default: '17'
77
description: 'The Java version to compile and test with'
8-
java-distribution:
8+
java-early-access:
99
required: false
10-
default: 'liberica'
11-
description: 'The Java distribution to use for the build'
10+
default: 'false'
11+
description: 'Whether the Java version is in early access'
1212
java-toolchain:
1313
required: false
1414
default: 'false'
@@ -35,7 +35,7 @@ runs:
3535
with:
3636
develocity-access-key: ${{ inputs.develocity-access-key }}
3737
java-version: ${{ inputs.java-version }}
38-
java-distribution: ${{ inputs.java-distribution }}
38+
java-early-access: ${{ inputs.java-early-access }}
3939
java-toolchain: ${{ inputs.java-toolchain }}
4040
- name: Build
4141
id: build

.github/actions/prepare-gradle-build/action.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ inputs:
55
required: false
66
default: '17'
77
description: 'The Java version to use for the build'
8-
java-distribution:
8+
java-early-access:
99
required: false
10-
default: 'liberica'
11-
description: 'The Java distribution to use for the build'
10+
default: 'false'
11+
description: 'Whether the Java version is in early access'
1212
java-toolchain:
1313
required: false
1414
default: 'false'
@@ -27,9 +27,9 @@ runs:
2727
- name: Set Up Java
2828
uses: actions/setup-java@v4
2929
with:
30-
distribution: ${{ inputs.java-distribution }}
30+
distribution: ${{ inputs.java-early-access == 'true' && 'temurin' || 'liberica' }}
3131
java-version: |
32-
${{ inputs.java-version }}
32+
${{ inputs.java-early-access == 'true' && format('{0}-ea', inputs.java-version) || inputs.java-version }}
3333
${{ inputs.java-toolchain == 'true' && '17' || '' }}
3434
- name: Set Up Gradle
3535
uses: gradle/actions/setup-gradle@d9c87d481d55275bb5441eef3fe0e46805f9ef70 # v3.5.0

.github/actions/publish-gradle-plugin/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ runs:
2121
using: composite
2222
steps:
2323
- name: Set Up JFrog CLI
24-
uses: jfrog/setup-jfrog-cli@8bab65dc312163b065ac5b03de6f6a5bdd1bec41 # v4.1.3
24+
uses: jfrog/setup-jfrog-cli@105617d23456a69a92485207c4f28ae12297581d # v4.2.1
2525
env:
2626
JF_ENV_SPRING: ${{ inputs.jfrog-cli-config-token }}
2727
- name: Download Artifacts

.github/actions/sync-to-maven-central/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ runs:
2020
using: composite
2121
steps:
2222
- name: Set Up JFrog CLI
23-
uses: jfrog/setup-jfrog-cli@8bab65dc312163b065ac5b03de6f6a5bdd1bec41 # v4.1.3
23+
uses: jfrog/setup-jfrog-cli@105617d23456a69a92485207c4f28ae12297581d # v4.2.1
2424
env:
2525
JF_ENV_SPRING: ${{ inputs.jfrog-cli-config-token }}
2626
- name: Download Release Artifacts

.github/workflows/ci.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,9 @@ jobs:
2424
toolchain: true
2525
- version: 22
2626
toolchain: true
27+
- version: 23
28+
early-access: true
29+
toolchain: true
2730
exclude:
2831
- os:
2932
name: Linux
@@ -43,7 +46,7 @@ jobs:
4346
uses: ./.github/actions/build
4447
with:
4548
java-version: ${{ matrix.java.version }}
46-
java-distribution: ${{ matrix.java.distribution || 'liberica' }}
49+
java-early-access: ${{ matrix.java.early-access || 'false' }}
4750
java-toolchain: ${{ matrix.java.toolchain }}
4851
develocity-access-key: ${{ secrets.GRADLE_ENTERPRISE_SECRET_ACCESS_KEY }}
4952
- name: Send Notification

.github/workflows/release-milestone.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ jobs:
5353
runs-on: ubuntu-latest
5454
steps:
5555
- name: Set up JFrog CLI
56-
uses: jfrog/setup-jfrog-cli@8bab65dc312163b065ac5b03de6f6a5bdd1bec41 # v4.1.3
56+
uses: jfrog/setup-jfrog-cli@105617d23456a69a92485207c4f28ae12297581d # v4.2.1
5757
env:
5858
JF_ENV_SPRING: ${{ secrets.JF_ARTIFACTORY_SPRING }}
5959
- name: Promote build

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ jobs:
6969
runs-on: ubuntu-latest
7070
steps:
7171
- name: Set up JFrog CLI
72-
uses: jfrog/setup-jfrog-cli@8bab65dc312163b065ac5b03de6f6a5bdd1bec41 # v4.1.3
72+
uses: jfrog/setup-jfrog-cli@105617d23456a69a92485207c4f28ae12297581d # v4.2.1
7373
env:
7474
JF_ENV_SPRING: ${{ secrets.JF_ARTIFACTORY_SPRING }}
7575
- name: Promote build

.idea/.gitignore

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gradle.properties

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@ graalVersion=22.3
1111
hamcrestVersion=2.2
1212
jacksonVersion=2.17.2
1313
junitJupiterVersion=5.10.3
14-
kotlinVersion=1.9.24
14+
kotlinVersion=1.9.25
1515
mavenVersion=3.9.4
1616
nativeBuildToolsVersion=0.10.2
17-
springFrameworkVersion=6.2.0-M6
17+
springFrameworkVersion=6.2.0-SNAPSHOT
1818
springFramework60xVersion=6.0.21
19-
tomcatVersion=10.1.26
19+
tomcatVersion=10.1.28
2020
snakeYamlVersion=2.2
2121

2222
kotlin.stdlib.default.dependency=false

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/logging/opentelemetry/otlp/OtlpLoggingConfigurations.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ static class PropertiesOtlpLoggingConnectionDetails implements OtlpLoggingConnec
5959
}
6060

6161
@Override
62-
public String getEndpoint() {
62+
public String getUrl() {
6363
return this.properties.getEndpoint();
6464
}
6565

@@ -77,7 +77,7 @@ static class Exporters {
7777
OtlpHttpLogRecordExporter otlpHttpLogRecordExporter(OtlpLoggingProperties properties,
7878
OtlpLoggingConnectionDetails connectionDetails) {
7979
OtlpHttpLogRecordExporterBuilder builder = OtlpHttpLogRecordExporter.builder()
80-
.setEndpoint(connectionDetails.getEndpoint())
80+
.setEndpoint(connectionDetails.getUrl())
8181
.setCompression(properties.getCompression().name().toLowerCase(Locale.US))
8282
.setTimeout(properties.getTimeout());
8383
properties.getHeaders().forEach(builder::addHeader);

0 commit comments

Comments
 (0)