From ca4ad73fb14ec2ac98a63bd7f511a22189203be4 Mon Sep 17 00:00:00 2001
From: Stanislav Ochotnicky <sochotnicky@redhat.com>
Date: Apr 26 2012 15:28:52 +0000
Subject: Update to 8.1.2 upstream release


---

diff --git a/.gitignore b/.gitignore
index dbc2473..9993328 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ jetty-6.1.26-src.zip
 /jetty-8.1.0.RC4.tar.bz2
 /jetty-8.1.0.RC5.tar.bz2
 /jetty-8.1.0.v20120127.tar.bz2
+/jetty-8.1.2.v20120308.tar.bz2
diff --git a/0001-Remove-javadoc-execution.patch b/0001-Remove-javadoc-execution.patch
index 78051b6..12363e1 100644
--- a/0001-Remove-javadoc-execution.patch
+++ b/0001-Remove-javadoc-execution.patch
@@ -1,4 +1,4 @@
-From 8509de87ff274653abd2f89f8a09c2ebf1840b36 Mon Sep 17 00:00:00 2001
+From c0a15ad5846a980a0031638ad56cfce1dcec8673 Mon Sep 17 00:00:00 2001
 From: Stanislav Ochotnicky <sochotnicky@redhat.com>
 Date: Tue, 24 Jan 2012 10:33:17 +0100
 Subject: [PATCH 1/6] Remove javadoc execution
@@ -10,10 +10,10 @@ We generate javadoc as a separate step
  2 files changed, 0 insertions(+), 20 deletions(-)
 
 diff --git a/jetty-aggregate/jetty-all/pom.xml b/jetty-aggregate/jetty-all/pom.xml
-index d0675a7..40f2a91 100644
+index d7126f3..86c693b 100644
 --- a/jetty-aggregate/jetty-all/pom.xml
 +++ b/jetty-aggregate/jetty-all/pom.xml
-@@ -73,19 +73,6 @@
+@@ -76,19 +76,6 @@
            </execution>
          </executions>
        </plugin>
@@ -34,10 +34,10 @@ index d0675a7..40f2a91 100644
    </build>
  
 diff --git a/jetty-distribution/pom.xml b/jetty-distribution/pom.xml
-index 105e166..13560e3 100644
+index d9a9da3..bb6aff6 100644
 --- a/jetty-distribution/pom.xml
 +++ b/jetty-distribution/pom.xml
-@@ -379,12 +379,5 @@
+@@ -398,12 +398,5 @@
        <artifactId>jetty-overlay-deployer</artifactId>
        <version>${project.version}</version>
      </dependency>
@@ -51,5 +51,5 @@ index 105e166..13560e3 100644
    </dependencies>
  </project>
 -- 
-1.7.6.2
+1.7.9
 
