From 49a91721b3d8dfa93879e2ff5e624238270c7c26 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 5 Jan 2026 08:27:09 +0000
Subject: [PATCH 1/3] fix(deps): update dependency checkstyle to v13

---
 buildSrc/src/main/kotlin/otel.java-conventions.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/buildSrc/src/main/kotlin/otel.java-conventions.gradle.kts b/buildSrc/src/main/kotlin/otel.java-conventions.gradle.kts
index aeccb69..b8af57c 100644
--- a/buildSrc/src/main/kotlin/otel.java-conventions.gradle.kts
+++ b/buildSrc/src/main/kotlin/otel.java-conventions.gradle.kts
@@ -24,7 +24,7 @@ java {
 
 checkstyle {
   configDirectory.set(file("$rootDir/buildscripts/"))
-  toolVersion = "12.3.1"
+  toolVersion = "13.0.0"
   isIgnoreFailures = false
   configProperties["rootDir"] = rootDir
 }

From 9ce9072e09e74f89b8f5a707857e2ce24dc47673 Mon Sep 17 00:00:00 2001
From: Lauri Tulmin <ltulmin@splunk.com>
Date: Mon, 5 Jan 2026 10:28:48 +0200
Subject: [PATCH 2/3] use java 21

---
 .github/workflows/build-common.yml | 2 +-
 .github/workflows/codeql.yml       | 4 ++--
 .github/workflows/release.yml      | 4 ++--
 CONTRIBUTING.md                    | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/build-common.yml b/.github/workflows/build-common.yml
index f67cff2..2e060e6 100644
--- a/.github/workflows/build-common.yml
+++ b/.github/workflows/build-common.yml
@@ -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
 
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index 1d47f79..8401fd1 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -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'
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 5afd30c..fbb63e4 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -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
 
@@ -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
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 1fa318b..dc2fa4e 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -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:
 

From aa894132312a29443585c17f44577e8fd8d4cabd Mon Sep 17 00:00:00 2001
From: Lauri Tulmin <ltulmin@splunk.com>
Date: Mon, 5 Jan 2026 10:42:55 +0200
Subject: [PATCH 3/3] use java 21

---
 buildSrc/src/main/kotlin/otel.java-conventions.gradle.kts | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/buildSrc/src/main/kotlin/otel.java-conventions.gradle.kts b/buildSrc/src/main/kotlin/otel.java-conventions.gradle.kts
index b8af57c..0eb6cc4 100644
--- a/buildSrc/src/main/kotlin/otel.java-conventions.gradle.kts
+++ b/buildSrc/src/main/kotlin/otel.java-conventions.gradle.kts
@@ -15,7 +15,7 @@ val otelJava = extensions.create<OtelJavaExtension>("otelJava")
 
 java {
   toolchain {
-    languageVersion.set(JavaLanguageVersion.of(17))
+    languageVersion.set(JavaLanguageVersion.of(21))
   }
 
   withJavadocJar()
@@ -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"
         )
       )