Merge branch 'jetty-10.0.x' into jetty-11.0.x

This commit is contained in:
Olivier Lamy 2022-08-02 14:18:48 +10:00
commit 60ea6d2bd6
2 changed files with 1 additions and 2 deletions

2
Jenkinsfile vendored
View File

@ -109,7 +109,7 @@ def mavenBuild(jdk, cmdline, mvnName) {
"MAVEN_OPTS=-Xms2g -Xmx4g -Djava.awt.headless=true"]) { "MAVEN_OPTS=-Xms2g -Xmx4g -Djava.awt.headless=true"]) {
configFileProvider( configFileProvider(
[configFile(fileId: 'oss-settings.xml', variable: 'GLOBAL_MVN_SETTINGS')]) { [configFile(fileId: 'oss-settings.xml', variable: 'GLOBAL_MVN_SETTINGS')]) {
sh "mvn --no-transfer-progress -s $GLOBAL_MVN_SETTINGS -Dmaven.repo.local=.repository -Pci -DexcludedGroups=\"stress, slow\" -V -B -e -Djetty.testtracker.log=true $cmdline" sh "mvn --no-transfer-progress -s $GLOBAL_MVN_SETTINGS -Dmaven.repo.local=.repository -Pci -DexcludedGroups=\"external, large-disk-resource, stress, slow\" -V -B -e -Djetty.testtracker.log=true $cmdline"
} }
} }
} }

View File

@ -2341,7 +2341,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>
<excludedGroups>external, large-disk-resource</excludedGroups>
<systemPropertyVariables> <systemPropertyVariables>
<env>ci</env> <env>ci</env>
</systemPropertyVariables> </systemPropertyVariables>