Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoakim Erdfelt2012-01-31 22:21:58 +0000
committerJoakim Erdfelt2012-01-31 22:21:58 +0000
commitfdaad62b633f9a5a534f7468715a0e26f9770c9f (patch)
tree0bccddf09c0b435dd4cb9d62b2891ab63089e2c6 /jetty-aggregate/jetty-all/pom.xml
parent6e3bd75d9989716c582a428066158902f9d2acf6 (diff)
downloadorg.eclipse.jetty.project-fdaad62b633f9a5a534f7468715a0e26f9770c9f.tar.gz
org.eclipse.jetty.project-fdaad62b633f9a5a534f7468715a0e26f9770c9f.tar.xz
org.eclipse.jetty.project-fdaad62b633f9a5a534f7468715a0e26f9770c9f.zip
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.
Diffstat (limited to 'jetty-aggregate/jetty-all/pom.xml')
-rw-r--r--jetty-aggregate/jetty-all/pom.xml65
1 files changed, 47 insertions, 18 deletions
diff --git a/jetty-aggregate/jetty-all/pom.xml b/jetty-aggregate/jetty-all/pom.xml
index 4b55a5c9f3..216fde08df 100644
--- a/jetty-aggregate/jetty-all/pom.xml
+++ b/jetty-aggregate/jetty-all/pom.xml
@@ -104,12 +104,16 @@
<exclusions>
<exclusion>
<groupId>org.mortbay.jetty</groupId>
- <artifactId>servlet-api</artifactId>
+ <artifactId>servlet-api</artifactId>
</exclusion>
<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>
@@ -119,8 +123,8 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
+ <groupId>org.eclipse.jetty.orbit</groupId>
+ <artifactId>javax.servlet</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
@@ -140,17 +144,33 @@
<artifactId>servlet-api</artifactId>
</exclusion>
<exclusion>
+ <groupId>org.eclipse.jetty.orbit</groupId>
+ <artifactId>javax.servlet</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jta_1.1_spec</artifactId>
</exclusion>
<exclusion>
+ <groupId>org.eclipse.jetty.orbit</groupId>
+ <artifactId>javax.security.auth.message</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
</exclusion>
<exclusion>
+ <groupId>org.eclipse.jetty.orbit</groupId>
+ <artifactId>javax.mail.glassfish</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>javax.activation</groupId>
<artifactId>activation</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.eclipse.jetty.orbit</groupId>
+ <artifactId>javax.activation</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -173,6 +193,14 @@
<groupId>asm</groupId>
<artifactId>asm-commons</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.eclipse.jetty.orbit</groupId>
+ <artifactId>javax.annotation</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.jetty.orbit</groupId>
+ <artifactId>org.objectweb.asm</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -185,6 +213,10 @@
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jaspic_1.0_spec</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.eclipse.jetty.orbit</groupId>
+ <artifactId>javax.security.auth.message</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -212,37 +244,34 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jta_1.1_spec</artifactId>
+ <groupId>org.eclipse.jetty.orbit</groupId>
+ <artifactId>javax.transaction</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
+ <groupId>org.eclipse.jetty.orbit</groupId>
+ <artifactId>javax.mail.glassfish</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>javax.activation</groupId>
- <artifactId>activation</artifactId>
+ <groupId>org.eclipse.jetty.orbit</groupId>
+ <artifactId>javax.activation</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jaspic_1.0_spec</artifactId>
- <version>1.0</version>
+ <groupId>org.eclipse.jetty.orbit</groupId>
+ <artifactId>javax.security.auth.message</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-annotation_1.0_spec</artifactId>
- <version>1.1.1</version>
+ <groupId>org.eclipse.jetty.orbit</groupId>
+ <artifactId>javax.annotation</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>asm</groupId>
- <artifactId>asm-commons</artifactId>
+ <groupId>org.eclipse.jetty.orbit</groupId>
+ <artifactId>org.objectweb.asm</artifactId>
<scope>compile</scope>
- <version>3.1</version>
</dependency>
</dependencies>
</project>

Back to the top