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

Jenkinsfile

@@ -64,6 +64,7 @@ pipeline {
           options { timeout(time: 30, unit: 'MINUTES') }
           steps {
             mavenBuild("jdk11", "install -DskipTests", "maven3", true)
+            mavenBuild("jdk11", "install -f build-resources", "maven3", true)
             mavenBuild("jdk11", "install checkstyle:check -DskipTests", "maven3", true)
             recordIssues(
                     enabledForFailure: true, aggregatingResults: true,
@@ -120,15 +121,13 @@ def slackNotif() {
  * @return the Jenkinsfile step representing a maven build
  */
 def mavenBuild(jdk, cmdline, mvnName, junitPublishDisabled) {
-  def localRepo = ".repository" // "${env.JENKINS_HOME}/${env.EXECUTOR_NUMBER}" //
-  def settingsName = 'oss-settings.xml'
+  def localRepo = ".repository"
   def mavenOpts = '-Xms1g -Xmx4g -Djava.awt.headless=true'
 
   withMaven(
       maven: mvnName,
       jdk: "$jdk",
       publisherStrategy: 'EXPLICIT',
-      globalMavenSettingsConfig: settingsName,
       options: [junitPublisher(disabled: junitPublishDisabled),mavenLinkerPublisher(disabled: false),pipelineGraphPublisher(disabled: false)],
       mavenOpts: mavenOpts,
       mavenLocalRepo: localRepo) {

build-resources/pom.xml

@@ -1,9 +1,4 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <parent>
-    <groupId>org.eclipse.jetty</groupId>
-    <artifactId>jetty-project</artifactId>
-    <version>10.0.0-SNAPSHOT</version>
-  </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.eclipse.jetty</groupId>
   <artifactId>build-resources</artifactId>

jetty-maven-plugin/src/it/it-parent-pom/pom.xml

@@ -145,6 +145,16 @@
           <artifactId>maven-war-plugin</artifactId>
           <version>@maven.war.plugin.version@</version>
         </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-install-plugin</artifactId>
+          <version>@maven.install.plugin.version@</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-deploy-plugin</artifactId>
+          <version>@maven.deploy.plugin.version@</version>
+        </plugin>
       </plugins>
     </pluginManagement>
   </build>

jetty-maven-plugin/src/it/jetty-run-mojo-multi-module-single-war-it/postbuild.groovy

@@ -20,7 +20,8 @@ File buildLog = new File( basedir, 'build.log' )
 assert buildLog.text.contains( 'Started Jetty Server' )
 
 assert buildLog.text.contains( '(1a) >> javax.servlet.ServletContextListener loaded from jar:' )
-assert buildLog.text.contains( 'local-repo/org/eclipse/jetty/toolchain/jetty-servlet-api/4.0.2/jetty-servlet-api-4.0.2.jar!/javax/servlet/ServletContextListener.class << (1b)' )
+
+assert buildLog.text.contains( '/org/eclipse/jetty/toolchain/jetty-servlet-api/4.0.2/jetty-servlet-api-4.0.2.jar!/javax/servlet/ServletContextListener.class << (1b)' )
 
 assert buildLog.text.contains( '(2a) >> mca.common.CommonService loaded from file:' )
 assert buildLog.text.contains( 'common/target/classes/mca/common/CommonService.class << (2b)' )

jetty-maven-plugin/src/it/settings.xml

@@ -1,6 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <settings>
+  <mirrors>
+    <mirror>
+      <id>local.mirror</id>
+      <url>file://@localRepo@</url>
+      <mirrorOf>central</mirrorOf>
+    </mirror>
+  </mirrors>
   <profiles>
     <profile>
       <id>it-repo</id>

jetty-osgi/test-jetty-osgi/pom.xml

@@ -14,8 +14,8 @@
     <bundle-symbolic-name>${project.groupId}.boot.test.osgi</bundle-symbolic-name>
     <jetty-orbit-url>http://download.eclipse.org/jetty/orbit/</jetty-orbit-url>
     <assembly-directory>target/distribution</assembly-directory>
-    <pax.exam.version>4.13.0</pax.exam.version>
-    <pax.url.version>2.5.4</pax.url.version>
+    <pax.exam.version>4.13.1</pax.exam.version>
+    <pax.url.version>2.6.1</pax.url.version>
     <injection.bundle.version>1.0</injection.bundle.version>
   </properties>
   <dependencies>
@@ -477,6 +477,7 @@
             <skipTests>${skipTests}</skipTests>
             <systemPropertyVariables>
               <mavenRepoPath>${settings.localRepository}</mavenRepoPath>
+              <settingsFilePath>${env.GLOBAL_MVN_SETTINGS}</settingsFilePath>
             </systemPropertyVariables>
             <argLine>-Dconscrypt-version=${conscrypt.version}</argLine>
           </configuration>

jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestOSGiUtil.java

@@ -41,6 +41,7 @@ import org.eclipse.jetty.util.log.StdErrLog;
 import org.eclipse.jetty.util.ssl.SslContextFactory;
 import org.ops4j.pax.exam.CoreOptions;
 import org.ops4j.pax.exam.Option;
+import org.ops4j.pax.url.mvn.internal.AetherBasedResolver;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.ServiceReference;
@@ -108,11 +109,23 @@ public class TestOSGiUtil
 
     public static List<Option> coreJettyDependencies()
     {
+        AetherBasedResolver l;
         List<Option> res = new ArrayList<>();
         res.add(systemProperty("bundle.debug").value(Boolean.toString(Boolean.getBoolean(TestOSGiUtil.BUNDLE_DEBUG))));
         String mavenRepoPath = System.getProperty("mavenRepoPath");
         if (!StringUtil.isBlank(mavenRepoPath))
+        {
             res.add(systemProperty("org.ops4j.pax.url.mvn.localRepository").value(mavenRepoPath));
+            res.add( systemProperty( "org.ops4j.pax.url.mvn.localRepository" ).value( mavenRepoPath ) );
+            res.add( systemProperty( "org.ops4j.pax.url.mvn.defaultRepositories" ).value( "file://" + mavenRepoPath + "@id=local.repo") );
+            res.add( systemProperty( "org.ops4j.pax.url.mvn.useFallbackRepositories").value( Boolean.FALSE.toString() ) );
+            res.add( systemProperty( "org.ops4j.pax.url.mvn.repositories").value( "+https://repo1.maven.org/maven2@id=maven.central.repo" ) );
+        }
+        String settingsFilePath = System.getProperty("settingsFilePath");
+        if (!StringUtil.isBlank(settingsFilePath))
+        {
+            res.add( systemProperty( "org.ops4j.pax.url.mvn.settings" ).value( System.getProperty( "settingsFilePath" ) ) );
+        }
         res.add(mavenBundle().groupId("org.eclipse.jetty.toolchain").artifactId("jetty-servlet-api").versionAsInProject().start());
         res.add(mavenBundle().groupId("org.ow2.asm").artifactId("asm").versionAsInProject().start());
         res.add(mavenBundle().groupId("org.ow2.asm").artifactId("asm-commons").versionAsInProject().start());

pom.xml

@@ -52,6 +52,8 @@
     <maven.source.plugin.version>3.0.1</maven.source.plugin.version>
     <maven.war.plugin.version>3.2.2</maven.war.plugin.version>
     <maven.plugin-tools.version>3.5.2</maven.plugin-tools.version>
+    <maven.install.plugin.version>2.5.2</maven.install.plugin.version>
+    <maven.deploy.plugin.version>2.8.2</maven.deploy.plugin.version>
 
     <!-- testing -->
     <it.debug>false</it.debug>
@@ -61,6 +63,8 @@
     <springboot.version>2.1.1.RELEASE</springboot.version>
     <annotation-api.version>1.3.4</annotation-api.version>
     <jackson-databind.version>2.9.7</jackson-databind.version>
+    <localRepoPath>${settings.localRepository}</localRepoPath>
+
   </properties>
 
   <licenses>
@@ -475,7 +479,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-deploy-plugin</artifactId>
-          <version>2.8.2</version>
+          <version>${maven.deploy.plugin.version}</version>
           <configuration>
             <retryFailedDeploymentCount>10</retryFailedDeploymentCount>
           </configuration>
@@ -510,18 +514,21 @@
             <projectsDirectory>src/it</projectsDirectory>
             <timeoutInSeconds>300</timeoutInSeconds>
             <cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
-            <localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
-            <settingsFile>src/it/settings.xml</settingsFile>
+            <localRepositoryPath>${localRepoPath}</localRepositoryPath>
+            <!--settingsFile>src/it/settings.xml</settingsFile-->
             <skipInvocation>${skipTests}</skipInvocation>
             <pomIncludes>
               <pomInclude>*/pom.xml</pomInclude>
             </pomIncludes>
+            <filterProperties>
+              <localRepo>${localRepoPath}</localRepo>
+            </filterProperties>
           </configuration>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-install-plugin</artifactId>
-          <version>2.5.2</version>
+          <version>${maven.install.plugin.version}</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>