Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--INCUBATION.txt17
-rw-r--r--README.txt21
-rw-r--r--jetty-ajp/pom.xml2
-rw-r--r--jetty-annotations/pom.xml2
-rw-r--r--jetty-assembly-descriptor/pom.xml4
-rw-r--r--jetty-client/pom.xml2
-rw-r--r--jetty-continuation/pom.xml2
-rw-r--r--jetty-deploy/pom.xml2
-rw-r--r--jetty-distribution/pom.xml2
-rw-r--r--jetty-embedded-examples/pom.xml2
-rw-r--r--jetty-http/pom.xml2
-rw-r--r--jetty-io/pom.xml2
-rw-r--r--jetty-jaspi/pom.xml2
-rw-r--r--jetty-jmx/pom.xml2
-rw-r--r--jetty-jndi/pom.xml2
-rw-r--r--jetty-plus/pom.xml2
-rw-r--r--jetty-rewrite/pom.xml2
-rw-r--r--jetty-security/pom.xml2
-rw-r--r--jetty-server/pom.xml2
-rw-r--r--jetty-servlet-tester/pom.xml2
-rw-r--r--jetty-servlet/pom.xml2
-rw-r--r--jetty-servlets/pom.xml2
-rw-r--r--jetty-start/pom.xml2
-rw-r--r--jetty-test-webapp/pom.xml2
-rw-r--r--jetty-test-webapp/src/test/java/org/eclipse/jetty/DemoServer.java2
-rw-r--r--jetty-util/pom.xml2
-rw-r--r--jetty-webapp/pom.xml2
-rw-r--r--jetty-xml/pom.xml2
-rw-r--r--pom.xml2
29 files changed, 63 insertions, 31 deletions
diff --git a/INCUBATION.txt b/INCUBATION.txt
new file mode 100644
index 0000000000..3de5a5d5b4
--- /dev/null
+++ b/INCUBATION.txt
@@ -0,0 +1,17 @@
+
+The Jetty @ eclipse project is based on the Jetty project at codehaus
+
+ http://jetty.codehaus.org
+
+Ongoing development is now under the eclipse foundation
+
+ http://www.eclipse.org/jetty/
+
+The Jetty project is in incubation at the eclipse foundation
+
+ http://wiki.eclipse.org/Development_Resources/Process_Guidelines/What_is_Incubation
+
+The Jetty project is in the parallel IP review process
+
+ http://wiki.eclipse.org/Development_Resources/HOWTO/Parallel_IP_Process
+
diff --git a/README.txt b/README.txt
index 23fe075f82..049bb04820 100644
--- a/README.txt
+++ b/README.txt
@@ -1,9 +1,24 @@
-This is the Jetty 7 HTTP server and servlet container.
+JETTY
+=====
-For more information about Jetty, please see the Jetty wiki:
+The Jetty project is a 100% Java HTTP Server, HTTP Client
+and Servlet Container.
+
+
+The Jetty @ eclipse project is based on the Jetty project at codehaus
+
+ http://jetty.codehaus.org
+
+Ongoing development is now under incubation at the eclipse foundation
+
+ http://www.eclipse.org/jetty/
+
+
+Jetty @ eclipse is open source and is dual licensed using the apache 2.0 and
+eclipse public license 1.0. You may choose either license when distributing
+jetty.
- http://docs.codehaus.org/display/JETTY/
BUILDING JETTY
diff --git a/jetty-ajp/pom.xml b/jetty-ajp/pom.xml
index 903a836e90..4ebf95ccd9 100644
--- a/jetty-ajp/pom.xml
+++ b/jetty-ajp/pom.xml
@@ -2,7 +2,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-project</artifactId>
- <version>7.0.0.incubation0-SNAPSHOT</version>
+ <version>7.0.0.M0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jetty-ajp</artifactId>
diff --git a/jetty-annotations/pom.xml b/jetty-annotations/pom.xml
index 01f62be190..7199211bdb 100644
--- a/jetty-annotations/pom.xml
+++ b/jetty-annotations/pom.xml
@@ -2,7 +2,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-project</artifactId>
- <version>7.0.0.incubation0-SNAPSHOT</version>
+ <version>7.0.0.M0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jetty-annotations</artifactId>
diff --git a/jetty-assembly-descriptor/pom.xml b/jetty-assembly-descriptor/pom.xml
index 0d7705563f..496c845ab5 100644
--- a/jetty-assembly-descriptor/pom.xml
+++ b/jetty-assembly-descriptor/pom.xml
@@ -2,9 +2,9 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-project</artifactId>
- <version>7.0.0.incubation0-SNAPSHOT</version>
+ <version>7.0.0.M0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jetty-assembly-descriptor</artifactId>
<name>Jetty :: Assembly Descriptor</name>
-</project> \ No newline at end of file
+</project>
diff --git a/jetty-client/pom.xml b/jetty-client/pom.xml
index 3835056f3a..e0290e8f2e 100644
--- a/jetty-client/pom.xml
+++ b/jetty-client/pom.xml
@@ -2,7 +2,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-project</artifactId>
- <version>7.0.0.incubation0-SNAPSHOT</version>
+ <version>7.0.0.M0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jetty-client</artifactId>
diff --git a/jetty-continuation/pom.xml b/jetty-continuation/pom.xml
index 8f6c35ea8f..585d1005b2 100644
--- a/jetty-continuation/pom.xml
+++ b/jetty-continuation/pom.xml
@@ -2,7 +2,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-project</artifactId>
- <version>7.0.0.incubation0-SNAPSHOT</version>
+ <version>7.0.0.M0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jetty-continuation</artifactId>
diff --git a/jetty-deploy/pom.xml b/jetty-deploy/pom.xml
index 71faefadd2..a4df177f34 100644
--- a/jetty-deploy/pom.xml
+++ b/jetty-deploy/pom.xml
@@ -2,7 +2,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-project</artifactId>
- <version>7.0.0.incubation0-SNAPSHOT</version>
+ <version>7.0.0.M0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jetty-deploy</artifactId>
diff --git a/jetty-distribution/pom.xml b/jetty-distribution/pom.xml
index 05fe60f4ff..091d8b7a7b 100644
--- a/jetty-distribution/pom.xml
+++ b/jetty-distribution/pom.xml
@@ -3,7 +3,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-project</artifactId>
- <version>7.0.0.incubation0-SNAPSHOT</version>
+ <version>7.0.0.M0-SNAPSHOT</version>
</parent>
<artifactId>jetty-distribution</artifactId>
<name>Jetty :: Distribution Assemblies</name>
diff --git a/jetty-embedded-examples/pom.xml b/jetty-embedded-examples/pom.xml
index d629d747fd..7753390ca8 100644
--- a/jetty-embedded-examples/pom.xml
+++ b/jetty-embedded-examples/pom.xml
@@ -2,7 +2,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-project</artifactId>
- <version>7.0.0.incubation0-SNAPSHOT</version>
+ <version>7.0.0.M0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jetty-embedded</artifactId>
diff --git a/jetty-http/pom.xml b/jetty-http/pom.xml
index df29a98400..c34e8c32aa 100644
--- a/jetty-http/pom.xml
+++ b/jetty-http/pom.xml
@@ -2,7 +2,7 @@
<parent>
<artifactId>jetty-project</artifactId>
<groupId>org.eclipse.jetty</groupId>
- <version>7.0.0.incubation0-SNAPSHOT</version>
+ <version>7.0.0.M0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.eclipse.jetty</groupId>
diff --git a/jetty-io/pom.xml b/jetty-io/pom.xml
index 56bdba25c1..645ce13f0c 100644
--- a/jetty-io/pom.xml
+++ b/jetty-io/pom.xml
@@ -2,7 +2,7 @@
<parent>
<artifactId>jetty-project</artifactId>
<groupId>org.eclipse.jetty</groupId>
- <version>7.0.0.incubation0-SNAPSHOT</version>
+ <version>7.0.0.M0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.eclipse.jetty</groupId>
diff --git a/jetty-jaspi/pom.xml b/jetty-jaspi/pom.xml
index 3e47c8403c..0f28ce181d 100644
--- a/jetty-jaspi/pom.xml
+++ b/jetty-jaspi/pom.xml
@@ -2,7 +2,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-project</artifactId>
- <version>7.0.0.incubation0-SNAPSHOT</version>
+ <version>7.0.0.M0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jetty-jaspi</artifactId>
diff --git a/jetty-jmx/pom.xml b/jetty-jmx/pom.xml
index 171f3dcea6..9f657c5b1c 100644
--- a/jetty-jmx/pom.xml
+++ b/jetty-jmx/pom.xml
@@ -2,7 +2,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-project</artifactId>
- <version>7.0.0.incubation0-SNAPSHOT</version>
+ <version>7.0.0.M0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jetty-jmx</artifactId>
diff --git a/jetty-jndi/pom.xml b/jetty-jndi/pom.xml
index d22f77a7ec..13211520a9 100644
--- a/jetty-jndi/pom.xml
+++ b/jetty-jndi/pom.xml
@@ -2,7 +2,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-project</artifactId>
- <version>7.0.0.incubation0-SNAPSHOT</version>
+ <version>7.0.0.M0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jetty-jndi</artifactId>
diff --git a/jetty-plus/pom.xml b/jetty-plus/pom.xml
index 2705d90484..d8b9e7aa5d 100644
--- a/jetty-plus/pom.xml
+++ b/jetty-plus/pom.xml
@@ -2,7 +2,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-project</artifactId>
- <version>7.0.0.incubation0-SNAPSHOT</version>
+ <version>7.0.0.M0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jetty-plus</artifactId>
diff --git a/jetty-rewrite/pom.xml b/jetty-rewrite/pom.xml
index f6091d04d7..0d6219e673 100644
--- a/jetty-rewrite/pom.xml
+++ b/jetty-rewrite/pom.xml
@@ -2,7 +2,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-project</artifactId>
- <version>7.0.0.incubation0-SNAPSHOT</version>
+ <version>7.0.0.M0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jetty-rewrite</artifactId>
diff --git a/jetty-security/pom.xml b/jetty-security/pom.xml
index ebeae8be07..1bca7faea9 100644
--- a/jetty-security/pom.xml
+++ b/jetty-security/pom.xml
@@ -2,7 +2,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-project</artifactId>
- <version>7.0.0.incubation0-SNAPSHOT</version>
+ <version>7.0.0.M0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jetty-security</artifactId>
diff --git a/jetty-server/pom.xml b/jetty-server/pom.xml
index 6e018ed5fe..beefa05465 100644
--- a/jetty-server/pom.xml
+++ b/jetty-server/pom.xml
@@ -2,7 +2,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-project</artifactId>
- <version>7.0.0.incubation0-SNAPSHOT</version>
+ <version>7.0.0.M0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jetty-server</artifactId>
diff --git a/jetty-servlet-tester/pom.xml b/jetty-servlet-tester/pom.xml
index 1a6f9cd0e8..e21e7e8bf3 100644
--- a/jetty-servlet-tester/pom.xml
+++ b/jetty-servlet-tester/pom.xml
@@ -2,7 +2,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-project</artifactId>
- <version>7.0.0.incubation0-SNAPSHOT</version>
+ <version>7.0.0.M0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jetty-servlet-tester</artifactId>
diff --git a/jetty-servlet/pom.xml b/jetty-servlet/pom.xml
index ab2baca08b..26b3ae98d7 100644
--- a/jetty-servlet/pom.xml
+++ b/jetty-servlet/pom.xml
@@ -3,7 +3,7 @@
<parent>
<artifactId>jetty-project</artifactId>
<groupId>org.eclipse.jetty</groupId>
- <version>7.0.0.incubation0-SNAPSHOT</version>
+ <version>7.0.0.M0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jetty-servlet</artifactId>
diff --git a/jetty-servlets/pom.xml b/jetty-servlets/pom.xml
index 6838444de9..6d10ebebde 100644
--- a/jetty-servlets/pom.xml
+++ b/jetty-servlets/pom.xml
@@ -3,7 +3,7 @@
<parent>
<artifactId>jetty-project</artifactId>
<groupId>org.eclipse.jetty</groupId>
- <version>7.0.0.incubation0-SNAPSHOT</version>
+ <version>7.0.0.M0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jetty-servlets</artifactId>
diff --git a/jetty-start/pom.xml b/jetty-start/pom.xml
index 0a2e86ee9b..29bf85b24e 100644
--- a/jetty-start/pom.xml
+++ b/jetty-start/pom.xml
@@ -2,7 +2,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-project</artifactId>
- <version>7.0.0.incubation0-SNAPSHOT</version>
+ <version>7.0.0.M0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jetty-start</artifactId>
diff --git a/jetty-test-webapp/pom.xml b/jetty-test-webapp/pom.xml
index c7bdb292e6..5560385585 100644
--- a/jetty-test-webapp/pom.xml
+++ b/jetty-test-webapp/pom.xml
@@ -2,7 +2,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-project</artifactId>
- <version>7.0.0.incubation0-SNAPSHOT</version>
+ <version>7.0.0.M0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.eclipse.jetty</groupId>
diff --git a/jetty-test-webapp/src/test/java/org/eclipse/jetty/DemoServer.java b/jetty-test-webapp/src/test/java/org/eclipse/jetty/DemoServer.java
index 214984c753..7a6b0db6f4 100644
--- a/jetty-test-webapp/src/test/java/org/eclipse/jetty/DemoServer.java
+++ b/jetty-test-webapp/src/test/java/org/eclipse/jetty/DemoServer.java
@@ -13,7 +13,7 @@ public class DemoServer
Server server = new Server(8080);
WebAppContext context = new WebAppContext();
- context.setWar("./target/jetty-test-webapp-7.0.0.incubation0-SNAPSHOT");
+ context.setWar("./target/jetty-test-webapp-7.0.0.M0-SNAPSHOT"); // TODO YUCK!
context.setDefaultsDescriptor("../jetty-webapp/src/main/config/etc/webdefault.xml");
server.setHandler(context);
diff --git a/jetty-util/pom.xml b/jetty-util/pom.xml
index 392fa04312..d6fb50c447 100644
--- a/jetty-util/pom.xml
+++ b/jetty-util/pom.xml
@@ -2,7 +2,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-project</artifactId>
- <version>7.0.0.incubation0-SNAPSHOT</version>
+ <version>7.0.0.M0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jetty-util</artifactId>
diff --git a/jetty-webapp/pom.xml b/jetty-webapp/pom.xml
index 31e54e81b8..376bf138f9 100644
--- a/jetty-webapp/pom.xml
+++ b/jetty-webapp/pom.xml
@@ -2,7 +2,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-project</artifactId>
- <version>7.0.0.incubation0-SNAPSHOT</version>
+ <version>7.0.0.M0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jetty-webapp</artifactId>
diff --git a/jetty-xml/pom.xml b/jetty-xml/pom.xml
index a57e109cf5..e4bf929c08 100644
--- a/jetty-xml/pom.xml
+++ b/jetty-xml/pom.xml
@@ -2,7 +2,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-project</artifactId>
- <version>7.0.0.incubation0-SNAPSHOT</version>
+ <version>7.0.0.M0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jetty-xml</artifactId>
diff --git a/pom.xml b/pom.xml
index 6c518a9b79..b93e9a1ccc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,7 +8,7 @@
</parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-project</artifactId>
- <version>7.0.0.incubation0-SNAPSHOT</version>
+ <version>7.0.0.M0-SNAPSHOT</version>
<name>Jetty :: Project</name>
<packaging>pom</packaging>

Back to the top