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

Merge branch 'jetty-10.0.x' into jetty-10.0.x-3129-websocket

This commit is contained in:
Greg Wilkins 2018-12-11 17:02:16 +11:00
parent e8d468b3e1 14ffa0d981
commit 252bb5dd72
16 changed files with 27 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jetty-alpn/jetty-alpn-java-server/pom.xml
View File

@ -22,7 +22,7 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<argLine>
@{argLine}
@{argLine} ${jetty.surefire.argLine}
--add-reads org.eclipse.jetty.alpn.java.server=org.eclipse.jetty.server
</argLine>
</configuration>

2
jetty-annotations/pom.xml
View File

@ -21,7 +21,7 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<argLine>
@{argLine}
@{argLine} ${jetty.surefire.argLine}
--add-opens org.eclipse.jetty.annotations/org.eclipse.jetty.annotations.resources=org.eclipse.jetty.plus
</argLine>
</configuration>

2
jetty-client/pom.xml
View File

@ -19,7 +19,7 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<argLine>
@{argLine}
@{argLine} ${jetty.surefire.argLine}
--add-reads org.eclipse.jetty.client=javax.servlet.api
--add-modules java.security.jgss
--add-modules javax.servlet.api

2
jetty-deploy/pom.xml
View File

@ -21,7 +21,7 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<argLine>
@{argLine}
@{argLine} ${jetty.surefire.argLine}
--add-modules org.eclipse.jetty.jmx
--add-reads org.eclipse.jetty.deploy=org.eclipse.jetty.http
</argLine>

5
jetty-http/pom.xml
View File

@ -44,7 +44,10 @@
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<argLine>@{argLine} --add-modules javax.servlet.api</argLine>
<argLine>
@{argLine} ${jetty.surefire.argLine}
--add-modules javax.servlet.api
</argLine>
</configuration>
</plugin>
<plugin>

2
jetty-http2/http2-client/pom.xml
View File

@ -21,7 +21,7 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<argLine>
@{argLine}
@{argLine} ${jetty.surefire.argLine}
--add-reads org.eclipse.jetty.http2.client=javax.servlet.api
--add-modules javax.servlet.api
</argLine>

2
jetty-http2/http2-http-client-transport/pom.xml
View File

@ -21,7 +21,7 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<argLine>
@{argLine}
@{argLine} ${jetty.surefire.argLine}
--add-reads org.eclipse.jetty.http2.http.client.transport=javax.servlet.api
--add-modules javax.servlet.api
</argLine>

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

@ -21,7 +21,7 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<argLine>
@{argLine}
@{argLine} ${jetty.surefire.argLine}
--add-reads org.eclipse.jetty.http2.server=javax.servlet.api
--add-modules javax.servlet.api
</argLine>

2
jetty-jmx/pom.xml
View File

@ -18,7 +18,7 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<argLine>
@{argLine}
@{argLine} ${jetty.surefire.argLine}
--add-opens org.eclipse.jetty.jmx/org.eclipse.jetty.jmx=ALL-UNNAMED
--add-opens org.eclipse.jetty.jmx/org.eclipse.jetty.util.log.jmx=ALL-UNNAMED
</argLine>

2
jetty-quickstart/pom.xml
View File

@ -22,7 +22,7 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<argLine>
@{argLine}
@{argLine} ${jetty.surefire.argLine}
--patch-module javax.servlet.api=${jetty-schemas-jar}
</argLine>
</configuration>

2
jetty-servlets/pom.xml
View File

@ -23,7 +23,7 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<argLine>
@{argLine}
@{argLine} ${jetty.surefire.argLine}
--add-modules javax.servlet.api
--add-modules org.eclipse.jetty.util
--add-modules org.eclipse.jetty.io

2
jetty-servlets/src/main/java/org/eclipse/jetty/servlets/DoSFilter.java
View File

@ -316,7 +316,7 @@ public class DoSFilter implements Filter
// Get a rate tracker associated with this request, and record one hit.
tracker = getRateTracker(request);
// Calculate the rate and check it is over the allowed limit
// Calculate the rate and check if it is over the allowed limit
final boolean overRateLimit = tracker.isRateExceeded(System.currentTimeMillis());
// Pass it through if we are not currently over the rate limit.

5
jetty-util/pom.xml
View File

@ -64,7 +64,10 @@
<systemPropertyVariables>
<mavenRepoPath>${settings.localRepository}</mavenRepoPath>
</systemPropertyVariables>
<argLine>@{argLine} --add-modules javax.servlet.api,org.slf4j</argLine>
<argLine>
@{argLine} ${jetty.surefire.argLine}
--add-modules javax.servlet.api,org.slf4j
</argLine>
</configuration>
</plugin>
</plugins>

2
jetty-webapp/pom.xml
View File

@ -44,7 +44,7 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<argLine>
@{argLine}
@{argLine} ${jetty.surefire.argLine}
--add-modules org.eclipse.jetty.jmx
</argLine>
<useManifestOnlyJar>false</useManifestOnlyJar>

2
jetty-websocket/javax-websocket-server/pom.xml
View File

@ -49,7 +49,7 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<argLine>
@{argLine}
@{argLine} ${jetty.surefire.argLine}
--add-reads org.eclipse.jetty.websocket.javax.common=org.eclipse.jetty.websocket.javax.server
</argLine>
</configuration>

6
pom.xml
View File

@ -67,6 +67,8 @@
<!-- enable or not TestTracker junit5 extension i.e log message when test method is starting -->
<jetty.testtracker.log>false</jetty.testtracker.log>
<jetty.surefire.argLine>-Dfile.encoding=UTF-8 -Duser.language=en -Duser.region=US -showversion -Xmx1g -Xms1g -Xlog:gc:stderr:time,level,tags</jetty.surefire.argLine>
<!-- some maven plugins versions -->
<maven.surefire.version>2.22.1</maven.surefire.version>
<maven.compiler.plugin.version>3.8.0</maven.compiler.plugin.version>
@ -590,7 +592,9 @@
<version>${maven.surefire.version}</version>
<configuration>
<forkedProcessTimeoutInSeconds>3600</forkedProcessTimeoutInSeconds>
<argLine>@{argLine} -Dfile.encoding=UTF-8 -Duser.language=en -Duser.region=US -showversion -Xmx1g -Xms1g -XX:+PrintGCDetails</argLine>
<argLine>
@{argLine} ${jetty.surefire.argLine}
</argLine>
<failIfNoTests>false</failIfNoTests>
<forkCount>1</forkCount>
<reuseForks>true</reuseForks> <!-- to work around crash at https://github.com/junit-team/junit5/issues/801 -->