From 4e25f7bb05ccce00593cbcb450104f0477271c9f Mon Sep 17 00:00:00 2001
From: Jesse McConnell
Date: Fri, 27 Jan 2012 08:13:00 -0600
Subject: [maven-release-plugin] prepare release jetty-7.6.0.v20120127
---
jetty-aggregate/jetty-all/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'jetty-aggregate/jetty-all/pom.xml')
diff --git a/jetty-aggregate/jetty-all/pom.xml b/jetty-aggregate/jetty-all/pom.xml
index 3a6eee3ac5..23b03d6e68 100644
--- a/jetty-aggregate/jetty-all/pom.xml
+++ b/jetty-aggregate/jetty-all/pom.xml
@@ -2,7 +2,7 @@
org.eclipse.jetty.aggregate
jetty-aggregate-project
- 7.6.0-SNAPSHOT
+ 7.6.0.v20120127
4.0.0
jetty-all
--
cgit v1.2.3
From ad6126553ba8d5b478500d2694f2e247bab7790f Mon Sep 17 00:00:00 2001
From: Jesse McConnell
Date: Fri, 27 Jan 2012 08:13:06 -0600
Subject: [maven-release-plugin] prepare for next development iteration
---
example-jetty-embedded/pom.xml | 2 +-
jetty-aggregate/jetty-all-server/pom.xml | 2 +-
jetty-aggregate/jetty-all/pom.xml | 2 +-
jetty-aggregate/jetty-client/pom.xml | 2 +-
jetty-aggregate/jetty-plus/pom.xml | 2 +-
jetty-aggregate/jetty-server/pom.xml | 2 +-
jetty-aggregate/jetty-servlet/pom.xml | 2 +-
jetty-aggregate/jetty-webapp/pom.xml | 2 +-
jetty-aggregate/jetty-websocket/pom.xml | 2 +-
jetty-aggregate/pom.xml | 2 +-
jetty-ajp/pom.xml | 2 +-
jetty-annotations/pom.xml | 2 +-
jetty-client/pom.xml | 2 +-
jetty-continuation/pom.xml | 2 +-
jetty-deploy/pom.xml | 2 +-
jetty-distribution/pom.xml | 2 +-
jetty-http-spi/pom.xml | 2 +-
jetty-http/pom.xml | 2 +-
jetty-io/pom.xml | 2 +-
jetty-jaspi/pom.xml | 2 +-
jetty-jmx/pom.xml | 2 +-
jetty-jndi/pom.xml | 2 +-
jetty-monitor/pom.xml | 2 +-
jetty-nested/pom.xml | 2 +-
jetty-nosql/pom.xml | 2 +-
jetty-osgi/jetty-osgi-boot-jsp/pom.xml | 2 +-
jetty-osgi/jetty-osgi-boot-logback/pom.xml | 2 +-
jetty-osgi/jetty-osgi-boot-warurl/pom.xml | 2 +-
jetty-osgi/jetty-osgi-boot/pom.xml | 2 +-
jetty-osgi/jetty-osgi-equinoxtools/pom.xml | 2 +-
jetty-osgi/jetty-osgi-httpservice/pom.xml | 2 +-
jetty-osgi/pom.xml | 2 +-
jetty-osgi/test-jetty-osgi/pom.xml | 2 +-
jetty-overlay-deployer/pom.xml | 2 +-
jetty-plus/pom.xml | 2 +-
jetty-policy/pom.xml | 2 +-
jetty-rewrite/pom.xml | 2 +-
jetty-security/pom.xml | 2 +-
jetty-server/pom.xml | 2 +-
jetty-servlet/pom.xml | 2 +-
jetty-servlets/pom.xml | 2 +-
jetty-start/pom.xml | 2 +-
jetty-util/pom.xml | 2 +-
jetty-webapp/pom.xml | 2 +-
jetty-websocket/pom.xml | 2 +-
jetty-xml/pom.xml | 2 +-
pom.xml | 2 +-
test-continuation/pom.xml | 2 +-
test-jetty-nested/pom.xml | 2 +-
test-jetty-servlet/pom.xml | 2 +-
test-jetty-webapp/pom.xml | 2 +-
tests/pom.xml | 2 +-
tests/test-integration/pom.xml | 2 +-
tests/test-loginservice/pom.xml | 2 +-
tests/test-sessions/pom.xml | 2 +-
tests/test-sessions/test-hash-sessions/pom.xml | 2 +-
tests/test-sessions/test-jdbc-sessions/pom.xml | 2 +-
tests/test-sessions/test-sessions-common/pom.xml | 2 +-
tests/test-webapps/pom.xml | 2 +-
tests/test-webapps/test-webapp-rfc2616/pom.xml | 2 +-
60 files changed, 60 insertions(+), 60 deletions(-)
(limited to 'jetty-aggregate/jetty-all/pom.xml')
diff --git a/example-jetty-embedded/pom.xml b/example-jetty-embedded/pom.xml
index a73ebf5885..63a378157e 100644
--- a/example-jetty-embedded/pom.xml
+++ b/example-jetty-embedded/pom.xml
@@ -2,7 +2,7 @@
org.eclipse.jetty
jetty-project
- 7.6.0.v20120127
+ 7.6.1-SNAPSHOT
4.0.0
example-jetty-embedded
diff --git a/jetty-aggregate/jetty-all-server/pom.xml b/jetty-aggregate/jetty-all-server/pom.xml
index 976fbbed2c..441fe8c043 100644
--- a/jetty-aggregate/jetty-all-server/pom.xml
+++ b/jetty-aggregate/jetty-all-server/pom.xml
@@ -2,7 +2,7 @@
org.eclipse.jetty.aggregate
jetty-aggregate-project
- 7.6.0.v20120127
+ 7.6.1-SNAPSHOT
4.0.0
jetty-all-server
diff --git a/jetty-aggregate/jetty-all/pom.xml b/jetty-aggregate/jetty-all/pom.xml
index 23b03d6e68..4b55a5c9f3 100644
--- a/jetty-aggregate/jetty-all/pom.xml
+++ b/jetty-aggregate/jetty-all/pom.xml
@@ -2,7 +2,7 @@
org.eclipse.jetty.aggregate
jetty-aggregate-project
- 7.6.0.v20120127
+ 7.6.1-SNAPSHOT
4.0.0
jetty-all
diff --git a/jetty-aggregate/jetty-client/pom.xml b/jetty-aggregate/jetty-client/pom.xml
index a6d28c8a4b..4b6a1f5af7 100644
--- a/jetty-aggregate/jetty-client/pom.xml
+++ b/jetty-aggregate/jetty-client/pom.xml
@@ -2,7 +2,7 @@
org.eclipse.jetty.aggregate
jetty-aggregate-project
- 7.6.0.v20120127
+ 7.6.1-SNAPSHOT
4.0.0
jetty-client
diff --git a/jetty-aggregate/jetty-plus/pom.xml b/jetty-aggregate/jetty-plus/pom.xml
index d12e95a422..6b2dc68292 100644
--- a/jetty-aggregate/jetty-plus/pom.xml
+++ b/jetty-aggregate/jetty-plus/pom.xml
@@ -2,7 +2,7 @@
org.eclipse.jetty.aggregate
jetty-aggregate-project
- 7.6.0.v20120127
+ 7.6.1-SNAPSHOT
4.0.0
jetty-plus
diff --git a/jetty-aggregate/jetty-server/pom.xml b/jetty-aggregate/jetty-server/pom.xml
index dcf6ed869a..4c6b9559b3 100644
--- a/jetty-aggregate/jetty-server/pom.xml
+++ b/jetty-aggregate/jetty-server/pom.xml
@@ -2,7 +2,7 @@
org.eclipse.jetty.aggregate
jetty-aggregate-project
- 7.6.0.v20120127
+ 7.6.1-SNAPSHOT
4.0.0
jetty-server
diff --git a/jetty-aggregate/jetty-servlet/pom.xml b/jetty-aggregate/jetty-servlet/pom.xml
index 68dd8c150c..b84dfefaaf 100644
--- a/jetty-aggregate/jetty-servlet/pom.xml
+++ b/jetty-aggregate/jetty-servlet/pom.xml
@@ -2,7 +2,7 @@
org.eclipse.jetty.aggregate
jetty-aggregate-project
- 7.6.0.v20120127
+ 7.6.1-SNAPSHOT
4.0.0
jetty-servlet
diff --git a/jetty-aggregate/jetty-webapp/pom.xml b/jetty-aggregate/jetty-webapp/pom.xml
index d16b4808aa..b01f1aae5b 100644
--- a/jetty-aggregate/jetty-webapp/pom.xml
+++ b/jetty-aggregate/jetty-webapp/pom.xml
@@ -2,7 +2,7 @@
org.eclipse.jetty.aggregate
jetty-aggregate-project
- 7.6.0.v20120127
+ 7.6.1-SNAPSHOT
4.0.0
jetty-webapp
diff --git a/jetty-aggregate/jetty-websocket/pom.xml b/jetty-aggregate/jetty-websocket/pom.xml
index a1713d0be6..982d288422 100644
--- a/jetty-aggregate/jetty-websocket/pom.xml
+++ b/jetty-aggregate/jetty-websocket/pom.xml
@@ -2,7 +2,7 @@
org.eclipse.jetty.aggregate
jetty-aggregate-project
- 7.6.0.v20120127
+ 7.6.1-SNAPSHOT
4.0.0
jetty-websocket
diff --git a/jetty-aggregate/pom.xml b/jetty-aggregate/pom.xml
index 4058880959..9cda62492f 100644
--- a/jetty-aggregate/pom.xml
+++ b/jetty-aggregate/pom.xml
@@ -4,7 +4,7 @@
org.eclipse.jetty
jetty-project
- 7.6.0.v20120127
+ 7.6.1-SNAPSHOT
org.eclipse.jetty.aggregate
jetty-aggregate-project
diff --git a/jetty-ajp/pom.xml b/jetty-ajp/pom.xml
index af04ae2fcc..7ebc0f51cb 100644
--- a/jetty-ajp/pom.xml
+++ b/jetty-ajp/pom.xml
@@ -2,7 +2,7 @@
org.eclipse.jetty
jetty-project
- 7.6.0.v20120127
+ 7.6.1-SNAPSHOT
4.0.0
jetty-ajp
diff --git a/jetty-annotations/pom.xml b/jetty-annotations/pom.xml
index 331ce95c6b..2e804956dd 100644
--- a/jetty-annotations/pom.xml
+++ b/jetty-annotations/pom.xml
@@ -2,7 +2,7 @@
org.eclipse.jetty
jetty-project
- 7.6.0.v20120127
+ 7.6.1-SNAPSHOT
4.0.0
jetty-annotations
diff --git a/jetty-client/pom.xml b/jetty-client/pom.xml
index abb5294101..a273af541a 100644
--- a/jetty-client/pom.xml
+++ b/jetty-client/pom.xml
@@ -2,7 +2,7 @@
org.eclipse.jetty
jetty-project
- 7.6.0.v20120127
+ 7.6.1-SNAPSHOT
4.0.0
diff --git a/jetty-continuation/pom.xml b/jetty-continuation/pom.xml
index fd507b6cb7..2ce99f9715 100644
--- a/jetty-continuation/pom.xml
+++ b/jetty-continuation/pom.xml
@@ -2,7 +2,7 @@
org.eclipse.jetty
jetty-project
- 7.6.0.v20120127
+ 7.6.1-SNAPSHOT
4.0.0
jetty-continuation
diff --git a/jetty-deploy/pom.xml b/jetty-deploy/pom.xml
index ab8d08f3ef..f8e1e59c5b 100644
--- a/jetty-deploy/pom.xml
+++ b/jetty-deploy/pom.xml
@@ -2,7 +2,7 @@
org.eclipse.jetty
jetty-project
- 7.6.0.v20120127
+ 7.6.1-SNAPSHOT
4.0.0
jetty-deploy
diff --git a/jetty-distribution/pom.xml b/jetty-distribution/pom.xml
index 7061691c16..9a86af25c4 100644
--- a/jetty-distribution/pom.xml
+++ b/jetty-distribution/pom.xml
@@ -3,7 +3,7 @@
org.eclipse.jetty
jetty-project
- 7.6.0.v20120127
+ 7.6.1-SNAPSHOT
jetty-distribution
Jetty :: Distribution Assemblies
diff --git a/jetty-http-spi/pom.xml b/jetty-http-spi/pom.xml
index e7e8e1c34a..0ce5763e4a 100644
--- a/jetty-http-spi/pom.xml
+++ b/jetty-http-spi/pom.xml
@@ -2,7 +2,7 @@
org.eclipse.jetty
jetty-project
- 7.6.0.v20120127
+ 7.6.1-SNAPSHOT
4.0.0
jetty-http-spi
diff --git a/jetty-http/pom.xml b/jetty-http/pom.xml
index 5bba539660..e6674c7abb 100644
--- a/jetty-http/pom.xml
+++ b/jetty-http/pom.xml
@@ -2,7 +2,7 @@
jetty-project
org.eclipse.jetty
- 7.6.0.v20120127
+ 7.6.1-SNAPSHOT
4.0.0
jetty-http
diff --git a/jetty-io/pom.xml b/jetty-io/pom.xml
index fec8caf38a..4787cd4791 100644
--- a/jetty-io/pom.xml
+++ b/jetty-io/pom.xml
@@ -2,7 +2,7 @@
jetty-project
org.eclipse.jetty
- 7.6.0.v20120127
+ 7.6.1-SNAPSHOT
4.0.0
jetty-io
diff --git a/jetty-jaspi/pom.xml b/jetty-jaspi/pom.xml
index 93e6bcf3bf..483f5858e6 100644
--- a/jetty-jaspi/pom.xml
+++ b/jetty-jaspi/pom.xml
@@ -2,7 +2,7 @@
org.eclipse.jetty
jetty-project
- 7.6.0.v20120127
+ 7.6.1-SNAPSHOT
4.0.0
jetty-jaspi
diff --git a/jetty-jmx/pom.xml b/jetty-jmx/pom.xml
index ac7da7a5f5..97429c3d95 100644
--- a/jetty-jmx/pom.xml
+++ b/jetty-jmx/pom.xml
@@ -2,7 +2,7 @@
org.eclipse.jetty
jetty-project
- 7.6.0.v20120127
+ 7.6.1-SNAPSHOT
4.0.0
jetty-jmx
diff --git a/jetty-jndi/pom.xml b/jetty-jndi/pom.xml
index d60a2c1c55..d8c9b64253 100644
--- a/jetty-jndi/pom.xml
+++ b/jetty-jndi/pom.xml
@@ -2,7 +2,7 @@
org.eclipse.jetty
jetty-project
- 7.6.0.v20120127
+ 7.6.1-SNAPSHOT
4.0.0
jetty-jndi
diff --git a/jetty-monitor/pom.xml b/jetty-monitor/pom.xml
index d3c350796e..d291d3cc4d 100644
--- a/jetty-monitor/pom.xml
+++ b/jetty-monitor/pom.xml
@@ -19,7 +19,7 @@
org.eclipse.jetty
jetty-project
- 7.6.0.v20120127
+ 7.6.1-SNAPSHOT
4.0.0
jetty-monitor
diff --git a/jetty-nested/pom.xml b/jetty-nested/pom.xml
index e98fa48ad2..9f69eb645b 100644
--- a/jetty-nested/pom.xml
+++ b/jetty-nested/pom.xml
@@ -4,7 +4,7 @@
org.eclipse.jetty
jetty-project
- 7.6.0.v20120127
+ 7.6.1-SNAPSHOT
jetty-nested
Jetty :: Nested
diff --git a/jetty-nosql/pom.xml b/jetty-nosql/pom.xml
index 11cd068eb0..7e747ab3f8 100644
--- a/jetty-nosql/pom.xml
+++ b/jetty-nosql/pom.xml
@@ -2,7 +2,7 @@
org.eclipse.jetty
jetty-project
- 7.6.0.v20120127
+ 7.6.1-SNAPSHOT
4.0.0
jetty-nosql
diff --git a/jetty-osgi/jetty-osgi-boot-jsp/pom.xml b/jetty-osgi/jetty-osgi-boot-jsp/pom.xml
index bd8d74eb60..010a41204d 100644
--- a/jetty-osgi/jetty-osgi-boot-jsp/pom.xml
+++ b/jetty-osgi/jetty-osgi-boot-jsp/pom.xml
@@ -2,7 +2,7 @@
org.eclipse.jetty.osgi
jetty-osgi-project
- 7.6.0.v20120127
+ 7.6.1-SNAPSHOT
../pom.xml
4.0.0
diff --git a/jetty-osgi/jetty-osgi-boot-logback/pom.xml b/jetty-osgi/jetty-osgi-boot-logback/pom.xml
index e21547c5b4..7084874f75 100644
--- a/jetty-osgi/jetty-osgi-boot-logback/pom.xml
+++ b/jetty-osgi/jetty-osgi-boot-logback/pom.xml
@@ -2,7 +2,7 @@
org.eclipse.jetty.osgi
jetty-osgi-project
- 7.6.0.v20120127
+ 7.6.1-SNAPSHOT
../pom.xml
4.0.0
diff --git a/jetty-osgi/jetty-osgi-boot-warurl/pom.xml b/jetty-osgi/jetty-osgi-boot-warurl/pom.xml
index f2bc20e737..ae393ea6ea 100644
--- a/jetty-osgi/jetty-osgi-boot-warurl/pom.xml
+++ b/jetty-osgi/jetty-osgi-boot-warurl/pom.xml
@@ -2,7 +2,7 @@
org.eclipse.jetty.osgi
jetty-osgi-project
- 7.6.0.v20120127
+ 7.6.1-SNAPSHOT
../pom.xml
4.0.0
diff --git a/jetty-osgi/jetty-osgi-boot/pom.xml b/jetty-osgi/jetty-osgi-boot/pom.xml
index 3cf68aaed5..c47b02c0db 100644
--- a/jetty-osgi/jetty-osgi-boot/pom.xml
+++ b/jetty-osgi/jetty-osgi-boot/pom.xml
@@ -2,7 +2,7 @@
org.eclipse.jetty.osgi
jetty-osgi-project
- 7.6.0.v20120127
+ 7.6.1-SNAPSHOT
../pom.xml
4.0.0
diff --git a/jetty-osgi/jetty-osgi-equinoxtools/pom.xml b/jetty-osgi/jetty-osgi-equinoxtools/pom.xml
index 75c31f8f63..b59c40c8d4 100644
--- a/jetty-osgi/jetty-osgi-equinoxtools/pom.xml
+++ b/jetty-osgi/jetty-osgi-equinoxtools/pom.xml
@@ -2,7 +2,7 @@
org.eclipse.jetty.osgi
jetty-osgi-project
- 7.6.0.v20120127
+ 7.6.1-SNAPSHOT
../pom.xml
4.0.0
diff --git a/jetty-osgi/jetty-osgi-httpservice/pom.xml b/jetty-osgi/jetty-osgi-httpservice/pom.xml
index 3cac823a44..f3cf6877ee 100644
--- a/jetty-osgi/jetty-osgi-httpservice/pom.xml
+++ b/jetty-osgi/jetty-osgi-httpservice/pom.xml
@@ -2,7 +2,7 @@
org.eclipse.jetty.osgi
jetty-osgi-project
- 7.6.0.v20120127
+ 7.6.1-SNAPSHOT
../pom.xml
4.0.0
diff --git a/jetty-osgi/pom.xml b/jetty-osgi/pom.xml
index 1368beabc5..99ae8c0730 100644
--- a/jetty-osgi/pom.xml
+++ b/jetty-osgi/pom.xml
@@ -3,7 +3,7 @@
org.eclipse.jetty
jetty-project
- 7.6.0.v20120127
+ 7.6.1-SNAPSHOT
../pom.xml
org.eclipse.jetty.osgi
diff --git a/jetty-osgi/test-jetty-osgi/pom.xml b/jetty-osgi/test-jetty-osgi/pom.xml
index cd7315e671..1f79108cdc 100644
--- a/jetty-osgi/test-jetty-osgi/pom.xml
+++ b/jetty-osgi/test-jetty-osgi/pom.xml
@@ -2,7 +2,7 @@
org.eclipse.jetty.osgi
jetty-osgi-project
- 7.6.0.v20120127
+ 7.6.1-SNAPSHOT
../pom.xml
4.0.0
diff --git a/jetty-overlay-deployer/pom.xml b/jetty-overlay-deployer/pom.xml
index 9329bb3fa6..3f1330f357 100644
--- a/jetty-overlay-deployer/pom.xml
+++ b/jetty-overlay-deployer/pom.xml
@@ -2,7 +2,7 @@
org.eclipse.jetty
jetty-project
- 7.6.0.v20120127
+ 7.6.1-SNAPSHOT
4.0.0
jetty-overlay-deployer
diff --git a/jetty-plus/pom.xml b/jetty-plus/pom.xml
index 228004ff89..a2a6f2c65e 100644
--- a/jetty-plus/pom.xml
+++ b/jetty-plus/pom.xml
@@ -2,7 +2,7 @@
org.eclipse.jetty
jetty-project
- 7.6.0.v20120127
+ 7.6.1-SNAPSHOT
4.0.0
jetty-plus
diff --git a/jetty-policy/pom.xml b/jetty-policy/pom.xml
index 7ebe5dc051..fc2930ec6f 100644
--- a/jetty-policy/pom.xml
+++ b/jetty-policy/pom.xml
@@ -3,7 +3,7 @@
org.eclipse.jetty
jetty-project
- 7.6.0.v20120127
+ 7.6.1-SNAPSHOT
jetty-policy
Jetty :: Policy Tool
diff --git a/jetty-rewrite/pom.xml b/jetty-rewrite/pom.xml
index f525bad006..8717dc5503 100644
--- a/jetty-rewrite/pom.xml
+++ b/jetty-rewrite/pom.xml
@@ -2,7 +2,7 @@
org.eclipse.jetty
jetty-project
- 7.6.0.v20120127
+ 7.6.1-SNAPSHOT
4.0.0
jetty-rewrite
diff --git a/jetty-security/pom.xml b/jetty-security/pom.xml
index 2b97d1666e..5a09732e23 100644
--- a/jetty-security/pom.xml
+++ b/jetty-security/pom.xml
@@ -2,7 +2,7 @@
org.eclipse.jetty
jetty-project
- 7.6.0.v20120127
+ 7.6.1-SNAPSHOT
4.0.0
jetty-security
diff --git a/jetty-server/pom.xml b/jetty-server/pom.xml
index d7ea33e15d..03273f40bf 100644
--- a/jetty-server/pom.xml
+++ b/jetty-server/pom.xml
@@ -2,7 +2,7 @@
org.eclipse.jetty
jetty-project
- 7.6.0.v20120127
+ 7.6.1-SNAPSHOT
4.0.0
jetty-server
diff --git a/jetty-servlet/pom.xml b/jetty-servlet/pom.xml
index 64536c08c1..609a94dc28 100644
--- a/jetty-servlet/pom.xml
+++ b/jetty-servlet/pom.xml
@@ -3,7 +3,7 @@
jetty-project
org.eclipse.jetty
- 7.6.0.v20120127
+ 7.6.1-SNAPSHOT
4.0.0
jetty-servlet
diff --git a/jetty-servlets/pom.xml b/jetty-servlets/pom.xml
index 4eda3fa7ae..3e2982199c 100644
--- a/jetty-servlets/pom.xml
+++ b/jetty-servlets/pom.xml
@@ -3,7 +3,7 @@
jetty-project
org.eclipse.jetty
- 7.6.0.v20120127
+ 7.6.1-SNAPSHOT
4.0.0
jetty-servlets
diff --git a/jetty-start/pom.xml b/jetty-start/pom.xml
index 7857494f7e..52964c5b6b 100644
--- a/jetty-start/pom.xml
+++ b/jetty-start/pom.xml
@@ -2,7 +2,7 @@
org.eclipse.jetty
jetty-project
- 7.6.0.v20120127
+ 7.6.1-SNAPSHOT
4.0.0
jetty-start
diff --git a/jetty-util/pom.xml b/jetty-util/pom.xml
index 4ac4ff1f1e..496c586322 100644
--- a/jetty-util/pom.xml
+++ b/jetty-util/pom.xml
@@ -2,7 +2,7 @@
org.eclipse.jetty
jetty-project
- 7.6.0.v20120127
+ 7.6.1-SNAPSHOT
4.0.0
jetty-util
diff --git a/jetty-webapp/pom.xml b/jetty-webapp/pom.xml
index 1b423d586b..fe53e3d3ed 100644
--- a/jetty-webapp/pom.xml
+++ b/jetty-webapp/pom.xml
@@ -2,7 +2,7 @@
org.eclipse.jetty
jetty-project
- 7.6.0.v20120127
+ 7.6.1-SNAPSHOT
4.0.0
jetty-webapp
diff --git a/jetty-websocket/pom.xml b/jetty-websocket/pom.xml
index 6ad0d696df..a4bb91a378 100644
--- a/jetty-websocket/pom.xml
+++ b/jetty-websocket/pom.xml
@@ -3,7 +3,7 @@
jetty-project
org.eclipse.jetty
- 7.6.0.v20120127
+ 7.6.1-SNAPSHOT
4.0.0
diff --git a/jetty-xml/pom.xml b/jetty-xml/pom.xml
index f6824e7272..ac7e26faf7 100644
--- a/jetty-xml/pom.xml
+++ b/jetty-xml/pom.xml
@@ -2,7 +2,7 @@
org.eclipse.jetty
jetty-project
- 7.6.0.v20120127
+ 7.6.1-SNAPSHOT
4.0.0
jetty-xml
diff --git a/pom.xml b/pom.xml
index f0e52fb76c..2b3c38f75c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
19
jetty-project
- 7.6.0.v20120127
+ 7.6.1-SNAPSHOT
Jetty :: Project
${jetty.url}
pom
diff --git a/test-continuation/pom.xml b/test-continuation/pom.xml
index 39526ee234..8ea3c705b0 100644
--- a/test-continuation/pom.xml
+++ b/test-continuation/pom.xml
@@ -2,7 +2,7 @@
org.eclipse.jetty
jetty-project
- 7.6.0.v20120127
+ 7.6.1-SNAPSHOT
4.0.0
test-continuation
diff --git a/test-jetty-nested/pom.xml b/test-jetty-nested/pom.xml
index d6322650b4..f69edcd112 100644
--- a/test-jetty-nested/pom.xml
+++ b/test-jetty-nested/pom.xml
@@ -4,7 +4,7 @@
org.eclipse.jetty
jetty-project
- 7.6.0.v20120127
+ 7.6.1-SNAPSHOT
test-jetty-nested
Jetty :: Nested Test
diff --git a/test-jetty-servlet/pom.xml b/test-jetty-servlet/pom.xml
index 7c46233710..1d04833257 100644
--- a/test-jetty-servlet/pom.xml
+++ b/test-jetty-servlet/pom.xml
@@ -2,7 +2,7 @@
org.eclipse.jetty
jetty-project
- 7.6.0.v20120127
+ 7.6.1-SNAPSHOT
4.0.0
test-jetty-servlet
diff --git a/test-jetty-webapp/pom.xml b/test-jetty-webapp/pom.xml
index ac0176cc0f..b9806477a5 100644
--- a/test-jetty-webapp/pom.xml
+++ b/test-jetty-webapp/pom.xml
@@ -2,7 +2,7 @@
org.eclipse.jetty
jetty-project
- 7.6.0.v20120127
+ 7.6.1-SNAPSHOT
4.0.0
test-jetty-webapp
diff --git a/tests/pom.xml b/tests/pom.xml
index 2a48d6f1f4..a2aa610a51 100644
--- a/tests/pom.xml
+++ b/tests/pom.xml
@@ -21,7 +21,7 @@
org.eclipse.jetty
jetty-project
- 7.6.0.v20120127
+ 7.6.1-SNAPSHOT
org.eclipse.jetty.tests
tests-parent
diff --git a/tests/test-integration/pom.xml b/tests/test-integration/pom.xml
index 645ae5992f..1f2b2f8d38 100644
--- a/tests/test-integration/pom.xml
+++ b/tests/test-integration/pom.xml
@@ -20,7 +20,7 @@
org.eclipse.jetty.tests
tests-parent
- 7.6.0.v20120127
+ 7.6.1-SNAPSHOT
4.0.0
test-integration
diff --git a/tests/test-loginservice/pom.xml b/tests/test-loginservice/pom.xml
index ec85c0bffb..89716a6272 100644
--- a/tests/test-loginservice/pom.xml
+++ b/tests/test-loginservice/pom.xml
@@ -21,7 +21,7 @@
org.eclipse.jetty.tests
tests-parent
- 7.6.0.v20120127
+ 7.6.1-SNAPSHOT
test-loginservice
Jetty Tests :: Login Service
diff --git a/tests/test-sessions/pom.xml b/tests/test-sessions/pom.xml
index 36c47e547a..d3db7956f0 100644
--- a/tests/test-sessions/pom.xml
+++ b/tests/test-sessions/pom.xml
@@ -21,7 +21,7 @@
org.eclipse.jetty.tests
tests-parent
- 7.6.0.v20120127
+ 7.6.1-SNAPSHOT
test-sessions-parent
Jetty Tests :: Sessions :: Parent
diff --git a/tests/test-sessions/test-hash-sessions/pom.xml b/tests/test-sessions/test-hash-sessions/pom.xml
index 17ab561251..98c15fd029 100644
--- a/tests/test-sessions/test-hash-sessions/pom.xml
+++ b/tests/test-sessions/test-hash-sessions/pom.xml
@@ -21,7 +21,7 @@
org.eclipse.jetty.tests
test-sessions-parent
- 7.6.0.v20120127
+ 7.6.1-SNAPSHOT
test-hash-sessions
Jetty Tests :: Sessions :: Hash
diff --git a/tests/test-sessions/test-jdbc-sessions/pom.xml b/tests/test-sessions/test-jdbc-sessions/pom.xml
index 08b52160c0..ad0f5aeb5f 100644
--- a/tests/test-sessions/test-jdbc-sessions/pom.xml
+++ b/tests/test-sessions/test-jdbc-sessions/pom.xml
@@ -21,7 +21,7 @@
org.eclipse.jetty.tests
test-sessions-parent
- 7.6.0.v20120127
+ 7.6.1-SNAPSHOT
test-jdbc-sessions
Jetty Tests :: Sessions :: JDBC
diff --git a/tests/test-sessions/test-sessions-common/pom.xml b/tests/test-sessions/test-sessions-common/pom.xml
index 870d1c9362..7d5b892e93 100644
--- a/tests/test-sessions/test-sessions-common/pom.xml
+++ b/tests/test-sessions/test-sessions-common/pom.xml
@@ -21,7 +21,7 @@
org.eclipse.jetty.tests
test-sessions-parent
- 7.6.0.v20120127
+ 7.6.1-SNAPSHOT
test-sessions-common
Jetty Tests :: Sessions :: Common
diff --git a/tests/test-webapps/pom.xml b/tests/test-webapps/pom.xml
index 3f5d03949b..26f83f052c 100644
--- a/tests/test-webapps/pom.xml
+++ b/tests/test-webapps/pom.xml
@@ -21,7 +21,7 @@
org.eclipse.jetty.tests
tests-parent
- 7.6.0.v20120127
+ 7.6.1-SNAPSHOT
test-webapps-parent
Jetty Tests :: WebApps :: Parent
diff --git a/tests/test-webapps/test-webapp-rfc2616/pom.xml b/tests/test-webapps/test-webapp-rfc2616/pom.xml
index 24a602af1a..38c683a2ad 100644
--- a/tests/test-webapps/test-webapp-rfc2616/pom.xml
+++ b/tests/test-webapps/test-webapp-rfc2616/pom.xml
@@ -21,7 +21,7 @@
org.eclipse.jetty.tests
test-webapps-parent
- 7.6.0.v20120127
+ 7.6.1-SNAPSHOT
test-webapp-rfc2616
Jetty Tests :: WebApp :: RFC2616
--
cgit v1.2.3
From fdaad62b633f9a5a534f7468715a0e26f9770c9f Mon Sep 17 00:00:00 2001
From: Joakim Erdfelt
Date: Tue, 31 Jan 2012 15:21:58 -0700
Subject: 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.
---
jetty-aggregate/jetty-all-server/pom.xml | 52 +++++++++++++--------
jetty-aggregate/jetty-all/pom.xml | 65 +++++++++++++++++++-------
jetty-aggregate/jetty-plus/pom.xml | 28 +++++++----
jetty-aggregate/jetty-server/pom.xml | 8 +++-
jetty-aggregate/jetty-servlet/pom.xml | 8 +++-
jetty-aggregate/jetty-webapp/pom.xml | 8 ++--
jetty-client/pom.xml | 2 +-
jetty-http/pom.xml | 7 +--
jetty-jndi/pom.xml | 10 +---
jetty-osgi/jetty-osgi-httpservice/pom.xml | 4 +-
jetty-plus/pom.xml | 4 +-
jetty-policy/pom.xml | 4 +-
jetty-rewrite/pom.xml | 4 +-
jetty-server/pom.xml | 4 +-
jetty-servlets/pom.xml | 4 +-
jetty-websocket/pom.xml | 4 +-
pom.xml | 65 +++++++++++++-------------
test-jetty-webapp/pom.xml | 14 +++---
tests/test-webapps/test-webapp-rfc2616/pom.xml | 16 +++----
19 files changed, 184 insertions(+), 127 deletions(-)
(limited to 'jetty-aggregate/jetty-all/pom.xml')
diff --git a/jetty-aggregate/jetty-all-server/pom.xml b/jetty-aggregate/jetty-all-server/pom.xml
index 441fe8c043..3df647ddf9 100644
--- a/jetty-aggregate/jetty-all-server/pom.xml
+++ b/jetty-aggregate/jetty-all-server/pom.xml
@@ -122,6 +122,10 @@
org.mortbay.jetty
servlet-api
+
+ org.eclipse.jetty.orbit
+ javax.servlet
+
javax.servlet
servlet-api
@@ -135,8 +139,8 @@
provided
- javax.servlet
- servlet-api
+ org.eclipse.jetty.orbit
+ javax.servlet
compile
@@ -155,18 +159,34 @@
javax.servlet
servlet-api
+
+ org.eclipse.jetty.orbit
+ javax.servlet
+
org.apache.geronimo.specs
geronimo-jta_1.1_spec
+
+ org.eclipse.jetty.orbit
+ javax.security.auth.message
+
javax.mail
mail
+
+ org.eclipse.jetty.orbit
+ javax.mail.glassfish
+
javax.activation
activation
+
+ org.eclipse.jetty.orbit
+ javax.activation
+
@@ -228,37 +248,29 @@
provided
- org.apache.geronimo.specs
- geronimo-jta_1.1_spec
- compile
-
-
- javax.mail
- mail
+ org.eclipse.jetty.orbit
+ javax.security.auth.message
compile
- javax.activation
- activation
+ org.eclipse.jetty.orbit
+ javax.mail.glassfish
compile
- org.apache.geronimo.specs
- geronimo-jaspic_1.0_spec
- 1.0
+ org.eclipse.jetty.orbit
+ javax.activation
compile
- org.apache.geronimo.specs
- geronimo-annotation_1.0_spec
- 1.1.1
+ org.eclipse.jetty.orbit
+ javax.annotation
compile
- asm
- asm-commons
+ org.eclipse.jetty.orbit
+ org.objectweb.asm
compile
- 3.1
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 @@
org.mortbay.jetty
- servlet-api
+ servlet-api
javax.servlet
servlet-api
+
+ org.eclipse.jetty.orbit
+ javax.servlet
+
@@ -119,8 +123,8 @@
provided
- javax.servlet
- servlet-api
+ org.eclipse.jetty.orbit
+ javax.servlet
compile
@@ -139,18 +143,34 @@
javax.servlet
servlet-api
+
+ org.eclipse.jetty.orbit
+ javax.servlet
+
org.apache.geronimo.specs
geronimo-jta_1.1_spec
+
+ org.eclipse.jetty.orbit
+ javax.security.auth.message
+
javax.mail
mail
+
+ org.eclipse.jetty.orbit
+ javax.mail.glassfish
+
javax.activation
activation
+
+ org.eclipse.jetty.orbit
+ javax.activation
+
@@ -173,6 +193,14 @@
asm
asm-commons
+
+ org.eclipse.jetty.orbit
+ javax.annotation
+
+
+ org.eclipse.jetty.orbit
+ org.objectweb.asm
+
@@ -185,6 +213,10 @@
org.apache.geronimo.specs
geronimo-jaspic_1.0_spec
+
+ org.eclipse.jetty.orbit
+ javax.security.auth.message
+
@@ -212,37 +244,34 @@
provided
- org.apache.geronimo.specs
- geronimo-jta_1.1_spec
+ org.eclipse.jetty.orbit
+ javax.transaction
compile
- javax.mail
- mail
+ org.eclipse.jetty.orbit
+ javax.mail.glassfish
compile
- javax.activation
- activation
+ org.eclipse.jetty.orbit
+ javax.activation
compile
- org.apache.geronimo.specs
- geronimo-jaspic_1.0_spec
- 1.0
+ org.eclipse.jetty.orbit
+ javax.security.auth.message
compile
- org.apache.geronimo.specs
- geronimo-annotation_1.0_spec
- 1.1.1
+ org.eclipse.jetty.orbit
+ javax.annotation
compile
- asm
- asm-commons
+ org.eclipse.jetty.orbit
+ org.objectweb.asm
compile
- 3.1
diff --git a/jetty-aggregate/jetty-plus/pom.xml b/jetty-aggregate/jetty-plus/pom.xml
index 6b2dc68292..45a040e09c 100644
--- a/jetty-aggregate/jetty-plus/pom.xml
+++ b/jetty-aggregate/jetty-plus/pom.xml
@@ -88,6 +88,10 @@
javax.servlet
servlet-api
+
+ org.eclipse.jetty.orbit
+ javax.servlet
+
org.apache.geronimo.specs
geronimo-jta_1.1_spec
@@ -96,30 +100,38 @@
javax.mail
mail
+
+ org.eclipse.jetty.orbit
+ javax.mail.glassfish
+
javax.activation
activation
+
+ org.eclipse.jetty.orbit
+ javax.activation
+
- javax.servlet
- servlet-api
+ org.eclipse.jetty.orbit
+ javax.servlet
compile
- org.apache.geronimo.specs
- geronimo-jta_1.1_spec
+ org.eclipse.jetty.orbit
+ javax.security.auth.message
compile
- javax.mail
- mail
+ org.eclipse.jetty.orbit
+ javax.mail.glassfish
compile
- javax.activation
- activation
+ org.eclipse.jetty.orbit
+ javax.activation
compile
diff --git a/jetty-aggregate/jetty-server/pom.xml b/jetty-aggregate/jetty-server/pom.xml
index 4c6b9559b3..d64920fe17 100644
--- a/jetty-aggregate/jetty-server/pom.xml
+++ b/jetty-aggregate/jetty-server/pom.xml
@@ -88,6 +88,10 @@
javax.servlet
servlet-api
+
+ org.eclipse.jetty.orbit
+ javax.servlet
+
@@ -97,8 +101,8 @@
provided
- javax.servlet
- servlet-api
+ org.eclipse.jetty.orbit
+ javax.servlet
compile
diff --git a/jetty-aggregate/jetty-servlet/pom.xml b/jetty-aggregate/jetty-servlet/pom.xml
index b84dfefaaf..c2305f5fa3 100644
--- a/jetty-aggregate/jetty-servlet/pom.xml
+++ b/jetty-aggregate/jetty-servlet/pom.xml
@@ -88,11 +88,15 @@
javax.servlet
servlet-api
+
+ org.eclipse.jetty.orbit
+ javax.servlet
+
- javax.servlet
- servlet-api
+ org.eclipse.jetty.orbit
+ javax.servlet
compile
diff --git a/jetty-aggregate/jetty-webapp/pom.xml b/jetty-aggregate/jetty-webapp/pom.xml
index b01f1aae5b..8e70b3e825 100644
--- a/jetty-aggregate/jetty-webapp/pom.xml
+++ b/jetty-aggregate/jetty-webapp/pom.xml
@@ -85,14 +85,14 @@
provided
- javax.servlet
- servlet-api
+ org.eclipse.jetty.orbit
+ javax.servlet
- javax.servlet
- servlet-api
+ org.eclipse.jetty.orbit
+ javax.servlet
compile
diff --git a/jetty-client/pom.xml b/jetty-client/pom.xml
index a273af541a..4efb47517f 100644
--- a/jetty-client/pom.xml
+++ b/jetty-client/pom.xml
@@ -68,7 +68,7 @@
org.eclipse.jetty.toolchain
jetty-test-policy
- ${jetty.test.policy}
+ ${jetty-test-policy-version}
jar
true
**/*.keystore,**/*.pem
diff --git a/jetty-http/pom.xml b/jetty-http/pom.xml
index e6674c7abb..a90dfa3195 100644
--- a/jetty-http/pom.xml
+++ b/jetty-http/pom.xml
@@ -1,4 +1,5 @@
-
+
+
jetty-project
org.eclipse.jetty
@@ -17,8 +18,8 @@
${project.version}
- javax.servlet
- servlet-api
+ org.eclipse.jetty.orbit
+ javax.servlet
provided
diff --git a/jetty-jndi/pom.xml b/jetty-jndi/pom.xml
index d8c9b64253..75d1f7deca 100644
--- a/jetty-jndi/pom.xml
+++ b/jetty-jndi/pom.xml
@@ -64,14 +64,8 @@
provided
- javax.mail
- mail
-
-
- javax.activation
- activation
-
-
+ org.eclipse.jetty.orbit
+ javax.mail.glassfish
diff --git a/jetty-osgi/jetty-osgi-httpservice/pom.xml b/jetty-osgi/jetty-osgi-httpservice/pom.xml
index f3cf6877ee..a3384cf2a9 100644
--- a/jetty-osgi/jetty-osgi-httpservice/pom.xml
+++ b/jetty-osgi/jetty-osgi-httpservice/pom.xml
@@ -30,8 +30,8 @@
org.eclipse.osgi
- javax.servlet
- servlet-api
+ org.eclipse.jetty.orbit
+ javax.servlet
diff --git a/jetty-plus/pom.xml b/jetty-plus/pom.xml
index a2a6f2c65e..5665bf2947 100644
--- a/jetty-plus/pom.xml
+++ b/jetty-plus/pom.xml
@@ -88,8 +88,8 @@
test
- org.apache.geronimo.specs
- geronimo-jta_1.1_spec
+ org.eclipse.jetty.orbit
+ javax.transaction
org.eclipse.jetty
diff --git a/jetty-policy/pom.xml b/jetty-policy/pom.xml
index fc2930ec6f..37c5d280c2 100644
--- a/jetty-policy/pom.xml
+++ b/jetty-policy/pom.xml
@@ -76,7 +76,7 @@
org.eclipse.jetty.toolchain
jetty-test-policy
- ${jetty.test.policy}
+ ${jetty-test-policy-version}
jar
true
**/*.keystore
@@ -96,7 +96,7 @@
org.eclipse.jetty.toolchain
jetty-test-policy
- ${jetty.test.policy}
+ ${jetty-test-policy-version}
jar
true
**
diff --git a/jetty-rewrite/pom.xml b/jetty-rewrite/pom.xml
index 8717dc5503..68e011ed18 100644
--- a/jetty-rewrite/pom.xml
+++ b/jetty-rewrite/pom.xml
@@ -80,8 +80,8 @@
${project.version}
- javax.servlet
- servlet-api
+ org.eclipse.jetty.orbit
+ javax.servlet
org.eclipse.jetty
diff --git a/jetty-server/pom.xml b/jetty-server/pom.xml
index 03273f40bf..fd35cd9d82 100644
--- a/jetty-server/pom.xml
+++ b/jetty-server/pom.xml
@@ -88,8 +88,8 @@
test
- javax.servlet
- servlet-api
+ org.eclipse.jetty.orbit
+ javax.servlet
org.eclipse.jetty
diff --git a/jetty-servlets/pom.xml b/jetty-servlets/pom.xml
index 3e2982199c..4f79583182 100644
--- a/jetty-servlets/pom.xml
+++ b/jetty-servlets/pom.xml
@@ -80,8 +80,8 @@
${project.version}
- javax.servlet
- servlet-api
+ org.eclipse.jetty.orbit
+ javax.servlet
provided
diff --git a/jetty-websocket/pom.xml b/jetty-websocket/pom.xml
index a4bb91a378..951e97b1ab 100644
--- a/jetty-websocket/pom.xml
+++ b/jetty-websocket/pom.xml
@@ -16,8 +16,8 @@
- javax.servlet
- servlet-api
+ org.eclipse.jetty.orbit
+ javax.servlet
provided
diff --git a/pom.xml b/pom.xml
index 761cacdee4..68604be42e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,18 +11,12 @@
${jetty.url}
pom
- 1.1
- 1.4.1
- 2.5.0.v201103041518
- 2.1.v20100127
- 1.1.1
- http://www.eclipse.org/jetty
- 4.8.1
UTF-8
- 1.6.1
+ http://www.eclipse.org/jetty
+ 2.5.0.v201103041518
1.1
- 1.6.1
- 1.2
+ 1.6.1
+ 1.2
scm:git:http://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project.git
@@ -139,7 +133,29 @@
+
+
+
+
+ enforce-orbit-deps
+
+ enforce
+
+
+
+
+
+
+ javax.servlet:servlet-api
+ org.apache.geronimo.specs
+ javax.mail
+ javax.activation
+
+ true
+ This dependency is banned, use the ORBIT provided dependency instead.
+
+ true
@@ -409,6 +425,11 @@
javax.servlet.jsp.jstl
1.2.0.v201105211821
+
+ org.eclipse.jetty.orbit
+ javax.security.auth.message
+ 1.0.0.v201108011116
+
org.eclipse.jetty.orbit
com.sun.el
@@ -431,11 +452,6 @@
-
- javax.servlet
- servlet-api
- 2.5
-
org.apache.maven
maven-plugin-tools-api
@@ -444,7 +460,7 @@
org.eclipse.jetty.toolchain
jetty-test-helper
- ${jetty.test.helper}
+ 1.6.1
org.slf4j
@@ -461,25 +477,10 @@
slf4j-api
${slf4j-version}
-
- org.apache.geronimo.specs
- geronimo-jta_1.1_spec
- ${javax-transaction-version}
-
-
- javax.mail
- mail
- ${javax-mail-version}
-
-
- javax.activation
- activation
- ${javax-activation-version}
-
junit
junit
- ${junit-version}
+ 4.8.1
org.mockito
diff --git a/test-jetty-webapp/pom.xml b/test-jetty-webapp/pom.xml
index b9806477a5..185dc8d0f8 100644
--- a/test-jetty-webapp/pom.xml
+++ b/test-jetty-webapp/pom.xml
@@ -63,10 +63,10 @@
maven-bundle-plugin
true
-
- war
-
-
+
+ war
+
+
bundle-manifest
@@ -76,7 +76,7 @@
- org.eclipse.jetty.test-jetty-webapp
+ org.eclipse.jetty.test-jetty-webapp
javax.servlet,org.eclipse.jetty.servlets,*
!com.acme*