Skip to content

Commit d5829cf

Browse files
authored
Java21 (#7784)
1 parent 2a0ad44 commit d5829cf

File tree

11 files changed

+16
-38
lines changed

11 files changed

+16
-38
lines changed

.github/workflows/benchmark-tags.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
3232
with:
3333
distribution: temurin
34-
java-version: 17
34+
java-version: 21
3535

3636
- name: Set up gradle
3737
uses: gradle/actions/setup-gradle@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # v5.0.0

.github/workflows/benchmark.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
3434
with:
3535
distribution: temurin
36-
java-version: 17
36+
java-version: 21
3737

3838
- name: Set up gradle
3939
uses: gradle/actions/setup-gradle@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # v5.0.0

.github/workflows/build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ jobs:
6666
uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
6767
with:
6868
distribution: temurin
69-
java-version: 17
69+
java-version: 21
7070

7171
- name: Set up gradle
7272
uses: gradle/actions/setup-gradle@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # v5.0.0
@@ -143,7 +143,7 @@ jobs:
143143
uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
144144
with:
145145
distribution: temurin
146-
java-version: 17
146+
java-version: 21
147147

148148
- name: Set up gradle
149149
uses: gradle/actions/setup-gradle@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # v5.0.0

.github/workflows/codeql.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,12 @@ jobs:
3333
steps:
3434
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
3535

36-
- name: Set up Java 17
36+
- name: Set up Java 21
3737
if: matrix.language == 'java'
3838
uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
3939
with:
4040
distribution: temurin
41-
java-version: 17
41+
java-version: 21
4242

4343
- name: Set up gradle
4444
if: matrix.language == 'java'

.github/workflows/javadoc-crawler.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
- uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
1818
with:
1919
distribution: temurin
20-
java-version: 17
20+
java-version: 21
2121

2222
- name: Set up gradle
2323
uses: gradle/actions/setup-gradle@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # v5.0.0

.github/workflows/owasp-dependency-check-daily.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
- uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
2020
with:
2121
distribution: temurin
22-
java-version: 17
22+
java-version: 21
2323

2424
- name: Set up gradle
2525
uses: gradle/actions/setup-gradle@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # v5.0.0

.github/workflows/release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
- uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
2626
with:
2727
distribution: temurin
28-
java-version: 17
28+
java-version: 21
2929

3030
- name: Set up gradle
3131
uses: gradle/actions/setup-gradle@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # v5.0.0
@@ -183,7 +183,7 @@ jobs:
183183
uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
184184
with:
185185
distribution: temurin
186-
java-version: 17
186+
java-version: 21
187187

188188
- name: Set up Gradle
189189
uses: gradle/actions/setup-gradle@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # v5.0.0

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ automatic check once you submit a PR, but you can also sign it after opening you
1616

1717
## Requirements
1818

19-
Java 17 or higher is required to build the projects in this repository. The built artifacts can be
19+
Java 21 or higher is required to build the projects in this repository. The built artifacts can be
2020
used on Java 8 or higher.
2121

2222
## Building opentelemetry-java

buildSrc/build.gradle.kts

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -5,23 +5,6 @@ plugins {
55
id("com.diffplug.spotless") version "8.0.0"
66
}
77

8-
if (!hasLauncherForJavaVersion(17)) {
9-
throw GradleException(
10-
"JDK 17 is required to build and gradle was unable to detect it on the system. " +
11-
"Please install it and see https://docs.gradle.org/current/userguide/toolchains.html#sec:auto_detection " +
12-
"for details on how gradle detects java toolchains."
13-
)
14-
}
15-
16-
fun hasLauncherForJavaVersion(version: Int): Boolean {
17-
return try {
18-
javaToolchains.launcherFor { languageVersion = JavaLanguageVersion.of(version) }.get()
19-
true
20-
} catch (e: Exception) {
21-
false
22-
}
23-
}
24-
258
spotless {
269
kotlinGradle {
2710
ktlint().editorConfigOverride(mapOf(
@@ -68,11 +51,3 @@ dependencies {
6851
implementation("org.owasp:dependency-check-gradle:12.1.8")
6952
implementation("ru.vyarus:gradle-animalsniffer-plugin:2.0.1")
7053
}
71-
72-
// We can't apply conventions to this build so include important ones such as the Java compilation
73-
// target.
74-
java {
75-
toolchain {
76-
languageVersion.set(JavaLanguageVersion.of(17))
77-
}
78-
}

buildSrc/src/main/kotlin/otel.java-conventions.gradle.kts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ tasks.withType<AbstractArchiveTask>().configureEach {
3333

3434
java {
3535
toolchain {
36-
languageVersion.set(JavaLanguageVersion.of(17))
36+
languageVersion.set(JavaLanguageVersion.of(21))
3737
}
3838

3939
withJavadocJar()
@@ -88,6 +88,8 @@ tasks {
8888
"-Xlint:-processing",
8989
// We suppress the "options" warning because it prevents compilation on modern JDKs
9090
"-Xlint:-options",
91+
"-Xlint:-serial",
92+
"-Xlint:-this-escape",
9193
// Fail build on any warning
9294
"-Werror",
9395
),

0 commit comments

Comments
 (0)