Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build-common.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ jobs:
uses: actions/setup-java@f2beeb24e141e01a676f977032f5a29d81c9e27e # v5.1.0
with:
distribution: temurin
java-version: 17
java-version: 21

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

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,12 @@ jobs:
steps:
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1

- name: Set up Java 17
- name: Set up Java 21
if: matrix.language == 'java'
uses: actions/setup-java@f2beeb24e141e01a676f977032f5a29d81c9e27e # v5.1.0
with:
distribution: temurin
java-version: 17
java-version: 21

- name: Set up gradle
if: matrix.language == 'java'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
- uses: actions/setup-java@f2beeb24e141e01a676f977032f5a29d81c9e27e # v5.1.0
with:
distribution: temurin
java-version: 17
java-version: 21

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

Expand Down Expand Up @@ -175,7 +175,7 @@ jobs:
- uses: actions/setup-java@f2beeb24e141e01a676f977032f5a29d81c9e27e # v5.1.0
with:
distribution: temurin
java-version: 17
java-version: 21

- name: Setup Gradle
uses: gradle/actions/setup-gradle@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # v5.0.0
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Welcome to the OpenTelemetry Semantic Convention Java repository!

## Building

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

Expand Down
9 changes: 6 additions & 3 deletions buildSrc/src/main/kotlin/otel.java-conventions.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ val otelJava = extensions.create<OtelJavaExtension>("otelJava")

java {
toolchain {
languageVersion.set(JavaLanguageVersion.of(17))
languageVersion.set(JavaLanguageVersion.of(21))
}

withJavadocJar()
Expand All @@ -24,7 +24,7 @@ java {

checkstyle {
configDirectory.set(file("$rootDir/buildscripts/"))
toolVersion = "12.3.1"
toolVersion = "13.0.0"
isIgnoreFailures = false
configProperties["rootDir"] = rootDir
}
Expand All @@ -37,9 +37,12 @@ tasks {
release.set(8)

compilerArgs.addAll(

listOf(
// Fail build on any warning
"-Werror"
"-Werror",
// Suppress warning about java 8 deprecation
"-Xlint:-options"
)
)

Expand Down