diff --git a/mrm-maven-plugin/pom.xml b/mrm-maven-plugin/pom.xml
index ca5c8f9a..f35b604e 100644
--- a/mrm-maven-plugin/pom.xml
+++ b/mrm-maven-plugin/pom.xml
@@ -77,15 +77,14 @@
${project.version}
- org.mortbay.jetty
- jetty
- 6.1.26
-
+ org.eclipse.jetty
+ jetty-server
+ ${jetty.version}
- org.mortbay.jetty
- servlet-api
- 2.5.20110712
+ org.eclipse.jetty
+ jetty-webapp
+ ${jetty.version}
org.apache.maven
diff --git a/mrm-maven-plugin/src/it/hostedrepo/pom.xml b/mrm-maven-plugin/src/it/hostedrepo/pom.xml
index e994875f..54c96580 100644
--- a/mrm-maven-plugin/src/it/hostedrepo/pom.xml
+++ b/mrm-maven-plugin/src/it/hostedrepo/pom.xml
@@ -13,7 +13,7 @@
org.apache.maven.plugins
maven-invoker-plugin
- 2.0.0
+ 3.2.2
@@ -32,6 +32,7 @@
${mrm.repository.url}
verify
+ true
verify
diff --git a/mrm-maven-plugin/src/it/settings.xml b/mrm-maven-plugin/src/it/settings.xml
index d9e3587e..edb4fd4f 100644
--- 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.
-->
-
-
\ No newline at end of file
+
+
+
+
+ it-repo
+
+ true
+
+
+
+ local.central
+ @localRepositoryUrl@
+
+ true
+
+
+ true
+
+
+
+
+
+ local.central
+ @localRepositoryUrl@
+
+ true
+
+
+ true
+
+
+
+
+
+
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
index 2a757710..e9493ef8 100644
--- 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
index c532fa51..4e13583d 100644
--- a/mrm-servlet/pom.xml
+++ b/mrm-servlet/pom.xml
@@ -57,7 +57,7 @@
javax.servlet
- servlet-api
+ javax.servlet-api
provided
diff --git a/mrm-webapp/pom.xml b/mrm-webapp/pom.xml
index c3945ca8..643e56c7 100644
--- a/mrm-webapp/pom.xml
+++ b/mrm-webapp/pom.xml
@@ -55,7 +55,7 @@
javax.servlet
- servlet-api
+ javax.servlet-api
provided
@@ -66,7 +66,7 @@
- org.mortbay.jetty
+ org.eclipse.jetty
jetty-maven-plugin
diff --git a/pom.xml b/pom.xml
index 84c4cef6..afa24ddb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -89,6 +89,7 @@
target/staging/mrm
2.2.1
1.8
+ 9.4.43.v20210629
@@ -138,11 +139,6 @@
plexus-archiver
3.4
-
- backport-util-concurrent
- backport-util-concurrent
- 3.1
-
org.apache.maven
maven-project
@@ -165,8 +161,8 @@
javax.servlet
- servlet-api
- 2.5
+ javax.servlet-api
+ 3.1.0
junit
@@ -194,9 +190,9 @@
- org.mortbay.jetty
+ org.eclipse.jetty
jetty-maven-plugin
- 8.1.16.v20140903
+ ${jetty.version}
maven-release-plugin
@@ -273,15 +269,6 @@
-
- disable-doclint-for-jdk8
-
- 1.8
-
-
- -Xdoclint:none
-
-