Skip to content

Commit b7b4254

Browse files
authored
Merge pull request #1694 from DependencyTrack/dependabot/maven/quarkus.platform.version-3.19.2
Bump quarkus.platform.version from 3.18.3 to 3.19.2
2 parents 4943e00 + fd9f07e commit b7b4254

File tree

11 files changed

+17
-16
lines changed

11 files changed

+17
-16
lines changed

.github/workflows/_build-native-meta.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ jobs:
7878
echo "Including resources: ${RESOURCES_INCLUDES:-None}"
7979
echo "Excluding resources: ${RESOURCES_EXCLUDES:-None}"
8080
mvn -B --no-transfer-progress -pl ${{ inputs.module }} package -Dnative -DskipTests \
81-
-Dquarkus.native.builder-image=quay.io/quarkus/ubi-quarkus-mandrel-builder-image:23.1-java21 \
81+
-Dquarkus.native.builder-image=quay.io/quarkus/ubi9-quarkus-mandrel-builder-image:23.1-java21 \
8282
-Dquarkus.native.container-build=true \
8383
-Dquarkus.native.resources.includes="$RESOURCES_INCLUDES" \
8484
-Dquarkus.native.resources.excludes="$RESOURCES_EXCLUDES"

mirror-service/src/main/docker/Dockerfile.native

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM quay.io/quarkus/quarkus-micro-image:2.0
1+
FROM quay.io/quarkus/ubi9-quarkus-micro-image:2.0
22
WORKDIR /work/
33
RUN chown 1001 /work \
44
&& chmod "g+rwX" /work \

mirror-service/src/main/docker/Dockerfile.native-multiarch

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM quay.io/quarkus/quarkus-micro-image:2.0
1+
FROM quay.io/quarkus/ubi9-quarkus-micro-image:2.0
22
ARG TARGETARCH
33
WORKDIR /work/
44
RUN chown 1001 /work \

notification-publisher/src/main/docker/Dockerfile.native

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM quay.io/quarkus/quarkus-micro-image:2.0
1+
FROM quay.io/quarkus/ubi9-quarkus-micro-image:2.0
22
WORKDIR /work/
33
RUN chown 1001 /work \
44
&& chmod "g+rwX" /work \

notification-publisher/src/main/docker/Dockerfile.native-multiarch

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM quay.io/quarkus/quarkus-micro-image:2.0
1+
FROM quay.io/quarkus/ubi9-quarkus-micro-image:2.0
22
ARG TARGETARCH
33
WORKDIR /work/
44
RUN chown 1001 /work \

notification-publisher/src/main/java/org/dependencytrack/notification/config/ParallelConsumerConfiguration.java

+6-5
Original file line numberDiff line numberDiff line change
@@ -26,19 +26,19 @@
2626
import io.quarkus.runtime.ShutdownEvent;
2727
import io.quarkus.runtime.annotations.RegisterForReflection;
2828
import io.smallrye.common.annotation.Identifier;
29-
import jakarta.enterprise.context.ApplicationScoped;
30-
import jakarta.enterprise.event.Observes;
31-
import jakarta.enterprise.inject.Produces;
3229
import org.apache.kafka.clients.consumer.ConsumerConfig;
3330
import org.apache.kafka.clients.consumer.KafkaConsumer;
3431
import org.apache.kafka.clients.consumer.internals.AsyncKafkaConsumer;
32+
import org.apache.kafka.clients.consumer.internals.ClassicKafkaConsumer;
3533
import org.apache.kafka.clients.consumer.internals.ConsumerCoordinator;
36-
import org.apache.kafka.clients.consumer.internals.LegacyKafkaConsumer;
3734
import org.apache.kafka.common.serialization.StringDeserializer;
3835
import org.dependencytrack.notification.serialization.NotificationKafkaProtobufDeserializer;
3936
import org.dependencytrack.proto.notification.v1.Notification;
4037
import org.eclipse.microprofile.config.ConfigProvider;
4138

