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

fix argLine inheritance (#3177) 

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
This commit is contained in:
Olivier Lamy 2018-12-03 11:20:20 +10:00 committed by GitHub
parent 18b0ad842a
commit 3e6ab2d1ac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 52 additions and 114 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
jetty-annotations/pom.xml
View File

@ -13,19 +13,14 @@
<properties> <properties>
<bundle-symbolic-name>${project.groupId}.annotations</bundle-symbolic-name> <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> </properties>
<build> <build>
<plugins> <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> <plugin>
<groupId>org.apache.felix</groupId> <groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId> <artifactId>maven-bundle-plugin</artifactId>

17
jetty-client/pom.xml
View File

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

15
jetty-deploy/pom.xml
View File

@ -13,20 +13,15 @@
<properties> <properties>
<bundle-symbolic-name>${project.groupId}.deploy</bundle-symbolic-name> <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> </properties>
<build> <build>
<plugins> <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> <plugin>
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId> <artifactId>findbugs-maven-plugin</artifactId>

7
jetty-http/pom.xml
View File

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

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

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

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

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

14
jetty-jmx/pom.xml
View File

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

18
jetty-quickstart/pom.xml
View File

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

19
jetty-servlets/pom.xml
View File

@ -15,15 +15,8 @@
<properties> <properties>
<bundle-symbolic-name>${project.groupId}.servlets</bundle-symbolic-name> <bundle-symbolic-name>${project.groupId}.servlets</bundle-symbolic-name>
</properties> <surefire.argLine>
${surefire.argLine.default}
<build>
<plugins>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<argLine>
@{argLine}
--add-modules javax.servlet.api --add-modules javax.servlet.api
--add-modules org.eclipse.jetty.util --add-modules org.eclipse.jetty.util
--add-modules org.eclipse.jetty.io --add-modules org.eclipse.jetty.io
@ -32,9 +25,11 @@
--add-modules org.eclipse.jetty.jmx --add-modules org.eclipse.jetty.jmx
--add-reads org.eclipse.jetty.servlets=java.management --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.jmx
</argLine> </surefire.argLine>
</configuration> </properties>
</plugin>
<build>
<plugins>
<plugin> <plugin>
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId> <artifactId>findbugs-maven-plugin</artifactId>

2
jetty-util/pom.xml
View File

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

5
jetty-webapp/pom.xml
View File

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

4
pom.xml
View File

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