--- resteasy-jaxrs/pom.xml.orig	2009-06-16 23:48:27.000000000 -0400
+++ resteasy-jaxrs/pom.xml	2009-07-02 02:27:46.000000000 -0400
@@ -17,8 +17,9 @@
         </dependency>
 
         <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
+            <groupId>JPP</groupId>
+            <artifactId>tomcat6-servlet-2.5-api</artifactId>
+            <version>2.5</version>
             <scope>provided</scope>
         </dependency>
 
@@ -78,5 +79,11 @@
             <scope>provided</scope>
         </dependency>
 
+        <dependency>
+            <groupId>commons-codec</groupId>
+            <artifactId>commons-codec</artifactId>
+            <version>1.3</version>
+        </dependency>
+
     </dependencies>
 </project>
--- async-http-tomcat/asynch-http-tomcat-jar/pom.xml.orig	2009-04-16 22:14:12.000000000 -0400
+++ async-http-tomcat/asynch-http-tomcat-jar/pom.xml	2009-07-05 00:36:46.000000000 -0400
@@ -11,9 +11,9 @@
 
    <dependencies>
       <dependency>
-         <groupId>jboss.web</groupId>
-         <artifactId>jbossweb</artifactId>
-         <version>2.0.1.GA</version>
+         <groupId>JPP/tomcat6</groupId>
+         <artifactId>catalina</artifactId>
+         <version>6.0.18</version>
          <scope>provided</scope>
       </dependency>
       <dependency>
@@ -43,4 +43,4 @@
       </plugins>
    </build>
 
-</project>
\ No newline at end of file
+</project>
--- async-http-servlet-3.0/pom.xml.orig	2009-07-03 15:57:07.000000000 -0400
+++ async-http-servlet-3.0/pom.xml	2009-07-05 12:28:14.000000000 -0400
@@ -12,8 +12,14 @@
     <artifactId>asynch-http-servlet-3.0-pom</artifactId>
     <packaging>pom</packaging>
 
+
     <modules>
         <module>async-http-servlet-3.0</module>
+<!-- If you need to build it, cd to that directory manually, and run mvn with
+     a different depmap, one that maps to jetty 7.xx .. once a mapping is
+     set, it cannot be changed and async-http-servlet-3.0-test won't build
+     against 6.x
         <module>async-http-servlet-3.0-test</module>
+-->
     </modules>
 </project>
--- resteasy-test-data/pom.xml.orig	2009-07-07 09:49:58.000000000 -0400
+++ resteasy-test-data/pom.xml	2009-07-07 09:53:47.000000000 -0400
@@ -14,6 +14,13 @@
          <groupId>com.sun.xml.bind</groupId>
          <artifactId>jaxb-impl</artifactId>
       </dependency>
+<!-- FIXME Our glassfish-jaxb lacks the impl POM so it does not automatically
+           bring the api  -->
+      <dependency>
+         <groupId>javax.xml.bind</groupId>
+         <artifactId>jaxb-api</artifactId>
+         <version>2.1</version>
+      </dependency>
       <dependency>
          <groupId>com.sun.xml.fastinfoset</groupId>
          <artifactId>FastInfoset</artifactId>
@@ -42,6 +49,13 @@
                   <artifactId>jaxb-impl</artifactId>
                   <version>2.1.2</version>
                </dependency>
+<!-- FIXME Our glassfish-jaxb lacks the impl POM so it does not automatically
+           bring the api  -->
+               <dependency>
+                  <groupId>javax.xml.bind</groupId>
+                  <artifactId>jaxb-api</artifactId>
+                  <version>2.1</version>
+               </dependency>
             </dependencies>
             <executions>
                <execution>
--- providers/jaxb/pom.xml.orig	2009-06-16 23:48:27.000000000 -0400
+++ providers/jaxb/pom.xml	2009-07-07 10:26:04.000000000 -0400
@@ -31,6 +31,13 @@
             <groupId>com.sun.xml.bind</groupId>
             <artifactId>jaxb-impl</artifactId>
         </dependency>
+<!-- FIXME Our glassfish-jaxb lacks the impl POM so it does not automatically
+           bring the api  -->
+        <dependency>
+            <groupId>javax.xml.bind</groupId>
+            <artifactId>jaxb-api</artifactId>
+            <version>2.1</version>
+        </dependency>
         <dependency>
             <groupId>com.sun.xml.fastinfoset</groupId>
             <artifactId>FastInfoset</artifactId>
@@ -79,4 +86,4 @@
         </plugins>
     </build>
 
-</project>
\ No newline at end of file
+</project>