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

Revert "fix argLine inheritance (#3177)" 

This reverts commit 3e6ab2d1ac.
This commit is contained in:
olivier lamy 2018-12-03 13:25:00 +10:00
parent 3e6ab2d1ac
commit c0655ce634
12 changed files with 114 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
jetty-annotations/pom.xml
View File

@ -13,14 +13,19 @@
<properties>
<bundle-symbolic-name>${project.groupId}.annotations</bundle-symbolic-name>
<surefire.argLine>
${surefire.argLine.default}
--add-opens org.eclipse.jetty.annotations/org.eclipse.jetty.annotations.resources=org.eclipse.jetty.plus
</surefire.argLine>
</properties>
<build>
<plugins>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<argLine>
@{argLine}
--add-opens org.eclipse.jetty.annotations/org.eclipse.jetty.annotations.resources=org.eclipse.jetty.plus
</argLine>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>

21
jetty-client/pom.xml
View File

@ -12,17 +12,22 @@
<properties>
<bundle-symbolic-name>${project.groupId}.client</bundle-symbolic-name>
<jetty.test.policy.loc>target/test-policy</jetty.test.policy.loc>
<surefire.argLine>
${surefire.argLine.default}
--add-reads org.eclipse.jetty.client=javax.servlet.api
--add-modules java.security.jgss
--add-modules javax.servlet.api
--add-modules org.eclipse.jetty.jmx
--add-modules org.slf4j
</surefire.argLine>
</properties>
<build>
<plugins>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<argLine>
@{argLine}
--add-reads org.eclipse.jetty.client=javax.servlet.api
--add-modules java.security.jgss
--add-modules javax.servlet.api
--add-modules org.eclipse.jetty.jmx
--add-modules org.slf4j
</argLine>
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>

15
jetty-deploy/pom.xml
View File

@ -13,15 +13,20 @@
<properties>
<bundle-symbolic-name>${project.groupId}.deploy</bundle-symbolic-name>
<surefire.argLine>
${surefire.argLine.default}
--add-modules org.eclipse.jetty.jmx
--add-reads org.eclipse.jetty.deploy=org.eclipse.jetty.http
</surefire.argLine>
</properties>
<build>
<plugins>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<argLine>
@{argLine}
--add-modules org.eclipse.jetty.jmx
--add-reads org.eclipse.jetty.deploy=org.eclipse.jetty.http
</argLine>
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>

7
jetty-http/pom.xml
View File

@ -13,7 +13,6 @@
<properties>
<bundle-symbolic-name>${project.groupId}.http</bundle-symbolic-name>
<surefire.argLine>${surefire.argLine.default} --add-modules javax.servlet.api</surefire.argLine>
</properties>
<dependencies>
@ -42,6 +41,12 @@
<build>
<plugins>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<argLine>@{argLine} --add-modules javax.servlet.api</argLine>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>

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

@ -13,13 +13,23 @@
<properties>
<bundle-symbolic-name>${project.groupId}.client</bundle-symbolic-name>
<surefire.argLine>
${surefire.argLine.default}
--add-reads org.eclipse.jetty.http2.client=javax.servlet.api
--add-modules javax.servlet.api
</surefire.argLine>
</properties>
<build>
<plugins>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<argLine>
@{argLine}
--add-reads org.eclipse.jetty.http2.client=javax.servlet.api
--add-modules javax.servlet.api
</argLine>
</configuration>
</plugin>
</plugins>
</build>
<dependencies>
<dependency>
<groupId>org.eclipse.jetty.http2</groupId>

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

@ -13,13 +13,23 @@
<properties>
<bundle-symbolic-name>${project.groupId}.client.http</bundle-symbolic-name>
<surefire.argLine>
${surefire.argLine.default}
--add-reads org.eclipse.jetty.http2.http.client.transport=javax.servlet.api
--add-modules javax.servlet.api
</surefire.argLine>
</properties>
<build>
<plugins>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<argLine>
@{argLine}
--add-reads org.eclipse.jetty.http2.http.client.transport=javax.servlet.api
--add-modules javax.servlet.api
</argLine>
</configuration>
</plugin>
</plugins>
</build>
<dependencies>
<dependency>
<groupId>org.eclipse.jetty</groupId>

14
jetty-jmx/pom.xml
View File

@ -11,13 +11,19 @@
<url>http://www.eclipse.org/jetty</url>
<properties>
<bundle-symbolic-name>${project.groupId}.jmx</bundle-symbolic-name>
<surefire.argLine>${surefire.argLine.default}
--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
</surefire.argLine>
</properties>
<build>
<plugins>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<argLine>
@{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>
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>

18
jetty-quickstart/pom.xml
View File

@ -14,12 +14,22 @@
<properties>
<bundle-symbolic-name>${project.groupId}.quickstart</bundle-symbolic-name>
<jetty-schemas-jar>${settings.localRepository}/org/eclipse/jetty/toolchain/jetty-schemas/${servlet.schema.version}/jetty-schemas-${servlet.schema.version}.jar</jetty-schemas-jar>
<surefire.argLine>
${surefire.argLine.default}
--patch-module javax.servlet.api=${jetty-schemas-jar}
</surefire.argLine>
</properties>
<build>
<plugins>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<argLine>
@{argLine}
--patch-module javax.servlet.api=${jetty-schemas-jar}
</argLine>
</configuration>
</plugin>
</plugins>
</build>
<dependencies>
<dependency>
<groupId>org.eclipse.jetty</groupId>

27
jetty-servlets/pom.xml
View File

@ -15,21 +15,26 @@
<properties>
<bundle-symbolic-name>${project.groupId}.servlets</bundle-symbolic-name>
<surefire.argLine>
${surefire.argLine.default}
--add-modules javax.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
</surefire.argLine>
</properties>
<build>
<plugins>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<argLine>
@{argLine}
--add-modules javax.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
</argLine>
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>

2
jetty-util/pom.xml
View File

@ -11,7 +11,6 @@
<url>http://www.eclipse.org/jetty</url>
<properties>
<bundle-symbolic-name>${project.groupId}.util</bundle-symbolic-name>
<surefire.argLine>${surefire.argLine.default} --add-modules javax.servlet.api,org.slf4j</surefire.argLine>
</properties>
<build>
<resources>
@ -65,6 +64,7 @@
<systemPropertyVariables>
<mavenRepoPath>${settings.localRepository}</mavenRepoPath>
</systemPropertyVariables>
<argLine>@{argLine} --add-modules javax.servlet.api,org.slf4j</argLine>
</configuration>
</plugin>
</plugins>

5
jetty-webapp/pom.xml
View File

@ -14,7 +14,6 @@
<properties>
<bundle-symbolic-name>${project.groupId}.webapp</bundle-symbolic-name>
<surefire.argLine>${surefire.argLine.default} --add-modules org.eclipse.jetty.jmx</surefire.argLine>
</properties>
<build>
@ -44,6 +43,10 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<argLine>
@{argLine}
--add-modules org.eclipse.jetty.jmx
</argLine>
<useManifestOnlyJar>false</useManifestOnlyJar>
<excludes>
<exclude>org.eclipse.jetty.webapp.WebAppClassLoaderUrlStreamTest</exclude>

4
pom.xml
View File

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