Use Jetty-all uber jar

d2a-raudenaerde · Jul 17, 2016 · 670129c · 670129c
1 parent 989150e
commit 670129c
Show file tree

Hide file tree

Showing 63 changed files with 239 additions and 155 deletions.
diff --git a/async-tasks-parent/async-tasks-demo/pom.xml b/async-tasks-parent/async-tasks-demo/pom.xml
@@ -48,7 +48,7 @@
             </plugin>
             <!-- Jetty configuration -->
             <plugin>
-                <groupId>org.mortbay.jetty</groupId>
+                <groupId>org.eclipse.jetty</groupId>
                 <artifactId>jetty-maven-plugin</artifactId>
                 <configuration>
                     <connectors>

diff --git a/autocomplete-tagit-parent/autocomplete-tagit-examples/pom.xml b/autocomplete-tagit-parent/autocomplete-tagit-examples/pom.xml
@@ -43,13 +43,14 @@
 		<!-- JETTY DEPENDENCIES FOR TESTING -->
 		<dependency>
 			<groupId>org.eclipse.jetty.aggregate</groupId>
-			<artifactId>jetty-all-server</artifactId>
+			<artifactId>jetty-all</artifactId>
+			<classifier>uber</classifier>
 		</dependency>
 	</dependencies>
 	<build>
 		<plugins>
 			<plugin>
-				<groupId>org.mortbay.jetty</groupId>
+				<groupId>org.eclipse.jetty</groupId>
 				<artifactId>jetty-maven-plugin</artifactId>
 			</plugin>
 		</plugins>

diff --git a/browserid-parent/browserid-examples/pom.xml b/browserid-parent/browserid-examples/pom.xml
@@ -43,13 +43,14 @@
 		<!-- JETTY DEPENDENCIES FOR TESTING -->
 		<dependency>
 			<groupId>org.eclipse.jetty.aggregate</groupId>
-			<artifactId>jetty-all-server</artifactId>
+			<artifactId>jetty-all</artifactId>
+            <classifier>uber</classifier>
 		</dependency>
 	</dependencies>
 	<build>
 		<plugins>
 			<plugin>
-				<groupId>org.mortbay.jetty</groupId>
+				<groupId>org.eclipse.jetty</groupId>
 				<artifactId>jetty-maven-plugin</artifactId>
 			</plugin>
 		</plugins>

diff --git a/closure-compiler/pom.xml b/closure-compiler/pom.xml
@@ -32,7 +32,8 @@
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty.aggregate</groupId>
-      <artifactId>jetty-all-server</artifactId>
+      <artifactId>jetty-all</artifactId>
+        <classifier>uber</classifier>
     </dependency>
   </dependencies>
 </project>
diff --git a/console-parent/console-examples/pom.xml b/console-parent/console-examples/pom.xml
@@ -25,7 +25,7 @@
 	<build>
 		<plugins>
 			<plugin>
-				<groupId>org.mortbay.jetty</groupId>
+				<groupId>org.eclipse.jetty</groupId>
 				<artifactId>jetty-maven-plugin</artifactId>
 			</plugin>
 		</plugins>
@@ -82,8 +82,8 @@
 		</dependency>
 		<dependency>
 			<groupId>org.eclipse.jetty.aggregate</groupId>
-			<artifactId>jetty-all-server</artifactId>
-			<scope>test</scope>
+			<artifactId>jetty-all</artifactId>
+            <classifier>uber</classifier>
 		</dependency>
 		<dependency>
 			<groupId>junit</groupId>

diff --git a/dashboard-parent/dashboard-examples/pom.xml b/dashboard-parent/dashboard-examples/pom.xml
@@ -114,8 +114,8 @@
 		<!-- JETTY DEPENDENCIES FOR TESTING -->
 		<dependency>
 			<groupId>org.eclipse.jetty.aggregate</groupId>
-			<artifactId>jetty-all-server</artifactId>
-			<scope>test</scope>
+			<artifactId>jetty-all</artifactId>
+            <classifier>uber</classifier>
 		</dependency>
 	</dependencies>
 </project>
diff --git a/datastores-parent/pom.xml b/datastores-parent/pom.xml
@@ -39,8 +39,9 @@
 
 		<dependency>
 			<groupId>org.eclipse.jetty.aggregate</groupId>
-			<artifactId>jetty-all-server</artifactId>
+			<artifactId>jetty-all</artifactId>
 			<scope>provided</scope>
