Skip to content

Commit

Permalink
Bump various dependencies (#889)
Browse files Browse the repository at this point in the history
  • Loading branch information
nscuro authored Sep 5, 2024
1 parent 1f5f736 commit 4de679f
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 19 deletions.
22 changes: 6 additions & 16 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -84,10 +84,10 @@
<properties>
<!-- Dependency Versions -->
<lib.alpine.version>${project.parent.version}</lib.alpine.version>
<lib.awaitility.version>4.2.1</lib.awaitility.version>
<lib.awaitility.version>4.2.2</lib.awaitility.version>
<lib.cel-tools.version>0.5.0</lib.cel-tools.version>
<lib.checkstyle.version>10.17.0</lib.checkstyle.version>
<lib.cloud-sql-postgres-socket-factory.version>1.19.1</lib.cloud-sql-postgres-socket-factory.version>
<lib.cloud-sql-postgres-socket-factory.version>1.20.0</lib.cloud-sql-postgres-socket-factory.version>
<lib.commons-compress.version>1.27.1</lib.commons-compress.version>
<lib.cpe-parser.version>2.1.0</lib.cpe-parser.version>
<lib.cvss-calculator.version>1.4.3</lib.cvss-calculator.version>
Expand All @@ -101,17 +101,17 @@
<lib.datanucleus.version>6.0.8</lib.datanucleus.version>
<lib.datanucleus-rdbms.version>6.0.8</lib.datanucleus-rdbms.version>
<lib.jaxb.runtime.version>4.0.5</lib.jaxb.runtime.version>
<lib.jdbi.version>3.45.3</lib.jdbi.version>
<lib.jdbi.version>3.45.4</lib.jdbi.version>
<lib.json-unit.version>3.4.1</lib.json-unit.version>
<lib.junit.version>4.13.2</lib.junit.version>
<lib.kafka.version>3.8.0</lib.kafka.version>
<lib.liquibase.version>4.29.1</lib.liquibase.version>
<lib.liquibase.version>4.29.2</lib.liquibase.version>
<lib.micrometer-jvm-extras.version>0.2.2</lib.micrometer-jvm-extras.version>
<lib.minio.version>8.5.12</lib.minio.version>
<lib.kotlin-stdlib.version>2.0.0</lib.kotlin-stdlib.version>
<lib.wiremock.version>3.9.1</lib.wiremock.version>
<lib.packageurl.version>1.5.0</lib.packageurl.version>
<lib.parallel-consumer.version>0.5.3.0</lib.parallel-consumer.version>
<lib.parallel-consumer.version>0.5.3.1</lib.parallel-consumer.version>
<lib.pebble.version>3.2.2</lib.pebble.version>
<lib.protobuf-java.version>4.28.0</lib.protobuf-java.version>
<lib.testcontainers.version>1.20.1</lib.testcontainers.version>
Expand All @@ -125,7 +125,7 @@
<lib.httpclient.version>4.5.14</lib.httpclient.version>
<lib.net.javacrumbs.shedlock.version>5.15.1</lib.net.javacrumbs.shedlock.version>
<lib.javacron.version>1.4.0</lib.javacron.version>
<lib.jdbc-driver.postgresql.version>42.7.3</lib.jdbc-driver.postgresql.version>
<lib.jdbc-driver.postgresql.version>42.7.4</lib.jdbc-driver.postgresql.version>
<!-- Maven Plugin Properties -->
<plugin.cyclonedx.projectType>application</plugin.cyclonedx.projectType>
<plugin.cyclonedx.outputFormat>json</plugin.cyclonedx.outputFormat>
Expand Down Expand Up @@ -173,16 +173,6 @@
<artifactId>kotlin-stdlib-jdk8</artifactId>
<version>${lib.kotlin-stdlib.version}</version>
</dependency>

<!--
Workaround for https://github.com/liquibase/liquibase/issues/6178.
Can be removed when upgrading Liquibase to >= 4.29.2.
-->
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.14.0</version>
</dependency>
</dependencies>
</dependencyManagement>

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/dependencytrack/common/ConfigKey.java
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ public enum ConfigKey implements Config.Key {

DEV_SERVICES_ENABLED("dev.services.enabled", false),
DEV_SERVICES_IMAGE_FRONTEND("dev.services.image.frontend", "ghcr.io/dependencytrack/hyades-frontend:snapshot"),
DEV_SERVICES_IMAGE_KAFKA("dev.services.image.kafka", "docker.redpanda.com/vectorized/redpanda:v24.2.2"),
DEV_SERVICES_IMAGE_KAFKA("dev.services.image.kafka", "docker.redpanda.com/vectorized/redpanda:v24.2.4"),
DEV_SERVICES_IMAGE_POSTGRES("dev.services.image.postgres", "postgres:16");

private final String propertyName;
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/application.properties
Original file line number Diff line number Diff line change
Expand Up @@ -1347,7 +1347,7 @@ dev.services.image.frontend=ghcr.io/dependencytrack/hyades-frontend:snapshot
#
# @category: Development
# @type: string
dev.services.image.kafka=docker.redpanda.com/vectorized/redpanda:v24.2.2
dev.services.image.kafka=docker.redpanda.com/vectorized/redpanda:v24.2.4

# The image to use for the PostgreSQL dev services container.
#
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ public class ProcessorManagerTest {

@Rule
public RedpandaContainer kafkaContainer = new RedpandaContainer(DockerImageName
.parse("docker.redpanda.com/vectorized/redpanda:v24.2.2"));
.parse("docker.redpanda.com/vectorized/redpanda:v24.2.4"));

private AdminClient adminClient;
private Producer<String, String> producer;
Expand Down

0 comments on commit 4de679f

Please sign in to comment.