From 6e6386ed180a8cdf984ca7081da4295c2d707d53 Mon Sep 17 00:00:00 2001
From: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Date: Wed, 1 Feb 2012 14:32:44 -0700
Subject: [PATCH 1/6] Bug 370373 - Fix jetty aggregates to exclude new orbit
 deps

    + Migrated jetty-server to new aggregate configuration.
---
 jetty-aggregate/jetty-server/pom.xml | 20 ++++----------------
 1 file changed, 4 insertions(+), 16 deletions(-)

diff --git a/jetty-aggregate/jetty-server/pom.xml b/jetty-aggregate/jetty-server/pom.xml
index d64920fe17b..686259c6d89 100644
--- a/jetty-aggregate/jetty-server/pom.xml
+++ b/jetty-aggregate/jetty-server/pom.xml
@@ -21,8 +21,9 @@
               <goal>unpack-dependencies</goal>
             </goals>
             <configuration>
-              <includes>**</includes>
               <excludes>**/MANIFEST.MF,javax/**</excludes>
+              <excludeArtifactIds>javax</excludeArtifactIds>
+              <excludeGroupIds>javax,org.eclipse.jetty.orbit</excludeGroupIds>
               <outputDirectory>${project.build.directory}/classes</outputDirectory>
               <overWriteReleases>false</overWriteReleases>
               <overWriteSnapshots>true</overWriteSnapshots>
@@ -39,6 +40,8 @@
               <includes>**/*</includes>
               <excludes>META-INF/**</excludes>
               <includeGroupIds>org.eclipse.jetty</includeGroupIds>
+              <excludeArtifactIds>javax</excludeArtifactIds>
+              <excludeGroupIds>javax,org.eclipse.jetty.orbit</excludeGroupIds>
               <outputDirectory>${project.build.directory}/sources</outputDirectory>
               <overWriteReleases>true</overWriteReleases>
               <overWriteSnapshots>true</overWriteSnapshots>
@@ -83,16 +86,6 @@
       <artifactId>jetty-server</artifactId>
       <version>${project.version}</version>
       <scope>provided</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>javax.servlet</groupId>
-          <artifactId>servlet-api</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.eclipse.jetty.orbit</groupId>
-          <artifactId>javax.servlet</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
@@ -100,10 +93,5 @@
       <version>${project.version}</version>
       <scope>provided</scope>
     </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty.orbit</groupId>
-      <artifactId>javax.servlet</artifactId>
-      <scope>compile</scope>
-    </dependency>
   </dependencies>
 </project>

From 34bc904be699c21fffd79b537be0118eeeaa9ddd Mon Sep 17 00:00:00 2001
From: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Date: Wed, 1 Feb 2012 14:37:09 -0700
Subject: [PATCH 2/6] Bug 370373 - Fix jetty aggregates to exclude new orbit
 deps

+ Migrated jetty-servlet to new aggregate configuration.
---
 jetty-aggregate/jetty-servlet/pom.xml | 25 ++++++-------------------
 1 file changed, 6 insertions(+), 19 deletions(-)

diff --git a/jetty-aggregate/jetty-servlet/pom.xml b/jetty-aggregate/jetty-servlet/pom.xml
index c2305f5fa3a..bbc29ae51bc 100644
--- a/jetty-aggregate/jetty-servlet/pom.xml
+++ b/jetty-aggregate/jetty-servlet/pom.xml
@@ -7,7 +7,7 @@
   <modelVersion>4.0.0</modelVersion>
   <artifactId>jetty-servlet</artifactId>
   <name>Jetty :: Aggregate :: Servlet Server</name>
-  
+
   <build>
     <sourceDirectory>${project.build.directory}/sources</sourceDirectory>
     <plugins>
@@ -21,8 +21,9 @@
               <goal>unpack-dependencies</goal>
             </goals>
             <configuration>
-              <includes>**</includes>
               <excludes>**/MANIFEST.MF,javax/**</excludes>
+              <excludeArtifactIds>javax</excludeArtifactIds>
+              <excludeGroupIds>javax,org.eclipse.jetty.orbit</excludeGroupIds>
               <outputDirectory>${project.build.directory}/classes</outputDirectory>
               <overWriteReleases>false</overWriteReleases>
               <overWriteSnapshots>true</overWriteSnapshots>
@@ -39,6 +40,8 @@
               <includes>**/*</includes>
               <excludes>META-INF/**</excludes>
               <includeGroupIds>org.eclipse.jetty</includeGroupIds>
+              <excludeArtifactIds>javax</excludeArtifactIds>
+              <excludeGroupIds>javax,org.eclipse.jetty.orbit</excludeGroupIds>
               <outputDirectory>${project.build.directory}/sources</outputDirectory>
               <overWriteReleases>true</overWriteReleases>
               <overWriteSnapshots>true</overWriteSnapshots>
@@ -47,8 +50,7 @@
         </executions>
       </plugin>
       <plugin>
-        <groupId>org.apache.maven.plugins
-        </groupId>
+        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>
         <executions>
           <execution>
@@ -83,21 +85,6 @@
       <artifactId>jetty-servlet</artifactId>
       <version>${project.version}</version>
       <scope>provided</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>javax.servlet</groupId>
-          <artifactId>servlet-api</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.eclipse.jetty.orbit</groupId>
-          <artifactId>javax.servlet</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty.orbit</groupId>
-      <artifactId>javax.servlet</artifactId>
-      <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>

From 427ea484790ec41ba2adb9ce825f7f414644538f Mon Sep 17 00:00:00 2001
From: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Date: Wed, 1 Feb 2012 14:43:38 -0700
Subject: [PATCH 3/6] Bug 370373 - Fix jetty aggregates to exclude new orbit
 deps

+ Migrated jetty-webapp to new aggregate configuration.
---
 jetty-aggregate/jetty-webapp/pom.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/jetty-aggregate/jetty-webapp/pom.xml b/jetty-aggregate/jetty-webapp/pom.xml
index 8e70b3e8251..5dfffc36c8b 100644
--- a/jetty-aggregate/jetty-webapp/pom.xml
+++ b/jetty-aggregate/jetty-webapp/pom.xml
@@ -23,6 +23,8 @@
             <configuration>
               <includes>META-INF/**,org/eclipse/**,org/apache/jasper/compiler/**</includes>
               <excludes>**/MANIFEST.MF,javax/**</excludes>
+              <excludeArtifactIds>javax</excludeArtifactIds>
+              <excludeGroupIds>javax,org.eclipse.jetty.orbit</excludeGroupIds>
               <outputDirectory>${project.build.directory}/classes</outputDirectory>
               <overWriteReleases>false</overWriteReleases>
               <overWriteSnapshots>true</overWriteSnapshots>
@@ -39,6 +41,8 @@
               <includes>**/*</includes>
               <excludes>META-INF/**</excludes>
               <includeGroupIds>org.eclipse.jetty</includeGroupIds>
+              <excludeArtifactIds>javax</excludeArtifactIds>
+              <excludeGroupIds>javax,org.eclipse.jetty.orbit</excludeGroupIds>
               <outputDirectory>${project.build.directory}/sources</outputDirectory>
               <overWriteReleases>true</overWriteReleases>
               <overWriteSnapshots>true</overWriteSnapshots>

From f9e3421a5b42deeefb806261ab1682036713ea59 Mon Sep 17 00:00:00 2001
From: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Date: Wed, 1 Feb 2012 14:46:45 -0700
Subject: [PATCH 4/6] Bug 370373 - Fix jetty aggregates to exclude new orbit
 deps

+ Migrated jetty-websocket to new aggregate configuration.
---
 jetty-aggregate/jetty-websocket/pom.xml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/jetty-aggregate/jetty-websocket/pom.xml b/jetty-aggregate/jetty-websocket/pom.xml
index 982d2884229..601a2e324e0 100644
--- a/jetty-aggregate/jetty-websocket/pom.xml
+++ b/jetty-aggregate/jetty-websocket/pom.xml
@@ -21,8 +21,9 @@
               <goal>unpack-dependencies</goal>
             </goals>
             <configuration>
-              <includes>META-INF/**,org/eclipse/**</includes>
               <excludes>**/MANIFEST.MF,javax/**,about.html</excludes>
+              <excludeArtifactIds>javax</excludeArtifactIds>
+              <excludeGroupIds>javax,org.eclipse.jetty.orbit</excludeGroupIds>
               <outputDirectory>${project.build.directory}/classes</outputDirectory>
               <overWriteReleases>false</overWriteReleases>
               <overWriteSnapshots>true</overWriteSnapshots>
@@ -39,6 +40,8 @@
               <includes>**/*</includes>
               <excludes>META-INF/**</excludes>
               <includeGroupIds>org.eclipse.jetty</includeGroupIds>
+              <excludeArtifactIds>javax</excludeArtifactIds>
+              <excludeGroupIds>javax,org.eclipse.jetty.orbit</excludeGroupIds>
               <outputDirectory>${project.build.directory}/sources</outputDirectory>
               <overWriteReleases>true</overWriteReleases>
               <overWriteSnapshots>true</overWriteSnapshots>

From f376cf46a12a74a4bfded3477212da8bae149593 Mon Sep 17 00:00:00 2001
From: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Date: Wed, 1 Feb 2012 15:15:04 -0700
Subject: [PATCH 5/6] Updating NOTICE.txt with new year + license urls

---
 NOTICE.txt | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/NOTICE.txt b/NOTICE.txt
index 8cda6d5719d..817de69dbf6 100644
--- a/NOTICE.txt
+++ b/NOTICE.txt
@@ -1,12 +1,24 @@
 ==============================================================
- Jetty Web Container 
+ Jetty Web Container
  Copyright 1995-2009 Mort Bay Consulting Pty Ltd
+           2009-2012 Webtide LLC
+           2011-2012 Intalio Inc
 ==============================================================
 
 The Jetty Web Container is Copyright Mort Bay Consulting Pty Ltd
-unless otherwise noted. It is dual licensed under the apache 2.0
-license and eclipse 1.0 license. Jetty may be distributed under
-either license.
+unless otherwise noted.
+
+Jetty is dual licensed under both
+
+  * The Apache 2.0 License
+    http://www.apache.org/licenses/LICENSE-2.0.html
+
+      and
+
+  * The Eclipse Public 1.0 License
+    http://www.eclipse.org/legal/epl-v10.html
+
+Jetty may be distributed under either license.
 
 The javax.servlet package used was sourced from the Apache
 Software Foundation and is distributed under the apache 2.0
@@ -15,7 +27,7 @@ license.
 The UnixCrypt.java code implements the one way cryptography used by
 Unix systems for simple password protection.  Copyright 1996 Aki Yoshida,
 modified April 2001  by Iris Van den Broeke, Daniel Deville.
-Permission to use, copy, modify and distribute UnixCrypt 
+Permission to use, copy, modify and distribute UnixCrypt
 for non-commercial or commercial purposes and without fee is
 granted provided that the copyright notice appears in all copies.
 

From 2559c0558bc70a9ef667a4378c3aa46561a845cf Mon Sep 17 00:00:00 2001
From: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Date: Wed, 1 Feb 2012 15:41:19 -0700
Subject: [PATCH 6/6] Bug 370372 - Fix references to SVNROOT present in pom.xml

+ Changing from dev.eclipse.org (svn) to git.eclipse.org (git) URLs
---
 .../src/main/java/org/eclipse/jetty/embedded/FileServerXml.java | 2 +-
 jetty-aggregate/jetty-all/pom.xml                               | 2 +-
 jetty-aggregate/jetty-client/pom.xml                            | 2 +-
 jetty-aggregate/jetty-plus/pom.xml                              | 2 +-
 jetty-aggregate/jetty-server/pom.xml                            | 2 +-
 jetty-aggregate/jetty-servlet/pom.xml                           | 2 +-
 jetty-aggregate/jetty-webapp/pom.xml                            | 2 +-
 jetty-aggregate/jetty-websocket/pom.xml                         | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/example-jetty-embedded/src/main/java/org/eclipse/jetty/embedded/FileServerXml.java b/example-jetty-embedded/src/main/java/org/eclipse/jetty/embedded/FileServerXml.java
index 6cf59bad31c..428a1dbbf6b 100644
--- a/example-jetty-embedded/src/main/java/org/eclipse/jetty/embedded/FileServerXml.java
+++ b/example-jetty-embedded/src/main/java/org/eclipse/jetty/embedded/FileServerXml.java
@@ -11,7 +11,7 @@ import org.eclipse.jetty.xml.XmlConfiguration;
  * is configured via an {@link XmlConfiguration} config file that
  * does the identical work.
  * <p>
- * See <a href="http://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk/example-jetty-embedded/src/main/resources/fileserver.xml">fileserver.xml</a>
+ * See <a href="http://git.eclipse.org/c/jetty/org.eclipse.jetty.project.git/tree/example-jetty-embedded/src/main/resources/fileserver.xml">fileserver.xml</a>
  */
 public class FileServerXml
 {
diff --git a/jetty-aggregate/jetty-all/pom.xml b/jetty-aggregate/jetty-all/pom.xml
index 0a029501273..58b44b51659 100644
--- a/jetty-aggregate/jetty-all/pom.xml
+++ b/jetty-aggregate/jetty-all/pom.xml
@@ -69,7 +69,7 @@
                   <url>http://eclipse.org/jetty</url>
                   <Built-By>${user.name}</Built-By>
                   <package>org.eclipse.jetty</package>
-                  <Bundle-License>http://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk/NOTICE.txt</Bundle-License>
+                  <Bundle-License>http://git.eclipse.org/c/jetty/org.eclipse.jetty.project.git/tree/NOTICE.txt</Bundle-License>
                   <Bundle-Name>Jetty</Bundle-Name>
                 </manifestEntries>
               </archive>
diff --git a/jetty-aggregate/jetty-client/pom.xml b/jetty-aggregate/jetty-client/pom.xml
index 4b6a1f5af70..88a74502c09 100644
--- a/jetty-aggregate/jetty-client/pom.xml
+++ b/jetty-aggregate/jetty-client/pom.xml
@@ -65,7 +65,7 @@
                   <url>http://eclipse.org/jetty</url>
                   <Built-By>${user.name}</Built-By>
                   <package>org.eclipse.jetty</package>
-                  <Bundle-License>http://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk/NOTICE.txt</Bundle-License>
+                  <Bundle-License>http://git.eclipse.org/c/jetty/org.eclipse.jetty.project.git/tree/NOTICE.txt</Bundle-License>
                   <Bundle-Name>Jetty HTTP Client</Bundle-Name>
                 </manifestEntries>
               </archive>
diff --git a/jetty-aggregate/jetty-plus/pom.xml b/jetty-aggregate/jetty-plus/pom.xml
index e2ccfb8de63..669451d9556 100644
--- a/jetty-aggregate/jetty-plus/pom.xml
+++ b/jetty-aggregate/jetty-plus/pom.xml
@@ -69,7 +69,7 @@
                   <url>http://eclipse.org/jetty</url>
                   <Built-By>${user.name}</Built-By>
                   <package>org.eclipse.jetty</package>
-                  <Bundle-License>http://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk/NOTICE.txt</Bundle-License>
+                  <Bundle-License>http://git.eclipse.org/c/jetty/org.eclipse.jetty.project.git/tree/NOTICE.txt</Bundle-License>
                   <Bundle-Name>Jetty HTTP Server</Bundle-Name>
                 </manifestEntries>
               </archive>
diff --git a/jetty-aggregate/jetty-server/pom.xml b/jetty-aggregate/jetty-server/pom.xml
index 686259c6d89..695787e7294 100644
--- a/jetty-aggregate/jetty-server/pom.xml
+++ b/jetty-aggregate/jetty-server/pom.xml
@@ -69,7 +69,7 @@
                   <url>http://eclipse.org/jetty</url>
                   <Built-By>${user.name}</Built-By>
                   <package>org.eclipse.jetty</package>
-                  <Bundle-License>http://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk/NOTICE.txt</Bundle-License>
+                  <Bundle-License>http://git.eclipse.org/c/jetty/org.eclipse.jetty.project.git/tree/NOTICE.txt</Bundle-License>
                   <Bundle-Name>Jetty HTTP Server</Bundle-Name>
                 </manifestEntries>
               </archive>
diff --git a/jetty-aggregate/jetty-servlet/pom.xml b/jetty-aggregate/jetty-servlet/pom.xml
index bbc29ae51bc..364d163f755 100644
--- a/jetty-aggregate/jetty-servlet/pom.xml
+++ b/jetty-aggregate/jetty-servlet/pom.xml
@@ -68,7 +68,7 @@
                   <url>http://eclipse.org/jetty</url>
                   <Built-By>${user.name}</Built-By>
                   <package>org.eclipse.jetty</package>
-                  <Bundle-License>http://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk/NOTICE.txt</Bundle-License>
+                  <Bundle-License>http://git.eclipse.org/c/jetty/org.eclipse.jetty.project.git/tree/NOTICE.txt</Bundle-License>
                   <Bundle-Name>Jetty HTTP Server</Bundle-Name>
                 </manifestEntries>
               </archive>
diff --git a/jetty-aggregate/jetty-webapp/pom.xml b/jetty-aggregate/jetty-webapp/pom.xml
index 5dfffc36c8b..b86c0a29df7 100644
--- a/jetty-aggregate/jetty-webapp/pom.xml
+++ b/jetty-aggregate/jetty-webapp/pom.xml
@@ -70,7 +70,7 @@
                   <url>http://eclipse.org/jetty</url>
                   <Built-By>${user.name}</Built-By>
                   <package>org.eclipse.jetty</package>
-                  <Bundle-License>http://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk/NOTICE.txt</Bundle-License>
+                  <Bundle-License>http://git.eclipse.org/c/jetty/org.eclipse.jetty.project.git/tree/NOTICE.txt</Bundle-License>
                   <Bundle-Name>Jetty HTTP Server</Bundle-Name>
                 </manifestEntries>
               </archive>
diff --git a/jetty-aggregate/jetty-websocket/pom.xml b/jetty-aggregate/jetty-websocket/pom.xml
index 601a2e324e0..e7b99c92310 100644
--- a/jetty-aggregate/jetty-websocket/pom.xml
+++ b/jetty-aggregate/jetty-websocket/pom.xml
@@ -69,7 +69,7 @@
                   <url>http://eclipse.org/jetty</url>
                   <Built-By>${user.name}</Built-By>
                   <package>org.eclipse.jetty</package>
-                  <Bundle-License>http://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk/NOTICE.txt</Bundle-License>
+                  <Bundle-License>http://git.eclipse.org/c/jetty/org.eclipse.jetty.project.git/tree/NOTICE.txt</Bundle-License>
                   <Bundle-Name>Jetty HTTP Server</Bundle-Name>
                 </manifestEntries>
               </archive>