Bump quarkus.platform.version from 3.30.6 to 3.31.0

commons-kstreams/pom.xml

@@ -60,12 +60,12 @@
 
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5-mockito</artifactId>
+            <artifactId>quarkus-junit-mockito</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>

commons-persistence/pom.xml

@@ -68,7 +68,7 @@
 
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
 

commons-persistence/src/main/java/org/dependencytrack/persistence/model/Component.java

@@ -83,7 +83,7 @@ public class Component extends PanacheEntityBase {
     @JoinColumn(name = "PROJECT_ID", nullable = false)
     private Project project;
 
-    @Column(name = "UUID")
+    @Column(name = "UUID", nullable = false)
     @JdbcType(UUIDJdbcType.class)
     private UUID uuid;
 

commons-persistence/src/main/java/org/dependencytrack/persistence/model/NotificationPublisher.java

@@ -38,25 +38,25 @@ public class NotificationPublisher extends PanacheEntityBase {
     @Column(name = "ID")
     private long id;
 
-    @Column(name = "NAME")
+    @Column(name = "NAME", nullable = false)
     private String name;
 
     @Column(name = "DESCRIPTION")
     private String description;
 
-    @Column(name = "PUBLISHER_CLASS")
+    @Column(name = "PUBLISHER_CLASS", nullable = false)
     private String publisherClass;
 
     @Column(name = "TEMPLATE")
     private String template;
 
-    @Column(name = "TEMPLATE_MIME_TYPE")
+    @Column(name = "TEMPLATE_MIME_TYPE", nullable = false)
     private String templateMimeType;
 
-    @Column(name = "DEFAULT_PUBLISHER")
+    @Column(name = "DEFAULT_PUBLISHER", nullable = false)
     private boolean defaultPublisher;
 
-    @Column(name = "UUID")
+    @Column(name = "UUID", nullable = false)
     @JdbcType(UUIDJdbcType.class)
     private UUID uuid;
 

commons-persistence/src/main/java/org/dependencytrack/persistence/model/NotificationRule.java

@@ -51,18 +51,18 @@ public class NotificationRule extends PanacheEntityBase {
     @Column(name = "ID")
     private long id;
 
-    @Column(name = "NAME")
+    @Column(name = "NAME", nullable = false)
     private String name;
 
-    @Column(name = "ENABLED")
+    @Column(name = "ENABLED", nullable = false)
     private boolean enabled;
 
     @Column(name = "SCOPE", nullable = false, columnDefinition = "varchar")
     @Convert(converter = NotificationScopeConverter.class)
     private NotificationScope scope;
 
     @JdbcTypeCode(SqlTypes.NAMED_ENUM)
-    @Column(name = "NOTIFICATION_LEVEL", columnDefinition = "notification_level")
+    @Column(name = "NOTIFICATION_LEVEL", columnDefinition = "notification_level", nullable = false)
     private NotificationLevel notificationLevel;
 
     @OneToMany
@@ -107,7 +107,7 @@ public class NotificationRule extends PanacheEntityBase {
     @Column(name = "PUBLISHER_CONFIG")
     private String publisherConfig;
 
-    @Column(name = "UUID")
+    @Column(name = "UUID", nullable = false)
     @JdbcType(UUIDJdbcType.class)
     private UUID uuid;
 

commons-persistence/src/main/java/org/dependencytrack/persistence/model/Project.java

@@ -53,7 +53,7 @@ public class Project implements Serializable {
     @Column(name = "\"GROUP\"", columnDefinition = "VARCHAR")
     private String group;
 
-    @Column(name = "NAME", columnDefinition = "VARCHAR")
+    @Column(name = "NAME", columnDefinition = "VARCHAR", nullable = false)
     private String name;
 
     @Column(name = "DESCRIPTION", columnDefinition = "VARCHAR")
@@ -91,7 +91,7 @@ public class Project implements Serializable {
     @OrderBy("name ASC")
     private List<Tag> tags;
 
-    @Column(name = "UUID")
+    @Column(name = "UUID", nullable = false)
     @JdbcType(UUIDJdbcType.class)
     private UUID uuid;
 

commons-persistence/src/main/java/org/dependencytrack/persistence/model/Repository.java

@@ -38,20 +38,20 @@ public class Repository {
     @Column(name = "ID")
     private long id;
 
-    @Column(name = "TYPE", columnDefinition = "VARCHAR")
+    @Column(name = "TYPE", columnDefinition = "VARCHAR", nullable = false)
     @Convert(converter = RepositoryTypeConverter.class)
     private RepositoryType type;
 
-    @Column(name = "IDENTIFIER")
+    @Column(name = "IDENTIFIER", nullable = false)
     private String identifier;
 
     @Column(name = "URL")
     private String url;
 
-    @Column(name = "RESOLUTION_ORDER")
+    @Column(name = "RESOLUTION_ORDER", nullable = false)
     private int resolutionOrder;
 
-    @Column(name = "ENABLED")
+    @Column(name = "ENABLED", nullable = false)
     private boolean enabled;
 
     @Column(name = "INTERNAL")
@@ -67,7 +67,7 @@ public class Repository {
     @Column(name = "PASSWORD")
     private String password;
 
-    @Column(name = "UUID")
+    @Column(name = "UUID", nullable = false)
     @JdbcType(UUIDJdbcType.class)
     private UUID uuid;
 

commons-persistence/src/main/java/org/dependencytrack/persistence/model/Tag.java

@@ -46,7 +46,7 @@ public class Tag {
     @Column(name = "ID")
     private long id;
 
-    @Column(name = "NAME")
+    @Column(name = "NAME", nullable = false)
     private String name;
 
     @OrderBy("name ASC")

commons-persistence/src/main/java/org/dependencytrack/persistence/model/Team.java

@@ -31,7 +31,7 @@ public class Team {
     @Column(name = "ID")
     private long id;
 
-    @Column(name = "NAME")
+    @Column(name = "NAME", nullable = false)
     private String name;
 
     public long getId() {

commons-persistence/src/main/java/org/dependencytrack/persistence/model/Vulnerability.java

@@ -76,10 +76,10 @@ public enum Source {
     @Column(name = "ID")
     private long id;
 
-    @Column(name = "VULNID")
+    @Column(name = "VULNID", nullable = false)
     private String vulnId;
 
-    @Column(name = "SOURCE")
+    @Column(name = "SOURCE", nullable = false)
     private String source;
 
     @Column(name = "FRIENDLYVULNID")
@@ -165,7 +165,7 @@ public enum Source {
     )
     private List<Component> components;
 
-    @Column(name = "UUID")
+    @Column(name = "UUID", nullable = false)
     @JdbcType(UUIDJdbcType.class)
     private UUID uuid;
 

commons-persistence/src/main/java/org/dependencytrack/persistence/model/VulnerabilityAlias.java

@@ -72,7 +72,7 @@ public class VulnerabilityAlias implements Serializable {
     @Column(name = "VULNDB_ID")
     private String vulnDbId;
 
-    @Column(name = "UUID")
+    @Column(name = "UUID", nullable = false)
     @JdbcType(UUIDJdbcType.class)
     private UUID uuid;
 

commons-persistence/src/main/java/org/dependencytrack/persistence/model/VulnerableSoftware.java

@@ -123,7 +123,7 @@ public class VulnerableSoftware extends PanacheEntityBase implements ICpe {
     @Column(name = "VERSIONSTARTINCLUDING")
     private String versionStartIncluding;
 
-    @Column(name = "VULNERABLE")
+    @Column(name = "VULNERABLE", nullable = false)
     private boolean vulnerable;
 
     @ManyToMany(fetch = FetchType.EAGER)
@@ -135,7 +135,7 @@ public class VulnerableSoftware extends PanacheEntityBase implements ICpe {
     @OrderBy("id ASC")
     private List<Vulnerability> vulnerabilities;
 
-    @Column(name = "UUID")
+    @Column(name = "UUID", nullable = false)
     @JdbcType(UUIDJdbcType.class)
     private UUID uuid;
 

commons-persistence/src/test/resources/application.properties

@@ -8,6 +8,6 @@ dtrack.internal.cluster.id=${quarkus.uuid}
 quarkus.hibernate-orm.quote-identifiers.strategy=all
 # Hibernate should only validate that the existing schema matches our entity classes,
 # but it should never generate a schema by itself.
-quarkus.hibernate-orm.database.generation=validate
+quarkus.hibernate-orm.schema-management.strategy=validate
 quarkus.datasource.devservices.image-name=postgres:14-alpine
 quarkus.datasource.devservices.init-script-path=schema.sql

commons/pom.xml

@@ -70,7 +70,7 @@
 
     <dependency>
       <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-junit5</artifactId>
+      <artifactId>quarkus-junit</artifactId>
       <scope>test</scope>
     </dependency>
 
@@ -91,7 +91,7 @@
     </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-junit5-mockito</artifactId>
+      <artifactId>quarkus-junit-mockito</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>

e2e/pom.xml

@@ -47,7 +47,7 @@
 
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-junit5</artifactId>
+            <artifactId>quarkus-junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -62,7 +62,7 @@
         </dependency>
         <dependency>
             <groupId>org.testcontainers</groupId>
-            <artifactId>minio</artifactId>
+            <artifactId>testcontainers-minio</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -88,7 +88,7 @@
         </dependency>
         <dependency>
             <groupId>org.testcontainers</groupId>
-            <artifactId>postgresql</artifactId>
+            <artifactId>testcontainers-postgresql</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>

e2e/src/test/java/org/dependencytrack/e2e/BomProcessedNotificationDelayedE2ET.java

@@ -19,6 +19,7 @@
 package org.dependencytrack.e2e;
 
 import com.github.tomakehurst.wiremock.junit5.WireMockExtension;
+import org.apache.commons.io.IOUtils;
 import org.dependencytrack.apiserver.model.BomUploadRequest;
 import org.dependencytrack.apiserver.model.CreateNotificationRuleRequest;
 import org.dependencytrack.apiserver.model.CreateVulnerabilityRequest;
@@ -31,7 +32,6 @@
 import org.junit.jupiter.api.extension.RegisterExtension;
 import org.testcontainers.Testcontainers;
 import org.testcontainers.containers.GenericContainer;
-import org.testcontainers.shaded.org.apache.commons.io.IOUtils;
 
 import java.time.Duration;
 import java.util.Base64;

e2e/src/test/java/org/dependencytrack/e2e/BomUploadOssIndexAnalysisE2ET.java

@@ -18,14 +18,14 @@
  */
 package org.dependencytrack.e2e;
 
+import org.apache.commons.io.IOUtils;
 import org.dependencytrack.apiserver.model.EventProcessingResponse;
 import org.dependencytrack.apiserver.model.BomUploadRequest;
 import org.dependencytrack.apiserver.model.Finding;
 import org.dependencytrack.apiserver.model.Project;
 import org.dependencytrack.apiserver.model.WorkflowTokenResponse;
 import org.junit.jupiter.api.Test;
 import org.testcontainers.containers.GenericContainer;
-import org.testcontainers.shaded.org.apache.commons.io.IOUtils;
 
 import java.time.Duration;
 import java.util.Base64;

e2e/src/test/java/org/dependencytrack/e2e/BomUploadProcessingE2ET.java

@@ -21,6 +21,7 @@
 import com.github.tomakehurst.wiremock.junit5.WireMockExtension;
 import com.icegreen.greenmail.junit5.GreenMailExtension;
 import com.icegreen.greenmail.util.ServerSetup;
+import org.apache.commons.io.IOUtils;
 import org.dependencytrack.apiserver.model.EventProcessingResponse;
 import org.dependencytrack.apiserver.model.BomUploadRequest;
 import org.dependencytrack.apiserver.model.ConfigProperty;
@@ -39,7 +40,6 @@
 import org.junit.jupiter.api.extension.RegisterExtension;
 import org.testcontainers.Testcontainers;
 import org.testcontainers.containers.GenericContainer;
-import org.testcontainers.shaded.org.apache.commons.io.IOUtils;
 
 import jakarta.mail.internet.MimeMessage;
 import java.time.Duration;

e2e/src/test/java/org/dependencytrack/e2e/BomUploadSnykAnalysisE2ET.java

@@ -18,6 +18,7 @@
  */
 package org.dependencytrack.e2e;
 
+import org.apache.commons.io.IOUtils;
 import org.dependencytrack.apiserver.model.EventProcessingResponse;
 import org.dependencytrack.apiserver.model.BomUploadRequest;
 import org.dependencytrack.apiserver.model.Finding;
@@ -26,7 +27,6 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.testcontainers.containers.GenericContainer;
-import org.testcontainers.shaded.org.apache.commons.io.IOUtils;
 
 import java.time.Duration;
 import java.util.Base64;

notification-publisher/pom.xml

@@ -26,6 +26,7 @@
     <version>0.7.0-SNAPSHOT</version>
   </parent>
   <artifactId>notification-publisher</artifactId>
+  <packaging>quarkus</packaging>
 
   <properties>
     <project.parentBaseDir>${project.basedir}/..</project.parentBaseDir>
@@ -99,12 +100,12 @@
 
     <dependency>
       <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-junit5</artifactId>
+      <artifactId>quarkus-junit</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-junit5-mockito</artifactId>
+      <artifactId>quarkus-junit-mockito</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>

notification-publisher/src/main/resources/application.properties

@@ -41,7 +41,7 @@ quarkus.hibernate-orm.quote-identifiers.strategy=all
 
 # Hibernate should only validate that the existing schema matches our entity classes,
 # but it should never generate a schema by itself.
-quarkus.hibernate-orm.database.generation=validate
+quarkus.hibernate-orm.schema-management.strategy=validate
 
 # Use external Postgres DB for dev mode (./mvnw quarkus:dev), but let Quarkus
 # take care of test container creation in the test profile.