Skip to content

Bump Alpine to 3.5.0 #5652

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nscuro merged 1 commit into from
Jan 1, 2026
Merged

Bump Alpine to 3.5.0 #5652

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 16 additions & 37 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>us.springett</groupId>
<artifactId>alpine-parent</artifactId>
<version>3.4.0</version>
<version>3.5.0</version>
</parent>

<modelVersion>4.0.0</modelVersion>
Expand Down Expand Up @@ -99,11 +99,8 @@
<lib.ae-security.version>0.149.0</lib.ae-security.version>
<lib.owasp-rr-calculator.version>1.0.1</lib.owasp-rr-calculator.version>
<lib.cyclonedx-java.version>11.0.1</lib.cyclonedx-java.version>
<lib.jakarta-validation.version>3.1.1</lib.jakarta-validation.version>
<lib.greenmail.version>2.1.8</lib.greenmail.version>
<lib.json-java.version>20250517</lib.json-java.version>
<lib.json-unit.version>5.1.0</lib.json-unit.version>
<lib.junit.version>5.11.4</lib.junit.version>
<lib.lucene.version>8.11.4</lib.lucene.version>
<lib.maven-artifact.version>3.9.12</lib.maven-artifact.version>
<lib.mockserver-netty.version>5.15.0</lib.mockserver-netty.version>
Expand All @@ -130,7 +127,6 @@
<lib.jdbc-driver.postgresql.version>42.7.8</lib.jdbc-driver.postgresql.version>
<!-- Maven Plugin Properties -->
<plugin.retirejs.breakOnFailure>false</plugin.retirejs.breakOnFailure>
<plugin.jetty.version>12.1.5</plugin.jetty.version>
<plugin.protoc-jar.version>3.11.4</plugin.protoc-jar.version>
<!-- SonarCloud properties -->
<sonar.exclusions>src/main/webapp/**</sonar.exclusions>
Expand Down Expand Up @@ -205,7 +201,6 @@
<dependency>
<groupId>jakarta.validation</groupId>
<artifactId>jakarta.validation-api</artifactId>
<version>${lib.jakarta-validation.version}</version>
</dependency>

<dependency>
Expand Down Expand Up @@ -414,25 +409,11 @@
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
<version>${lib.junit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<version>${lib.junit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
<version>${lib.junit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.test-framework.providers</groupId>
<artifactId>jersey-test-framework-provider-grizzly2</artifactId>
<version>${lib.jersey.version}</version>
<scope>test</scope>
<exclusions>
<exclusion>
Expand All @@ -441,41 +422,30 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.connectors</groupId>
<artifactId>jersey-grizzly-connector</artifactId>
<version>${lib.jersey.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>${lib.mockito.version}</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>com.github.tomakehurst</groupId>
<artifactId>wiremock-jre8-standalone</artifactId>
<version>${lib.wiremock.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit-pioneer</groupId>
<artifactId>junit-pioneer</artifactId>
<version>${lib.junit-pioneer.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<version>${lib.assertj.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>net.javacrumbs.json-unit</groupId>
<artifactId>json-unit-assertj</artifactId>
<version>${lib.json-unit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -608,6 +578,15 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<argLine>
@{argLine}
-Xmx512m
--add-opens java.base/java.net=ALL-UNNAMED
--add-opens java.base/java.lang=ALL-UNNAMED
--add-opens java.base/java.util=ALL-UNNAMED
-javaagent:${settings.localRepository}/org/mockito/mockito-core/${lib.mockito.version}/mockito-core-${lib.mockito.version}.jar
-Xshare:off
</argLine>
<systemProperties>
<property>
<name>java.util.logging.config.file</name>
Expand Down Expand Up @@ -729,9 +708,9 @@
</executions>
</plugin>
<plugin>
<groupId>org.eclipse.jetty.ee10</groupId>
<artifactId>jetty-ee10-maven-plugin</artifactId>
<version>${plugin.jetty.version}</version>
<groupId>org.eclipse.jetty.ee11</groupId>
<artifactId>jetty-ee11-maven-plugin</artifactId>
<version>${lib.jetty.version}</version>
<configuration>
<systemProperties>
<dev.mode.enabled>true</dev.mode.enabled>
Expand Down Expand Up @@ -807,9 +786,9 @@
<build>
<plugins>
<plugin>
<groupId>org.eclipse.jetty.ee10</groupId>
<artifactId>jetty-ee10-maven-plugin</artifactId>
<version>${plugin.jetty.version}</version>
<groupId>org.eclipse.jetty.ee11</groupId>
<artifactId>jetty-ee11-maven-plugin</artifactId>
<version>${lib.jetty.version}</version>
<configuration>
<systemProperties>
<dev.mode.enabled>true</dev.mode.enabled>
Expand Down
2 changes: 1 addition & 1 deletion src/main/webapp/WEB-INF/jetty-context.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
<Configure class="org.eclipse.jetty.ee10.webapp.WebAppContext">
<Configure class="org.eclipse.jetty.ee11.webapp.WebAppContext">
<!-- Disable classpath scanning. -->
<Call name="setAttribute">
<Arg>org.eclipse.jetty.server.webapp.ContainerIncludeJarPattern</Arg>
Expand Down
4 changes: 4 additions & 0 deletions src/main/webapp/WEB-INF/web.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,10 @@
<param-name>jersey.config.beanValidation.enableOutputValidationErrorEntity.server</param-name>
<param-value>true</param-value>
</init-param>
<init-param>
<param-name>jersey.config.server.wadl.disableWadl</param-name>
<param-value>true</param-value>
</init-param>
<load-on-startup>1</load-on-startup>
</servlet>
<servlet-mapping>
Expand Down
11 changes: 6 additions & 5 deletions src/test/java/org/dependencytrack/JerseyTestExtension.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

import jakarta.ws.rs.client.WebTarget;
import org.glassfish.jersey.client.ClientConfig;
import org.glassfish.jersey.grizzly.connector.GrizzlyConnectorProvider;
import org.glassfish.jersey.client.HttpUrlConnectorProvider;
import org.glassfish.jersey.server.ResourceConfig;
import org.glassfish.jersey.servlet.ServletContainer;
import org.glassfish.jersey.test.DeploymentContext;
Expand Down Expand Up @@ -66,10 +66,11 @@ protected TestContainerFactory getTestContainerFactory() throws TestContainerExc

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

@Override
Expand Down
Loading