Merge branch 'master' into update/collector-0.20.0

.github/workflows/ci.yml

@@ -3,6 +3,8 @@ on:
   push:
     branches: ["**"]
     tags: ["v*"]
+  pull_request:
+    branches: ["master"]
 
 permissions:
   contents: read
@@ -28,22 +30,23 @@ jobs:
       - name: Run tests and coverage
         run: |-
           cp .jvmopts-ci .jvmopts
-          sbt coverage test coverageReport && bash <(curl -s https://codecov.io/bash)  
+          sbt coverage test coverageReport && bash <(curl -s https://codecov.io/bash)
       - name: Prepare draft release notes
-        # Run this step only for pushes to the master branch or for tags starting with 'v'
-        if: ${{ github.event_name == 'push' && (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/v')) }}
+        # Run this step only in the original repo and for pushes to the master branch or for tags starting with 'v'
+        if: ${{ github.event_name == 'push' && (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/v')) && ! github.event.repository.fork }}
         continue-on-error: true
         uses: release-drafter/release-drafter@v6
         with:
           config-name: release-drafter.yml
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
   publish-sonatype:
     permissions:
       contents: write
       pull-requests: write
     name: Publish to Sonatype
-    # Publish to Sonatype only on tags starting with 'v' (stable releases) and not from forked repositories
+    # Publish to Sonatype only from the original repo and for the tags starting with 'v'
     if: ${{ github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v') && ! github.event.repository.fork }}
     needs: [ci]
     runs-on: ubuntu-latest
@@ -65,13 +68,14 @@ jobs:
           PGP_SECRET: ${{ secrets.PGP_SECRET }}
           SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
           SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
+
   publish-azure:
     permissions:
       contents: write
       pull-requests: write
     name: Publish to Azure
-    # Publish to Azure only for non-tag references (e.g., all the pushes to default and other branches) and not from forked repositories
-    if: ${{ ! startsWith(github.ref, 'refs/tags/') && ! github.event.repository.fork }}
+    # Publish to Azure all the commits for all the branches from the original repo except for tags.
+    if: ${{ github.event_name == 'push' && ! startsWith(github.ref, 'refs/tags/') && ! github.event.repository.fork }}
     needs: [ci]
     runs-on: ubuntu-latest
     steps:
@@ -91,13 +95,13 @@ jobs:
           AZURE_FEEDUSER: ${{ secrets.AZURE_FEEDUSER }}
           AZURE_FEEDPASSWORD: ${{ secrets.AZURE_FEEDPASSWORD }}
           AZURE_FEEDURL: ${{ secrets.AZURE_FEEDURL }}
+
   dependency-submission:
     name: Submit dependency graph
     continue-on-error: true
     needs: [ci]
-    # run on 1) master branch
-    # do not run on pull requests
-    if: github.event_name != 'pull_request' && github.ref == 'refs/heads/master'
+    # Submit dependency graph only for the master branch commits
+    if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }}
     runs-on: ubuntu-latest
     permissions:
       contents: write
@@ -112,6 +116,5 @@ jobs:
           distribution: temurin
           java-version: 17
           cache: sbt
-      - name: Submit dependency graph 
-        uses: scalacenter/sbt-dependency-submission@v2
-
+      - name: Submit dependency graph
+        uses: scalacenter/sbt-dependency-submission@v2

build.sbt

@@ -39,7 +39,7 @@ lazy val buildExampleDockerCommand: Command = Command.command("buildExampleDocke
       state
 })
 
-lazy val scala213 = "2.13.14"
+lazy val scala213 = "2.13.15"
 
 lazy val supportedScalaVersions = List(scala213)
 val commonSettings: Seq[Setting[_]] = Defaults.coreDefaultSettings ++ Seq(

project/Dependencies.scala

@@ -31,7 +31,7 @@ object Dependencies {
   val mockitoScalaTest = "org.mockito" %% "mockito-scala-scalatest" % mockitoScalaVersion
   val mockServer = "org.mock-server" % "mockserver-netty" % "5.15.0"
   val junitInterface = "com.github.sbt" % "junit-interface" % "0.13.3"
-  val junitJupiter = "org.junit.jupiter" % "junit-jupiter-engine" % "5.11.0"
+  val junitJupiter = "org.junit.jupiter" % "junit-jupiter-engine" % "5.11.2"
 
   val akkaActor = "com.typesafe.akka" %% "akka-actor" % akkaVersion
 
@@ -80,7 +80,7 @@ object Dependencies {
   val cassandraUnit = "org.cassandraunit" % "cassandra-unit" % "4.3.1.0"
   val cassandraDriverCore = "com.datastax.oss" % "java-driver-core" % "4.17.0"
   val cassandraDriverQueryBuilder = "com.datastax.oss" % "java-driver-query-builder" % "4.17.0"
-  val cassandraDriverMetrics = "io.dropwizard.metrics" % "metrics-jmx" % "4.2.27"
+  val cassandraDriverMetrics = "io.dropwizard.metrics" % "metrics-jmx" % "4.2.28"
 
   val skuber = "io.skuber" %% "skuber" % "2.6.7"
   val play = "com.typesafe.play" %% "play-json" % "2.9.4"
@@ -115,7 +115,7 @@ object Dependencies {
 
   val scalapbRuntime = "com.thesamet.scalapb" %% "scalapb-runtime" % scalapbVersion % "protobuf"
 
-  val protobufJava = "com.google.protobuf" % "protobuf-java" % "3.25.4" % "protobuf"
+  val protobufJava = "com.google.protobuf" % "protobuf-java" % "3.25.5" % "protobuf"
 
   val betterFiles = "com.github.pathikrit" %% "better-files" % "3.9.2"
 
@@ -148,7 +148,7 @@ object Dependencies {
   val bouncyCastleBcprov = "org.bouncycastle" % "bcprov-jdk18on" % bouncycastleVersion
   val bouncyCastleBcpkix = "org.bouncycastle" % "bcpkix-jdk18on" % bouncycastleVersion
 
-  val guava = "com.google.guava" % "guava" % "33.3.0-jre"
+  val guava = "com.google.guava" % "guava" % "33.3.1-jre"
 
   val kotlinXCoroutinesCore = "org.jetbrains.kotlinx" % "kotlinx-coroutines-core" % "1.7.3" pomOnly()
   val kotlinXCoroutinesJdk8 = "org.jetbrains.kotlinx" % "kotlinx-coroutines-jdk8" % "1.7.3"

project/plugins.sbt

@@ -2,7 +2,7 @@ addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.2.0")
 
 addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.6.1")
 
-addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.2.0")
+addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.2.1")
 
 addSbtPlugin("net.vonbuchholtz" % "sbt-dependency-check" % "5.1.0")