diff --git a/pom.xml b/pom.xml index 28dc182976..77a8d5a661 100644 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,7 @@ us.springett alpine-parent - 2.2.6-SNAPSHOT + 3.0.0-SNAPSHOT 4.0.0 @@ -99,10 +99,9 @@ 1.4.2 1.0.1 9.0.0 - 1.6.15 + 2.0.1 2.17.1 2.17.1 - 2.3.9 20240303 3.2.7 8.11.3 @@ -117,6 +116,7 @@ 1.19.8 2.35.2 6.6.2 + 2.12.2 1.1.1 2.1.1 4.5.14 @@ -131,8 +131,7 @@ application json false - - 10.0.21 + 12.0.9 src/main/webapp/** @@ -197,16 +196,6 @@ cyclonedx-core-java ${lib.cyclonedx-java.version} - - org.glassfish.jaxb - jaxb-runtime - ${lib.jaxb.runtime.version} - - - javax.activation - javax.activation-api - 1.2.0 - - + xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-app_6_0.xsd" + version="6.0"> org.dependencytrack.RequirementsVerifier diff --git a/src/test/java/org/dependencytrack/JerseyTestRule.java b/src/test/java/org/dependencytrack/JerseyTestRule.java index a30cfe0625..4d2c00e9f7 100644 --- a/src/test/java/org/dependencytrack/JerseyTestRule.java +++ b/src/test/java/org/dependencytrack/JerseyTestRule.java @@ -29,7 +29,7 @@ import org.glassfish.jersey.test.spi.TestContainerFactory; import org.junit.rules.ExternalResource; -import javax.ws.rs.client.WebTarget; +import jakarta.ws.rs.client.WebTarget; /** * @since 4.11.0 diff --git a/src/test/java/org/dependencytrack/ResourceTest.java b/src/test/java/org/dependencytrack/ResourceTest.java index 22ddd0900e..ef37c77967 100644 --- a/src/test/java/org/dependencytrack/ResourceTest.java +++ b/src/test/java/org/dependencytrack/ResourceTest.java @@ -29,11 +29,11 @@ import org.junit.Before; import org.junit.BeforeClass; -import javax.json.Json; -import javax.json.JsonArray; -import javax.json.JsonObject; -import javax.json.JsonReader; -import javax.ws.rs.core.Response; +import jakarta.json.Json; +import jakarta.json.JsonArray; +import jakarta.json.JsonObject; +import jakarta.json.JsonReader; +import jakarta.ws.rs.core.Response; import java.io.StringReader; import java.util.ArrayList; import java.util.List; diff --git a/src/test/java/org/dependencytrack/integrations/FindingPackagingFormatTest.java b/src/test/java/org/dependencytrack/integrations/FindingPackagingFormatTest.java index 5a50899e7a..6171bfaed8 100644 --- a/src/test/java/org/dependencytrack/integrations/FindingPackagingFormatTest.java +++ b/src/test/java/org/dependencytrack/integrations/FindingPackagingFormatTest.java @@ -20,19 +20,22 @@ import alpine.Config; import org.dependencytrack.PersistenceCapableTest; -import org.dependencytrack.model.*; +import org.dependencytrack.model.AnalysisState; +import org.dependencytrack.model.Finding; +import org.dependencytrack.model.Project; +import org.dependencytrack.model.Severity; +import org.dependencytrack.model.Vulnerability; +import org.dependencytrack.model.VulnerabilityAlias; import org.dependencytrack.tasks.scanners.AnalyzerIdentity; import org.json.JSONArray; import org.json.JSONObject; import org.junit.Assert; import org.junit.Test; -import javax.json.JsonArray; import java.math.BigDecimal; import java.util.Collections; import java.util.Date; import java.util.List; -import java.util.UUID; public class FindingPackagingFormatTest extends PersistenceCapableTest { diff --git a/src/test/java/org/dependencytrack/integrations/defectdojo/DefectDojoUploaderTest.java b/src/test/java/org/dependencytrack/integrations/defectdojo/DefectDojoUploaderTest.java index c034b5a8fa..e3cc101014 100644 --- a/src/test/java/org/dependencytrack/integrations/defectdojo/DefectDojoUploaderTest.java +++ b/src/test/java/org/dependencytrack/integrations/defectdojo/DefectDojoUploaderTest.java @@ -33,7 +33,7 @@ import org.junit.Rule; import org.junit.Test; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import java.io.InputStream; import java.util.List; diff --git a/src/test/java/org/dependencytrack/model/validation/SpdxExpressionValidatorTest.java b/src/test/java/org/dependencytrack/model/validation/SpdxExpressionValidatorTest.java index 14fbdf5fe1..d072a565f2 100644 --- a/src/test/java/org/dependencytrack/model/validation/SpdxExpressionValidatorTest.java +++ b/src/test/java/org/dependencytrack/model/validation/SpdxExpressionValidatorTest.java @@ -21,10 +21,10 @@ import org.junit.Before; import org.junit.Test; -import javax.validation.ConstraintViolation; -import javax.validation.Validation; -import javax.validation.Validator; -import javax.validation.ValidatorFactory; +import jakarta.validation.ConstraintViolation; +import jakarta.validation.Validation; +import jakarta.validation.Validator; +import jakarta.validation.ValidatorFactory; import java.util.Set; import static org.assertj.core.api.Assertions.assertThat; diff --git a/src/test/java/org/dependencytrack/notification/NotificationRouterTest.java b/src/test/java/org/dependencytrack/notification/NotificationRouterTest.java index 06dc400ebe..58ca81e97c 100644 --- a/src/test/java/org/dependencytrack/notification/NotificationRouterTest.java +++ b/src/test/java/org/dependencytrack/notification/NotificationRouterTest.java @@ -43,7 +43,7 @@ import org.junit.Assert; import org.junit.Test; -import javax.json.JsonObject; +import jakarta.json.JsonObject; import java.util.ArrayList; import java.util.HashSet; import java.util.List; diff --git a/src/test/java/org/dependencytrack/notification/NotificationSubsystemInitializerTest.java b/src/test/java/org/dependencytrack/notification/NotificationSubsystemInitializerTest.java index 649cc231a2..c5d479407f 100644 --- a/src/test/java/org/dependencytrack/notification/NotificationSubsystemInitializerTest.java +++ b/src/test/java/org/dependencytrack/notification/NotificationSubsystemInitializerTest.java @@ -23,8 +23,8 @@ import org.junit.Assert; import org.junit.Test; -import javax.servlet.ServletContext; -import javax.servlet.ServletContextEvent; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletContextEvent; import static org.mockito.Mockito.mock; diff --git a/src/test/java/org/dependencytrack/notification/publisher/AbstractPublisherTest.java b/src/test/java/org/dependencytrack/notification/publisher/AbstractPublisherTest.java index 5df72bea0d..f6926e5535 100644 --- a/src/test/java/org/dependencytrack/notification/publisher/AbstractPublisherTest.java +++ b/src/test/java/org/dependencytrack/notification/publisher/AbstractPublisherTest.java @@ -40,9 +40,9 @@ import org.dependencytrack.notification.vo.NewVulnerabilityIdentified; import org.junit.Test; -import javax.json.Json; -import javax.json.JsonObject; -import javax.json.JsonObjectBuilder; +import jakarta.json.Json; +import jakarta.json.JsonObject; +import jakarta.json.JsonObjectBuilder; import java.math.BigDecimal; import java.time.LocalDateTime; import java.time.ZoneOffset; diff --git a/src/test/java/org/dependencytrack/notification/publisher/AbstractWebhookPublisherTest.java b/src/test/java/org/dependencytrack/notification/publisher/AbstractWebhookPublisherTest.java index a95487aa45..2f6943965b 100644 --- a/src/test/java/org/dependencytrack/notification/publisher/AbstractWebhookPublisherTest.java +++ b/src/test/java/org/dependencytrack/notification/publisher/AbstractWebhookPublisherTest.java @@ -22,7 +22,7 @@ import org.junit.Before; import org.junit.Rule; -import javax.json.JsonObjectBuilder; +import jakarta.json.JsonObjectBuilder; import static com.github.tomakehurst.wiremock.client.WireMock.aResponse; import static com.github.tomakehurst.wiremock.client.WireMock.anyUrl; diff --git a/src/test/java/org/dependencytrack/notification/publisher/CsWebexPublisherTest.java b/src/test/java/org/dependencytrack/notification/publisher/CsWebexPublisherTest.java index b370081b26..f4df293a44 100644 --- a/src/test/java/org/dependencytrack/notification/publisher/CsWebexPublisherTest.java +++ b/src/test/java/org/dependencytrack/notification/publisher/CsWebexPublisherTest.java @@ -30,7 +30,7 @@ import org.mockserver.client.MockServerClient; import org.mockserver.integration.ClientAndServer; -import javax.json.JsonObject; +import jakarta.json.JsonObject; import java.io.IOException; import static org.mockserver.integration.ClientAndServer.startClientAndServer; diff --git a/src/test/java/org/dependencytrack/notification/publisher/DefaultNotificationPublishersTest.java b/src/test/java/org/dependencytrack/notification/publisher/DefaultNotificationPublishersTest.java index f8fd2eefbf..3718ba3bec 100644 --- a/src/test/java/org/dependencytrack/notification/publisher/DefaultNotificationPublishersTest.java +++ b/src/test/java/org/dependencytrack/notification/publisher/DefaultNotificationPublishersTest.java @@ -21,7 +21,7 @@ import org.junit.Assert; import org.junit.Test; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; public class DefaultNotificationPublishersTest { diff --git a/src/test/java/org/dependencytrack/notification/publisher/JiraPublisherTest.java b/src/test/java/org/dependencytrack/notification/publisher/JiraPublisherTest.java index 6c3670faf2..cec86f7a3a 100644 --- a/src/test/java/org/dependencytrack/notification/publisher/JiraPublisherTest.java +++ b/src/test/java/org/dependencytrack/notification/publisher/JiraPublisherTest.java @@ -23,7 +23,7 @@ import org.junit.Before; import org.junit.Test; -import javax.json.JsonObjectBuilder; +import jakarta.json.JsonObjectBuilder; import static com.github.tomakehurst.wiremock.client.WireMock.equalTo; import static com.github.tomakehurst.wiremock.client.WireMock.equalToJson; diff --git a/src/test/java/org/dependencytrack/notification/publisher/NotificationTestConfigProvider.java b/src/test/java/org/dependencytrack/notification/publisher/NotificationTestConfigProvider.java index b15f3882c5..9920c86654 100644 --- a/src/test/java/org/dependencytrack/notification/publisher/NotificationTestConfigProvider.java +++ b/src/test/java/org/dependencytrack/notification/publisher/NotificationTestConfigProvider.java @@ -21,9 +21,9 @@ import org.apache.commons.io.FileUtils; import org.dependencytrack.util.NotificationUtil; -import javax.json.Json; -import javax.json.JsonObject; -import javax.json.JsonObjectBuilder; +import jakarta.json.Json; +import jakarta.json.JsonObject; +import jakarta.json.JsonObjectBuilder; import java.io.File; import java.io.IOException; import java.net.URLDecoder; diff --git a/src/test/java/org/dependencytrack/notification/publisher/SendMailPublisherTest.java b/src/test/java/org/dependencytrack/notification/publisher/SendMailPublisherTest.java index 9739227bfc..b7fcc648c0 100644 --- a/src/test/java/org/dependencytrack/notification/publisher/SendMailPublisherTest.java +++ b/src/test/java/org/dependencytrack/notification/publisher/SendMailPublisherTest.java @@ -12,19 +12,19 @@ import org.junit.Rule; import org.junit.Test; -import javax.json.Json; -import javax.json.JsonObject; -import javax.json.JsonObjectBuilder; -import javax.mail.internet.MimeBodyPart; -import javax.mail.internet.MimeMultipart; +import jakarta.json.Json; +import jakarta.json.JsonObject; +import jakarta.json.JsonObjectBuilder; +import jakarta.mail.internet.MimeBodyPart; +import jakarta.mail.internet.MimeMultipart; import java.util.ArrayList; import java.util.List; import static com.icegreen.greenmail.configuration.GreenMailConfiguration.aConfig; import static org.assertj.core.api.Assertions.assertThat; +import static org.dependencytrack.model.ConfigPropertyConstants.EMAIL_PREFIX; import static org.dependencytrack.model.ConfigPropertyConstants.EMAIL_SMTP_ENABLED; import static org.dependencytrack.model.ConfigPropertyConstants.EMAIL_SMTP_FROM_ADDR; -import static org.dependencytrack.model.ConfigPropertyConstants.EMAIL_PREFIX; import static org.dependencytrack.model.ConfigPropertyConstants.EMAIL_SMTP_PASSWORD; import static org.dependencytrack.model.ConfigPropertyConstants.EMAIL_SMTP_SERVER_HOSTNAME; import static org.dependencytrack.model.ConfigPropertyConstants.EMAIL_SMTP_SERVER_PORT; diff --git a/src/test/java/org/dependencytrack/resources/OpenApiResourceTest.java b/src/test/java/org/dependencytrack/resources/OpenApiResourceTest.java index 26bc2e14b5..da3d862672 100644 --- a/src/test/java/org/dependencytrack/resources/OpenApiResourceTest.java +++ b/src/test/java/org/dependencytrack/resources/OpenApiResourceTest.java @@ -28,7 +28,7 @@ import org.junit.ClassRule; import org.junit.Test; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import java.util.List; import static org.assertj.core.api.Assertions.assertThat; diff --git a/src/test/java/org/dependencytrack/resources/v1/AnalysisResourceTest.java b/src/test/java/org/dependencytrack/resources/v1/AnalysisResourceTest.java index 08ca069344..237344d9ca 100644 --- a/src/test/java/org/dependencytrack/resources/v1/AnalysisResourceTest.java +++ b/src/test/java/org/dependencytrack/resources/v1/AnalysisResourceTest.java @@ -51,12 +51,12 @@ import org.junit.ClassRule; import org.junit.Test; -import javax.json.Json; -import javax.json.JsonArray; -import javax.json.JsonObject; -import javax.ws.rs.client.Entity; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.json.Json; +import jakarta.json.JsonArray; +import jakarta.json.JsonObject; +import jakarta.ws.rs.client.Entity; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import java.time.Duration; import java.util.List; import java.util.UUID; diff --git a/src/test/java/org/dependencytrack/resources/v1/BadgeResourceTest.java b/src/test/java/org/dependencytrack/resources/v1/BadgeResourceTest.java index a2435e065a..f427cc1f81 100644 --- a/src/test/java/org/dependencytrack/resources/v1/BadgeResourceTest.java +++ b/src/test/java/org/dependencytrack/resources/v1/BadgeResourceTest.java @@ -28,7 +28,7 @@ import org.junit.ClassRule; import org.junit.Test; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; import java.io.ByteArrayInputStream; diff --git a/src/test/java/org/dependencytrack/resources/v1/BomResourceTest.java b/src/test/java/org/dependencytrack/resources/v1/BomResourceTest.java index 829489f127..8beb695155 100644 --- a/src/test/java/org/dependencytrack/resources/v1/BomResourceTest.java +++ b/src/test/java/org/dependencytrack/resources/v1/BomResourceTest.java @@ -49,10 +49,10 @@ import org.junit.ClassRule; import org.junit.Test; -import javax.json.JsonObject; -import javax.ws.rs.client.Entity; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.json.JsonObject; +import jakarta.ws.rs.client.Entity; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import java.util.Base64; import java.util.List; import java.util.UUID; diff --git a/src/test/java/org/dependencytrack/resources/v1/CalculatorResourceTest.java b/src/test/java/org/dependencytrack/resources/v1/CalculatorResourceTest.java index 07ffdd7a23..98e44b2e29 100644 --- a/src/test/java/org/dependencytrack/resources/v1/CalculatorResourceTest.java +++ b/src/test/java/org/dependencytrack/resources/v1/CalculatorResourceTest.java @@ -28,8 +28,8 @@ import org.junit.Test; import us.springett.owasp.riskrating.Level; -import javax.json.JsonObject; -import javax.ws.rs.core.Response; +import jakarta.json.JsonObject; +import jakarta.ws.rs.core.Response; public class CalculatorResourceTest extends ResourceTest { diff --git a/src/test/java/org/dependencytrack/resources/v1/ComponentPropertyResourceTest.java b/src/test/java/org/dependencytrack/resources/v1/ComponentPropertyResourceTest.java index e5f3910d21..5d436d5a99 100644 --- a/src/test/java/org/dependencytrack/resources/v1/ComponentPropertyResourceTest.java +++ b/src/test/java/org/dependencytrack/resources/v1/ComponentPropertyResourceTest.java @@ -30,9 +30,9 @@ import org.junit.ClassRule; import org.junit.Test; -import javax.ws.rs.client.Entity; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.client.Entity; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import java.util.UUID; import static net.javacrumbs.jsonunit.assertj.JsonAssertions.assertThatJson; diff --git a/src/test/java/org/dependencytrack/resources/v1/ComponentResourceTest.java b/src/test/java/org/dependencytrack/resources/v1/ComponentResourceTest.java index 0f98459340..3fee3924af 100644 --- a/src/test/java/org/dependencytrack/resources/v1/ComponentResourceTest.java +++ b/src/test/java/org/dependencytrack/resources/v1/ComponentResourceTest.java @@ -36,11 +36,11 @@ import org.junit.ClassRule; import org.junit.Test; -import javax.json.JsonArray; -import javax.json.JsonObject; -import javax.ws.rs.client.Entity; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.json.JsonArray; +import jakarta.json.JsonObject; +import jakarta.ws.rs.client.Entity; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import java.util.ArrayList; import java.util.Date; import java.util.List; diff --git a/src/test/java/org/dependencytrack/resources/v1/ConfigPropertyResourceTest.java b/src/test/java/org/dependencytrack/resources/v1/ConfigPropertyResourceTest.java index 516a7a3577..ed2a63d868 100644 --- a/src/test/java/org/dependencytrack/resources/v1/ConfigPropertyResourceTest.java +++ b/src/test/java/org/dependencytrack/resources/v1/ConfigPropertyResourceTest.java @@ -30,11 +30,11 @@ import org.junit.ClassRule; import org.junit.Test; -import javax.json.JsonArray; -import javax.json.JsonObject; -import javax.ws.rs.client.Entity; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.json.JsonArray; +import jakarta.json.JsonObject; +import jakarta.ws.rs.client.Entity; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import java.util.Arrays; public class ConfigPropertyResourceTest extends ResourceTest { diff --git a/src/test/java/org/dependencytrack/resources/v1/CweResourceTest.java b/src/test/java/org/dependencytrack/resources/v1/CweResourceTest.java index 4feeb8542f..188b97fae4 100644 --- a/src/test/java/org/dependencytrack/resources/v1/CweResourceTest.java +++ b/src/test/java/org/dependencytrack/resources/v1/CweResourceTest.java @@ -27,9 +27,9 @@ import org.junit.ClassRule; import org.junit.Test; -import javax.json.JsonArray; -import javax.json.JsonObject; -import javax.ws.rs.core.Response; +import jakarta.json.JsonArray; +import jakarta.json.JsonObject; +import jakarta.ws.rs.core.Response; public class CweResourceTest extends ResourceTest { diff --git a/src/test/java/org/dependencytrack/resources/v1/DependencyGraphResourceTest.java b/src/test/java/org/dependencytrack/resources/v1/DependencyGraphResourceTest.java index 5ea6a06a32..c48c54f51c 100644 --- a/src/test/java/org/dependencytrack/resources/v1/DependencyGraphResourceTest.java +++ b/src/test/java/org/dependencytrack/resources/v1/DependencyGraphResourceTest.java @@ -36,8 +36,8 @@ import org.junit.ClassRule; import org.junit.Test; -import javax.json.JsonArray; -import javax.ws.rs.core.Response; +import jakarta.json.JsonArray; +import jakarta.ws.rs.core.Response; import java.util.ArrayList; import java.util.Date; import java.util.List; diff --git a/src/test/java/org/dependencytrack/resources/v1/FindingResourceTest.java b/src/test/java/org/dependencytrack/resources/v1/FindingResourceTest.java index e058c30a76..8eee1442ef 100644 --- a/src/test/java/org/dependencytrack/resources/v1/FindingResourceTest.java +++ b/src/test/java/org/dependencytrack/resources/v1/FindingResourceTest.java @@ -39,10 +39,10 @@ import org.junit.ClassRule; import org.junit.Test; -import javax.json.JsonArray; -import javax.json.JsonObject; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.Response; +import jakarta.json.JsonArray; +import jakarta.json.JsonObject; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.Response; import java.util.Date; import java.util.List; import java.util.UUID; diff --git a/src/test/java/org/dependencytrack/resources/v1/IntegrationResourceTest.java b/src/test/java/org/dependencytrack/resources/v1/IntegrationResourceTest.java index 2d59768a4e..55760d66be 100644 --- a/src/test/java/org/dependencytrack/resources/v1/IntegrationResourceTest.java +++ b/src/test/java/org/dependencytrack/resources/v1/IntegrationResourceTest.java @@ -29,8 +29,8 @@ import org.junit.ClassRule; import org.junit.Test; -import javax.json.JsonArray; -import javax.ws.rs.core.Response; +import jakarta.json.JsonArray; +import jakarta.ws.rs.core.Response; import static org.dependencytrack.model.ConfigPropertyConstants.VULNERABILITY_SOURCE_GOOGLE_OSV_BASE_URL; import static org.dependencytrack.model.ConfigPropertyConstants.VULNERABILITY_SOURCE_GOOGLE_OSV_ENABLED; diff --git a/src/test/java/org/dependencytrack/resources/v1/LdapResourceTest.java b/src/test/java/org/dependencytrack/resources/v1/LdapResourceTest.java index b759a8d381..6c5c041c11 100644 --- a/src/test/java/org/dependencytrack/resources/v1/LdapResourceTest.java +++ b/src/test/java/org/dependencytrack/resources/v1/LdapResourceTest.java @@ -29,11 +29,11 @@ import org.junit.ClassRule; import org.junit.Test; -import javax.json.JsonArray; -import javax.json.JsonObject; -import javax.ws.rs.client.Entity; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.json.JsonArray; +import jakarta.json.JsonObject; +import jakarta.ws.rs.client.Entity; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import java.util.UUID; public class LdapResourceTest extends ResourceTest { diff --git a/src/test/java/org/dependencytrack/resources/v1/LicenseResourceTest.java b/src/test/java/org/dependencytrack/resources/v1/LicenseResourceTest.java index ad558ad876..9513737e62 100644 --- a/src/test/java/org/dependencytrack/resources/v1/LicenseResourceTest.java +++ b/src/test/java/org/dependencytrack/resources/v1/LicenseResourceTest.java @@ -31,11 +31,11 @@ import org.junit.ClassRule; import org.junit.Test; -import javax.json.JsonArray; -import javax.json.JsonObject; -import javax.ws.rs.client.Entity; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.json.JsonArray; +import jakarta.json.JsonObject; +import jakarta.ws.rs.client.Entity; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; public class LicenseResourceTest extends ResourceTest { diff --git a/src/test/java/org/dependencytrack/resources/v1/NotificationPublisherResourceTest.java b/src/test/java/org/dependencytrack/resources/v1/NotificationPublisherResourceTest.java index 01e3f4c803..293c3e6cc2 100644 --- a/src/test/java/org/dependencytrack/resources/v1/NotificationPublisherResourceTest.java +++ b/src/test/java/org/dependencytrack/resources/v1/NotificationPublisherResourceTest.java @@ -38,12 +38,12 @@ import org.junit.ClassRule; import org.junit.Test; -import javax.json.JsonArray; -import javax.json.JsonObject; -import javax.ws.rs.client.Entity; -import javax.ws.rs.core.Form; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.json.JsonArray; +import jakarta.json.JsonObject; +import jakarta.ws.rs.client.Entity; +import jakarta.ws.rs.core.Form; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import java.util.UUID; public class NotificationPublisherResourceTest extends ResourceTest { diff --git a/src/test/java/org/dependencytrack/resources/v1/NotificationRuleResourceTest.java b/src/test/java/org/dependencytrack/resources/v1/NotificationRuleResourceTest.java index 0967eed04c..03d5b1fb86 100644 --- a/src/test/java/org/dependencytrack/resources/v1/NotificationRuleResourceTest.java +++ b/src/test/java/org/dependencytrack/resources/v1/NotificationRuleResourceTest.java @@ -40,11 +40,11 @@ import org.junit.ClassRule; import org.junit.Test; -import javax.json.JsonArray; -import javax.json.JsonObject; -import javax.ws.rs.client.Entity; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.json.JsonArray; +import jakarta.json.JsonObject; +import jakarta.ws.rs.client.Entity; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import java.util.ArrayList; import java.util.Collections; import java.util.List; diff --git a/src/test/java/org/dependencytrack/resources/v1/OidcResourceAuthenticatedTest.java b/src/test/java/org/dependencytrack/resources/v1/OidcResourceAuthenticatedTest.java index ad21029915..495ac996b7 100644 --- a/src/test/java/org/dependencytrack/resources/v1/OidcResourceAuthenticatedTest.java +++ b/src/test/java/org/dependencytrack/resources/v1/OidcResourceAuthenticatedTest.java @@ -29,11 +29,11 @@ import org.junit.ClassRule; import org.junit.Test; -import javax.json.JsonArray; -import javax.json.JsonObject; -import javax.ws.rs.client.Entity; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.json.JsonArray; +import jakarta.json.JsonObject; +import jakarta.ws.rs.client.Entity; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import java.util.UUID; import static org.assertj.core.api.Assertions.assertThat; diff --git a/src/test/java/org/dependencytrack/resources/v1/OidcResourceUnauthenticatedTest.java b/src/test/java/org/dependencytrack/resources/v1/OidcResourceUnauthenticatedTest.java index 45cd0d7031..37ebe91011 100644 --- a/src/test/java/org/dependencytrack/resources/v1/OidcResourceUnauthenticatedTest.java +++ b/src/test/java/org/dependencytrack/resources/v1/OidcResourceUnauthenticatedTest.java @@ -24,7 +24,7 @@ import org.junit.ClassRule; import org.junit.Test; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import static org.assertj.core.api.Assertions.assertThat; diff --git a/src/test/java/org/dependencytrack/resources/v1/PermissionResourceTest.java b/src/test/java/org/dependencytrack/resources/v1/PermissionResourceTest.java index 87d4a04a12..ba737005e8 100644 --- a/src/test/java/org/dependencytrack/resources/v1/PermissionResourceTest.java +++ b/src/test/java/org/dependencytrack/resources/v1/PermissionResourceTest.java @@ -33,11 +33,11 @@ import org.junit.ClassRule; import org.junit.Test; -import javax.json.JsonArray; -import javax.json.JsonObject; -import javax.ws.rs.client.Entity; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.json.JsonArray; +import jakarta.json.JsonObject; +import jakarta.ws.rs.client.Entity; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import java.util.UUID; public class PermissionResourceTest extends ResourceTest { diff --git a/src/test/java/org/dependencytrack/resources/v1/PolicyResourceTest.java b/src/test/java/org/dependencytrack/resources/v1/PolicyResourceTest.java index ee1fba255c..6a32957f1a 100644 --- a/src/test/java/org/dependencytrack/resources/v1/PolicyResourceTest.java +++ b/src/test/java/org/dependencytrack/resources/v1/PolicyResourceTest.java @@ -34,11 +34,11 @@ import org.junit.ClassRule; import org.junit.Test; -import javax.json.JsonArray; -import javax.json.JsonObject; -import javax.ws.rs.client.Entity; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.json.JsonArray; +import jakarta.json.JsonObject; +import jakarta.ws.rs.client.Entity; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import java.util.Date; import static java.util.Collections.singletonList; diff --git a/src/test/java/org/dependencytrack/resources/v1/PolicyViolationResourceTest.java b/src/test/java/org/dependencytrack/resources/v1/PolicyViolationResourceTest.java index c78ca186e3..da4aba1971 100644 --- a/src/test/java/org/dependencytrack/resources/v1/PolicyViolationResourceTest.java +++ b/src/test/java/org/dependencytrack/resources/v1/PolicyViolationResourceTest.java @@ -33,9 +33,9 @@ import org.junit.ClassRule; import org.junit.Test; -import javax.json.JsonArray; -import javax.json.JsonObject; -import javax.ws.rs.core.Response; +import jakarta.json.JsonArray; +import jakarta.json.JsonObject; +import jakarta.ws.rs.core.Response; import java.util.ArrayList; import java.util.Date; import java.util.UUID; diff --git a/src/test/java/org/dependencytrack/resources/v1/ProjectPropertyResourceTest.java b/src/test/java/org/dependencytrack/resources/v1/ProjectPropertyResourceTest.java index 961b2d36c1..d75a9d6b27 100644 --- a/src/test/java/org/dependencytrack/resources/v1/ProjectPropertyResourceTest.java +++ b/src/test/java/org/dependencytrack/resources/v1/ProjectPropertyResourceTest.java @@ -31,11 +31,11 @@ import org.junit.ClassRule; import org.junit.Test; -import javax.json.JsonArray; -import javax.json.JsonObject; -import javax.ws.rs.client.Entity; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.json.JsonArray; +import jakarta.json.JsonObject; +import jakarta.ws.rs.client.Entity; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import java.util.UUID; public class ProjectPropertyResourceTest extends ResourceTest { diff --git a/src/test/java/org/dependencytrack/resources/v1/ProjectResourceTest.java b/src/test/java/org/dependencytrack/resources/v1/ProjectResourceTest.java index a2abaeeed6..406816028e 100644 --- a/src/test/java/org/dependencytrack/resources/v1/ProjectResourceTest.java +++ b/src/test/java/org/dependencytrack/resources/v1/ProjectResourceTest.java @@ -52,13 +52,13 @@ import org.junit.ClassRule; import org.junit.Test; -import javax.json.Json; -import javax.json.JsonArray; -import javax.json.JsonObject; -import javax.ws.rs.HttpMethod; -import javax.ws.rs.client.Entity; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.json.Json; +import jakarta.json.JsonArray; +import jakarta.json.JsonObject; +import jakarta.ws.rs.HttpMethod; +import jakarta.ws.rs.client.Entity; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import java.time.Duration; import java.util.ArrayList; import java.util.List; diff --git a/src/test/java/org/dependencytrack/resources/v1/RepositoryResourceTest.java b/src/test/java/org/dependencytrack/resources/v1/RepositoryResourceTest.java index 5d289a57bc..bf62d0bc44 100644 --- a/src/test/java/org/dependencytrack/resources/v1/RepositoryResourceTest.java +++ b/src/test/java/org/dependencytrack/resources/v1/RepositoryResourceTest.java @@ -33,11 +33,11 @@ import org.junit.ClassRule; import org.junit.Test; -import javax.json.JsonArray; -import javax.json.JsonObject; -import javax.ws.rs.client.Entity; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.json.JsonArray; +import jakarta.json.JsonObject; +import jakarta.ws.rs.client.Entity; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import java.util.Date; import java.util.List; diff --git a/src/test/java/org/dependencytrack/resources/v1/SearchResourceTest.java b/src/test/java/org/dependencytrack/resources/v1/SearchResourceTest.java index 9a3142dacc..5f7ee38087 100644 --- a/src/test/java/org/dependencytrack/resources/v1/SearchResourceTest.java +++ b/src/test/java/org/dependencytrack/resources/v1/SearchResourceTest.java @@ -36,8 +36,8 @@ import org.junit.ClassRule; import org.junit.Test; -import javax.json.JsonObject; -import javax.ws.rs.core.Response; +import jakarta.json.JsonObject; +import jakarta.ws.rs.core.Response; import java.time.Duration; import java.util.concurrent.ConcurrentLinkedQueue; diff --git a/src/test/java/org/dependencytrack/resources/v1/TagResourceTest.java b/src/test/java/org/dependencytrack/resources/v1/TagResourceTest.java index f417caabc8..e447ce26a8 100644 --- a/src/test/java/org/dependencytrack/resources/v1/TagResourceTest.java +++ b/src/test/java/org/dependencytrack/resources/v1/TagResourceTest.java @@ -10,8 +10,8 @@ import org.junit.ClassRule; import org.junit.Test; -import javax.json.JsonArray; -import javax.ws.rs.core.Response; +import jakarta.json.JsonArray; +import jakarta.ws.rs.core.Response; import java.util.List; public class TagResourceTest extends ResourceTest { diff --git a/src/test/java/org/dependencytrack/resources/v1/TeamResourceTest.java b/src/test/java/org/dependencytrack/resources/v1/TeamResourceTest.java index 784797cb4f..b1662d8d36 100644 --- a/src/test/java/org/dependencytrack/resources/v1/TeamResourceTest.java +++ b/src/test/java/org/dependencytrack/resources/v1/TeamResourceTest.java @@ -37,11 +37,11 @@ import org.junit.ClassRule; import org.junit.Test; -import javax.json.JsonArray; -import javax.json.JsonObject; -import javax.ws.rs.client.Entity; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.json.JsonArray; +import jakarta.json.JsonObject; +import jakarta.ws.rs.client.Entity; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import java.util.UUID; import static net.javacrumbs.jsonunit.assertj.JsonAssertions.assertThatJson; diff --git a/src/test/java/org/dependencytrack/resources/v1/UserResourceAuthenticatedTest.java b/src/test/java/org/dependencytrack/resources/v1/UserResourceAuthenticatedTest.java index dfdd39df10..c8babba726 100644 --- a/src/test/java/org/dependencytrack/resources/v1/UserResourceAuthenticatedTest.java +++ b/src/test/java/org/dependencytrack/resources/v1/UserResourceAuthenticatedTest.java @@ -35,11 +35,11 @@ import org.junit.ClassRule; import org.junit.Test; -import javax.json.JsonArray; -import javax.json.JsonObject; -import javax.ws.rs.client.Entity; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.json.JsonArray; +import jakarta.json.JsonObject; +import jakarta.ws.rs.client.Entity; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import java.util.UUID; public class UserResourceAuthenticatedTest extends ResourceTest { diff --git a/src/test/java/org/dependencytrack/resources/v1/UserResourceUnauthenticatedTest.java b/src/test/java/org/dependencytrack/resources/v1/UserResourceUnauthenticatedTest.java index 18c6bd5f4e..18526d3200 100644 --- a/src/test/java/org/dependencytrack/resources/v1/UserResourceUnauthenticatedTest.java +++ b/src/test/java/org/dependencytrack/resources/v1/UserResourceUnauthenticatedTest.java @@ -29,10 +29,10 @@ import org.junit.ClassRule; import org.junit.Test; -import javax.ws.rs.client.Entity; -import javax.ws.rs.core.Form; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.client.Entity; +import jakarta.ws.rs.core.Form; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; public class UserResourceUnauthenticatedTest extends ResourceTest { diff --git a/src/test/java/org/dependencytrack/resources/v1/VexResourceTest.java b/src/test/java/org/dependencytrack/resources/v1/VexResourceTest.java index fdb389de34..bd158c0140 100644 --- a/src/test/java/org/dependencytrack/resources/v1/VexResourceTest.java +++ b/src/test/java/org/dependencytrack/resources/v1/VexResourceTest.java @@ -39,9 +39,9 @@ import org.junit.ClassRule; import org.junit.Test; -import javax.ws.rs.client.Entity; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.client.Entity; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import java.util.Base64; import static net.javacrumbs.jsonunit.assertj.JsonAssertions.assertThatJson; diff --git a/src/test/java/org/dependencytrack/resources/v1/ViolationAnalysisResourceTest.java b/src/test/java/org/dependencytrack/resources/v1/ViolationAnalysisResourceTest.java index a7b3670112..603eeb944f 100644 --- a/src/test/java/org/dependencytrack/resources/v1/ViolationAnalysisResourceTest.java +++ b/src/test/java/org/dependencytrack/resources/v1/ViolationAnalysisResourceTest.java @@ -52,12 +52,12 @@ import org.junit.ClassRule; import org.junit.Test; -import javax.json.Json; -import javax.json.JsonArray; -import javax.json.JsonObject; -import javax.ws.rs.client.Entity; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.json.Json; +import jakarta.json.JsonArray; +import jakarta.json.JsonObject; +import jakarta.ws.rs.client.Entity; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import java.time.Duration; import java.util.Date; import java.util.UUID; diff --git a/src/test/java/org/dependencytrack/resources/v1/VulnerabilityResourceTest.java b/src/test/java/org/dependencytrack/resources/v1/VulnerabilityResourceTest.java index e57f16cf11..d217b0a290 100644 --- a/src/test/java/org/dependencytrack/resources/v1/VulnerabilityResourceTest.java +++ b/src/test/java/org/dependencytrack/resources/v1/VulnerabilityResourceTest.java @@ -38,12 +38,12 @@ import org.junit.ClassRule; import org.junit.Test; -import javax.json.Json; -import javax.json.JsonArray; -import javax.json.JsonObject; -import javax.ws.rs.client.Entity; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.json.Json; +import jakarta.json.JsonArray; +import jakarta.json.JsonObject; +import jakarta.ws.rs.client.Entity; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import java.util.List; import java.util.UUID; diff --git a/src/test/java/org/dependencytrack/resources/v1/exception/ClientErrorExceptionMapperTest.java b/src/test/java/org/dependencytrack/resources/v1/exception/ClientErrorExceptionMapperTest.java index 038e5b73ac..efdd96fb15 100644 --- a/src/test/java/org/dependencytrack/resources/v1/exception/ClientErrorExceptionMapperTest.java +++ b/src/test/java/org/dependencytrack/resources/v1/exception/ClientErrorExceptionMapperTest.java @@ -24,9 +24,9 @@ import org.junit.ClassRule; import org.junit.Test; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.core.Response; import static org.assertj.core.api.Assertions.assertThat; diff --git a/src/test/java/org/dependencytrack/resources/v1/exception/ConstraintViolationExceptionMapperTest.java b/src/test/java/org/dependencytrack/resources/v1/exception/ConstraintViolationExceptionMapperTest.java index 459187625b..a34f714627 100644 --- a/src/test/java/org/dependencytrack/resources/v1/exception/ConstraintViolationExceptionMapperTest.java +++ b/src/test/java/org/dependencytrack/resources/v1/exception/ConstraintViolationExceptionMapperTest.java @@ -26,14 +26,14 @@ import org.junit.ClassRule; import org.junit.Test; -import javax.validation.constraints.Pattern; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.validation.constraints.Pattern; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import static net.javacrumbs.jsonunit.assertj.JsonAssertions.assertThatJson; import static org.assertj.core.api.Assertions.assertThat; @@ -64,7 +64,7 @@ public void test() { }, { "message": "must match \\"^[a-z]+$\\"", - "messageTemplate": "{javax.validation.constraints.Pattern.message}", + "messageTemplate": "{jakarta.validation.constraints.Pattern.message}", "path": "get.arg2", "invalidValue": "666" } diff --git a/src/test/java/org/dependencytrack/resources/v1/exception/NotSortableExceptionMapperTest.java b/src/test/java/org/dependencytrack/resources/v1/exception/NotSortableExceptionMapperTest.java index 1b047ddede..5e914fba06 100644 --- a/src/test/java/org/dependencytrack/resources/v1/exception/NotSortableExceptionMapperTest.java +++ b/src/test/java/org/dependencytrack/resources/v1/exception/NotSortableExceptionMapperTest.java @@ -29,11 +29,11 @@ import org.junit.ClassRule; import org.junit.Test; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import static net.javacrumbs.jsonunit.assertj.JsonAssertions.assertThatJson; import static org.assertj.core.api.Assertions.assertThat; diff --git a/src/test/java/org/dependencytrack/servlet/NvdMirrorServletTest.java b/src/test/java/org/dependencytrack/servlet/NvdMirrorServletTest.java index a4681a1f91..d4b5c7bdd0 100644 --- a/src/test/java/org/dependencytrack/servlet/NvdMirrorServletTest.java +++ b/src/test/java/org/dependencytrack/servlet/NvdMirrorServletTest.java @@ -22,11 +22,11 @@ import org.junit.Before; import org.junit.Test; -import javax.servlet.ServletConfig; -import javax.servlet.ServletContext; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; diff --git a/src/test/java/org/dependencytrack/tasks/RepoMetaAnalysisTaskTest.java b/src/test/java/org/dependencytrack/tasks/RepoMetaAnalysisTaskTest.java index b33ba4d4d8..02455e160b 100644 --- a/src/test/java/org/dependencytrack/tasks/RepoMetaAnalysisTaskTest.java +++ b/src/test/java/org/dependencytrack/tasks/RepoMetaAnalysisTaskTest.java @@ -19,7 +19,7 @@ import org.junit.Rule; import org.junit.Test; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import java.util.List; import static com.github.tomakehurst.wiremock.client.WireMock.containing; diff --git a/src/test/java/org/dependencytrack/tasks/scanners/OssIndexAnalysisTaskTest.java b/src/test/java/org/dependencytrack/tasks/scanners/OssIndexAnalysisTaskTest.java index 414e208c4f..c2491aec82 100644 --- a/src/test/java/org/dependencytrack/tasks/scanners/OssIndexAnalysisTaskTest.java +++ b/src/test/java/org/dependencytrack/tasks/scanners/OssIndexAnalysisTaskTest.java @@ -16,7 +16,7 @@ import org.junit.Rule; import org.junit.Test; -import javax.json.Json; +import jakarta.json.Json; import java.util.Date; import java.util.List; import java.util.Map; diff --git a/src/test/java/org/dependencytrack/tasks/scanners/SnykAnalysisTaskTest.java b/src/test/java/org/dependencytrack/tasks/scanners/SnykAnalysisTaskTest.java index 3d6f8d71b4..af6621df4a 100644 --- a/src/test/java/org/dependencytrack/tasks/scanners/SnykAnalysisTaskTest.java +++ b/src/test/java/org/dependencytrack/tasks/scanners/SnykAnalysisTaskTest.java @@ -49,8 +49,8 @@ import org.mockserver.matchers.Times; import org.mockserver.verify.VerificationTimes; +import jakarta.json.Json; import javax.jdo.Query; -import javax.json.Json; import java.math.BigDecimal; import java.time.Duration; import java.util.ArrayList; diff --git a/src/test/java/org/dependencytrack/tasks/scanners/TrivyAnalysisTaskTest.java b/src/test/java/org/dependencytrack/tasks/scanners/TrivyAnalysisTaskTest.java index 403b665a08..d04102b764 100644 --- a/src/test/java/org/dependencytrack/tasks/scanners/TrivyAnalysisTaskTest.java +++ b/src/test/java/org/dependencytrack/tasks/scanners/TrivyAnalysisTaskTest.java @@ -44,7 +44,7 @@ import org.junit.Rule; import org.junit.Test; -import javax.json.Json; +import jakarta.json.Json; import java.util.Date; import java.util.List; import java.util.Map; diff --git a/src/test/java/org/dependencytrack/tasks/scanners/VulnDBAnalysisTaskTest.java b/src/test/java/org/dependencytrack/tasks/scanners/VulnDBAnalysisTaskTest.java index f4a8595635..906038b966 100644 --- a/src/test/java/org/dependencytrack/tasks/scanners/VulnDBAnalysisTaskTest.java +++ b/src/test/java/org/dependencytrack/tasks/scanners/VulnDBAnalysisTaskTest.java @@ -41,8 +41,8 @@ import org.mockserver.integration.ClientAndServer; import org.mockserver.model.Header; +import jakarta.json.Json; import javax.jdo.Query; -import javax.json.Json; import java.util.ArrayList; import java.util.Date; import java.util.List; diff --git a/src/test/webapp/WEB-INF/h2-console-activation.xml b/src/test/webapp/WEB-INF/h2-console-activation.xml deleted file mode 100644 index 2275179950..0000000000 --- a/src/test/webapp/WEB-INF/h2-console-activation.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - h2.console.enabled - true - - - h2.console.path - /h2-console - - \ No newline at end of file diff --git a/src/test/webapp/WEB-INF/h2-console-web.xml b/src/test/webapp/WEB-INF/h2-console-web.xml new file mode 100644 index 0000000000..8cefdf14a0 --- /dev/null +++ b/src/test/webapp/WEB-INF/h2-console-web.xml @@ -0,0 +1,32 @@ + + + + + h2.console.enabled + true + + + h2.console.path + /h2-console + + \ No newline at end of file