Skip to content
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

Bump maven.surefire.plugin.version from 3.0.0-M5 to 3.0.0-M8 #9255

Merged
merged 8 commits into from
Feb 2, 2023
Merged

Bump maven.surefire.plugin.version from 3.0.0-M5 to 3.0.0-M8 #9255

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
ec1c531
Bump maven.surefire.plugin.version from 3.0.0-M5 to 3.0.0-M8
dependabot[bot] Feb 1, 2023
9330f7f
Bump maven.surefire.plugin.version from 3.0.0-M5 to 3.0.0-M8
dependabot[bot] Feb 1, 2023
9c89e7a
Merge branch 'dependabot/maven/jetty-10.0.x/maven.surefire.plugin.ver…
joakime Feb 1, 2023
69f5540
Merge remote-tracking branch 'origin/jetty-10.0.x' into dependabot/ma…
joakime Feb 1, 2023
40a15be
surefire config to add-reads for jetty-slf4j-impl
joakime Feb 1, 2023
2244e5f
More surefire config for `--add-reads` to `org.eclipse.jetty.logging`
joakime Feb 1, 2023
6601b90
More surefire config for `--add-reads` to `org.eclipse.jetty.logging`
joakime Feb 1, 2023
ebc1bb0
fix jpms issue with foreig module not anymore in jdk19
olamy Feb 2, 2023
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
2 changes: 1 addition & 1 deletion build-resources/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<maven.deploy.plugin.version>3.0.0-M2</maven.deploy.plugin.version>
<maven.javadoc.plugin.version>3.4.0</maven.javadoc.plugin.version>
<maven.remote-resources.plugin.version>3.0.0</maven.remote-resources.plugin.version>
<maven.surefire.plugin.version>3.0.0-M5</maven.surefire.plugin.version>
<maven.surefire.plugin.version>3.0.0-M8</maven.surefire.plugin.version>
<maven.deploy.skip>true</maven.deploy.skip>
<maven.javadoc.skip>true</maven.javadoc.skip>
</properties>
Expand Down
4 changes: 3 additions & 1 deletion jetty-annotations/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,9 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<argLine>
@{argLine} ${jetty.surefire.argLine} --add-opens org.eclipse.jetty.annotations/org.eclipse.jetty.annotations.resources=org.eclipse.jetty.plus
@{argLine} ${jetty.surefire.argLine}
--add-opens org.eclipse.jetty.annotations/org.eclipse.jetty.annotations.resources=org.eclipse.jetty.plus
--add-reads org.eclipse.jetty.annotations=org.eclipse.jetty.logging
</argLine>
</configuration>
</plugin>
Expand Down
1 change: 1 addition & 0 deletions jetty-client/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
@{argLine} ${jetty.surefire.argLine}
--add-modules java.security.jgss
--add-modules org.eclipse.jetty.jmx
--add-reads org.eclipse.jetty.client=org.eclipse.jetty.logging
</argLine>
</configuration>
</plugin>
Expand Down
5 changes: 4 additions & 1 deletion jetty-deploy/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,10 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<argLine>
@{argLine} ${jetty.surefire.argLine} --add-modules org.eclipse.jetty.jmx --add-reads org.eclipse.jetty.deploy=org.eclipse.jetty.http,jetty.servlet.api
@{argLine} ${jetty.surefire.argLine}
--add-modules org.eclipse.jetty.jmx
--add-reads org.eclipse.jetty.deploy=org.eclipse.jetty.http,jetty.servlet.api
--add-reads org.eclipse.jetty.deploy=org.eclipse.jetty.logging
</argLine>
</configuration>
</plugin>
Expand Down
14 changes: 14 additions & 0 deletions jetty-fcgi/fcgi-server/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,20 @@
<bundle-symbolic-name>${project.groupId}.server</bundle-symbolic-name>
</properties>

<build>
<plugins>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<argLine>
@{argLine} ${jetty.surefire.argLine}
--add-reads org.eclipse.jetty.fcgi.server=org.eclipse.jetty.logging
</argLine>
</configuration>
</plugin>
</plugins>
</build>

