Merge branch 'main' into update

trask · web-flow · commit c3b90fbc9306 · 2025-05-14T17:25:56.000-07:00
diff --git a/.github/workflows/fossa.yml b/.github/workflows/fossa.yml
@@ -14,7 +14,7 @@ jobs:
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
-      - uses: fossas/fossa-action@c0a7d013f84c8ee5e910593186598625513cc1e4 # v1.6.0
+      - uses: fossas/fossa-action@3ebcea1862c6ffbd5cf1b4d0bd6b3fe7bd6f2cac # v1.7.0
         with:
           api-key: ${{secrets.FOSSA_API_KEY}}
           team: OpenTelemetry
diff --git a/grpc/build.gradle.kts b/grpc/build.gradle.kts
@@ -16,7 +16,7 @@ java {
 }
 
 var grpcVersion = "1.72.0" // CURRENT_GRPC_VERSION
-var protobufVersion = "4.30.2"
+var protobufVersion = "4.31.0"
 var protocVersion = protobufVersion
 
 dependencies {

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ java {`
`16`	`16`	`}`
`17`	`17`
`18`	`18`	`var grpcVersion = "1.72.0" // CURRENT_GRPC_VERSION`
`19`		`-var protobufVersion = "4.30.2"`
	`19`	`+var protobufVersion = "4.31.0"`
`20`	`20`	`var protocVersion = protobufVersion`
`21`	`21`
`22`	`22`	`dependencies {`