--- pom.xml.orig	2012-08-06 00:54:09.491115851 +0100
+++ pom.xml	2012-08-06 00:54:25.129820980 +0100
@@ -331,7 +331,7 @@
           <version>2.1.1</version>
         </plugin>
         <plugin>
-          <groupId>org.mortbay.jetty</groupId>
+          <groupId>org.eclipse.jetty</groupId>
           <artifactId>maven-jetty-plugin</artifactId>
           <version>6.1.6</version>
         </plugin>
diff -Naur archetype-common.orig/src/test/java/org/apache/maven/archetype/ArchetypeCatalogsTest.java archetype-common/src/test/java/org/apache/maven/archetype/ArchetypeCatalogsTest.java
--- archetype-common.orig/src/test/java/org/apache/maven/archetype/ArchetypeCatalogsTest.java	2012-08-06 00:55:02.864109496 +0100
+++ archetype-common/src/test/java/org/apache/maven/archetype/ArchetypeCatalogsTest.java	2012-08-06 00:57:25.316423574 +0100
@@ -22,8 +22,8 @@
 import org.apache.maven.archetype.catalog.ArchetypeCatalog;
 import org.apache.maven.archetype.catalog.io.xpp3.ArchetypeCatalogXpp3Writer;
 import org.codehaus.plexus.PlexusTestCase;
-import org.mortbay.jetty.Server;
-import org.mortbay.jetty.webapp.WebAppContext;
+import org.eclipse.jetty.Server;
+import org.eclipse.jetty.webapp.WebAppContext;
 
 import java.io.File;
 import java.io.FileWriter;
diff -Naur archetype-common.orig/src/test/java/org/apache/maven/archetype/test/ArchetyperRoundtripTest.java archetype-common/src/test/java/org/apache/maven/archetype/test/ArchetyperRoundtripTest.java
--- archetype-common.orig/src/test/java/org/apache/maven/archetype/test/ArchetyperRoundtripTest.java	2012-08-06 00:55:02.864109496 +0100
+++ archetype-common/src/test/java/org/apache/maven/archetype/test/ArchetyperRoundtripTest.java	2012-08-06 00:56:58.834922877 +0100
@@ -35,8 +35,8 @@
 import org.codehaus.plexus.PlexusTestCase;
 import org.codehaus.plexus.util.FileUtils;
 import org.codehaus.plexus.util.StringUtils;
-import org.mortbay.jetty.Server;
-import org.mortbay.jetty.webapp.WebAppContext;
+import org.eclipse.jetty.Server;
+import org.eclipse.jetty.webapp.WebAppContext;
 
 import java.io.File;
 import java.io.FileWriter;
diff -Naur archetype-common.orig/src/test/java/org/apache/maven/archetype/test/ArchetyperRoundtripWithProxyTest.java archetype-common/src/test/java/org/apache/maven/archetype/test/ArchetyperRoundtripWithProxyTest.java
--- archetype-common.orig/src/test/java/org/apache/maven/archetype/test/ArchetyperRoundtripWithProxyTest.java	2012-08-06 00:55:02.864109496 +0100
+++ archetype-common/src/test/java/org/apache/maven/archetype/test/ArchetyperRoundtripWithProxyTest.java	2012-08-06 00:56:18.124690463 +0100
@@ -36,8 +36,8 @@
 import org.codehaus.plexus.PlexusTestCase;
 import org.codehaus.plexus.util.FileUtils;
 import org.codehaus.plexus.util.StringUtils;
-import org.mortbay.jetty.Server;
-import org.mortbay.jetty.webapp.WebAppContext;
+import org.eclipse.jetty.Server;
+import org.eclipse.jetty.webapp.WebAppContext;
 
 import java.io.File;
 import java.io.FileOutputStream;
diff -Naur archetype-common.orig/src/test/java/org/apache/maven/archetype/test/RoundtripMultiModuleTest.java archetype-common/src/test/java/org/apache/maven/archetype/test/RoundtripMultiModuleTest.java
--- archetype-common.orig/src/test/java/org/apache/maven/archetype/test/RoundtripMultiModuleTest.java	2012-08-06 00:55:02.864109496 +0100
+++ archetype-common/src/test/java/org/apache/maven/archetype/test/RoundtripMultiModuleTest.java	2012-08-06 00:55:48.423250480 +0100
@@ -36,8 +36,8 @@
 import org.codehaus.plexus.PlexusTestCase;
 import org.codehaus.plexus.util.FileUtils;
 import org.codehaus.plexus.util.StringUtils;
-import org.mortbay.jetty.Server;
-import org.mortbay.jetty.webapp.WebAppContext;
+import org.eclipse.jetty.Server;
+import org.eclipse.jetty.webapp.WebAppContext;
 
 import java.io.File;
 import java.io.FileOutputStream;
diff -Naur archetype-samples.orig/webapp/pom.xml archetype-samples/webapp/pom.xml
--- archetype-samples.orig/webapp/pom.xml	2012-08-06 01:01:25.372897736 +0100
+++ archetype-samples/webapp/pom.xml	2012-08-06 01:19:19.295657306 +0100
@@ -22,11 +22,11 @@
                 <defaultGoal>jetty:run</defaultGoal>
                 <plugins>
                     <plugin>
-                        <groupId>org.mortbay.jetty</groupId>
+                        <groupId>org.eclipse.jetty</groupId>
                         <artifactId>maven-jetty-plugin</artifactId>
                         <configuration>
                             <connectors>
