Migrating old javax.* deps to new org.eclipse.jetty.orbit deps

+ Removed old deps in javax.*, geronimo, and asm in favor of
  new org.eclipse.jetty.orbit deps
+ Added enforcer rule to prevent reintroducing the old deps.

1 files changed, 33 insertions, 32 deletions

diff --git a/pom.xml b/pom.xml
index 761cacdee4..68604be42e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,18 +11,12 @@
   <url>${jetty.url}</url>
   <packaging>pom</packaging>
   <properties>
-    <javax-activation-version>1.1</javax-activation-version>
-    <javax-mail-version>1.4.1</javax-mail-version>
-    <orbit-servlet-api-version>2.5.0.v201103041518</orbit-servlet-api-version>
-    <javax-servlet-jsp-version>2.1.v20100127</javax-servlet-jsp-version>
-    <javax-transaction-version>1.1.1</javax-transaction-version>
-    <jetty.url>http://www.eclipse.org/jetty</jetty.url>
-    <junit-version>4.8.1</junit-version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <slf4j-version>1.6.1</slf4j-version>
+    <jetty.url>http://www.eclipse.org/jetty</jetty.url>
+    <orbit-servlet-api-version>2.5.0.v201103041518</orbit-servlet-api-version>
     <build-support-version>1.1</build-support-version>
-    <jetty.test.helper>1.6.1</jetty.test.helper>
-    <jetty.test.policy>1.2</jetty.test.policy>
+    <slf4j-version>1.6.1</slf4j-version>
+    <jetty-test-policy-version>1.2</jetty-test-policy-version>
   </properties>
   <scm>
     <connection>scm:git:http://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project.git</connection>
@@ -139,7 +133,29 @@
                 <versionOsgiRule implementation="org.eclipse.jetty.toolchain.enforcer.rules.RequireOsgiCompatibleVersionRule" />
                 <versionRedhatRule implementation="org.eclipse.jetty.toolchain.enforcer.rules.RequireRedhatCompatibleVersionRule" />
                 <versionDebianRule implementation="org.eclipse.jetty.toolchain.enforcer.rules.RequireDebianCompatibleVersionRule" />
+             </rules>
+            </configuration>
+          </execution>
+          <execution>
+            <id>enforce-orbit-deps</id>
+            <goals>
+              <goal>enforce</goal>
+            </goals>
+            <configuration>
+              <rules>
+                <!-- Banned Dependencies (should use Orbit based versions now) -->
+                <bannedDependencies>
+                  <includes>
+                    <include>javax.servlet:servlet-api</include>
+                    <include>org.apache.geronimo.specs</include>
+                    <include>javax.mail</include>
+                    <include>javax.activation</include>
+                  </includes>
+                  <searchTransitive>true</searchTransitive>
+                  <message>This dependency is banned, use the ORBIT provided dependency instead.</message>
+                </bannedDependencies>
               </rules>
+              <fail>true</fail>
             </configuration>
           </execution>
         </executions>
@@ -411,6 +427,11 @@
       </dependency>
       <dependency>
         <groupId>org.eclipse.jetty.orbit</groupId>
+        <artifactId>javax.security.auth.message</artifactId>
+        <version>1.0.0.v201108011116</version>
+      </dependency>
+      <dependency>
+        <groupId>org.eclipse.jetty.orbit</groupId>
         <artifactId>com.sun.el</artifactId>
         <version>1.0.0.v201105211818</version>
       </dependency>
@@ -432,11 +453,6 @@
 
       <!-- Old Deps -->
       <dependency>
-         <groupId>javax.servlet</groupId>
-         <artifactId>servlet-api</artifactId>
-         <version>2.5</version>
-       </dependency>
-      <dependency>
         <groupId>org.apache.maven</groupId>
         <artifactId>maven-plugin-tools-api</artifactId>
         <version>2.0</version>
@@ -444,7 +460,7 @@
       <dependency>
         <groupId>org.eclipse.jetty.toolchain</groupId>
         <artifactId>jetty-test-helper</artifactId>
-        <version>${jetty.test.helper}</version>
+        <version>1.6.1</version>
       </dependency>
       <dependency>
         <groupId>org.slf4j</groupId>
@@ -462,24 +478,9 @@
         <version>${slf4j-version}</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.geronimo.specs</groupId>
-        <artifactId>geronimo-jta_1.1_spec</artifactId>
-        <version>${javax-transaction-version}</version>
-      </dependency>
-      <dependency>
-        <groupId>javax.mail</groupId>
-        <artifactId>mail</artifactId>
-        <version>${javax-mail-version}</version>
-      </dependency>
-      <dependency>
-        <groupId>javax.activation</groupId>
-        <artifactId>activation</artifactId>
-        <version>${javax-activation-version}</version>
-      </dependency>
-      <dependency>
         <groupId>junit</groupId>
         <artifactId>junit</artifactId>
-        <version>${junit-version}</version>
+        <version>4.8.1</version>
       </dependency>
       <dependency>
         <groupId>org.mockito</groupId>