Upgrade to Jetty 9.4.43.v20210629 (#35)

Signed-off-by: Olivier Lamy <olamy@apache.org>
mojohaus · Aug 15, 2021 · a9a94c8 · a9a94c8
1 parent c8c214e
commit a9a94c8
Show file tree

Hide file tree

Showing 7 changed files with 62 additions and 45 deletions.
diff --git a/mrm-maven-plugin/pom.xml b/mrm-maven-plugin/pom.xml
@@ -77,15 +77,14 @@
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.mortbay.jetty</groupId>
-      <artifactId>jetty</artifactId>
-      <version>6.1.26</version>
-      <!-- last version to run on JVM 1.4 -->
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-server</artifactId>
+      <version>${jetty.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.mortbay.jetty</groupId>
-      <artifactId>servlet-api</artifactId>
-      <version>2.5.20110712</version>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-webapp</artifactId>
+      <version>${jetty.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>

diff --git a/mrm-maven-plugin/src/it/hostedrepo/pom.xml b/mrm-maven-plugin/src/it/hostedrepo/pom.xml
@@ -13,7 +13,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-invoker-plugin</artifactId>
-        <version>2.0.0</version>
+        <version>3.2.2</version>
         <executions>
           <execution>
             <goals>
@@ -32,6 +32,7 @@
             <mrm.repository.url>${mrm.repository.url}</mrm.repository.url>
           </filterProperties>
           <postBuildHookScript>verify</postBuildHookScript>
+          <streamLogs>true</streamLogs>
           <goal>verify</goal>
         </configuration>
       </plugin>

diff --git a/mrm-maven-plugin/src/it/settings.xml b/mrm-maven-plugin/src/it/settings.xml
@@ -18,5 +18,38 @@ KIND, either express or implied.  See the License for the
 specific language governing permissions and limitations
 under the License.
 -->
-
-<settings/>
+<!--<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"/>-->
+  <settings>
+  <profiles>
+    <profile>
+      <id>it-repo</id>
+      <activation>
+        <activeByDefault>true</activeByDefault>
+      </activation>
+      <repositories>
+        <repository>
+          <id>local.central</id>
+          <url>@localRepositoryUrl@</url>
+          <releases>
+            <enabled>true</enabled>
+          </releases>
+          <snapshots>
+            <enabled>true</enabled>
+          </snapshots>
+        </repository>
+      </repositories>
+      <pluginRepositories>
+        <pluginRepository>
+          <id>local.central</id>
+          <url>@localRepositoryUrl@</url>
+          <releases>
+            <enabled>true</enabled>
+          </releases>
+          <snapshots>
+            <enabled>true</enabled>
+          </snapshots>
+        </pluginRepository>
+      </pluginRepositories>
+    </profile>
+  </profiles>
+</settings>
diff --git a/mrm-maven-plugin/src/main/java/org/codehaus/mojo/mrm/plugin/FileSystemServer.java b/mrm-maven-plugin/src/main/java/org/codehaus/mojo/mrm/plugin/FileSystemServer.java
@@ -19,10 +19,10 @@
 import org.apache.maven.plugin.MojoExecutionException;
 import org.codehaus.mojo.mrm.api.FileSystem;
 import org.codehaus.mojo.mrm.servlet.FileSystemServlet;
-import org.mortbay.jetty.Connector;
-import org.mortbay.jetty.Server;
-import org.mortbay.jetty.servlet.Context;
-import org.mortbay.jetty.servlet.ServletHolder;
+import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.server.ServerConnector;
+import org.eclipse.jetty.servlet.ServletContextHandler;
+import org.eclipse.jetty.servlet.ServletHolder;
 
 import java.net.InetAddress;
 import java.net.UnknownHostException;
@@ -32,6 +32,7 @@
  */
 public class FileSystemServer
 {
+
     /**
      * Guard for {@link #starting}, {@link #started}, {@link #finishing}, {@link #finished}, {@link #boundPort}
      * and {@link #problem}.
@@ -262,18 +263,13 @@ public void run()
             try {
                 Server server = new Server(requestedPort);
                 try {
-                    Context root = new Context(server, "/", Context.SESSIONS);
-                    root.addServlet(new ServletHolder(new FileSystemServlet(fileSystem, settingsServletPath)), "/*");
+                    ServletContextHandler context = new ServletContextHandler();
+                    context.setContextPath("/");
+                    context.addServlet(new ServletHolder(new FileSystemServlet(fileSystem, settingsServletPath)), "/*");
+                    server.setHandler(context);
                     server.start();
                     synchronized (lock) {
-                        boundPort = 0;
-                        Connector[] connectors = server.getConnectors();
-                        for (int i = 0; i < connectors.length; i++) {
-                            if (connectors[i].getLocalPort() > 0) {
-                                boundPort = connectors[i].getLocalPort();
-                                break;
-                            }
-                        }
+                        boundPort = ((ServerConnector)server.getConnectors()[0]).getLocalPort();
                         starting = false;
                         started = true;
                         lock.notifyAll();
@@ -282,6 +278,7 @@ public void run()
                     synchronized (lock) {
                         problem = e;
                     }
+                    e.printStackTrace();
                     throw e;
                 }
                 synchronized (lock) {

diff --git a/mrm-servlet/pom.xml b/mrm-servlet/pom.xml
@@ -57,7 +57,7 @@
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
+      <artifactId>javax.servlet-api</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>

diff --git a/mrm-webapp/pom.xml b/mrm-webapp/pom.xml
@@ -55,7 +55,7 @@
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
+      <artifactId>javax.servlet-api</artifactId>
       <scope>provided</scope>
     </dependency>
   </dependencies>
@@ -66,7 +66,7 @@
       <build>
         <plugins>
           <plugin>
-            <groupId>org.mortbay.jetty</groupId>
+            <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-maven-plugin</artifactId>
             <executions>
               <execution>

diff --git a/pom.xml b/pom.xml
@@ -89,6 +89,7 @@
     <scmpublish.content>target/staging/mrm</scmpublish.content>
     <mavenVersion>2.2.1</mavenVersion>
     <mojo.java.target>1.8</mojo.java.target>
+    <jetty.version>9.4.43.v20210629</jetty.version>
   </properties>
 
   <dependencyManagement>
@@ -138,11 +139,6 @@
         <artifactId>plexus-archiver</artifactId>
         <version>3.4</version>
       </dependency>
-      <dependency>
-        <groupId>backport-util-concurrent</groupId>
-        <artifactId>backport-util-concurrent</artifactId>
-        <version>3.1</version>
-      </dependency>
       <dependency>
         <groupId>org.apache.maven</groupId>
         <artifactId>maven-project</artifactId>
@@ -165,8 +161,8 @@
       </dependency>
       <dependency>
         <groupId>javax.servlet</groupId>
-        <artifactId>servlet-api</artifactId>
-        <version>2.5</version>
+        <artifactId>javax.servlet-api</artifactId>
+        <version>3.1.0</version>
       </dependency>
       <dependency>
         <groupId>junit</groupId>
@@ -194,9 +190,9 @@
           </configuration>
         </plugin>
         <plugin>
-          <groupId>org.mortbay.jetty</groupId>
+          <groupId>org.eclipse.jetty</groupId>
           <artifactId>jetty-maven-plugin</artifactId>
-          <version>8.1.16.v20140903</version>
+          <version>${jetty.version}</version>
         </plugin>
         <plugin>
           <artifactId>maven-release-plugin</artifactId>
@@ -273,15 +269,6 @@
   </build>
 
   <profiles>
-    <profile>
-      <id>disable-doclint-for-jdk8</id>
-      <activation>
-        <jdk>1.8</jdk>
-      </activation>
-      <properties>
-        <additionalparam>-Xdoclint:none</additionalparam>
-      </properties>
-    </profile>
     <profile>
       <!-- run integration tests
           to use this profile: