Final sweep of the orbit deps in jetty-distribution

jetty-distribution/pom.xml

@@ -9,23 +9,8 @@
   <name>Jetty :: Distribution Assemblies</name>
   <packaging>pom</packaging>
   <properties>
-    <jetty-orbit-url>http://download.eclipse.org/jetty/orbit</jetty-orbit-url>
     <assembly-directory>target/distribution</assembly-directory>
-    <orbit-javax-activation-version>${javax-activation-version}.0.v201005080500</orbit-javax-activation-version>
-    <!--
-    <eclipse-ecj-version>3.6</eclipse-ecj-version>
-    <orbit-javax-annotation-version>1.0.0.v20100513-0750</orbit-javax-annotation-version>
-    <orbit-javax-servlet-version>2.5.0.v200910301333</orbit-javax-servlet-version>
-    <orbit-javax-el-version>2.1.0.v201004190952</orbit-javax-el-version>
-    <orbit-javax-transaction-version>1.1.1.v201004190952</orbit-javax-transaction-version>
-    <orbit-javax-servlet-jsp-version>2.1.0.v201004190952</orbit-javax-servlet-jsp-version>
-    <orbit-javax-servlet-jsp-jstl-version>1.2.0.v201004190952</orbit-javax-servlet-jsp-jstl-version>
-    <orbit-com-sun-el-version>1.0.0.v201004190952</orbit-com-sun-el-version>
-    <orbit-org-apache-jasper-version>2.1.0.v201110031002</orbit-org-apache-jasper-version>
-    <orbit-org-apache-taglibs-standard-version>1.2.0.v201004190952</orbit-org-apache-taglibs-standard-version>
-     -->
-    <orbit-javax-mail-glassfish-version>${javax-mail-version}.v201005082020</orbit-javax-mail-glassfish-version>
-    <orbit-org-objectweb-asm-version>3.1.0.v200803061910</orbit-org-objectweb-asm-version>
+    <orbit-servlet-api-version>2.5.0.v201103041518</orbit-servlet-api-version>
   </properties>
   <build>
     <plugins>
@@ -63,86 +48,6 @@
             </goals>
             <configuration>
               <tasks>
-                <!-- 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-2.5.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>
@@ -220,22 +125,29 @@
             </goals>
             <configuration>
               <includeGroupIds>org.eclipse.jetty</includeGroupIds>
+              <excludeGroupIds>org.eclipse.jetty.orbit</excludeGroupIds>
               <excludeArtifactIds>jetty-start,jetty-monitor</excludeArtifactIds>
               <includeTypes>jar</includeTypes>
               <outputDirectory>${assembly-directory}/lib</outputDirectory>
             </configuration>
           </execution>
           <execution>
-            <id>copy-orbit-lib-deps</id>
+            <id>copy-orbit-servlet-api-deps</id>
             <phase>generate-resources</phase>
             <goals>
-              <goal>copy-dependencies</goal>
+              <goal>copy</goal>
             </goals>
             <configuration>
-              <includeGroupIds>org.eclipse.jetty.osgi</includeGroupIds>
-              <includeArtifactIds>javax.servlet</includeArtifactIds>
-              <includeTypes>jar</includeTypes>
+              <artifactItems>
+                <artifactItem>
+                  <groupId>org.eclipse.jetty.orbit</groupId>
+                  <artifactId>javax.servlet</artifactId>
+                  <version>${orbit-servlet-api-version}</version>
+                  <overWrite>true</overWrite>
                   <outputDirectory>${assembly-directory}/lib</outputDirectory>
+                  <destFileName>servlet-api-2.5.jar</destFileName>
+                </artifactItem>
+              </artifactItems>
             </configuration>
           </execution>
           <execution>
@@ -245,7 +157,7 @@
               <goal>copy-dependencies</goal>
             </goals>
             <configuration>
-              <includeGroupIds>org.eclipse.jetty.osgi</includeGroupIds>
+              <includeGroupIds>org.eclipse.jetty.orbit</includeGroupIds>
               <includeArtifactIds>javax.annotation,org.objectweb.asm</includeArtifactIds>
               <includeTypes>jar</includeTypes>
               <outputDirectory>${assembly-directory}/lib/annotations</outputDirectory>
@@ -258,7 +170,7 @@
               <goal>copy-dependencies</goal>
             </goals>
             <configuration>
-              <includeGroupIds>org.eclipse.jetty.osgi</includeGroupIds>
+              <includeGroupIds>org.eclipse.jetty.orbit</includeGroupIds>
               <includeArtifactIds>javax.transaction</includeArtifactIds>
               <includeTypes>jar</includeTypes>
               <outputDirectory>${assembly-directory}/lib/jta</outputDirectory>
@@ -271,8 +183,8 @@
               <goal>copy-dependencies</goal>
             </goals>
             <configuration>
-              <includeGroupIds>org.eclipse.jetty.osgi</includeGroupIds>
-              <includeArtifactIds>javax.mail.glassfish</includeArtifactIds>
+              <includeGroupIds>org.eclipse.jetty.orbit</includeGroupIds>
+              <includeArtifactIds>javax.mail.glassfish,javax.activation</includeArtifactIds>
               <includeTypes>jar</includeTypes>
               <outputDirectory>${assembly-directory}/lib/jndi</outputDirectory>
             </configuration>
@@ -284,7 +196,7 @@
               <goal>copy-dependencies</goal>
             </goals>
             <configuration>
-              <includeGroupIds>org.eclipse.jetty.osgi</includeGroupIds>
+              <includeGroupIds>org.eclipse.jetty.orbit</includeGroupIds>
               <includeArtifactIds>com.sun.el,javax.el,javax.servlet.jsp,javax.servlet.jsp.jstl,org.apache.jasper.glassfish,org.apache.taglibs.standard.glassfish,org.eclipse.jdt.core</includeArtifactIds>
               <includeTypes>jar</includeTypes>
               <outputDirectory>${assembly-directory}/lib/jsp</outputDirectory>
@@ -376,7 +288,7 @@
     <dependency>
       <groupId>org.eclipse.jetty.orbit</groupId>
       <artifactId>javax.servlet</artifactId>
-      <version>2.5.0.v201103041518</version>
+      <version>${orbit-servlet-api-version}</version>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty.orbit</groupId>
@@ -386,17 +298,17 @@
     <dependency>
       <groupId>org.eclipse.jetty.orbit</groupId>
       <artifactId>org.objectweb.asm</artifactId>
-      <version>${orbit-org-objectweb-asm-version}</version>
+      <version>3.1.0.v200803061910</version>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty.orbit</groupId>
       <artifactId>javax.activation</artifactId>
-      <version>${orbit-javax-activation-version}</version>
+      <version>1.1.0.v201105071233</version>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty.orbit</groupId>
       <artifactId>javax.mail.glassfish</artifactId>
-      <version>${orbit-javax-mail-glassfish-version}</version>
+      <version>1.4.1.v201005082020</version>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty.orbit</groupId>