diff --git a/0002-Cleaup-distribution-generation.patch b/0002-Cleaup-distribution-generation.patch
deleted file mode 100644
index 17ee218..0000000
--- a/0002-Cleaup-distribution-generation.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-From 18d40c0909309f145fd36e2b35f009484787829f Mon Sep 17 00:00:00 2001
-From: Stanislav Ochotnicky <sochotnicky@redhat.com>
-Date: Tue, 24 Jan 2012 10:37:20 +0100
-Subject: [PATCH 2/6] Cleaup distribution generation
-
-We recreate distribution package anyway, this just complicated things
----
- jetty-distribution/pom.xml |   46 --------------------------------------------
- 1 files changed, 0 insertions(+), 46 deletions(-)
-
-diff --git a/jetty-distribution/pom.xml b/jetty-distribution/pom.xml
-index 13560e3..70677a9 100644
---- a/jetty-distribution/pom.xml
-+++ b/jetty-distribution/pom.xml
-@@ -64,71 +64,25 @@
-                 <!-- This is the Orbit Downloads Process -->
- 
-                 <!-- Step 1: download orbit artifact into orbit-cache (if not present) -->
--                <property name="orbit-cache" value="${user.home}/.m2/eclipse-orbit" />
- 
--                <mkdir dir="${orbit-cache}" />
--                <get dest="${orbit-cache}" verbose="true" skipexisting="true">
--                  <url url="${jetty-orbit-url}/javax.servlet_${orbit-javax-servlet-version}.jar" />
--                  <url url="${jetty-orbit-url}/javax.activation_${orbit-javax-activation-version}.jar" />
--                  <url url="${jetty-orbit-url}/javax.annotation_${orbit-javax-annotation-version}.jar" />
--                  <url url="${jetty-orbit-url}/javax.mail.glassfish_${orbit-javax-mail-glassfish-version}.jar" />
--                  <url url="${jetty-orbit-url}/javax.el_${orbit-javax-el-version}.jar" />
--                  <url url="${jetty-orbit-url}/javax.servlet.jsp_${orbit-javax-servlet-jsp-version}.jar" />
--                  <url url="${jetty-orbit-url}/javax.servlet.jsp.jstl_${orbit-javax-servlet-jsp-jstl-version}.jar" />
--                  <url url="${jetty-orbit-url}/com.sun.el_${orbit-com-sun-el-version}.jar" />
--                  <url url="${jetty-orbit-url}/org.apache.jasper.glassfish_${orbit-org-apache-jasper-version}.jar" />
--                  <url url="${jetty-orbit-url}/org.apache.taglibs.standard.glassfish_${orbit-org-apache-taglibs-standard-version}.jar" />
--                  <url url="${jetty-orbit-url}/org.objectweb.asm_${orbit-org-objectweb-asm-version}.jar" />
--                  <url url="${jetty-orbit-url}/javax.transaction_${orbit-javax-transaction-version}.jar" />
--                  <url url="${jetty-orbit-url}/ecj-${eclipse-ecj-version}.jar" />
--                </get>
- 
-                 <!-- Step 2: copy the orbit artifact from orbit-cache to the appropriate lib directory -->
- 
-                 <!-- ${jetty.home}/lib/ -->
-                 <mkdir dir="${assembly-directory}/lib" />
--                <copy file="${orbit-cache}/javax.servlet_${orbit-javax-servlet-version}.jar" tofile="${assembly-directory}/lib/servlet-api-3.0.jar" />
- 
-                
-                 <!-- ${jetty.home}/lib/annotations/ -->
-                 <mkdir dir="${assembly-directory}/lib/annotations" />
--                <copy todir="${assembly-directory}/lib/annotations">
--                  <fileset dir="${orbit-cache}">
--                    <include name="javax.annotation_${orbit-javax-annotation-version}.jar" />
--                    <include name="org.objectweb.asm_${orbit-org-objectweb-asm-version}.jar" />
--                  </fileset>
--                </copy>
- 
-                 <!-- ${jetty.home}/lib/jndi/ -->
-                 <mkdir dir="${assembly-directory}/lib/jndi" />
--                <copy todir="${assembly-directory}/lib/jndi">
--                  <fileset dir="${orbit-cache}">
--                    <include name="javax.activation_${orbit-javax-activation-version}.jar" />
--                    <include name="javax.mail.glassfish_${orbit-javax-mail-glassfish-version}.jar" />
--                  </fileset>
--                </copy>
- 
-                <!-- ${jetty.home}/lib/jta/ -->
-                 <mkdir dir="${assembly-directory}/lib/jta" />
--                <copy todir="${assembly-directory}/lib/jta">
--                  <fileset dir="${orbit-cache}">
--                    <include name="javax.transaction_${orbit-javax-transaction-version}.jar" />
--                  </fileset>
--                </copy>
- 
-                 <!-- ${jetty.home}/lib/jsp/ -->
-                 <mkdir dir="${assembly-directory}/lib/jsp" />
--                <copy todir="${assembly-directory}/lib/jsp">
--                  <fileset dir="${orbit-cache}">
--                    <include name="javax.el_${orbit-javax-el-version}.jar" />
--                    <include name="javax.servlet.jsp_${orbit-javax-servlet-jsp-version}.jar" />
--                    <include name="javax.servlet.jsp.jstl_${orbit-javax-servlet-jsp-jstl-version}.jar" />
--                    <include name="com.sun.el_${orbit-com-sun-el-version}.jar" />
--                    <include name="org.apache.jasper.glassfish_${orbit-org-apache-jasper-version}.jar" />         
--                    <include name="org.apache.taglibs.standard.glassfish_${orbit-org-apache-taglibs-standard-version}.jar" />
--                    <include name="ecj-${eclipse-ecj-version}.jar" />
--                  </fileset>
--                </copy>
-                 <chmod dir="${assembly-directory}/bin" perm="755" includes="**/*.sh" />
-               </tasks>
-             </configuration>
--- 
-1.7.6.2
-
diff --git a/0002-Disable-test-artifacts.patch b/0002-Disable-test-artifacts.patch
new file mode 100644
index 0000000..a739c90
--- /dev/null
+++ b/0002-Disable-test-artifacts.patch
@@ -0,0 +1,45 @@
+From b6a6651f548b741a2cc6a930c171c3176e431af7 Mon Sep 17 00:00:00 2001
+From: Stanislav Ochotnicky <sochotnicky@redhat.com>
+Date: Tue, 24 Jan 2012 11:09:27 +0100
+Subject: [PATCH 2/6] Disable test artifacts
+
+- they need more dependencies then we have time for right now :-)
+---
+ jetty-osgi/pom.xml |    1 -
+ pom.xml            |    5 -----
+ 2 files changed, 0 insertions(+), 6 deletions(-)
+
+diff --git a/jetty-osgi/pom.xml b/jetty-osgi/pom.xml
+index e0117fb..3e8c563 100644
+--- a/jetty-osgi/pom.xml
++++ b/jetty-osgi/pom.xml
+@@ -23,7 +23,6 @@
+     <module>jetty-osgi-boot-jsp</module>
+     <module>jetty-osgi-boot-warurl</module>
+     <module>jetty-osgi-httpservice</module>
+-    <module>test-jetty-osgi</module>
+   </modules>
+   <build>
+     <resources>
+diff --git a/pom.xml b/pom.xml
+index bc5db52..87b391b 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -383,14 +383,9 @@
+     <module>jetty-http-spi</module>
+     <module>jetty-jsp</module>
+     <module>jetty-distribution</module>
+-    <module>test-continuation</module>
+-    <!--module>test-continuation-jetty6</module-->
+-    <module>test-jetty-servlet</module>
+     <module>test-jetty-webapp</module>
+-    <module>test-jetty-nested</module>
+     <module>example-jetty-embedded</module>
+     <module>example-async-rest</module>
+-    <module>tests</module>
+   </modules>
+   <dependencyManagement>
+     <dependencies>
+-- 
+1.7.9
+
diff --git a/0003-Change-servelt-groupId-to-javax.servlet.patch b/0003-Change-servelt-groupId-to-javax.servlet.patch
new file mode 100644
index 0000000..0159dad
--- /dev/null
+++ b/0003-Change-servelt-groupId-to-javax.servlet.patch
@@ -0,0 +1,26 @@
+From a74ec5b7cd509887b1169aec62c21858bbd6e1e4 Mon Sep 17 00:00:00 2001
+From: Stanislav Ochotnicky <sochotnicky@redhat.com>
+Date: Tue, 24 Jan 2012 11:10:12 +0100
+Subject: [PATCH 3/6] Change servelt groupId to javax.servlet
+
+---
+ pom.xml |    3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+diff --git a/pom.xml b/pom.xml
+index 87b391b..564de42 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -14,6 +14,9 @@
+     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+     <jetty.url>http://www.eclipse.org/jetty</jetty.url>
+     <orbit-servlet-api-version>3.0.0.v201112011016</orbit-servlet-api-version>
++    <servlet.spec.groupId>javax.servlet</servlet.spec.groupId>
++    <servlet.spec.artifactId>servlet-api</servlet.spec.artifactId>
++    <servlet.spec.version>3.0.20100224</servlet.spec.version>
+     <build-support-version>1.1</build-support-version>
+     <slf4j-version>1.6.1</slf4j-version>
+     <jetty-test-policy-version>1.2</jetty-test-policy-version>
+-- 
+1.7.9
+
diff --git a/0003-Disable-test-artifacts.patch b/0003-Disable-test-artifacts.patch
deleted file mode 100644
index e93ca0c..0000000
--- a/0003-Disable-test-artifacts.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 6bebe830eada634485c7c872a1038a3a0a5e06f2 Mon Sep 17 00:00:00 2001
-From: Stanislav Ochotnicky <sochotnicky@redhat.com>
-Date: Tue, 24 Jan 2012 11:09:27 +0100
-Subject: [PATCH 3/6] Disable test artifacts
-
-- they need more dependencies then we have time for right now :-)
----
- jetty-osgi/pom.xml |    1 -
- pom.xml            |    9 ++-------
- 2 files changed, 2 insertions(+), 8 deletions(-)
-
-diff --git a/jetty-osgi/pom.xml b/jetty-osgi/pom.xml
-index 91bcb2e..2529824 100644
---- a/jetty-osgi/pom.xml
-+++ b/jetty-osgi/pom.xml
-@@ -25,7 +25,6 @@
-     <module>jetty-osgi-boot-jsp</module>
-     <module>jetty-osgi-boot-warurl</module>
-     <module>jetty-osgi-httpservice</module>
--    <module>test-jetty-osgi</module>
-   </modules>
-   <build>
-     <resources>
-diff --git a/pom.xml b/pom.xml
-index 6bcfc31..7be01ea 100644
---- a/pom.xml
-+++ b/pom.xml
-@@ -352,17 +352,12 @@
-     <module>jetty-nested</module>
-     <module>jetty-overlay-deployer</module>
-     <module>jetty-osgi</module>
--    <module>jetty-nosql</module>
--    <module>jetty-http-spi</module>
-     <module>jetty-distribution</module>
--    <module>test-continuation</module>
--    <!--module>test-continuation-jetty6</module-->
--    <module>test-jetty-servlet</module>
-     <module>test-jetty-webapp</module>
--    <module>test-jetty-nested</module>
-+    <module>jetty-nosql</module>
-+    <module>jetty-http-spi</module>
-     <module>example-jetty-embedded</module>
-     <module>example-async-rest</module>
--    <module>tests</module>
-   </modules>
-   <dependencyManagement>
-     <dependencies>
--- 
-1.7.6.2
-
diff --git a/0004-Change-servelt-groupId-to-javax.servlet.patch b/0004-Change-servelt-groupId-to-javax.servlet.patch
deleted file mode 100644
index f43b66b..0000000
--- a/0004-Change-servelt-groupId-to-javax.servlet.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From b27a862cd8edd2f82a488bba3e4ae43544592ce2 Mon Sep 17 00:00:00 2001
-From: Stanislav Ochotnicky <sochotnicky@redhat.com>
-Date: Tue, 24 Jan 2012 11:10:12 +0100
-Subject: [PATCH 4/6] Change servelt groupId to javax.servlet
-
----
- pom.xml |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/pom.xml b/pom.xml
-index 7be01ea..e556e89 100644
---- a/pom.xml
-+++ b/pom.xml
-@@ -18,7 +18,7 @@
-     <junit-version>4.8.1</junit-version>
-     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-     <slf4j-version>1.6.1</slf4j-version>
--    <servlet.spec.groupId>org.mortbay.jetty</servlet.spec.groupId>
-+    <servlet.spec.groupId>javax.servlet</servlet.spec.groupId>
-     <servlet.spec.artifactId>servlet-api</servlet.spec.artifactId>
-     <servlet.spec.version>3.0.20100224</servlet.spec.version>
-     <build-support-version>1.1</build-support-version>
--- 
-1.7.6.2
-
diff --git a/0004-Modify-dependencies.patch b/0004-Modify-dependencies.patch
new file mode 100644
index 0000000..783ef3a
--- /dev/null
+++ b/0004-Modify-dependencies.patch
@@ -0,0 +1,52 @@
+From efe1875615248d81e08142e9fef92ba0a5fab7f6 Mon Sep 17 00:00:00 2001
+From: Stanislav Ochotnicky <sochotnicky@redhat.com>
+Date: Tue, 24 Jan 2012 11:13:25 +0100
+Subject: [PATCH 4/6] Modify dependencies
+
+- remove sun httpserver
+- add tomcat-jasper
+---
+ jetty-http-spi/pom.xml                 |    6 ------
+ jetty-osgi/jetty-osgi-boot-jsp/pom.xml |    9 +++++++++
+ 2 files changed, 9 insertions(+), 6 deletions(-)
+
+diff --git a/jetty-http-spi/pom.xml b/jetty-http-spi/pom.xml
+index 7d97c01..29b19e9 100644
+--- a/jetty-http-spi/pom.xml
++++ b/jetty-http-spi/pom.xml
+@@ -17,12 +17,6 @@
+       <scope>test</scope>
+     </dependency>
+     <dependency>
+-      <groupId>com.sun.net.httpserver</groupId>
+-      <artifactId>http</artifactId>
+-      <version>20070405</version>
+-      <scope>provided</scope>
+-    </dependency>
+-    <dependency>
+       <groupId>org.eclipse.jetty</groupId>
+       <artifactId>jetty-server</artifactId>
+       <version>${project.version}</version>
+diff --git a/jetty-osgi/jetty-osgi-boot-jsp/pom.xml b/jetty-osgi/jetty-osgi-boot-jsp/pom.xml
+index 8f56510..3a35489 100644
+--- a/jetty-osgi/jetty-osgi-boot-jsp/pom.xml
++++ b/jetty-osgi/jetty-osgi-boot-jsp/pom.xml
+@@ -41,6 +41,15 @@
+       <groupId>org.eclipse.jetty</groupId>
+       <artifactId>jetty-jsp</artifactId>
+       <version>${project.version}</version>
++    </dependency>  
++    <dependency>
++     <groupId>org.apache.tomcat</groupId>
++     <artifactId>tomcat-jasper</artifactId>
++     <version>7.0.23</version>
++    </dependency>
++    <dependency>
++     <groupId>${servlet.spec.groupId}</groupId>
++     <artifactId>${servlet.spec.artifactId}</artifactId>
+     </dependency>
+   </dependencies>
+ 
+-- 
+1.7.9
+
diff --git a/0005-Modify-dependencies.patch b/0005-Modify-dependencies.patch
deleted file mode 100644
index ab9741d..0000000
--- a/0005-Modify-dependencies.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 968ec2b8f92311ef6c5e3d17dba2f9bd3bd4df68 Mon Sep 17 00:00:00 2001
-From: Stanislav Ochotnicky <sochotnicky@redhat.com>
-Date: Tue, 24 Jan 2012 11:13:25 +0100
-Subject: [PATCH 5/6] Modify dependencies
-
-- remove sun httpserver
-- add tomcat-jasper
----
- jetty-http-spi/pom.xml                 |    6 ------
- jetty-osgi/jetty-osgi-boot-jsp/pom.xml |    5 +++++
- 2 files changed, 5 insertions(+), 6 deletions(-)
-
-diff --git a/jetty-http-spi/pom.xml b/jetty-http-spi/pom.xml
-index dd64b1f..3df3312 100644
---- a/jetty-http-spi/pom.xml
-+++ b/jetty-http-spi/pom.xml
-@@ -17,12 +17,6 @@
-       <scope>test</scope>
-     </dependency>
-     <dependency>
--      <groupId>com.sun.net.httpserver</groupId>
--      <artifactId>http</artifactId>
--      <version>20070405</version>
--      <scope>provided</scope>
--    </dependency>
--    <dependency>
-       <groupId>org.eclipse.jetty</groupId>
-       <artifactId>jetty-server</artifactId>
-       <version>${project.version}</version>
-diff --git a/jetty-osgi/jetty-osgi-boot-jsp/pom.xml b/jetty-osgi/jetty-osgi-boot-jsp/pom.xml
-index 9bc544b..2417dd5 100644
---- a/jetty-osgi/jetty-osgi-boot-jsp/pom.xml
-+++ b/jetty-osgi/jetty-osgi-boot-jsp/pom.xml
-@@ -53,6 +53,11 @@
-       <version>2.2</version>
-     </dependency>
-     <dependency>
-+     <groupId>org.apache.tomcat</groupId>
-+     <artifactId>tomcat-jasper</artifactId>
-+     <version>7.0.23</version>
-+    </dependency>
-+    <dependency>
-      <groupId>${servlet.spec.groupId}</groupId>
-      <artifactId>${servlet.spec.artifactId}</artifactId>
-     </dependency>
--- 
-1.7.6.2
-
diff --git a/0005-Remove-pmd-plugin.patch b/0005-Remove-pmd-plugin.patch
new file mode 100644
index 0000000..b134d8c
--- /dev/null
+++ b/0005-Remove-pmd-plugin.patch
@@ -0,0 +1,54 @@
+From 77de1649a07e5c7c117039586b53da748907fac6 Mon Sep 17 00:00:00 2001
+From: Stanislav Ochotnicky <sochotnicky@redhat.com>
+Date: Tue, 24 Jan 2012 11:15:56 +0100
+Subject: [PATCH 5/6] Remove pmd plugin
+
+- prevents problem with "Reporting mojo's can only be called from
+  ReportDocumentRender". Investigate proper fix some other time?
+---
+ pom.xml |   29 -----------------------------
+ 1 files changed, 0 insertions(+), 29 deletions(-)
+
+diff --git a/pom.xml b/pom.xml
+index 564de42..65cf13a 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -170,35 +170,6 @@
+            </dependency>
+         </dependencies>
+       </plugin>
+-      <plugin>
+-        <groupId>org.apache.maven.plugins</groupId>
+-        <artifactId>maven-pmd-plugin</artifactId>
+-        <executions>
+-          <execution>
+-            <id>named-logging-enforcement</id>
+-            <phase>compile</phase>
+-            <goals>
+-              <goal>check</goal>
+-            </goals>
+-            <configuration>
+-              <verbose>true</verbose>
+-            </configuration>
+-          </execution>
+-        </executions>
+-        <configuration>
+-          <targetJdk>1.6</targetJdk>
+-          <rulesets>
+-            <ruleset>jetty/pmd_logging_ruleset.xml</ruleset>
+-          </rulesets>
+-        </configuration>
+-        <dependencies>
+-          <dependency>
+-            <groupId>org.eclipse.jetty.toolchain</groupId>
+-            <artifactId>jetty-build-support</artifactId>
+-            <version>${build-support-version}</version>
+-          </dependency>
+-        </dependencies>
+-      </plugin>
+     </plugins>
+     <pluginManagement>
+       <plugins>
+-- 
+1.7.9
+
diff --git a/0006-Remove-pmd-plugin.patch b/0006-Remove-pmd-plugin.patch
deleted file mode 100644
index 8427468..0000000
--- a/0006-Remove-pmd-plugin.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From d390cf8cbd2ef711a59196534134a12c31057a2d Mon Sep 17 00:00:00 2001
-From: Stanislav Ochotnicky <sochotnicky@redhat.com>
-Date: Tue, 24 Jan 2012 11:15:56 +0100
-Subject: [PATCH 6/6] Remove pmd plugin
-
-- prevents problem with "Reporting mojo's can only be called from
-  ReportDocumentRender". Investigate proper fix some other time?
----
- pom.xml |   29 -----------------------------
- 1 files changed, 0 insertions(+), 29 deletions(-)
-
-diff --git a/pom.xml b/pom.xml
-index e556e89..6e5a47e 100644
---- a/pom.xml
-+++ b/pom.xml
-@@ -152,35 +152,6 @@
-            </dependency>
-         </dependencies>
-       </plugin>
--      <plugin>
--        <groupId>org.apache.maven.plugins</groupId>
--        <artifactId>maven-pmd-plugin</artifactId>
--        <executions>
--          <execution>
--            <id>named-logging-enforcement</id>
--            <phase>compile</phase>
--            <goals>
--              <goal>check</goal>
--            </goals>
--            <configuration>
--              <verbose>true</verbose>
--            </configuration>
--          </execution>
--        </executions>
--        <configuration>
--          <targetJdk>1.6</targetJdk>
--          <rulesets>
--            <ruleset>jetty/pmd_logging_ruleset.xml</ruleset>
--          </rulesets>
--        </configuration>
--        <dependencies>
--          <dependency>
--            <groupId>org.eclipse.jetty.toolchain</groupId>
--            <artifactId>jetty-build-support</artifactId>
--            <version>${build-support-version}</version>
--          </dependency>
--        </dependencies>
--      </plugin>
-     </plugins>
-     <pluginManagement>
-       <plugins>
--- 
-1.7.6.2
-
diff --git a/0006-Remove-unpack-config-deps-from-distribution.patch b/0006-Remove-unpack-config-deps-from-distribution.patch
new file mode 100644
index 0000000..8c45814
--- /dev/null
+++ b/0006-Remove-unpack-config-deps-from-distribution.patch
@@ -0,0 +1,44 @@
+From c20556699d33e3a85329650d9ef21f17190ecf0f Mon Sep 17 00:00:00 2001
+From: Stanislav Ochotnicky <sochotnicky@redhat.com>
+Date: Tue, 27 Mar 2012 10:11:41 +0200
+Subject: [PATCH 6/6] Remove unpack-config-deps from distribution
+
+This is needed because original code used classifiers to select subset
+of artifacts. Unfortunately there seems to be a weird bug affecting even
+upstream maven when this goes outside of reactor resolver. Or perhaps
+this is a weird feature.
+
+Our resolver obviously can't handle this so we have to unpack these
+manually before building distribution
+---
+ jetty-distribution/pom.xml |   14 --------------
+ 1 files changed, 0 insertions(+), 14 deletions(-)
+
+diff --git a/jetty-distribution/pom.xml b/jetty-distribution/pom.xml
+index bb6aff6..00101d0 100644
+--- a/jetty-distribution/pom.xml
++++ b/jetty-distribution/pom.xml
+@@ -216,20 +216,6 @@
+             </configuration>
+           </execution>
+           <execution>
+-            <id>unpack-config-deps</id>
+-            <phase>generate-resources</phase>
+-            <goals>
+-              <goal>unpack-dependencies</goal>
+-            </goals>
+-            <configuration>
+-              <includeGroupIds>org.eclipse.jetty</includeGroupIds>
+-              <classifier>config</classifier>
+-              <failOnMissingClassifierArtifact>false</failOnMissingClassifierArtifact>
+-              <excludes>META-INF/**</excludes>
+-              <outputDirectory>${assembly-directory}</outputDirectory>
+-            </configuration>
+-          </execution>
+-          <execution>
+             <id>unpack-javadoc</id>
+             <phase>generate-resources</phase>
+             <goals>
+-- 
+1.7.9
+
diff --git a/jetty-depmap.xml b/jetty-depmap.xml
index b2c4219..f47991a 100644
--- a/jetty-depmap.xml
+++ b/jetty-depmap.xml
@@ -163,4 +163,5 @@
         <version>3.0</version>
     </maven>
 </dependency>
+
 </dependencies>
diff --git a/jetty.spec b/jetty.spec
index e27f8f9..f0a9601 100644
--- a/jetty.spec
+++ b/jetty.spec
@@ -40,11 +40,11 @@
 %global jettylibdir %{_localstatedir}/lib/%{name}
 %global appdir      %{jettylibdir}/webapps
 
-%global addver v20120127
+%global addver v20120308
 
 Name:           jetty
-Version:        8.1.0
-Release:        7%{?dist}
+Version:        8.1.2
+Release:        1%{?dist}
 Summary:        Java Webserver and Servlet Container
 
 Group:          Applications/Internet
@@ -57,20 +57,26 @@ Source3:        jetty.logrotate
 Source4:        %{name}-depmap.xml
 Source5:        %{name}.service
 Patch1:         0001-Remove-javadoc-execution.patch
-Patch2:         0002-Cleaup-distribution-generation.patch
-Patch3:         0003-Disable-test-artifacts.patch
-Patch4:         0004-Change-servelt-groupId-to-javax.servlet.patch
-Patch5:         0005-Modify-dependencies.patch
-Patch6:         0006-Remove-pmd-plugin.patch
-Patch8:         0007-disable-jetty-osgi.patch
+Patch2:         0002-Disable-test-artifacts.patch
+Patch3:         0003-Change-servelt-groupId-to-javax.servlet.patch
+Patch4:         0004-Modify-dependencies.patch
+Patch5:         0005-Remove-pmd-plugin.patch
+Patch6:         0006-Remove-unpack-config-deps-from-distribution.patch
+Patch7:         0007-disable-jetty-osgi.patch
 
 %if 0%{?rhel} <= 0
 BuildRequires:  fedora-usermgmt-devel
 %{?FE_USERADD_REQ}
 %endif
+BuildRequires:  geronimo-annotation
 BuildRequires:  geronimo-jaspic-spec
+BuildRequires:  geronimo-jta
+BuildRequires:  glassfish-jsp
+BuildRequires:  glassfish-jsp-api
+BuildRequires:  jakarta-taglibs-standard
 BuildRequires:  java-devel >= 1:1.7.0
 BuildRequires:  jpackage-utils
+BuildRequires:  jvnet-parent
 BuildRequires:  maven
 BuildRequires:  maven-dependency-plugin
 BuildRequires:  maven-enforcer-plugin
@@ -79,17 +85,15 @@ BuildRequires:  mongo-java-driver >= 2.6.5-4
 BuildRequires:  objectweb-asm
 BuildRequires:  slf4j
 BuildRequires:  systemd-units
+BuildRequires:  tomcat-el-2.2-api
+BuildRequires:  tomcat-jsp-2.2-api
 BuildRequires:  tomcat-lib
 BuildRequires:  tomcat-servlet-3.0-api
+
 %if 0%{?rhel} <= 0
 BuildRequires:  eclipse-platform
 BuildRequires:  eclipse-rcp
 %endif
-BuildRequires:  geronimo-annotation
-BuildRequires:  geronimo-jta
-BuildRequires:  jakarta-taglibs-standard
-BuildRequires:  tomcat-el-2.2-api
-BuildRequires:  tomcat-jsp-2.2-api
 
 # we want javamail not classpathx-javamail
 BuildRequires:  %{_javadir}/javamail/mail.jar
@@ -101,7 +105,7 @@ BuildRequires:  jetty-toolchain
 BuildRequires:  jetty-assembly-descriptors
 BuildRequires:  jetty-test-policy
 BuildRequires:  jetty-artifact-remote-resources
-#FIXME: the JSP is probably broken, eclipse-ecj et al. need to be R and BR
+
 
 BuildArch:      noarch
 
@@ -181,7 +185,6 @@ Requires:       jetty-io      = %{epoch}:%{version}-%{release}
 Requires:       jetty-server  = %{epoch}:%{version}-%{release}
 Requires:       jetty-util    = %{epoch}:%{version}-%{release}
 Requires:       tomcat-servlet-3.0-api
-
 %description    ajp
 %{extdesc} %{summary}.
 
@@ -199,7 +202,6 @@ Requires:       jetty-webapp   = %{epoch}:%{version}-%{release}
 Requires:       objectweb-asm
 Requires:       geronimo-annotation
 Requires:       tomcat-lib
-
 %description    annotations
 %{extdesc} %{summary}.
 
@@ -222,7 +224,6 @@ Requires:       jpackage-utils
 Requires:       jetty-project = %{epoch}:%{version}-%{release}
 Requires:       jetty-util    = %{epoch}:%{version}-%{release}
 Requires:       tomcat-servlet-3.0-api
-
 %description    continuation
 %{extdesc} %{summary}.
 
@@ -248,7 +249,6 @@ Requires:       jetty-project = %{epoch}:%{version}-%{release}
 Requires:       jetty-io      = %{epoch}:%{version}-%{release}
 Requires:       jetty-util    = %{epoch}:%{version}-%{release}
 Requires:       tomcat-servlet-3.0-api
-
 %description    http
 %{extdesc} %{summary}.
 
@@ -543,6 +543,8 @@ Requires:       jetty-webapp      = %{epoch}:%{version}-%{release}
 Requires:       jetty-xml         = %{epoch}:%{version}-%{release}
 Requires:       eclipse-platform
 Requires:       eclipse-rcp
+Requires:       glassfish-jsp
+Requires:       glassfish-jsp-api
 Requires:       tomcat-servlet-3.0-api
 Requires:       tomcat-el-2.2-api
 Requires:       tomcat-jsp-2.2-api
@@ -558,13 +560,14 @@ Group:          Documentation
 Requires:       jpackage-utils
 
 %description    javadoc
-%{extdesc} %{summary}.
+%{summary}.
 
 %prep
 %setup -q -n %{jettyname}-%{version}.%{addver}
 for f in $(find . -name "*.?ar"); do rm $f; done
 find . -name "*.class" -exec rm {} \;
 
+
 %patch1 -p1 -b .sav
 %patch2 -p1 -b .sav
 %patch3 -p1 -b .sav
@@ -572,7 +575,7 @@ find . -name "*.class" -exec rm {} \;
 %patch5 -p1 -b .sav
 %patch6 -p1 -b .sav
 %if 0%{?rhel} > 0
-%patch8 -p1 -b .sav
+%patch7 -p1 -b .sav
 %endif
 
 cp %{SOURCE1} djetty
@@ -586,9 +589,25 @@ iconv -f iso-8859-1 -t utf-8 LICENSE-CONTRIBUTOR/CDDLv1.0.txt > \
 mv LICENSE-CONTRIBUTOR/CDDLv1.0.txt{.con,}
 
 %build
+#rm -rf ./*
+#ln -sf ~/temp/jetty/jetty-8.1.0.%{addver}.copy/* .
+#exit 0
+# remove previous lines!
 sed -i -e "s|/usr/share|%{_datadir}|g" djetty
 
-mvn-rpmbuild  -X \
+mvn-rpmbuild  -e \
+    -Dmaven.local.depmap.file=%{SOURCE4} \
+    -Dmaven.test.skip=true \
+    install javadoc:aggregate
+cd jetty-distribution
+rm -rf target/distribution
+mkdir -p target/distribution
+find .. -ipath '*target/*config.jar' | ( while read; do
+  unzip $REPLY -x 'META-INF/*' -d target/distribution
+done)
+
+mvn-rpmbuild \
+    -Dmaven.repo.local=$(pwd)/../.m2 \
     -Dmaven.local.depmap.file=%{SOURCE4} \
     -Dmaven.test.skip=true \
     install javadoc:aggregate
@@ -615,7 +634,7 @@ cp %{SOURCE5} %{buildroot}%{_unitdir}/
 # main pkg
 tar xvf jetty-distribution/target/%{name}-distribution-%{version}.%{addver}.tar.gz -C %{buildroot}%{homedir}
 mv %{buildroot}%{homedir}/%{name}-distribution-%{version}.%{addver}/* %{buildroot}%{homedir}/
-rmdir %{buildroot}%{homedir}/%{name}-distribution-%{version}.%{addver}
+rm -rf %{buildroot}%{homedir}/%{name}-distribution-%{version}.%{addver}
 
 chmod +x %{buildroot}%{homedir}/bin/jetty-xinetd.sh
 chmod +x djetty
@@ -633,7 +652,7 @@ for module in jetty-ajp jetty-annotations jetty-client jetty-continuation \
            jetty-rewrite jetty-security jetty-server jetty-servlet \
            jetty-servlets jetty-util jetty-webapp jetty-websocket \
            jetty-xml; do
-    mv %{buildroot}%{homedir}/lib/$module-%{version}.%{addver}.jar \
+    mv %{buildroot}%{homedir}/lib/$module-*.jar \
            %{buildroot}%{_javadir}/%{name}/$module.jar
     ln -s  %{_javadir}/%{name}/$module.jar \
            %{buildroot}%{homedir}/lib/$module-%{version}.%{addver}.jar
@@ -675,6 +694,9 @@ popd
 install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-project.pom
 %add_maven_depmap JPP.%{name}-project.pom -f project
 
+# purge bundled jars
+rm %{buildroot}%{homedir}/lib/{annotations,jndi,jsp,jta}/*
+
 # recreat tarball structure in lib
 ln -sf $(build-classpath tomcat-servlet-3.0-api) \
        %{buildroot}%{homedir}/lib/servlet-api-3.0.jar
@@ -684,10 +706,10 @@ build-jar-repository %{buildroot}%{homedir}/lib/annotations \
 
 build-jar-repository %{buildroot}%{homedir}/lib/jndi javamail/mail
 
-build-jar-repository %{buildroot}%{homedir}/lib/jsp tomcat-el-2.2-api \
-           taglibs-core taglibs-standard tomcat/jasper-el eclipse-ecj \
-           tomcat/jasper tomcat/tomcat-api tomcat/tomcat-jsp-2.2-api \
-           tomcat/tomcat-juli
+build-jar-repository %{buildroot}%{homedir}/lib/jsp \
+           taglibs-core taglibs-standard glassfish-jsp \
+           tomcat/jasper tomcat/tomcat-api \
+           tomcat/tomcat-juli glassfish-jsp
 
 
 ln -sf $(build-classpath geronimo-jta) \
@@ -763,8 +785,8 @@ cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/
                     -g %username %username &>/dev/null || :
 
 %post
-if [ $1 -eq 1 ] ; then 
-    # Initial installation 
+if [ $1 -eq 1 ] ; then
+    # Initial installation
     /bin/systemctl daemon-reload >/dev/null 2>&1 || :
 fi
 
@@ -996,6 +1018,9 @@ fi
 %doc %{_javadocdir}/%{name}
 
 %changelog
+* Thu Apr 26 2012 Stanislav Ochotnicky <sochotnicky@redhat.com> - 8.1.2-1
+- Update to 8.1.2 upstream release
+
 * Wed Apr 25 2012 Mikolaj Izdebski <mizdebsk@redhat.com> - 8.1.0-7
 - Split into number of subpackages
 
diff --git a/sources b/sources
index adb0fc7..6c400aa 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-662e42ac878578c69c79140e2733498a  jetty-8.1.0.v20120127.tar.bz2
+faf96761ba634974e6545793cadea498  jetty-8.1.2.v20120308.tar.bz2