<dependencies>
<dependency>
<groupId>org.slf4j</groupId>
Expand Down
9 changes: 9 additions & 0 deletions jetty-http/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,15 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<argLine>
@{argLine} ${jetty.surefire.argLine} --add-reads org.eclipse.jetty.http=org.eclipse.jetty.logging
</argLine>
</configuration>
</plugin>
</plugins>
</build>
</project>
1 change: 1 addition & 0 deletions jetty-http2/http2-client/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
<argLine>
@{argLine} ${jetty.surefire.argLine}
--add-reads org.eclipse.jetty.http2.client=org.eclipse.jetty.http2.hpack
--add-reads org.eclipse.jetty.http2.client=org.eclipse.jetty.logging
</argLine>
</configuration>
</plugin>
Expand Down
5 changes: 4 additions & 1 deletion jetty-http2/http2-server/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,10 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<argLine>
@{argLine} ${jetty.surefire.argLine} --add-reads org.eclipse.jetty.http2.server=jetty.servlet.api --add-modules jetty.servlet.api
@{argLine} ${jetty.surefire.argLine}
--add-modules jetty.servlet.api
--add-reads org.eclipse.jetty.http2.server=jetty.servlet.api
--add-reads org.eclipse.jetty.http2.server=org.eclipse.jetty.logging
</argLine>
</configuration>
</plugin>
Expand Down
13 changes: 13 additions & 0 deletions jetty-io/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,4 +37,17 @@
<scope>test</scope>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<argLine>
@{argLine} ${jetty.surefire.argLine} --add-reads org.eclipse.jetty.io=org.eclipse.jetty.logging
</argLine>
</configuration>
</plugin>
</plugins>
</build>
</project>
14 changes: 14 additions & 0 deletions jetty-proxy/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,20 @@
<spotbugs.onlyAnalyze>org.eclipse.jetty.proxy.*</spotbugs.onlyAnalyze>
</properties>

<build>
<plugins>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<argLine>
@{argLine} ${jetty.surefire.argLine}
--add-reads org.eclipse.jetty.proxy=org.eclipse.jetty.logging
</argLine>
</configuration>
</plugin>
</plugins>
</build>

<dependencies>
<dependency>
<groupId>org.slf4j</groupId>
Expand Down
2 changes: 1 addition & 1 deletion jetty-quic/quic-server/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
<profile>
<id>jdk17</id>
<activation>
<jdk>[17,)</jdk>
<jdk>17</jdk>
</activation>
<dependencies>
<dependency>
Expand Down
4 changes: 3 additions & 1 deletion jetty-server/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,9 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<argLine>
@{argLine} ${jetty.surefire.argLine} --add-opens org.eclipse.jetty.server/org.eclipse.jetty.server=ALL-UNNAMED
@{argLine} ${jetty.surefire.argLine}
--add-opens org.eclipse.jetty.server/org.eclipse.jetty.server=ALL-UNNAMED
--add-reads org.eclipse.jetty.server=org.eclipse.jetty.logging
</argLine>
</configuration>
</plugin>
Expand Down
1 change: 1 addition & 0 deletions jetty-servlet/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
<argLine>
@{argLine} ${jetty.surefire.argLine}
--add-modules org.eclipse.jetty.util.ajax
--add-reads org.eclipse.jetty.servlet=org.eclipse.jetty.logging
</argLine>
</configuration>
</plugin>
Expand Down
11 changes: 10 additions & 1 deletion jetty-servlets/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,16 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<argLine>
@{argLine} ${jetty.surefire.argLine} --add-modules jetty.servlet.api --add-modules org.eclipse.jetty.util --add-modules org.eclipse.jetty.io --add-modules org.eclipse.jetty.http --add-modules org.eclipse.jetty.server --add-reads org.eclipse.jetty.servlets=java.management --add-reads org.eclipse.jetty.servlets=org.eclipse.jetty.jmx
@{argLine} ${jetty.surefire.argLine}
--add-modules jetty.servlet.api
--add-modules org.eclipse.jetty.util
--add-modules org.eclipse.jetty.io
--add-modules org.eclipse.jetty.http
--add-modules org.eclipse.jetty.server
--add-modules org.eclipse.jetty.jmx
--add-reads org.eclipse.jetty.servlets=java.management
--add-reads org.eclipse.jetty.servlets=org.eclipse.jetty.jmx
--add-reads org.eclipse.jetty.servlets=org.eclipse.jetty.logging
</argLine>
</configuration>
</plugin>
Expand Down
3 changes: 3 additions & 0 deletions jetty-util/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,9 @@
<systemPropertyVariables>
<mavenRepoPath>${settings.localRepository}</mavenRepoPath>
</systemPropertyVariables>
<argLine>
@{argLine} ${jetty.surefire.argLine} --add-reads org.eclipse.jetty.util=org.eclipse.jetty.logging
</argLine>
</configuration>
</plugin>
</plugins>
Expand Down
9 changes: 9 additions & 0 deletions jetty-xml/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,15 @@
</instructions>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<argLine>
@{argLine} ${jetty.surefire.argLine} --add-reads org.eclipse.jetty.xml=org.eclipse.jetty.logging
</argLine>
</configuration>
</plugin>
</plugins>
</build>
<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@
<maven.remote-resources-plugin.version>3.0.0</maven.remote-resources-plugin.version>
<maven.resources.plugin.version>3.3.0</maven.resources.plugin.version>
<maven.shade.plugin.version>3.4.1</maven.shade.plugin.version>
<maven.surefire.plugin.version>3.0.0-M5</maven.surefire.plugin.version>
<maven.surefire.plugin.version>3.0.0-M8</maven.surefire.plugin.version>
<maven.source.plugin.version>3.2.1</maven.source.plugin.version>
<maven.war.plugin.version>3.3.2</maven.war.plugin.version>
<spotbugs.maven.plugin.version>4.7.2.0</spotbugs.maven.plugin.version>
Expand Down