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

This commit is contained in:
Olivier Lamy 2022-11-19 16:37:54 +10:00
commit 54d9d5cd41
No known key found for this signature in database
GPG Key ID: 873A8E86B4372146
2 changed files with 3 additions and 1 deletions

2
Jenkinsfile vendored
View File

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

View File

@ -2300,6 +2300,7 @@
<spotbugs.effort>Default</spotbugs.effort>
<spotbugs.skip>false</spotbugs.skip>
<spotbugs.onlyAnalyze>org.eclipse.jetty.*</spotbugs.onlyAnalyze>
<maven.repo.uri></maven.repo.uri>
</properties>
<modules>
<module>javadoc</module>
@ -2318,6 +2319,7 @@
<configuration>
<systemPropertyVariables>
<env>ci</env>
<maven.repo.uri>${maven.repo.uri}</maven.repo.uri>
</systemPropertyVariables>
</configuration>
</plugin>