-                                <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
+                                <connector implementation="org.eclipse.jetty.server.nio.SelectChannelConnector">
                                     <port>15000</port>
                                     <maxIdleTime>60000</maxIdleTime>
                                 </connector>
diff -Naur archetype-testing.orig/archetype-proxy/pom.xml archetype-testing/archetype-proxy/pom.xml
--- archetype-testing.orig/archetype-proxy/pom.xml	2012-08-06 00:57:48.450987379 +0100
+++ archetype-testing/archetype-proxy/pom.xml	2012-08-06 01:21:14.575484775 +0100
@@ -47,7 +47,7 @@
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>org.mortbay.jetty</groupId>
+      <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-util</artifactId>
       <version>6.1.11</version>
       <scope>compile</scope>
@@ -68,11 +68,11 @@
             </proxy>
           </proxies>
         -->
-        <groupId>org.mortbay.jetty</groupId>
+        <groupId>org.eclipse.jetty</groupId>
         <artifactId>maven-jetty-plugin</artifactId>
         <configuration>
           <connectors>
-            <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
+            <connector implementation="org.eclipse.jetty.server.nio.SelectChannelConnector">
               <port>18881</port>
               <maxIdleTime>60000</maxIdleTime>
             </connector>
@@ -84,4 +84,4 @@
       </plugin>
     </plugins>
   </build>
-</project>
\ No newline at end of file
+</project>
diff -Naur archetype-testing.orig/archetype-proxy/src/main/java/org/apache/maven/archetype/proxy/ProxyServlet.java archetype-testing/archetype-proxy/src/main/java/org/apache/maven/archetype/proxy/ProxyServlet.java
--- archetype-testing.orig/archetype-proxy/src/main/java/org/apache/maven/archetype/proxy/ProxyServlet.java	2012-08-06 00:57:48.451987360 +0100
+++ archetype-testing/archetype-proxy/src/main/java/org/apache/maven/archetype/proxy/ProxyServlet.java	2012-08-06 01:07:52.133608424 +0100
@@ -36,7 +36,7 @@
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import org.mortbay.util.IO;
+import org.eclipse.jetty.util.IO;
 
 /**
  * Stolen code from Mortbay
diff -Naur archetype-testing.orig/archetype-proxy/src/main/java/org/apache/maven/archetype/proxy/RepositoryServlet.java archetype-testing/archetype-proxy/src/main/java/org/apache/maven/archetype/proxy/RepositoryServlet.java
--- archetype-testing.orig/archetype-proxy/src/main/java/org/apache/maven/archetype/proxy/RepositoryServlet.java	2012-08-06 00:57:48.451987360 +0100
+++ archetype-testing/archetype-proxy/src/main/java/org/apache/maven/archetype/proxy/RepositoryServlet.java	2012-08-06 01:07:08.369433256 +0100
@@ -32,8 +32,8 @@
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import org.mortbay.util.IO;
-import org.mortbay.util.StringUtil;
+import org.eclipse.jetty.util.IO;
+import org.eclipse.jetty.util.StringUtil;
 
 /**
  *
@@ -258,4 +258,4 @@
         return "Repository Servlet";
     }
 
-}
\ No newline at end of file
+}
diff -Naur archetype-testing.orig/archetype-repository/pom.xml archetype-testing/archetype-repository/pom.xml
--- archetype-testing.orig/archetype-repository/pom.xml	2012-08-06 00:57:48.452987341 +0100
+++ archetype-testing/archetype-repository/pom.xml	2012-08-06 01:22:04.447544897 +0100
@@ -47,7 +47,7 @@
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>org.mortbay.jetty</groupId>
+      <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-util</artifactId>
       <version>6.1.11</version>
       <scope>compile</scope>
@@ -68,11 +68,11 @@
             </proxy>
           </proxies>
         -->
-        <groupId>org.mortbay.jetty</groupId>
+        <groupId>org.eclipse.jetty</groupId>
         <artifactId>maven-jetty-plugin</artifactId>
         <configuration>
           <connectors>
-            <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
+            <connector implementation="org.eclipse.jetty.server.nio.SelectChannelConnector">
               <port>18882</port>
               <maxIdleTime>60000</maxIdleTime>
             </connector>
@@ -90,4 +90,4 @@
       </plugin>
     </plugins>
   </build>
-</project>
\ No newline at end of file
+</project>
diff -Naur archetype-testing.orig/archetype-repository/src/main/java/org/apache/maven/archetype/repository/RepositoryServlet.java archetype-testing/archetype-repository/src/main/java/org/apache/maven/archetype/repository/RepositoryServlet.java
--- archetype-testing.orig/archetype-repository/src/main/java/org/apache/maven/archetype/repository/RepositoryServlet.java	2012-08-06 00:57:48.453987322 +0100
+++ archetype-testing/archetype-repository/src/main/java/org/apache/maven/archetype/repository/RepositoryServlet.java	2012-08-06 01:08:39.759710801 +0100
@@ -26,8 +26,8 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.mortbay.util.IO;
-import org.mortbay.util.StringUtil;
+import org.eclipse.jetty.util.IO;
+import org.eclipse.jetty.util.StringUtil;
 
 /**
  *
@@ -83,4 +83,4 @@
             IO.close( is );
         }
     }
-}
\ No newline at end of file
+}