diff --git a/jetty-distribution/pom.xml b/jetty-distribution/pom.xml
index 11922135a37..9d0b24ae1e8 100644
--- a/jetty-distribution/pom.xml
+++ b/jetty-distribution/pom.xml
@@ -13,10 +13,10 @@
     <orbit-url>http://download.eclipse.org/tools/orbit/downloads/drops/S20100423142122/bundles</orbit-url>
     <assembly-directory>target/distribution</assembly-directory>
     <eclipse-drop>S-3.6M7-201004291549</eclipse-drop>
-    <orbit-ecj-version>3.6M7</orbit-ecj-version>
-    <orbit-javax-activation-version>1.1.0.v200906290531</orbit-javax-activation-version>
+    <eclipse-ecj-version>3.6M7</eclipse-ecj-version>
+    <orbit-javax-activation-version>${javax-activation-version}.0.v200906290531</orbit-javax-activation-version>
     <orbit-javax-el-version>2.1.0.v201004190952</orbit-javax-el-version>
-    <orbit-javax-mail-glassfish-version>1.4.1.v200808130215</orbit-javax-mail-glassfish-version>
+    <orbit-javax-mail-glassfish-version>${javax-mail-version}.v200808130215</orbit-javax-mail-glassfish-version>
     <orbit-javax-servlet-version>2.5.0.v200910301333</orbit-javax-servlet-version>
     <orbit-javax-servlet-jsp-version>2.1.0.v201004190952</orbit-javax-servlet-jsp-version>
     <orbit-com-sun-el-version>1.0.0.v201004190952</orbit-com-sun-el-version>
@@ -60,7 +60,7 @@
                 <get src="${orbit-url}/javax.mail.glassfish_${orbit-javax-mail-glassfish-version}.jar" dest="${assembly-directory}/lib/jndi/javax.mail.glassfish_${orbit-javax-mail-glassfish-version}.jar" usetimestamp="true" verbose="true" />
                
                 <mkdir dir="${assembly-directory}/lib/jsp" />           
-                <get src="${eclipse-mirror}/${eclipse-drop}/ecj-${orbit-ecj-version}.jar" dest="${assembly-directory}/lib/jsp/ecj-${orbit-ecj-version}.jar" usetimestamp="true" verbose="true" />
+                <get src="${eclipse-mirror}/${eclipse-drop}/ecj-${eclipse-ecj-version}.jar" dest="${assembly-directory}/lib/jsp/ecj-${eclipse-ecj-version}.jar" usetimestamp="true" verbose="true" />
                 <get src="${orbit-url}/javax.el_${orbit-javax-el-version}.jar" dest="${assembly-directory}/lib/jsp/javax.el_${orbit-javax-el-version}.jar" usetimestamp="true" verbose="true" />
                 <get src="${orbit-url}/javax.servlet.jsp_${orbit-javax-servlet-jsp-version}.jar" dest="${assembly-directory}/lib/jsp/javax.servlet.jsp_${orbit-javax-servlet-jsp-version}.jar" usetimestamp="true" verbose="true" />
                 <get src="${orbit-url}/com.sun.el_${orbit-com-sun-el-version}.jar" dest="${assembly-directory}/lib/jsp/com.sun.el_${orbit-com-sun-el-version}.jar" usetimestamp="true" verbose="true" />
diff --git a/jetty-jndi/pom.xml b/jetty-jndi/pom.xml
index 4b7379baca9..a63df267aa7 100644
--- a/jetty-jndi/pom.xml
+++ b/jetty-jndi/pom.xml
@@ -60,7 +60,7 @@
     <dependency>
       <groupId>javax.mail</groupId>
       <artifactId>mail</artifactId>
-      <version>${mail-version}</version>
+      <version>${javax-mail-version}</version>
 	  <exclusions>
 	    <exclusion>
 		  <groupId>javax.activation</groupId>
@@ -79,7 +79,7 @@
 		<dependency>
 		  <groupId>javax.activation</groupId>
 		  <artifactId>activation</artifactId>
-		  <version>${activation-version}</version>
+		  <version>${javax-activation-version}</version>
 		</dependency>	  
       </dependencies>
     </profile>