39+
import jakarta.enterprise.context.ApplicationScoped;
40+
import jakarta.enterprise.event.Observes;
41+
import jakarta.enterprise.inject.Produces;
4242
import java.time.Duration;
4343
import java.util.HashMap;
4444
import java.util.Map;
@@ -52,7 +52,7 @@
5252
// https://github.com/confluentinc/parallel-consumer/pull/762
5353
KafkaConsumer.class,
5454
AsyncKafkaConsumer.class,
55-
LegacyKafkaConsumer.class,
55+
ClassicKafkaConsumer.class,
5656
ConsumerCoordinator.class
5757
})
5858
class ParallelConsumerConfiguration {
@@ -91,6 +91,7 @@ private static ParallelStreamProcessor<String, Notification> createParallelConsu
9191
final var parallelConsumerOptions = ParallelConsumerOptions.<String, Notification>builder()
9292
.consumer(consumer)
9393
.maxConcurrency(parallelConsumerConfig.maxConcurrency())
94+
.ignoreReflectiveAccessExceptionsForAutoCommitDisabledCheck(true)
9495
.ordering(ProcessingOrder.KEY)
9596
.retryDelayProvider(recordCtx -> {
9697
final long delayMillis = RetryConfig

pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575
<lib.httpclient5.version>5.4.2</lib.httpclient5.version>
7676
<lib.java-uuid-generator.version>5.1.0</lib.java-uuid-generator.version>
7777
<lib.json-unit.version>4.1.0</lib.json-unit.version>
78-
<lib.kafka.version>3.7.1</lib.kafka.version>
78+
<lib.kafka.version>3.9.0</lib.kafka.version>
7979
<lib.maven-artifact.version>4.0.0-rc-2</lib.maven-artifact.version>
8080
<lib.micrometer-jvm-extras.version>0.2.2</lib.micrometer-jvm-extras.version>
8181
<lib.minio.version>8.5.17</lib.minio.version>
@@ -91,7 +91,7 @@
9191
<lib.snappy-java.version>1.1.10.7</lib.snappy-java.version>
9292
<lib.testcontainers-minio.version>1.20.5</lib.testcontainers-minio.version>
9393
<lib.wiremock.version>2.35.2</lib.wiremock.version>
94-
<quarkus.platform.version>3.18.3</quarkus.platform.version>
94+
<quarkus.platform.version>3.19.2</quarkus.platform.version>
9595
<quarkus.wiremock.version>1.3.3</quarkus.wiremock.version>
9696
<lib.brotli.version>0.1.2</lib.brotli.version>
9797
<lib.versatile.version>0.7.0</lib.versatile.version>

repository-meta-analyzer/src/main/docker/Dockerfile.native

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM quay.io/quarkus/quarkus-micro-image:2.0
1+
FROM quay.io/quarkus/ubi9-quarkus-micro-image:2.0
22
WORKDIR /work/
33
RUN chown 1001 /work \
44
&& chmod "g+rwX" /work \

repository-meta-analyzer/src/main/docker/Dockerfile.native-multiarch

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM quay.io/quarkus/quarkus-micro-image:2.0
1+
FROM quay.io/quarkus/ubi9-quarkus-micro-image:2.0
22
ARG TARGETARCH
33
WORKDIR /work/
44
RUN chown 1001 /work \

vulnerability-analyzer/src/main/docker/Dockerfile.native

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM quay.io/quarkus/quarkus-micro-image:2.0
1+
FROM quay.io/quarkus/ubi9-quarkus-micro-image:2.0
22
WORKDIR /work/
33
RUN chown 1001 /work \
44
&& chmod "g+rwX" /work \

vulnerability-analyzer/src/main/docker/Dockerfile.native-multiarch

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM quay.io/quarkus/quarkus-micro-image:2.0
1+
FROM quay.io/quarkus/ubi9-quarkus-micro-image:2.0
22
ARG TARGETARCH
33
WORKDIR /work/
44
RUN chown 1001 /work \

0 commit comments

Comments
 (0)