Skip to content

Commit d8c3d93

Browse files
renovate[bot]trask
andauthored
Update dependency java to v26 (#2744)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>
1 parent 5a76ebb commit d8c3d93

File tree

3 files changed

+8
-7
lines changed

3 files changed

+8
-7
lines changed

.github/renovate.json5

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -300,15 +300,15 @@
300300
},
301301
{
302302
customType: 'regex',
303-
datasourceTemplate: 'java-version',
303+
datasourceTemplate: 'docker',
304304
managerFilePatterns: [
305305
'.github/workflows/**',
306306
],
307307
matchStrings: [
308308
'(?<currentValue>\\d+) # renovate\\(java-version\\)',
309309
],
310-
depNameTemplate: 'java',
311-
extractVersionTemplate: '^(?<version>\\d+)',
310+
// using zulu because new releases get published quickly
311+
depNameTemplate: 'azul/zulu-openjdk',
312312
},
313313
{
314314
customType: 'regex',

.github/workflows/build-common.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,15 +94,16 @@ jobs:
9494
- 11
9595
- 17
9696
- 21
97-
- 25 # renovate(java-version)
97+
- 26 # renovate(java-version)
9898
steps:
9999
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
100100

101101
- id: setup-java-test
102102
name: Set up Java ${{ matrix.test-java-version }} for tests
103103
uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
104104
with:
105-
distribution: temurin
105+
# using zulu because new releases get published quickly
106+
distribution: zulu
106107
java-version: ${{ matrix.test-java-version }}
107108

108109
- 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)