+            <classifier>uber</classifier>
 		</dependency>
 		<dependency>
 			<groupId>org.slf4j</groupId>

diff --git a/datatables-parent/datatables-examples/pom.xml b/datatables-parent/datatables-examples/pom.xml
@@ -68,7 +68,8 @@
 		</dependency>
 		<dependency>
 			<groupId>org.eclipse.jetty.aggregate</groupId>
-			<artifactId>jetty-all-server</artifactId>
+			<artifactId>jetty-all</artifactId>
+            <classifier>uber</classifier>
 		</dependency>
 		<dependency>
 			<groupId>org.webjars</groupId>

diff --git a/editable-grid-parent/editable-grid-examples/pom.xml b/editable-grid-parent/editable-grid-examples/pom.xml
@@ -57,7 +57,7 @@
 		</testResources>
 		<plugins>
 			<plugin>
-				<groupId>org.mortbay.jetty</groupId>
+				<groupId>org.eclipse.jetty</groupId>
 				<artifactId>jetty-maven-plugin</artifactId>
 				<configuration>
 					<connectors>

diff --git a/flot-parent/flot-examples/pom.xml b/flot-parent/flot-examples/pom.xml
@@ -40,7 +40,8 @@
 		</dependency>
 		<dependency>
 			<groupId>org.eclipse.jetty.aggregate</groupId>
-			<artifactId>jetty-all-server</artifactId>
+			<artifactId>jetty-all</artifactId>
+            <classifier>uber</classifier>
 		</dependency>
 	</dependencies>
 </project>
diff --git a/inmethod-grid-parent/pom.xml b/inmethod-grid-parent/pom.xml
@@ -78,7 +78,8 @@
 		<!-- JETTY DEPENDENCIES FOR TESTING -->
 		<dependency>
 			<groupId>org.eclipse.jetty.aggregate</groupId>
-			<artifactId>jetty-all-server</artifactId>
+			<artifactId>jetty-all</artifactId>
+            <classifier>uber</classifier>
 		</dependency>
 	</dependencies>
 

diff --git a/input-events-parent/input-events-examples/pom.xml b/input-events-parent/input-events-examples/pom.xml
@@ -51,7 +51,8 @@
 		<!--  JETTY DEPENDENCIES FOR TESTING  -->
 		<dependency>
 			<groupId>org.eclipse.jetty.aggregate</groupId>
-			<artifactId>jetty-all-server</artifactId>
+			<artifactId>jetty-all</artifactId>
+            <classifier>uber</classifier>
 		</dependency>
 	</dependencies>
 

diff --git a/jamon-parent/jamon-examples/pom.xml b/jamon-parent/jamon-examples/pom.xml
@@ -24,7 +24,8 @@
 		</dependency>
 		<dependency>
 			<groupId>org.eclipse.jetty.aggregate</groupId>
-			<artifactId>jetty-all-server</artifactId>
+			<artifactId>jetty-all</artifactId>
+            <classifier>uber</classifier>
 		</dependency>
 
 		<!-- LOGGING -->
@@ -40,9 +41,9 @@
 	<build>
 		<plugins>
 			<plugin>
-				<groupId>org.mortbay.jetty</groupId>
+				<groupId>org.eclipse.jetty</groupId>
 				<artifactId>jetty-maven-plugin</artifactId>
 			</plugin>
 		</plugins>
 	</build>
-</project>
+</project>
diff --git a/jasperreports-parent/jasperreports-examples/pom.xml b/jasperreports-parent/jasperreports-examples/pom.xml
@@ -38,7 +38,8 @@
 		<!--  JETTY DEPENDENCIES FOR TESTING  -->
 		<dependency>
 			<groupId>org.eclipse.jetty.aggregate</groupId>
-			<artifactId>jetty-all-server</artifactId>
+			<artifactId>jetty-all</artifactId>
+            <classifier>uber</classifier>
 		</dependency>
 
 		<!-- LOGGING DEPENDENCIES - LOG4J -->

diff --git a/jqplot-parent/jqplot-examples/pom.xml b/jqplot-parent/jqplot-examples/pom.xml
@@ -52,8 +52,8 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.mortbay.jetty</groupId>
-                <artifactId>maven-jetty-plugin</artifactId>
+                <groupId>org.eclipse.jetty</groupId>
+                <artifactId>jetty-maven-plugin</artifactId>
             </plugin>
         </plugins>
     </build>

diff --git a/jquery-parent/jquery-examples/pom.xml b/jquery-parent/jquery-examples/pom.xml
@@ -69,23 +69,18 @@
 		</dependency>
 		<dependency>
 			<groupId>org.eclipse.jetty.aggregate</groupId>