diff --git a/jetty-jsp-2.1/pom.xml b/jetty-jsp-2.1/pom.xml
index 271b59bbf2d..89a1c98db45 100644
--- a/jetty-jsp-2.1/pom.xml
+++ b/jetty-jsp-2.1/pom.xml
@@ -8,10 +8,6 @@
   <artifactId>jetty-jsp-2.1</artifactId>
   <name>Jetty :: Jetty JSP Additions</name>
   <description>Additions to Jasper implementation from Glassfish</description>
-  <properties>
-     <eclipse-compiler-version>3.1.1</eclipse-compiler-version>
-     <servlet-version>2.5</servlet-version>
-  </properties>
   <build>
     <plugins>
       <plugin>
@@ -51,7 +47,7 @@
     <dependency>
       <groupId>org.mortbay.jetty</groupId>
       <artifactId>jsp-2.1-glassfish</artifactId>
-      <version>${jsp-2-1-version}</version>
+      <version>${javax-servlet-jsp-version}</version>
       <exclusions>
         <exclusion>
           <groupId>org.mortbay.jetty</groupId>
@@ -63,7 +59,6 @@
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>servlet-api</artifactId>
-      <version>${servlet-version}</version>
       <scope>provided</scope>
     </dependency>
     <!-- dependency>
diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/Server.java b/jetty-server/src/main/java/org/eclipse/jetty/server/Server.java
index ce987837a13..b0d70160ec8 100644
--- a/jetty-server/src/main/java/org/eclipse/jetty/server/Server.java
+++ b/jetty-server/src/main/java/org/eclipse/jetty/server/Server.java
@@ -57,7 +57,7 @@ public class Server extends HandlerWrapper implements Attributes
         if (Server.class.getPackage()!=null && Server.class.getPackage().getImplementationVersion()!=null)
             _version=Server.class.getPackage().getImplementationVersion();
         else
-            _version=System.getProperty("jetty.version","7.0.2-SNAPSHOT");
+            _version=System.getProperty("jetty.version","7.x.y-SNAPSHOT");
     }
     private final Container _container=new Container();
     private final AttributesMap _attributes = new AttributesMap();
diff --git a/pom.xml b/pom.xml
index bda1d9eec6f..493f0ab35fd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,19 +13,16 @@
   <url>${jetty.url}</url>
   <packaging>pom</packaging>
   <properties>
-    <jetty.url>http://www.eclipse.org/jetty</jetty.url>
     <felix.bundle.version>2.0.0</felix.bundle.version>
-    <activation-version>1.1</activation-version>
-    <ant-version>1.6.5</ant-version>
-    <jta-spec-version>1.1.1</jta-spec-version>
+    <javax-activation-version>1.1</javax-activation-version>
+    <javax-mail-version>1.4.1</javax-mail-version>
+    <javax-servlet-jsp-version>2.1.v20091210</javax-servlet-jsp-version>
+    <javax-transaction-version>1.1.1</javax-transaction-version>
+    <jetty.url>http://www.eclipse.org/jetty</jetty.url>
     <junit-version>3.8.2</junit-version>
     <junit4-version>4.8.1</junit4-version>
-    <mail-version>1.4</mail-version>
-    <slf4j-version>1.5.10</slf4j-version>
-    <eclipse-compiler-version>3.1.1</eclipse-compiler-version>
-    <cometd-version>1.0.beta4</cometd-version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <jsp-2-1-version>2.1.v20091210</jsp-2-1-version>
+    <slf4j-version>1.5.10</slf4j-version>
   </properties>
   <scm>
     <connection>scm:svn:http://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk</connection>
@@ -231,25 +228,20 @@
         <artifactId>slf4j-api</artifactId>
         <version>${slf4j-version}</version>
       </dependency>
-      <dependency>
-        <groupId>ant</groupId>
-        <artifactId>ant</artifactId>
-        <version>${ant-version}</version>
-      </dependency>
       <dependency>
         <groupId>org.apache.geronimo.specs</groupId>
         <artifactId>geronimo-jta_1.1_spec</artifactId>
-        <version>${jta-spec-version}</version>
+        <version>${javax-transaction-version}</version>
       </dependency>
       <dependency>
         <groupId>javax.mail</groupId>
         <artifactId>mail</artifactId>
-        <version>${mail-version}</version>
+        <version>${javax-mail-version}</version>
       </dependency>
       <dependency>
         <groupId>javax.activation</groupId>
         <artifactId>activation</artifactId>
-        <version>${activation-version}</version>
+        <version>${javax-activation-version}</version>
       </dependency>
     </dependencies>
   </dependencyManagement>