diff --git a/example-async-rest/async-rest-jar/pom.xml b/example-async-rest/async-rest-jar/pom.xml
index ed7629b7859..894f2c448ed 100644
--- a/example-async-rest/async-rest-jar/pom.xml
+++ b/example-async-rest/async-rest-jar/pom.xml
@@ -15,9 +15,9 @@
jetty-client
${project.version}
-
- ${servlet.spec.groupId}
- ${servlet.spec.artifactId}
+
+ org.eclipse.jetty.orbit
+ javax.servlet
provided
diff --git a/example-async-rest/async-rest-webapp/pom.xml b/example-async-rest/async-rest-webapp/pom.xml
index 0cb8d8924f9..650e8b7d689 100644
--- a/example-async-rest/async-rest-webapp/pom.xml
+++ b/example-async-rest/async-rest-webapp/pom.xml
@@ -25,8 +25,8 @@
test
- ${servlet.spec.groupId}
- ${servlet.spec.artifactId}
+ org.eclipse.jetty.orbit
+ javax.servlet
provided
diff --git a/jetty-aggregate/jetty-all-server/pom.xml b/jetty-aggregate/jetty-all-server/pom.xml
index 8a2e9a79d49..31533d1148e 100644
--- a/jetty-aggregate/jetty-all-server/pom.xml
+++ b/jetty-aggregate/jetty-all-server/pom.xml
@@ -114,7 +114,7 @@
-
+
org.eclipse.jetty
jetty-deploy
@@ -128,8 +128,8 @@
provided
- javax.servlet
- servlet-api
+ org.eclipse.jetty.orbit
+ javax.servlet
compile
diff --git a/jetty-aggregate/jetty-all/pom.xml b/jetty-aggregate/jetty-all/pom.xml
index 5fdf78d264c..41d32683642 100644
--- a/jetty-aggregate/jetty-all/pom.xml
+++ b/jetty-aggregate/jetty-all/pom.xml
@@ -92,7 +92,7 @@
-
+
org.eclipse.jetty
jetty-client
@@ -104,16 +104,6 @@
jetty-deploy
${project.version}
provided
-
-
- org.mortbay.jetty
- servlet-api
-
-
- javax.servlet
- servlet-api
-
-
org.eclipse.jetty
@@ -122,8 +112,8 @@
provided
- javax.servlet
- servlet-api
+ org.eclipse.jetty.orbit
+ javax.servlet
compile
@@ -137,24 +127,6 @@
jetty-plus
${project.version}
provided
-
-
- javax.servlet
- servlet-api
-
-
- org.apache.geronimo.specs
- geronimo-jta_1.1_spec
-
-
- javax.mail
- mail
-
-
- javax.activation
- activation
-
-
org.eclipse.jetty
@@ -192,11 +164,6 @@
${project.version}
provided
-
- ${servlet.spec.groupId}
- ${servlet.spec.artifactId}
- compile
-
org.eclipse.jetty
jetty-nested
diff --git a/jetty-aggregate/jetty-plus/pom.xml b/jetty-aggregate/jetty-plus/pom.xml
index ad7c06ed6b7..0c20198f733 100644
--- a/jetty-aggregate/jetty-plus/pom.xml
+++ b/jetty-aggregate/jetty-plus/pom.xml
@@ -69,7 +69,7 @@
http://eclipse.org/jetty
${user.name}
org.eclipse.jetty
- http://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk/NOTICE.txt
+ http://git.eclipse.org/c/jetty/org.eclipse.jetty.project.git/tree/NOTICE.txt
Jetty HTTP Server
@@ -86,44 +86,6 @@
jetty-plus
${project.version}
provided
-
-
- javax.servlet
- servlet-api
-
-
- org.apache.geronimo.specs
- geronimo-jta_1.1_spec
-
-
- javax.mail
- mail
-
-
- javax.activation
- activation
-
-
-
-
- javax.servlet
- servlet-api
- compile
-
-
- org.apache.geronimo.specs
- geronimo-jta_1.1_spec
- compile
-
-
- javax.mail
- mail
- compile
-
-
- javax.activation
- activation
- compile
-
+
\ No newline at end of file
diff --git a/jetty-distribution/pom.xml b/jetty-distribution/pom.xml
index d32cff3dbf5..4a2578ce2a3 100644
--- a/jetty-distribution/pom.xml
+++ b/jetty-distribution/pom.xml
@@ -10,19 +10,6 @@
pom
target/distribution
- 3.6
- ${javax-activation-version}.0.v201005080500
- 1.0.0.v20100513-0750
- 2.1.0.v201004190952
- ${javax-mail-version}.v201005082020
- 2.5.0.v200910301333
- 2.1.0.v201004190952
- 1.2.0.v201004190952
- 1.0.0.v201004190952
- 2.1.0.v201110031002
- 1.2.0.v201004190952
- 3.1.0.v200803061910
- 1.1.1.v201004190952
@@ -60,74 +47,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -225,7 +144,7 @@
${orbit-servlet-api-version}
true
${assembly-directory}/lib
- servlet-api-2.5.jar
+ servlet-api-3.0.jar
@@ -458,11 +377,6 @@
jetty-policy
${project.version}
-
- ${servlet.spec.groupId}
- ${servlet.spec.artifactId}
- ${servlet.spec.version}
-
org.eclipse.jetty
jetty-servlets
diff --git a/jetty-jsp/pom.xml b/jetty-jsp/pom.xml
index ec81f9ef0b0..fcdf826c1b0 100644
--- a/jetty-jsp/pom.xml
+++ b/jetty-jsp/pom.xml
@@ -2,7 +2,7 @@
org.eclipse.jetty
jetty-project
- 7.6.1-SNAPSHOT
+ 8.1.1-SNAPSHOT
4.0.0
jetty-jsp
@@ -16,13 +16,13 @@
org.eclipse.jetty.orbit
javax.servlet.jsp
- 2.1.0.v201105211820
+ 2.2.0.v201112011158
org.eclipse.jetty.orbit
org.apache.jasper.glassfish
- 2.1.0.v201110031002
+ 2.2.2.v201112011158
@@ -40,13 +40,13 @@
org.eclipse.jetty.orbit
javax.el
- 2.1.0.v201105211819
+ 2.2.0.v201108011116
org.eclipse.jetty.orbit
com.sun.el
- 1.0.0.v201105211818
+ 2.2.0.v201108011116
diff --git a/jetty-util/pom.xml b/jetty-util/pom.xml
index acfb7e95abd..772451bc938 100644
--- a/jetty-util/pom.xml
+++ b/jetty-util/pom.xml
@@ -69,6 +69,11 @@
+
+ org.eclipse.jetty.orbit
+ javax.servlet
+ provided
+
org.eclipse.jetty.toolchain
jetty-test-helper
diff --git a/pom.xml b/pom.xml
index ce3b672f63a..2766583e3ad 100644
--- a/pom.xml
+++ b/pom.xml
@@ -384,9 +384,9 @@
- javax.servlet
- servlet-api
- 2.5
+ org.eclipse.jetty.orbit
+ javax.servlet
+ 3.0.0.v201112011016
org.eclipse.jetty.orbit