Skip to content

Commit 6b77026

Browse files
committed
Merge branch 'main' into renovate/org.apache.kafka-kafka-clients-4.x
2 parents 36a7990 + 55bd524 commit 6b77026

File tree

35 files changed

+427
-65
lines changed

35 files changed

+427
-65
lines changed

.github/renovate.json5

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
{
22
$schema: 'https://docs.renovatebot.com/renovate-schema.json',
33
extends: [
4-
'config:recommended',
5-
'docker:pinDigests',
6-
'helpers:pinGitHubActionDigests',
4+
'config:best-practices',
5+
'helpers:pinGitHubActionDigestsToSemver',
76
],
87
ignorePresets: [
98
':ignoreModulesAndTests', // needed to keep maven-extension test pom files up-to-date
@@ -165,8 +164,8 @@
165164
{
166165
customType: 'regex',
167166
datasourceTemplate: 'npm',
168-
fileMatch: [
169-
'^.github/workflows/',
167+
managerFilePatterns: [
168+
'/^.github/workflows//',
170169
],
171170
matchStrings: [
172171
'npx (?<depName>[^@]+)@(?<currentValue>[^\\s]+)',

.github/workflows/backport.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
- name: Use CLA approved bot
3030
run: .github/scripts/use-cla-approved-bot.sh
3131

32-
- uses: actions/create-github-app-token@3ff1caaa28b64c9cc276ce0a02e2ff584f3900c5 # v2.0.2
32+
- uses: actions/create-github-app-token@df432ceedc7162793a195dd1713ff69aefc7379e # v2.0.6
3333
id: otelbot-token
3434
with:
3535
app-id: ${{ vars.OTELBOT_APP_ID }}

.github/workflows/codeql.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
uses: gradle/actions/setup-gradle@06832c7b30a0129d7fb559bcc6e43d26f6374244 # v4.3.1
3939

4040
- name: Initialize CodeQL
41-
uses: github/codeql-action/init@45775bd8235c68ba998cffa5171334d58593da47 # v3.28.15
41+
uses: github/codeql-action/init@60168efe1c415ce0f5521ea06d5c2062adbeed1b # v3.28.17
4242
with:
4343
languages: java, actions
4444
# using "latest" helps to keep up with the latest Kotlin support
@@ -52,4 +52,4 @@ jobs:
5252
run: ./gradlew assemble --no-build-cache --no-daemon
5353

5454
- name: Perform CodeQL analysis
55-
uses: github/codeql-action/analyze@45775bd8235c68ba998cffa5171334d58593da47 # v3.28.15
55+
uses: github/codeql-action/analyze@60168efe1c415ce0f5521ea06d5c2062adbeed1b # v3.28.17

.github/workflows/ossf-scorecard.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,6 @@ jobs:
4242
# Upload the results to GitHub's code scanning dashboard (optional).
4343
# Commenting out will disable upload of results to your repo's Code Scanning dashboard
4444
- name: "Upload to code-scanning"
45-
uses: github/codeql-action/upload-sarif@45775bd8235c68ba998cffa5171334d58593da47 # v3.28.15
45+
uses: github/codeql-action/upload-sarif@60168efe1c415ce0f5521ea06d5c2062adbeed1b # v3.28.17
4646
with:
4747
sarif_file: results.sarif

.github/workflows/prepare-patch-release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
- name: Use CLA approved bot
4848
run: .github/scripts/use-cla-approved-bot.sh
4949

50-
- uses: actions/create-github-app-token@3ff1caaa28b64c9cc276ce0a02e2ff584f3900c5 # v2.0.2
50+
- uses: actions/create-github-app-token@df432ceedc7162793a195dd1713ff69aefc7379e # v2.0.6
5151
id: otelbot-token
5252
with:
5353
app-id: ${{ vars.OTELBOT_APP_ID }}

.github/workflows/prepare-release-branch.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ jobs:
5959
- name: Use CLA approved bot
6060
run: .github/scripts/use-cla-approved-bot.sh
6161

62-
- uses: actions/create-github-app-token@3ff1caaa28b64c9cc276ce0a02e2ff584f3900c5 # v2.0.2
62+
- uses: actions/create-github-app-token@df432ceedc7162793a195dd1713ff69aefc7379e # v2.0.6
6363
id: otelbot-token
6464
with:
6565
app-id: ${{ vars.OTELBOT_APP_ID }}
@@ -116,7 +116,7 @@ jobs:
116116
- name: Use CLA approved bot
117117
run: .github/scripts/use-cla-approved-bot.sh
118118

119-
- uses: actions/create-github-app-token@3ff1caaa28b64c9cc276ce0a02e2ff584f3900c5 # v2.0.2
119+
- uses: actions/create-github-app-token@df432ceedc7162793a195dd1713ff69aefc7379e # v2.0.6
120120
id: otelbot-token
121121
with:
122122
app-id: ${{ vars.OTELBOT_APP_ID }}

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ jobs:
221221
- name: Use CLA approved bot
222222
run: .github/scripts/use-cla-approved-bot.sh
223223

224-
- uses: actions/create-github-app-token@3ff1caaa28b64c9cc276ce0a02e2ff584f3900c5 # v2.0.2
224+
- uses: actions/create-github-app-token@df432ceedc7162793a195dd1713ff69aefc7379e # v2.0.6
225225
id: otelbot-token
226226
with:
227227
app-id: ${{ vars.OTELBOT_APP_ID }}

.github/workflows/reusable-markdown-link-check.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,12 @@ jobs:
1212
steps:
1313
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
1414

15-
- uses: lycheeverse/lychee-action@1d97d84f0bc547f7b25f4c2170d87d810dc2fb2c # v2.4.0
15+
- uses: lycheeverse/lychee-action@82202e5e9c2f4ef1a55a3d02563e1cb6041e5332 # v2.4.1
1616
with:
1717
# excluding links to pull requests and issues is done for performance
1818
args: >
1919
--include-fragments
2020
--exclude "^https://github.com/open-telemetry/opentelemetry-java-contrib/(issues|pull)/\\d+$"
2121
--max-retries 6
22+
--max-concurrency 1
2223
.

compressors/compressor-zstd/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ otelJava.moduleName.set("io.opentelemetry.contrib.compressor.zstd")
99
dependencies {
1010
api("io.opentelemetry:opentelemetry-exporter-common")
1111

12-
implementation("com.github.luben:zstd-jni:1.5.7-2")
12+
implementation("com.github.luben:zstd-jni:1.5.7-3")
1313

1414
testImplementation("io.opentelemetry:opentelemetry-sdk-testing")
1515
testImplementation("io.opentelemetry:opentelemetry-exporter-otlp")

dependencyManagement/build.gradle.kts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ dependencies {
1515
// (the constraints section below doesn't have this issue, and will only show up
1616
// as runtime dependencies if they are actually used as runtime dependencies)
1717
api(enforcedPlatform("io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:${otelInstrumentationVersion}"))
18-
api(enforcedPlatform("com.fasterxml.jackson:jackson-bom:2.18.3"))
18+
api(enforcedPlatform("com.fasterxml.jackson:jackson-bom:2.19.0"))
1919

2020
constraints {
2121
api("io.opentelemetry.semconv:opentelemetry-semconv:${semconvVersion}")
@@ -44,7 +44,7 @@ dependencies {
4444
api("com.google.code.findbugs:annotations:3.0.1u2")
4545
api("com.google.code.findbugs:jsr305:3.0.2")
4646
api("com.squareup.okhttp3:okhttp:4.12.0")
47-
api("com.uber.nullaway:nullaway:0.12.6")
47+
api("com.uber.nullaway:nullaway:0.12.7")
4848
api("org.assertj:assertj-core:3.27.3")
4949
api("org.awaitility:awaitility:4.3.0")
5050
api("org.bouncycastle:bcpkix-jdk15on:1.70")
@@ -54,7 +54,7 @@ dependencies {
5454
api("org.testcontainers:kafka:1.21.0")
5555
api("com.lmax:disruptor:3.4.4")
5656
api("org.jctools:jctools-core:4.0.5")
57-
api("tools.profiler:async-profiler:3.0")
57+
api("tools.profiler:async-profiler:4.0")
5858
api("com.blogspot.mydailyjava:weak-lock-free:0.18")
5959
api("org.agrona:agrona:1.22.0")
6060
}

0 commit comments

Comments
 (0)