Skip to content

Commit d4a8418

Browse files
authored
Merge branch 'open-telemetry:main' into main
2 parents 0cfe7e6 + 613e5d6 commit d4a8418

File tree

7 files changed

+8
-8
lines changed

7 files changed

+8
-8
lines changed

.github/workflows/build-tracecontext-testsuite.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
2323

2424
- name: Login to GitHub package registry
25-
uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0
25+
uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 # v3.5.0
2626
with:
2727
registry: ghcr.io
2828
username: ${{ github.repository_owner }}

.github/workflows/codeql.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
uses: gradle/actions/setup-gradle@ac638b010cf58a27ee6c972d7336334ccaf61c96 # v4.4.1
4646

4747
- name: Initialize CodeQL
48-
uses: github/codeql-action/init@4e828ff8d448a8a6e532957b1811f387a63867e8 # v3.29.4
48+
uses: github/codeql-action/init@51f77329afa6477de8c49fc9c7046c15b9a4e79d # v3.29.5
4949
with:
5050
languages: ${{ matrix.language }}
5151
# using "latest" helps to keep up with the latest Kotlin support
@@ -60,6 +60,6 @@ jobs:
6060
run: ./gradlew assemble --no-build-cache --no-daemon
6161

6262
- name: Perform CodeQL analysis
63-
uses: github/codeql-action/analyze@4e828ff8d448a8a6e532957b1811f387a63867e8 # v3.29.4
63+
uses: github/codeql-action/analyze@51f77329afa6477de8c49fc9c7046c15b9a4e79d # v3.29.5
6464
with:
6565
category: "/language:${{matrix.language}}"

.github/workflows/docker-test-containers-daily.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
runs-on: ubuntu-latest
2828
steps:
2929
- name: Docker login
30-
uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0
30+
uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 # v3.5.0
3131
with:
3232
registry: ghcr.io
3333
username: ${{ github.repository_owner }}

.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@4e828ff8d448a8a6e532957b1811f387a63867e8 # v3.29.4
45+
uses: github/codeql-action/upload-sarif@51f77329afa6477de8c49fc9c7046c15b9a4e79d # v3.29.5
4646
with:
4747
sarif_file: results.sarif

buildSrc/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ repositories {
5050
}
5151

5252
dependencies {
53-
implementation(enforcedPlatform("com.squareup.wire:wire-bom:5.3.5"))
53+
implementation(enforcedPlatform("com.squareup.wire:wire-bom:5.3.6"))
5454
implementation("com.google.auto.value:auto-value-annotations:1.11.0")
5555
// When updating, update above in plugins too
5656
implementation("com.diffplug.spotless:spotless-plugin-gradle:7.2.1")

dependencyManagement/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ val DEPENDENCIES = listOf(
7070
"io.prometheus:prometheus-metrics-exposition-formats-no-protobuf:${prometheusServerVersion}",
7171
"javax.annotation:javax.annotation-api:1.3.2",
7272
"com.github.stefanbirkner:system-rules:1.19.0",
73-
"com.google.api.grpc:proto-google-common-protos:2.59.2",
73+
"com.google.api.grpc:proto-google-common-protos:2.60.0",
7474
"com.google.code.findbugs:jsr305:3.0.2",
7575
"com.google.guava:guava-beta-checker:1.0",
7676
"com.sun.net.httpserver:http:20070405",

settings.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
pluginManagement {
22
plugins {
3-
id("com.gradleup.shadow") version "8.3.8"
3+
id("com.gradleup.shadow") version "8.3.9"
44
id("com.gradle.develocity") version "4.1"
55
id("de.undercouch.download") version "5.6.0"
66
id("org.jsonschema2pojo") version "1.2.2"

0 commit comments

Comments
 (0)