Skip to content

Commit 7cceb8f

Browse files
authored
Merge branch 'main' into gradle-cache-config
2 parents cb341c2 + d05ba6c commit 7cceb8f

File tree

13 files changed

+24
-14
lines changed

13 files changed

+24
-14
lines changed

.github/renovate.json5

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -190,6 +190,16 @@
190190
'npx (?<depName>[^@]+)@(?<currentValue>[^\\s]+)',
191191
],
192192
},
193+
{
194+
customType: 'regex',
195+
datasourceTemplate: 'npm',
196+
managerFilePatterns: [
197+
'.github/workflows/**',
198+
],
199+
matchStrings: [
200+
'npm install (?<depName>[^@\\s]+)@(?<currentValue>[^\\s]+)',
201+
],
202+
},
193203
{
194204
customType: 'regex',
195205
datasourceTemplate: 'java-version',

.github/workflows/assign-issue-owners.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ jobs:
2020
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
2121

2222
- name: Install js-yaml
23-
run: npm install js-yaml
23+
run: npm install js-yaml@4.1.0
2424

2525
- name: Parse component label and assign owners
26-
uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
26+
uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
2727
with:
2828
script: |
2929
const fs = require('fs');

.github/workflows/assign-reviewers.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,6 @@ jobs:
1818
pull-requests: write # for assigning reviewers
1919
runs-on: ubuntu-latest
2020
steps:
21-
- uses: open-telemetry/assign-reviewers-action@2f4f06ccc561740d5094d9ca5e66dc2392d13e8f # main
21+
- uses: dyladan/component-owners@58bd86e9814d23f1525d0a970682cead459fa783 # v0.1.0
2222
with:
2323
config-file: .github/component_owners.yml

.github/workflows/build-common.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
2525

2626
- name: Set up JDK for running Gradle
27-
uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
27+
uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
2828
with:
2929
distribution: temurin
3030
java-version: 17

.github/workflows/codeql.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050
uses: gradle/actions/setup-gradle@017a9effdb900e5b5b2fddfb590a105619dca3c3 # v4.4.2
5151

5252
- name: Initialize CodeQL
53-
uses: github/codeql-action/init@3c3833e0f8c1c83d449a7478aa59c036a9165498 # v3.29.11
53+
uses: github/codeql-action/init@f1f6e5f6af878fb37288ce1c627459e94dbf7d01 # v3.30.1
5454
with:
5555
languages: ${{ matrix.language }}
5656
# using "linked" helps to keep up with the latest Kotlin support
@@ -65,6 +65,6 @@ jobs:
6565
run: ./gradlew assemble --no-build-cache --no-daemon
6666

6767
- name: Perform CodeQL analysis
68-
uses: github/codeql-action/analyze@3c3833e0f8c1c83d449a7478aa59c036a9165498 # v3.29.11
68+
uses: github/codeql-action/analyze@f1f6e5f6af878fb37288ce1c627459e94dbf7d01 # v3.30.1
6969
with:
7070
category: "/language:${{matrix.language}}"

.github/workflows/copilot-setup-steps.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
2323

2424
- name: Set up JDK for running Gradle
25-
uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
25+
uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
2626
with:
2727
distribution: temurin
2828
java-version: 17

.github/workflows/ossf-scorecard.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,6 @@ jobs:
5252
# Upload the results to GitHub's code scanning dashboard (optional).
5353
# Commenting out will disable upload of results to your repo's Code Scanning dashboard
5454
- name: "Upload to code-scanning"
55-
uses: github/codeql-action/upload-sarif@3c3833e0f8c1c83d449a7478aa59c036a9165498 # v3.29.11
55+
uses: github/codeql-action/upload-sarif@f1f6e5f6af878fb37288ce1c627459e94dbf7d01 # v3.30.1
5656
with:
5757
sarif_file: results.sarif

dependencyManagement/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ dependencies {
5151
api("org.bouncycastle:bcpkix-jdk15on:1.70")
5252
api("org.junit-pioneer:junit-pioneer:1.9.1")
5353
api("org.skyscreamer:jsonassert:1.5.3")
54-
api("org.apache.kafka:kafka-clients:4.0.0")
54+
api("org.apache.kafka:kafka-clients:4.1.0")
5555
api("org.testcontainers:kafka:1.21.3")
5656
api("com.lmax:disruptor:3.4.4")
5757
api("org.jctools:jctools-core:4.0.5")

disk-buffering/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ plugins {
66
id("otel.animalsniffer-conventions")
77
id("com.gradleup.shadow")
88
id("me.champeau.jmh") version "0.7.3"
9-
id("com.squareup.wire") version "5.3.11"
9+
id("com.squareup.wire") version "5.4.0"
1010
}
1111

1212
description = "Exporter implementations that store signals on disk"

gcp-auth-extension/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ dependencies {
2424
compileOnly("io.opentelemetry:opentelemetry-exporter-otlp")
2525

2626
// Only dependencies added to `implementation` configuration will be picked up by Shadow plugin
27-
implementation("com.google.auth:google-auth-library-oauth2-http:1.38.0")
27+
implementation("com.google.auth:google-auth-library-oauth2-http:1.39.0")
2828

2929
// Test dependencies
3030
testCompileOnly("com.google.auto.service:auto-service-annotations")

0 commit comments

Comments
 (0)