Merge branch 'main' into renovate/com.fasterxml.jackson-jackson-bom-2.x

signalfx · Nov 17, 2023 · f40906d · f40906d
2 parents 01a8d94 + db5055f
commit f40906d
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 5 deletions.
diff --git a/.github/workflows/publish-docker-image-ghcr.yml b/.github/workflows/publish-docker-image-ghcr.yml
@@ -42,7 +42,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: build and publish container
-        uses: docker/build-push-action@v5.0.0
+        uses: docker/build-push-action@v5.1.0
         with:
           push: true
           file: Dockerfile-ghcr

diff --git a/.github/workflows/publish-profiling-petclinic-base.yml b/.github/workflows/publish-profiling-petclinic-base.yml
@@ -21,7 +21,7 @@ jobs:
           username: ${{ github.repository_owner }}
           password: ${{ secrets.GITHUB_TOKEN }}
       - name: push to gh packages
-        uses: docker/build-push-action@v5.0.0
+        uses: docker/build-push-action@v5.1.0
         with:
           push: true
           file: smoke-tests/profiling-base-petclinic/linux/Dockerfile

diff --git a/dependencyManagement/build.gradle.kts b/dependencyManagement/build.gradle.kts
@@ -13,7 +13,7 @@ val dockerJavaVersion = "3.3.4"
 val micrometerOldVersion = "1.3.20"
 val micrometerVersion = "1.11.5"
 val mockitoVersion = "5.7.0"
-val protobufVersion = "3.25.0"
+val protobufVersion = "3.25.1"
 val slf4jVersion = "2.0.9"
 
 // instrumentation version is used to compute Implementation-Version manifest attribute

diff --git a/licenses/licenses.md b/licenses/licenses.md
@@ -1,7 +1,10 @@
 
 # splunk-otel-javaagent
 ## Dependency License Report
+
 _2023-11-17 17:36:47 EET_
+=======
+
 ## Apache License, Version 2.0
 
 **1** **Group:** `com.fasterxml.jackson.core` **Name:** `jackson-core` **Version:** `2.16.0` 
@@ -249,7 +252,7 @@ _2023-11-17 17:36:47 EET_
 
 ## The 3-Clause BSD License
 
-**49** **Group:** `com.google.protobuf` **Name:** `protobuf-java` **Version:** `3.25.0` 
+**49** **Group:** `com.google.protobuf` **Name:** `protobuf-java` **Version:** `3.25.1` 
 > - **Manifest Project URL**: [https://developers.google.com/protocol-buffers/](https://developers.google.com/protocol-buffers/)
 > - **Manifest License**: The 3-Clause BSD License (Not Packaged)
 > - **POM License**: The 3-Clause BSD License - [https://opensource.org/licenses/BSD-3-Clause](https://opensource.org/licenses/BSD-3-Clause)

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -1,6 +1,6 @@
 pluginManagement {
   plugins {
-    id("com.bmuschko.docker-remote-api") version "9.3.6"
+    id("com.bmuschko.docker-remote-api") version "9.3.7"
     id("com.github.johnrengelman.shadow") version "8.1.1"
     id("io.github.gradle-nexus.publish-plugin") version "1.3.0"
     id("com.github.jk1.dependency-license-report") version "2.5"