-			<artifactId>jetty-all-server</artifactId>
+			<artifactId>jetty-all</artifactId>
+            <classifier>uber</classifier>
 		</dependency>
     </dependencies>
     <build>
         <plugins>
             <plugin>
-                <groupId>org.mortbay.jetty</groupId>
+                <groupId>org.eclipse.jetty</groupId>
                 <artifactId>jetty-maven-plugin</artifactId>
                 <configuration>
                     <scanIntervalSeconds>60</scanIntervalSeconds>
                     <webAppSourceDirectory>src/main/webapp</webAppSourceDirectory>
-                    <connectors>
-                        <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
-                            <port>8080</port>
-                            <maxIdleTime>60000</maxIdleTime>
-                        </connector>
-                    </connectors>
                 </configuration>
             </plugin>
         </plugins>

diff --git a/jwicket-parent/jwicket-examples/pom.xml b/jwicket-parent/jwicket-examples/pom.xml
@@ -41,7 +41,7 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.mortbay.jetty</groupId>
+                <groupId>org.eclipse.jetty</groupId>
                 <artifactId>jetty-maven-plugin</artifactId>
             </plugin>
         </plugins>

diff --git a/jwicket-parent/pom.xml b/jwicket-parent/pom.xml
@@ -73,19 +73,19 @@
 
         <!--  JETTY DEPENDENCIES FOR TESTING  -->
         <dependency>
-            <groupId>org.mortbay.jetty</groupId>
+            <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty</artifactId>
             <scope>provided</scope>
             <version>${jetty.ver}</version>
         </dependency>
         <dependency>
-            <groupId>org.mortbay.jetty</groupId>
+            <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-util</artifactId>
             <scope>provided</scope>
             <version>${jetty.ver}</version>
         </dependency>
         <dependency>
-            <groupId>org.mortbay.jetty</groupId>
+            <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-management</artifactId>
             <scope>provided</scope>
             <version>${jetty.ver}</version>

diff --git a/lightbox2-parent/lightbox2-examples/pom.xml b/lightbox2-parent/lightbox2-examples/pom.xml
@@ -52,8 +52,8 @@
 	<build>
 		<plugins>
 			<plugin>
-				<groupId>org.mortbay.jetty</groupId>
-				<artifactId>maven-jetty-plugin</artifactId>
+				<groupId>org.eclipse.jetty</groupId>
+				<artifactId>jetty-maven-plugin</artifactId>
 			</plugin>
 		</plugins>
 	</build>

diff --git a/mbeanview-parent/mbeanview-examples/pom.xml b/mbeanview-parent/mbeanview-examples/pom.xml
@@ -47,7 +47,8 @@
 		<!--  JETTY DEPENDENCIES FOR TESTING  -->
 		<dependency>
 			<groupId>org.eclipse.jetty.aggregate</groupId>
-			<artifactId>jetty-all-server</artifactId>
+			<artifactId>jetty-all</artifactId>
+            <classifier>uber</classifier>
 		</dependency>
 	</dependencies>
 </project>
diff --git a/minis-parent/minis-examples/pom.xml b/minis-parent/minis-examples/pom.xml
@@ -58,7 +58,8 @@
 		<!-- JETTY DEPENDENCIES FOR TESTING -->
 		<dependency>
 			<groupId>org.eclipse.jetty.aggregate</groupId>
-			<artifactId>jetty-all-server</artifactId>
+			<artifactId>jetty-all</artifactId>
+            <classifier>uber</classifier>
 		</dependency>
 	</dependencies>
 

diff --git a/modalx-parent/modalx-examples/pom.xml b/modalx-parent/modalx-examples/pom.xml
@@ -49,13 +49,14 @@
 		<!-- JETTY DEPENDENCIES FOR TESTING -->
 		<dependency>
 			<groupId>org.eclipse.jetty.aggregate</groupId>
-			<artifactId>jetty-all-server</artifactId>
+			<artifactId>jetty-all</artifactId>
+            <classifier>uber</classifier>
 		</dependency>
 	</dependencies>
 	<build>
 		<plugins>
 			<plugin>
-				<groupId>org.mortbay.jetty</groupId>
+				<groupId>org.eclipse.jetty</groupId>
 				<artifactId>jetty-maven-plugin</artifactId>
 			</plugin>
 			<plugin>

