Skip to content

Commit b2b20ee

Browse files
nscuronscuro
committed
Bump Alpine to 3.5.0
Signed-off-by: nscuro <nscuro@protonmail.com>
1 parent 7409ce9 commit b2b20ee

File tree

4 files changed

+27
-43
lines changed

4 files changed

+27
-43
lines changed

‎pom.xml‎

Lines changed: 16 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<parent>
2525
<groupId>us.springett</groupId>
2626
<artifactId>alpine-parent</artifactId>
27-
<version>3.4.0</version>
27+
<version>3.5.0</version>
2828
</parent>
2929

3030
<modelVersion>4.0.0</modelVersion>
@@ -99,11 +99,8 @@
9999
<lib.ae-security.version>0.149.0</lib.ae-security.version>
100100
<lib.owasp-rr-calculator.version>1.0.1</lib.owasp-rr-calculator.version>
101101
<lib.cyclonedx-java.version>11.0.1</lib.cyclonedx-java.version>
102-
<lib.jakarta-validation.version>3.1.1</lib.jakarta-validation.version>
103102
<lib.greenmail.version>2.1.8</lib.greenmail.version>
104103
<lib.json-java.version>20250517</lib.json-java.version>
105-
<lib.json-unit.version>5.1.0</lib.json-unit.version>
106-
<lib.junit.version>5.11.4</lib.junit.version>
107104
<lib.lucene.version>8.11.4</lib.lucene.version>
108105
<lib.maven-artifact.version>3.9.12</lib.maven-artifact.version>
109106
<lib.mockserver-netty.version>5.15.0</lib.mockserver-netty.version>
@@ -130,7 +127,6 @@
130127
<lib.jdbc-driver.postgresql.version>42.7.8</lib.jdbc-driver.postgresql.version>
131128
<!-- Maven Plugin Properties -->
132129
<plugin.retirejs.breakOnFailure>false</plugin.retirejs.breakOnFailure>
133-
<plugin.jetty.version>12.1.5</plugin.jetty.version>
134130
<plugin.protoc-jar.version>3.11.4</plugin.protoc-jar.version>
135131
<!-- SonarCloud properties -->
136132
<sonar.exclusions>src/main/webapp/**</sonar.exclusions>
@@ -205,7 +201,6 @@
205201
<dependency>
206202
<groupId>jakarta.validation</groupId>
207203
<artifactId>jakarta.validation-api</artifactId>
208-
<version>${lib.jakarta-validation.version}</version>
209204
</dependency>
210205

211206
<dependency>
@@ -414,25 +409,11 @@
414409
<dependency>
415410
<groupId>org.junit.jupiter</groupId>
416411
<artifactId>junit-jupiter</artifactId>
417-
<version>${lib.junit.version}</version>
418-
<scope>test</scope>
419-
</dependency>
420-
<dependency>
421-
<groupId>org.junit.jupiter</groupId>
422-
<artifactId>junit-jupiter-api</artifactId>
423-
<version>${lib.junit.version}</version>
424-
<scope>test</scope>
425-
</dependency>
426-
<dependency>
427-
<groupId>org.junit.jupiter</groupId>
428-
<artifactId>junit-jupiter-engine</artifactId>
429-
<version>${lib.junit.version}</version>
430412
<scope>test</scope>
431413
</dependency>
432414
<dependency>
433415
<groupId>org.glassfish.jersey.test-framework.providers</groupId>
434416
<artifactId>jersey-test-framework-provider-grizzly2</artifactId>
435-
<version>${lib.jersey.version}</version>
436417
<scope>test</scope>
437418
<exclusions>
438419
<exclusion>
@@ -441,41 +422,30 @@
441422
</exclusion>
442423
</exclusions>
443424
</dependency>
444-
<dependency>
445-
<groupId>org.glassfish.jersey.connectors</groupId>
446-
<artifactId>jersey-grizzly-connector</artifactId>
447-
<version>${lib.jersey.version}</version>
448-
<scope>test</scope>
449-
</dependency>
450425
<dependency>
451426
<groupId>org.mockito</groupId>
452427
<artifactId>mockito-core</artifactId>
453-
<version>${lib.mockito.version}</version>
454428
<scope>test</scope>
455429
</dependency>
456430

457431
<dependency>
458432
<groupId>com.github.tomakehurst</groupId>
459433
<artifactId>wiremock-jre8-standalone</artifactId>
460-
<version>${lib.wiremock.version}</version>
461434
<scope>test</scope>
462435
</dependency>
463436
<dependency>
464437
<groupId>org.junit-pioneer</groupId>
465438
<artifactId>junit-pioneer</artifactId>
466-
<version>${lib.junit-pioneer.version}</version>
467439
<scope>test</scope>
468440
</dependency>
469441
<dependency>
470442
<groupId>org.assertj</groupId>
471443
<artifactId>assertj-core</artifactId>
472-
<version>${lib.assertj.version}</version>
473444
<scope>test</scope>
474445
</dependency>
475446
<dependency>
476447
<groupId>net.javacrumbs.json-unit</groupId>
477448
<artifactId>json-unit-assertj</artifactId>
478-
<version>${lib.json-unit.version}</version>
479449
<scope>test</scope>
480450
</dependency>
481451
<dependency>
@@ -608,6 +578,15 @@
608578
<groupId>org.apache.maven.plugins</groupId>
609579
<artifactId>maven-surefire-plugin</artifactId>
610580
<configuration>
581+
<argLine>
582+
@{argLine}
583+
-Xmx2g
584+
--add-opens java.base/java.net=ALL-UNNAMED
585+
--add-opens java.base/java.lang=ALL-UNNAMED
586+
--add-opens java.base/java.util=ALL-UNNAMED
587+
-javaagent:${settings.localRepository}/org/mockito/mockito-core/${lib.mockito.version}/mockito-core-${lib.mockito.version}.jar
588+
-Xshare:off
589+
</argLine>
611590
<systemProperties>
612591
<property>
613592
<name>java.util.logging.config.file</name>
@@ -729,9 +708,9 @@
729708
</executions>
730709
</plugin>
731710
<plugin>
732-
<groupId>org.eclipse.jetty.ee10</groupId>
733-
<artifactId>jetty-ee10-maven-plugin</artifactId>
734-
<version>${plugin.jetty.version}</version>
711+
<groupId>org.eclipse.jetty.ee11</groupId>
712+
<artifactId>jetty-ee11-maven-plugin</artifactId>
713+
<version>${lib.jetty.version}</version>
735714
<configuration>
736715
<systemProperties>
737716
<dev.mode.enabled>true</dev.mode.enabled>
@@ -807,9 +786,9 @@
807786
<build>
808787
<plugins>
809788
<plugin>
810-
<groupId>org.eclipse.jetty.ee10</groupId>
811-
<artifactId>jetty-ee10-maven-plugin</artifactId>
812-
<version>${plugin.jetty.version}</version>
789+
<groupId>org.eclipse.jetty.ee11</groupId>
790+
<artifactId>jetty-ee11-maven-plugin</artifactId>
791+
<version>${lib.jetty.version}</version>
813792
<configuration>
814793
<systemProperties>
815794
<dev.mode.enabled>true</dev.mode.enabled>

‎src/main/webapp/WEB-INF/jetty-context.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0"?>
22
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
3-
<Configure class="org.eclipse.jetty.ee10.webapp.WebAppContext">
3+
<Configure class="org.eclipse.jetty.ee11.webapp.WebAppContext">
44
<!-- Disable classpath scanning. -->
55
<Call name="setAttribute">
66
<Arg>org.eclipse.jetty.server.webapp.ContainerIncludeJarPattern</Arg>

‎src/main/webapp/WEB-INF/web.xml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,10 @@
120120
<param-name>jersey.config.beanValidation.enableOutputValidationErrorEntity.server</param-name>
121121
<param-value>true</param-value>
122122
</init-param>
123+
<init-param>
124+
<param-name>jersey.config.server.wadl.disableWadl</param-name>
125+
<param-value>true</param-value>
126+
</init-param>
123127
<load-on-startup>1</load-on-startup>
124128
</servlet>
125129
<servlet-mapping>

‎src/test/java/org/dependencytrack/JerseyTestExtension.java‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
import jakarta.ws.rs.client.WebTarget;
2222
import org.glassfish.jersey.client.ClientConfig;
23-
import org.glassfish.jersey.grizzly.connector.GrizzlyConnectorProvider;
23+
import org.glassfish.jersey.client.HttpUrlConnectorProvider;
2424
import org.glassfish.jersey.server.ResourceConfig;
2525
import org.glassfish.jersey.servlet.ServletContainer;
2626
import org.glassfish.jersey.test.DeploymentContext;
@@ -66,10 +66,11 @@ protected TestContainerFactory getTestContainerFactory() throws TestContainerExc
6666

6767
@Override
6868
protected void configureClient(final ClientConfig config) {
69-
// Prevent InaccessibleObjectException with JDK >= 16 when performing PATCH requests
70-
// using the default HttpUrlConnection connector provider.
71-
// See https://github.com/eclipse-ee4j/jersey/issues/4825
72-
config.connectorProvider(new GrizzlyConnectorProvider());
69+
config.connectorProvider(
70+
new HttpUrlConnectorProvider()
71+
// Required for PATCH support.
72+
// See https://github.com/eclipse-ee4j/jersey/issues/4825
73+
.useSetMethodWorkaround());
7374
}
7475

7576
@Override

0 commit comments

Comments
 (0)