Skip to content

Commit 411f301

Browse files
committed
Update dependency java to v26
This PR contains the following updates: | Package | Update | Change | |---|---|---| | java | major | 25 -> 26 | Ported from open-telemetry/opentelemetry-java-contrib#2744
1 parent 7daa1f3 commit 411f301

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

.github/renovate.json5

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -146,15 +146,15 @@
146146
},
147147
{
148148
customType: 'regex',
149-
datasourceTemplate: 'java-version',
149+
datasourceTemplate: 'docker',
150150
managerFilePatterns: [
151151
'.github/workflows/**',
152152
],
153153
matchStrings: [
154154
'(?<currentValue>\\d+) # renovate\\(java-version\\)',
155155
],
156-
depNameTemplate: 'java',
157-
extractVersionTemplate: '^(?<version>\\d+)',
156+
// using zulu because new releases get published quickly
157+
depNameTemplate: 'azul/zulu-openjdk',
158158
},
159159
{
160160
customType: 'regex',

.github/workflows/build.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
- 11
3232
- 17
3333
- 21
34-
- 25 # renovate(java-version)
34+
- 26 # renovate(java-version)
3535
# Collect coverage on latest LTS
3636
include:
3737
- os: ubuntu-latest
@@ -45,8 +45,8 @@ jobs:
4545
name: Set up Java ${{ matrix.test-java-version }} for tests
4646
uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
4747
with:
48-
# use corretto for testing, since it supports java 8 on more OS versions, including macos-latest
49-
distribution: corretto
48+
# using zulu for 26 because new releases get published quickly
49+
distribution: zulu
5050
java-version: ${{ matrix.test-java-version }}
5151

5252
- id: setup-java

custom-checks/src/test/java/io/opentelemetry/gradle/customchecks/OtelDeprecatedApiUsageTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -181,9 +181,9 @@ void positiveCases_externalDeprecatedApi() {
181181
"ExternalDeprecated.java",
182182
"package test;",
183183
"public class ExternalDeprecated {",
184-
" void method(Thread t) {",
184+
" void method() {",
185185
" // BUG: Diagnostic contains: Use of deprecated API",
186-
" t.stop();",
186+
" new Boolean(false);",
187187
" }",
188188
"}")
189189
.doTest();

0 commit comments

Comments
 (0)