diff --git a/nashorn-parent/nashorn-examples/pom.xml b/nashorn-parent/nashorn-examples/pom.xml
@@ -25,7 +25,6 @@
 
 	<properties>
 		<servlet.jsp.api.version>3.1.0</servlet.jsp.api.version>
-		<jetty.version>9.1.6.v20160112</jetty.version>
 		<javadoc.disabled>true</javadoc.disabled>
 		<deployment.disabled>true</deployment.disabled>
 		<sources.disabled>true</sources.disabled>
@@ -50,8 +49,7 @@
 		<dependency>
 			<groupId>org.eclipse.jetty.aggregate</groupId>
 			<artifactId>jetty-all</artifactId>
-			<version>${jetty.version}</version>
-			<scope>test</scope>
+            <classifier>uber</classifier>
 		</dependency>
 		<dependency>
 			<groupId>javax.servlet</groupId>
@@ -71,4 +69,4 @@
 			</plugin>
 		</plugins>
 	</build>
-</project>
+</project>
diff --git a/objectautocomplete-parent/objectautocomplete-examples/pom.xml b/objectautocomplete-parent/objectautocomplete-examples/pom.xml
@@ -47,7 +47,8 @@
         <!--  JETTY DEPENDENCIES FOR TESTING  -->
 		<dependency>
 			<groupId>org.eclipse.jetty.aggregate</groupId>
-			<artifactId>jetty-all-server</artifactId>
+			<artifactId>jetty-all</artifactId>
+            <classifier>uber</classifier>
 		</dependency>
 
     </dependencies>

diff --git a/offline-mode-parent/offline-mode-examples/pom.xml b/offline-mode-parent/offline-mode-examples/pom.xml
@@ -25,7 +25,6 @@
 
 	<properties>
 		<servlet.jsp.api.version>3.1.0</servlet.jsp.api.version>
-		<jetty.version>9.1.6.v20160112</jetty.version>
 		<javadoc.disabled>true</javadoc.disabled>
 		<deployment.disabled>true</deployment.disabled>
 		<sources.disabled>true</sources.disabled>
@@ -50,8 +49,7 @@
 		<dependency>
 			<groupId>org.eclipse.jetty.aggregate</groupId>
 			<artifactId>jetty-all</artifactId>
-			<version>${jetty.version}</version>
-			<scope>test</scope>
+            <classifier>uber</classifier>
 		</dependency>
 		<dependency>
 			<groupId>javax.servlet</groupId>
@@ -71,4 +69,4 @@
 			</plugin>
 		</plugins>
 	</build>
-</project>
+</project>
diff --git a/openlayers-parent/openlayers-examples/pom.xml b/openlayers-parent/openlayers-examples/pom.xml
@@ -59,7 +59,8 @@
 		<!-- JETTY DEPENDENCIES FOR TESTING -->
 		<dependency>
 			<groupId>org.eclipse.jetty.aggregate</groupId>
-			<artifactId>jetty-all-server</artifactId>
+			<artifactId>jetty-all</artifactId>
+            <classifier>uber</classifier>
 		</dependency>
 		<dependency>
 			<groupId>${project.groupId}</groupId>

diff --git a/openlayers3-parent/openlayers3-examples/pom.xml b/openlayers3-parent/openlayers3-examples/pom.xml
@@ -66,7 +66,8 @@
         <!-- JETTY DEPENDENCIES FOR TESTING -->
         <dependency>
             <groupId>org.eclipse.jetty.aggregate</groupId>
-            <artifactId>jetty-all-server</artifactId>
+            <artifactId>jetty-all</artifactId>
+            <classifier>uber</classifier>
         </dependency>
     </dependencies>
 
@@ -75,8 +76,7 @@
             <plugin>
                 <groupId>org.eclipse.jetty</groupId>
                 <artifactId>jetty-maven-plugin</artifactId>
-                <version>9.2.2.v20140723</version>
-		<configuration>
+                <configuration>
                     <webAppConfig>
                         <maxFormContentSize>2000000</maxFormContentSize>
                     </webAppConfig>

diff --git a/phonebook/pom.xml b/phonebook/pom.xml
@@ -83,8 +83,9 @@
 		</dependency>
 		<dependency>
 			<groupId>org.eclipse.jetty.aggregate</groupId>
-			<artifactId>jetty-all-server</artifactId>
+			<artifactId>jetty-all</artifactId>
 			<scope>provided</scope>
+            <classifier>uber</classifier>
 		</dependency>
 		<dependency>
 			<groupId>net.sf.shadesdb</groupId>