Skip to content

Commit 60c9a53

Browse files
fix(deps): update dependency checkstyle to v13 (#375)
* fix(deps): update dependency checkstyle to v13 * use java 21 * use java 21 --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Lauri Tulmin <ltulmin@splunk.com>
1 parent 9f1c149 commit 60c9a53

5 files changed

Lines changed: 12 additions & 9 deletions

File tree

.github/workflows/build-common.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ jobs:
6969
uses: actions/setup-java@f2beeb24e141e01a676f977032f5a29d81c9e27e # v5.1.0
7070
with:
7171
distribution: temurin
72-
java-version: 17
72+
java-version: 21
7373

7474
- uses: gradle/actions/setup-gradle@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # v5.0.0
7575

.github/workflows/codeql.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,12 @@ jobs:
3131
steps:
3232
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
3333

34-
- name: Set up Java 17
34+
- name: Set up Java 21
3535
if: matrix.language == 'java'
3636
uses: actions/setup-java@f2beeb24e141e01a676f977032f5a29d81c9e27e # v5.1.0
3737
with:
3838
distribution: temurin
39-
java-version: 17
39+
java-version: 21
4040

4141
- name: Set up gradle
4242
if: matrix.language == 'java'

.github/workflows/release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
- uses: actions/setup-java@f2beeb24e141e01a676f977032f5a29d81c9e27e # v5.1.0
3333
with:
3434
distribution: temurin
35-
java-version: 17
35+
java-version: 21
3636

3737
- uses: gradle/actions/setup-gradle@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # v5.0.0
3838

@@ -175,7 +175,7 @@ jobs:
175175
- uses: actions/setup-java@f2beeb24e141e01a676f977032f5a29d81c9e27e # v5.1.0
176176
with:
177177
distribution: temurin
178-
java-version: 17
178+
java-version: 21
179179

180180
- name: Setup Gradle
181181
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
@@ -4,7 +4,7 @@ Welcome to the OpenTelemetry Semantic Convention Java repository!
44

55
## Building
66

7-
Java 17 or higher is required to build the projects in this repository
7+
Java 21 or higher is required to build the projects in this repository
88
(the built artifacts can be used on Java 8 or higher).
99
To check your Java version, run:
1010

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ val otelJava = extensions.create<OtelJavaExtension>("otelJava")
1515

1616
java {
1717
toolchain {
18-
languageVersion.set(JavaLanguageVersion.of(17))
18+
languageVersion.set(JavaLanguageVersion.of(21))
1919
}
2020

2121
withJavadocJar()
@@ -24,7 +24,7 @@ java {
2424

2525
checkstyle {
2626
configDirectory.set(file("$rootDir/buildscripts/"))
27-
toolVersion = "12.3.1"
27+
toolVersion = "13.0.0"
2828
isIgnoreFailures = false
2929
configProperties["rootDir"] = rootDir
3030
}
@@ -37,9 +37,12 @@ tasks {
3737
release.set(8)
3838

3939
compilerArgs.addAll(
40+
4041
listOf(
4142
// Fail build on any warning
42-
"-Werror"
43+
"-Werror",
44+
// Suppress warning about java 8 deprecation
45+
"-Xlint:-options"
4346
)
4447
)
4548

0 commit comments

Comments
 (0)