Merge branch 'main' into port-Fix-project-link-for-email-publisher

DependencyTrack · Aug 8, 2024 · 116ac6c · 116ac6c
2 parents 57ef852 + 7caabee
commit 116ac6c
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 10 deletions.
diff --git a/.github/workflows/_build-native-meta.yml b/.github/workflows/_build-native-meta.yml
@@ -152,7 +152,7 @@ jobs:
         fi
         echo "tags=${TAGS}" >> $GITHUB_OUTPUT
     - name: Build Container Image
-      uses: docker/build-push-action@5176d81f87c23d6fc96624dfdbcd9f3830bbe445 # tag=v6.5.0
+      uses: docker/build-push-action@16ebe778df0e7752d2cfcbd924afdbbd89c1a755 # tag=v6.6.1
       with:
         context: ./${{ inputs.module }}
         file: ./${{ inputs.module }}/src/main/docker/Dockerfile.native-multiarch

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -183,7 +183,7 @@ services:
     restart: unless-stopped
 
   redpanda:
-    image: docker.redpanda.com/vectorized/redpanda:v24.2.1
+    image: docker.redpanda.com/vectorized/redpanda:v24.2.2
     container_name: dt-redpanda
     command:
       - redpanda
@@ -220,7 +220,7 @@ services:
     restart: unless-stopped
 
   redpanda-init:
-    image: docker.redpanda.com/vectorized/redpanda:v24.2.1
+    image: docker.redpanda.com/vectorized/redpanda:v24.2.2
     container_name: dt-redpanda-init
     depends_on:
       redpanda:

diff --git a/e2e/src/test/java/org/dependencytrack/e2e/AbstractE2ET.java b/e2e/src/test/java/org/dependencytrack/e2e/AbstractE2ET.java
@@ -54,7 +54,7 @@
 public class AbstractE2ET {
 
     protected static DockerImageName POSTGRES_IMAGE = DockerImageName.parse("postgres:15-alpine");
-    protected static DockerImageName REDPANDA_IMAGE = DockerImageName.parse("docker.redpanda.com/vectorized/redpanda:v24.2.1");
+    protected static DockerImageName REDPANDA_IMAGE = DockerImageName.parse("docker.redpanda.com/vectorized/redpanda:v24.2.2");
     protected static DockerImageName API_SERVER_IMAGE = DockerImageName.parse("ghcr.io/dependencytrack/hyades-apiserver")
             .withTag(Optional.ofNullable(System.getenv("APISERVER_VERSION")).orElse("snapshot"));
     protected static DockerImageName MIRROR_SERVICE_IMAGE = DockerImageName.parse("ghcr.io/dependencytrack/hyades-mirror-service")

diff --git a/mirror-service/src/main/resources/application.properties b/mirror-service/src/main/resources/application.properties
@@ -210,7 +210,7 @@ kafka-streams.exception.thresholds.production.interval=PT30M
 
 # @category: Kafka
 # @hidden
-quarkus.kafka.devservices.image-name=docker.redpanda.com/vectorized/redpanda:v24.2.1
+quarkus.kafka.devservices.image-name=docker.redpanda.com/vectorized/redpanda:v24.2.2
 
 # @category: Kafka
 # @hidden

diff --git a/notification-publisher/src/main/resources/application.properties b/notification-publisher/src/main/resources/application.properties
@@ -35,7 +35,7 @@ dt.kafka.topic.prefix=
 
 ## Dev Services for Kafka
 #
-quarkus.kafka.devservices.image-name=docker.redpanda.com/vectorized/redpanda:v24.2.1
+quarkus.kafka.devservices.image-name=docker.redpanda.com/vectorized/redpanda:v24.2.2
 quarkus.kafka.devservices.topic-partitions."dtrack.notification.new-vulnerability"=1
 
 ##quarkus hibernate properties

diff --git a/pom.xml b/pom.xml
@@ -87,10 +87,10 @@
     <lib.packageurl-java.version>1.5.0</lib.packageurl-java.version>
     <lib.protobuf-java.version>3.25.4</lib.protobuf-java.version>
     <lib.quarkus-mailpit.version>1.2.2</lib.quarkus-mailpit.version>
-    <lib.snappy-java.version>1.1.10.5</lib.snappy-java.version>
+    <lib.snappy-java.version>1.1.10.6</lib.snappy-java.version>
     <lib.testcontainers-minio.version>1.20.1</lib.testcontainers-minio.version>
     <lib.wiremock.version>2.35.2</lib.wiremock.version>
-    <quarkus.platform.version>3.13.0</quarkus.platform.version>
+    <quarkus.platform.version>3.13.1</quarkus.platform.version>
     <quarkus.wiremock.version>1.3.3</quarkus.wiremock.version>
     <lib.brotli.version>0.1.2</lib.brotli.version>
     <lib.versatile.version>0.7.0</lib.versatile.version>

diff --git a/repository-meta-analyzer/src/main/resources/application.properties b/repository-meta-analyzer/src/main/resources/application.properties
@@ -182,7 +182,7 @@ kafka-streams.exception.thresholds.production.interval=PT30M
 
 # @category: Kafka
 # @hidden
-quarkus.kafka.devservices.image-name=docker.redpanda.com/vectorized/redpanda:v24.2.1
+quarkus.kafka.devservices.image-name=docker.redpanda.com/vectorized/redpanda:v24.2.2
 
 # @category: Kafka
 # @hidden

diff --git a/vulnerability-analyzer/src/main/resources/application.properties b/vulnerability-analyzer/src/main/resources/application.properties
@@ -62,7 +62,7 @@ state-store.type=in_memory
 
 ## Dev Services for Kafka
 #
-quarkus.kafka.devservices.image-name=docker.redpanda.com/vectorized/redpanda:v24.2.1
+quarkus.kafka.devservices.image-name=docker.redpanda.com/vectorized/redpanda:v24.2.2
 quarkus.kafka.devservices.topic-partitions."dtrack.vuln-analysis.component"=3
 quarkus.kafka.devservices.topic-partitions."dtrack.vuln-analysis.scanner.result"=3
 quarkus.kafka.devservices.topic-partitions."dtrack.vuln-analysis.result"=3