Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x

This commit is contained in:
Joakim Erdfelt 2023-02-02 15:04:26 -06:00
parent 106382d810 ca19b143a9
commit 1c7c020a93
No known key found for this signature in database
GPG Key ID: 2D0E1FB8FE4B68B4
17 changed files with 92 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build-resources/pom.xml
View File

@ -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>

4
jetty-annotations/pom.xml
View File

@ -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>

1
jetty-client/pom.xml
View File

@ -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>

5
jetty-deploy/pom.xml
View File

@ -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>

14
jetty-fcgi/fcgi-server/pom.xml
View File

@ -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>

9
jetty-http/pom.xml
View File

@ -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
jetty-http2/http2-client/pom.xml
View File

@ -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>

5
jetty-http2/http2-server/pom.xml
View File

@ -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>

13
jetty-io/pom.xml
View File

@ -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
jetty-proxy/pom.xml
View File

@ -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>

2
jetty-quic/quic-server/pom.xml
View File

@ -42,7 +42,7 @@
<profile>
<id>jdk17</id>
<activation>
<jdk>[17,)</jdk>
<jdk>17</jdk>
</activation>
<dependencies>
<dependency>

4
jetty-server/pom.xml
View File

@ -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>

1
jetty-servlet/pom.xml
View File

@ -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>

11
jetty-servlets/pom.xml
View File

@ -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>

3
jetty-util/pom.xml
View File

@ -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>

9
jetty-xml/pom.xml
View File

@ -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>

2
pom.xml
View File

@ -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>