diff --git a/build-spring-framework/generate-pom.xml b/build-spring-framework/generate-pom.xml
index eb970cad219..e7d4b8201d2 100644
--- a/build-spring-framework/generate-pom.xml
+++ b/build-spring-framework/generate-pom.xml
@@ -74,7 +74,7 @@
      <mapping conf="runtime" scope="runtime"/>
     </ivy:makepom>
 
-    <xmlproperty file="../build-spring-framework/pom.xml"/>
+    <xmlproperty file="../org.springframework.spring-library/pom.xml"/>
 
     <replaceregexp file="pom.xml" 
 	           match="&lt;version>.*?&lt;/version>"
@@ -93,8 +93,8 @@
 	 <replacevalue><![CDATA[  <version>@project-version@</version>
   <parent>
     <groupId>org.springframework</groupId>
-    <artifactId>org.springframework.parent</artifactId>
-    <relativePath>../build-spring-framework</relativePath>
+    <artifactId>spring-parent</artifactId>
+    <relativePath>../org.springframework.spring-parent</relativePath>
     <version>@project-version@</version>
   </parent>
 ]]></replacevalue>
diff --git a/org.springframework.aop/pom.xml b/org.springframework.aop/pom.xml
index 148d08dc480..fafdb6b52e8 100644
--- a/org.springframework.aop/pom.xml
+++ b/org.springframework.aop/pom.xml
@@ -4,12 +4,12 @@
   <groupId>org.springframework</groupId>
   <artifactId>spring-aop</artifactId>
   <packaging>jar</packaging>
-  <version>3.0.0.M3</version>
+  <version>3.0.0.BUILD-SNAPSHOT</version>
   <parent>
     <groupId>org.springframework</groupId>
-    <artifactId>org.springframework.parent</artifactId>
-    <relativePath>../build-spring-framework</relativePath>
-    <version>3.0.0.M3</version>
+    <artifactId>spring-parent</artifactId>
+    <relativePath>../org.springframework.spring-parent</relativePath>
+    <version>3.0.0.BUILD-SNAPSHOT</version>
   </parent>
 
   <dependencies>
@@ -52,13 +52,13 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-beans</artifactId>
-      <version>3.0.0.M3</version>
+      <version>${project.version}</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-core</artifactId>
-      <version>3.0.0.M3</version>
+      <version>${project.version}</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -82,21 +82,8 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-asm</artifactId>
-      <version>3.0.0.M3</version>
+      <version>${project.version}</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>
-  <build>
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-surefire-plugin</artifactId>
-          <configuration>
-            <junitArtifactName>junit:junit</junitArtifactName>
-          </configuration>
-        </plugin>
-      </plugins>
-    </pluginManagement>
-  </build>
 </project>
diff --git a/org.springframework.asm/pom.xml b/org.springframework.asm/pom.xml
index 762e54b0022..880a362e96f 100644
--- a/org.springframework.asm/pom.xml
+++ b/org.springframework.asm/pom.xml
@@ -4,12 +4,12 @@
   <groupId>org.springframework</groupId>
   <artifactId>spring-asm</artifactId>
   <packaging>jar</packaging>
-  <version>3.0.0.M3</version>
+  <version>3.0.0.BUILD-SNAPSHOT</version>
   <parent>
     <groupId>org.springframework</groupId>
-    <artifactId>org.springframework.parent</artifactId>
-    <relativePath>../build-spring-framework</relativePath>
-    <version>3.0.0.M3</version>
+    <artifactId>spring-parent</artifactId>
+    <relativePath>../org.springframework.spring-parent</relativePath>
+    <version>3.0.0.BUILD-SNAPSHOT</version>
   </parent>
 
 </project>
diff --git a/org.springframework.aspects/pom.xml b/org.springframework.aspects/pom.xml
index 95eb4aeb82d..b4171ccd47a 100644
--- a/org.springframework.aspects/pom.xml
+++ b/org.springframework.aspects/pom.xml
@@ -4,12 +4,12 @@
   <groupId>org.springframework</groupId>
   <artifactId>spring-aspects</artifactId>
   <packaging>jar</packaging>
-  <version>3.0.0.M3</version>
+  <version>3.0.0.BUILD-SNAPSHOT</version>
   <parent>
     <groupId>org.springframework</groupId>
-    <artifactId>org.springframework.parent</artifactId>
-    <relativePath>../build-spring-framework</relativePath>
-    <version>3.0.0.M3</version>
+    <artifactId>spring-parent</artifactId>
+    <relativePath>../org.springframework.spring-parent</relativePath>
+    <version>3.0.0.BUILD-SNAPSHOT</version>
   </parent>
 
   <dependencies>
@@ -28,13 +28,13 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-beans</artifactId>
-      <version>3.0.0.M3</version>
+      <version>${project.version}</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-tx</artifactId>
-      <version>3.0.0.M3</version>
+      <version>${project.version}</version>
       <optional>true</optional>
     </dependency>
   </dependencies>
diff --git a/org.springframework.beans/pom.xml b/org.springframework.beans/pom.xml
index 5a15fa618b8..1e21dfaf503 100644
--- a/org.springframework.beans/pom.xml
+++ b/org.springframework.beans/pom.xml
@@ -4,12 +4,12 @@
   <groupId>org.springframework</groupId>
   <artifactId>spring-beans</artifactId>
   <packaging>jar</packaging>
-  <version>3.0.0.M3</version>
+  <version>3.0.0.BUILD-SNAPSHOT</version>
   <parent>
     <groupId>org.springframework</groupId>
-    <artifactId>org.springframework.parent</artifactId>
-    <relativePath>../build-spring-framework</relativePath>
-    <version>3.0.0.M3</version>
+    <artifactId>spring-parent</artifactId>
+    <relativePath>../org.springframework.spring-parent</relativePath>
+    <version>3.0.0.BUILD-SNAPSHOT</version>
   </parent>
 
   <dependencies>
@@ -34,7 +34,7 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-core</artifactId>
-      <version>3.0.0.M3</version>
+      <version>${project.version}</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
diff --git a/org.springframework.context.support/pom.xml b/org.springframework.context.support/pom.xml
index ac9dbb3192e..146cfa11aa7 100644
--- a/org.springframework.context.support/pom.xml
+++ b/org.springframework.context.support/pom.xml
@@ -4,12 +4,12 @@
   <groupId>org.springframework</groupId>
   <artifactId>spring-context-support</artifactId>
   <packaging>jar</packaging>
-  <version>3.0.0.M3</version>
+  <version>3.0.0.BUILD-SNAPSHOT</version>
   <parent>
     <groupId>org.springframework</groupId>
-    <artifactId>org.springframework.parent</artifactId>
-    <relativePath>../build-spring-framework</relativePath>
-    <version>3.0.0.M3</version>
+    <artifactId>spring-parent</artifactId>
+    <relativePath>../org.springframework.spring-parent</relativePath>
+    <version>3.0.0.BUILD-SNAPSHOT</version>
   </parent>
 
   <dependencies>
@@ -26,12 +26,19 @@
     </dependency>
 
 
-
+    
     <dependency>
       <groupId>quartz</groupId>
       <artifactId>quartz</artifactId>
       <version>1.6.2</version>
     </dependency>
+    <dependency>
+      <groupId>opensymphony</groupId>
+      <artifactId>quartz-all</artifactId>
+      <version>1.6.0</version>
+      <optional>true</optional>
+    </dependency>
+
 
     <dependency>
       <groupId>org.freemarker</groupId>
@@ -81,12 +88,6 @@
       <version>1.5</version>
       <optional>true</optional>
     </dependency>
-    <dependency>
-      <groupId>opensymphony</groupId>
-      <artifactId>quartz-all</artifactId>
-      <version>1.6.0</version>
-      <optional>true</optional>
-    </dependency>
     <dependency>
       <groupId>jfree</groupId>
       <artifactId>jfreechart</artifactId>
@@ -96,31 +97,31 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-beans</artifactId>
-      <version>3.0.0.M3</version>
+      <version>${project.version}</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-context</artifactId>
-      <version>3.0.0.M3</version>
+      <version>${project.version}</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-core</artifactId>
-      <version>3.0.0.M3</version>
+      <version>${project.version}</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-jdbc</artifactId>
-      <version>3.0.0.M3</version>
+      <version>${project.version}</version>
       <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-tx</artifactId>
-      <version>3.0.0.M3</version>
+      <version>${project.version}</version>
       <optional>true</optional>
     </dependency>
     <dependency>
@@ -152,7 +153,7 @@
   <build>
     <testResources>
       <testResource>
-        <directory>src/main/java</directory>
+        <directory>${pom.build.sourceDirectory}</directory>
         <includes>
           <include>**/*.types</include>
         </includes>
diff --git a/org.springframework.context/pom.xml b/org.springframework.context/pom.xml
index cceb925abef..cac97948ef0 100644
--- a/org.springframework.context/pom.xml
+++ b/org.springframework.context/pom.xml
@@ -4,12 +4,12 @@
   <groupId>org.springframework</groupId>
   <artifactId>spring-context</artifactId>
   <packaging>jar</packaging>
-  <version>3.0.0.M3</version>
+  <version>3.0.0.BUILD-SNAPSHOT</version>
   <parent>
     <groupId>org.springframework</groupId>
-    <artifactId>org.springframework.parent</artifactId>
-    <relativePath>../build-spring-framework</relativePath>
-    <version>3.0.0.M3</version>
+    <artifactId>spring-parent</artifactId>
+    <relativePath>../org.springframework.spring-parent</relativePath>
+    <version>3.0.0.BUILD-SNAPSHOT</version>
   </parent>
 
   <dependencies>
@@ -112,31 +112,31 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-aop</artifactId>
-      <version>3.0.0.M3</version>
+      <version>${project.version}</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-beans</artifactId>
-      <version>3.0.0.M3</version>
+      <version>${project.version}</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-core</artifactId>
-      <version>3.0.0.M3</version>
+      <version>${project.version}</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-expression</artifactId>
-      <version>3.0.0.M3</version>
+      <version>${project.version}</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-instrument</artifactId>
-      <version>3.0.0.M3</version>
+      <version>${project.version}</version>
       <optional>true</optional>
     </dependency>
     <dependency>
@@ -184,7 +184,7 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-asm</artifactId>
-      <version>3.0.0.M3</version>
+      <version>${project.version}</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>
diff --git a/org.springframework.core/pom.xml b/org.springframework.core/pom.xml
index 3eac7656ef3..c622d99e1ca 100644
--- a/org.springframework.core/pom.xml
+++ b/org.springframework.core/pom.xml
@@ -4,12 +4,12 @@
   <groupId>org.springframework</groupId>
   <artifactId>spring-core</artifactId>
   <packaging>jar</packaging>
-  <version>3.0.0.M3</version>
+  <version>3.0.0.BUILD-SNAPSHOT</version>
   <parent>
     <groupId>org.springframework</groupId>
-    <artifactId>org.springframework.parent</artifactId>
-    <relativePath>../build-spring-framework</relativePath>
-    <version>3.0.0.M3</version>
+    <artifactId>spring-parent</artifactId>
+    <relativePath>../org.springframework.spring-parent</relativePath>
+    <version>3.0.0.BUILD-SNAPSHOT</version>
   </parent>
 
   <dependencies>
@@ -22,7 +22,7 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-asm</artifactId>
-      <version>3.0.0.M3</version>
+      <version>${project.version}</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -74,17 +74,4 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
-  <build>
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-surefire-plugin</artifactId>
-          <configuration>
-            <junitArtifactName>junit:junit</junitArtifactName>
-          </configuration>
-        </plugin>
-      </plugins>
-    </pluginManagement>
-  </build>
 </project>
diff --git a/org.springframework.expression/pom.xml b/org.springframework.expression/pom.xml
index 5a896421f46..12e7d4b7e3b 100644
--- a/org.springframework.expression/pom.xml
+++ b/org.springframework.expression/pom.xml
@@ -4,12 +4,12 @@
   <groupId>org.springframework</groupId>
   <artifactId>spring-expression</artifactId>
   <packaging>jar</packaging>
-  <version>3.0.0.M3</version>
+  <version>3.0.0.BUILD-SNAPSHOT</version>
   <parent>
     <groupId>org.springframework</groupId>
-    <artifactId>org.springframework.parent</artifactId>
-    <relativePath>../build-spring-framework</relativePath>
-    <version>3.0.0.M3</version>
+    <artifactId>spring-parent</artifactId>
+    <relativePath>../org.springframework.spring-parent</relativePath>
+    <version>3.0.0.BUILD-SNAPSHOT</version>
   </parent>
 
   <dependencies>
@@ -22,7 +22,7 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-core</artifactId>
-      <version>3.0.0.M3</version>
+      <version>${project.version}</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
diff --git a/org.springframework.instrument.classloading/pom.xml b/org.springframework.instrument.classloading/pom.xml
index a89885e61b0..40c6da46a67 100644
--- a/org.springframework.instrument.classloading/pom.xml
+++ b/org.springframework.instrument.classloading/pom.xml
@@ -4,12 +4,12 @@
   <groupId>org.springframework</groupId>
   <artifactId>spring-instrument-classloading</artifactId>
   <packaging>jar</packaging>
-  <version>3.0.0.M3</version>
+  <version>3.0.0.BUILD-SNAPSHOT</version>
   <parent>
     <groupId>org.springframework</groupId>
-    <artifactId>org.springframework.parent</artifactId>
-    <relativePath>../build-spring-framework</relativePath>
-    <version>3.0.0.M3</version>
+    <artifactId>spring-parent</artifactId>
+    <relativePath>../org.springframework.spring-parent</relativePath>
+    <version>3.0.0.BUILD-SNAPSHOT</version>
   </parent>
 
   <dependencies>
@@ -20,17 +20,5 @@
       <scope>provided</scope>
     </dependency>
   </dependencies>
-  <build>
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-surefire-plugin</artifactId>
-          <configuration>
-            <junitArtifactName>junit:junit</junitArtifactName>
-          </configuration>
-        </plugin>
-      </plugins>
-    </pluginManagement>
-  </build>
+
 </project>
diff --git a/org.springframework.instrument/pom.xml b/org.springframework.instrument/pom.xml
index e0f60e6b9f0..14f69b1761c 100644
--- a/org.springframework.instrument/pom.xml
+++ b/org.springframework.instrument/pom.xml
@@ -4,25 +4,12 @@
   <groupId>org.springframework</groupId>
   <artifactId>spring-instrument</artifactId>
   <packaging>jar</packaging>
-  <version>3.0.0.M3</version>
+  <version>3.0.0.BUILD-SNAPSHOT</version>
   <parent>
     <groupId>org.springframework</groupId>
-    <artifactId>org.springframework.parent</artifactId>
-    <relativePath>../build-spring-framework</relativePath>
-    <version>3.0.0.M3</version>
+    <artifactId>spring-parent</artifactId>
+    <relativePath>../org.springframework.spring-parent</relativePath>
+    <version>3.0.0.BUILD-SNAPSHOT</version>
   </parent>
 
-  <build>
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-surefire-plugin</artifactId>
-          <configuration>
-            <junitArtifactName>junit:junit</junitArtifactName>
-          </configuration>
-        </plugin>
-      </plugins>
-    </pluginManagement>
-  </build>
 </project>
diff --git a/org.springframework.jdbc/pom.xml b/org.springframework.jdbc/pom.xml
index 3ea22491fe0..f7a6fadfa0e 100644
--- a/org.springframework.jdbc/pom.xml
+++ b/org.springframework.jdbc/pom.xml
@@ -4,12 +4,12 @@
   <groupId>org.springframework</groupId>
   <artifactId>spring-jdbc</artifactId>
   <packaging>jar</packaging>
-  <version>3.0.0.M3</version>
+  <version>3.0.0.BUILD-SNAPSHOT</version>
   <parent>
     <groupId>org.springframework</groupId>
-    <artifactId>org.springframework.parent</artifactId>
-    <relativePath>../build-spring-framework</relativePath>
-    <version>3.0.0.M3</version>
+    <artifactId>spring-parent</artifactId>
+    <relativePath>../org.springframework.spring-parent</relativePath>
+    <version>3.0.0.BUILD-SNAPSHOT</version>
   </parent>
 
   <dependencies>
@@ -34,25 +34,25 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-beans</artifactId>
-      <version>3.0.0.M3</version>
+      <version>${project.version}</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-context</artifactId>
-      <version>3.0.0.M3</version>
+      <version>${project.version}</version>
       <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-core</artifactId>
-      <version>3.0.0.M3</version>
+      <version>${project.version}</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-tx</artifactId>
-      <version>3.0.0.M3</version>
+      <version>${project.version}</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -74,17 +74,4 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
-  <build>
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-surefire-plugin</artifactId>
-          <configuration>
-            <junitArtifactName>junit:junit</junitArtifactName>
-          </configuration>
-        </plugin>
-      </plugins>
-    </pluginManagement>
-  </build>
 </project>
diff --git a/org.springframework.jms/pom.xml b/org.springframework.jms/pom.xml
index da76cf154f7..5426a8ac4b1 100644
--- a/org.springframework.jms/pom.xml
+++ b/org.springframework.jms/pom.xml
@@ -4,12 +4,12 @@
   <groupId>org.springframework</groupId>
   <artifactId>spring-jms</artifactId>
   <packaging>jar</packaging>
-  <version>3.0.0.M3</version>
+  <version>3.0.0.BUILD-SNAPSHOT</version>
   <parent>
     <groupId>org.springframework</groupId>
-    <artifactId>org.springframework.parent</artifactId>
-    <relativePath>../build-spring-framework</relativePath>
-    <version>3.0.0.M3</version>
+    <artifactId>spring-parent</artifactId>
+    <relativePath>../org.springframework.spring-parent</relativePath>
+    <version>3.0.0.BUILD-SNAPSHOT</version>
   </parent>
 
   <dependencies>
diff --git a/org.springframework.orm/pom.xml b/org.springframework.orm/pom.xml
index c7d22c0df13..2495f3b5849 100644
--- a/org.springframework.orm/pom.xml
+++ b/org.springframework.orm/pom.xml
@@ -4,12 +4,12 @@
   <groupId>org.springframework</groupId>
   <artifactId>spring-orm</artifactId>
   <packaging>jar</packaging>
-  <version>3.0.0.M3</version>
+  <version>3.0.0.BUILD-SNAPSHOT</version>
   <parent>
     <groupId>org.springframework</groupId>
-    <artifactId>org.springframework.parent</artifactId>
-    <relativePath>../build-spring-framework</relativePath>
-    <version>3.0.0.M3</version>
+    <artifactId>spring-parent</artifactId>
+    <relativePath>../org.springframework.spring-parent</relativePath>
+    <version>3.0.0.BUILD-SNAPSHOT</version>
   </parent>
 
   <dependencies>
@@ -135,49 +135,49 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-aop</artifactId>
-      <version>3.0.0.M3</version>
+      <version>${project.version}</version>
       <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-beans</artifactId>
-      <version>3.0.0.M3</version>
+      <version>${project.version}</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-context</artifactId>
-      <version>3.0.0.M3</version>
+      <version>${project.version}</version>
       <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-core</artifactId>
-      <version>3.0.0.M3</version>
+      <version>${project.version}</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-instrument-classloading</artifactId>
-      <version>3.0.0.M3</version>
+      <version>${project.version}</version>
       <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-jdbc</artifactId>
-      <version>3.0.0.M3</version>
+      <version>${project.version}</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-tx</artifactId>
-      <version>3.0.0.M3</version>
+      <version>${project.version}</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-web</artifactId>
-      <version>3.0.0.M3</version>
+      <version>${project.version}</version>
       <optional>true</optional>
     </dependency>
     <dependency>
@@ -220,20 +220,13 @@
   <build>
     <testResources>
       <testResource>
-        <directory>src/test/java</directory>
+        <directory>${pom.build.unitTestSourceDirectory}</directory>
         <includes>
           <include>**/*.xml</include>
         </includes>
       </testResource>
       <testResource>
-        <directory>src/main/java</directory>
-        <includes>
-          <include>**/*.xsd</include>
-        </includes>
-      </testResource>
-
-      <testResource>
-        <directory>../org.springframework.integration/src/main/java</directory>
+        <directory>${pom.build.sourceDirectory}</directory>
         <includes>
           <include>**/*.xsd</include>
         </includes>
diff --git a/org.springframework.oxm/pom.xml b/org.springframework.oxm/pom.xml
index 91ba450a102..6d8bc15d1fc 100644
--- a/org.springframework.oxm/pom.xml
+++ b/org.springframework.oxm/pom.xml
@@ -4,12 +4,12 @@
   <groupId>org.springframework</groupId>
   <artifactId>spring-oxm</artifactId>
   <packaging>jar</packaging>
-  <version>3.0.0.M3</version>
+  <version>3.0.0.BUILD-SNAPSHOT</version>
   <parent>
     <groupId>org.springframework</groupId>
-    <artifactId>org.springframework.parent</artifactId>
-    <relativePath>../build-spring-framework</relativePath>
-    <version>3.0.0.M3</version>
+    <artifactId>spring-parent</artifactId>
+    <relativePath>../org.springframework.spring-parent</relativePath>
+    <version>3.0.0.BUILD-SNAPSHOT</version>
   </parent>
 
   <dependencies>
@@ -58,19 +58,19 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-beans</artifactId>
-      <version>3.0.0.M3</version>
+      <version>${project.version}</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-context</artifactId>
-      <version>3.0.0.M3</version>
+      <version>${project.version}</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-core</artifactId>
-      <version>3.0.0.M3</version>
+      <version>${project.version}</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -104,17 +104,4 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
-  <build>
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-surefire-plugin</artifactId>
-          <configuration>
-            <junitArtifactName>junit:junit</junitArtifactName>
-          </configuration>
-        </plugin>
-      </plugins>
-    </pluginManagement>
-  </build>
 </project>
diff --git a/org.springframework.spring-library/build.xml b/org.springframework.spring-library/build.xml
index de198b0eb48..d74eff1015e 100644
--- a/org.springframework.spring-library/build.xml
+++ b/org.springframework.spring-library/build.xml
@@ -1,6 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project name="org.springframework.spring-library">
+<project name="org.springframework.spring-library" xmlns:maven="antlib:org.apache.maven.artifact.ant">
 	<property file="${basedir}/../build.properties"/>
 	<import file="${basedir}/../build-spring-framework/package-library.xml"/>
 	<import file="${basedir}/../spring-build/library/default.xml"/>
+
+
+	<target name="publish-maven-central-pom-only" depends="maven.init">
+		<maven:deploy>
+			<remoteRepository url="${maven.central.repository}"/>
+
+			<!-- Due to http://jira.codehaus.org/browse/MANTTASKS-103 in 2.0.8 on windows, fixed in 2.0.9 -->
+			<!-- e.g. file:L:\temp\maven-repo-test -->
+			<!-- 
+			<remoteRepository id="localDisk" url="file:${maven.local.staging.repository}"/>
+			-->
+
+			<pom file="${local.pom.output.file}"/>
+		</maven:deploy>
+	</target>
 </project>
diff --git a/org.springframework.spring-parent/build.xml b/org.springframework.spring-parent/build.xml
new file mode 100644
index 00000000000..f15ea33c05d
--- /dev/null
+++ b/org.springframework.spring-parent/build.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="org.springframework.spring-parent" xmlns:maven="antlib:org.apache.maven.artifact.ant">
+	<property file="${basedir}/../build.properties"/>
+	<import file="${basedir}/../build-spring-framework/package-library.xml"/>
+	<import file="${basedir}/../spring-build/library/default.xml"/>
+
+
+	<target name="publish-maven-central-pom-only" depends="maven.init">
+		<maven:deploy>
+			<remoteRepository url="${maven.central.repository}"/>
+
+			<!-- Due to http://jira.codehaus.org/browse/MANTTASKS-103 in 2.0.8 on windows, fixed in 2.0.9 -->
+			<!-- e.g. file:L:\temp\maven-repo-test -->
+			<!-- 
+			<remoteRepository id="localDisk" url="file:${maven.local.staging.repository}"/>
+			-->
+
+			<pom file="${local.pom.output.file}"/>
+		</maven:deploy>
+	</target>
+</project>
diff --git a/build-spring-framework/pom.xml b/org.springframework.spring-parent/pom.xml
similarity index 79%
rename from build-spring-framework/pom.xml
rename to org.springframework.spring-parent/pom.xml
index 2c1007c7774..4b7b9a836a2 100644
--- a/build-spring-framework/pom.xml
+++ b/org.springframework.spring-parent/pom.xml
@@ -4,10 +4,12 @@
 
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.springframework</groupId>
-  <artifactId>org.springframework.parent</artifactId>
-  <name>Spring Framework</name>
-  <version>3.0.0.M3</version>
+  <artifactId>spring-parent</artifactId>
   <packaging>pom</packaging>
+  <name>Spring Framework</name>
+  <version>3.0.0.BUILD-SNAPSHOT</version>
+  <description>Spring Framework</description>
+
 
   <repositories>
     <repository>
@@ -65,7 +67,7 @@
       <dependency>
         <artifactId>org.springframework</artifactId>
         <groupId>spring-context</groupId>
-        <version>3.0.0.M3</version>
+        <version>${project.version}</version>
         <exclusions>
           <exclusion>
             <groupId>com.oracle.oc4j</groupId>
@@ -96,15 +98,15 @@
       <distributionManagement>
         <site>
           <id>staging</id>
-          <url>file:///${user.dir}/target/staging</url>
+          <url>file:${maven.local.staging.repository}</url>
         </site>
         <repository>
           <id>staging</id>
-          <url>file:///${user.dir}/target/staging</url>
+          <url>file:${maven.local.staging.repository}</url>
         </repository>
         <snapshotRepository>
           <id>staging</id>
-          <url>file:///${user.dir}/target/staging</url>
+          <url>file:${maven.local.staging.repository}</url>
         </snapshotRepository>
       </distributionManagement>
     </profile>
@@ -186,39 +188,6 @@
     </plugins>
   </build>
   
-  <modules>
-    <module>../org.springframework.instrument</module>
-    <module>../org.springframework.instrument.classloading</module>
-    <module>../org.springframework.asm</module>
-    <module>../org.springframework.core</module>
-    <module>../org.springframework.expression</module>
-    <module>../org.springframework.core</module>
-    <module>../org.springframework.beans</module>
-    <module>../org.springframework.aop</module>
-    <module>../org.springframework.context</module>
-    <module>../org.springframework.transaction</module>
-    <module>../org.springframework.oxm</module>
-    <module>../org.springframework.jms</module>
-    <module>../org.springframework.aspects</module>
-    <module>../org.springframework.jdbc</module>
-    <module>../org.springframework.web</module>
-    <module>../org.springframework.orm</module>
-    <module>../org.springframework.context.support</module>
-    <module>../org.springframework.web.portlet</module>
-    <module>../org.springframework.web.servlet</module>
-    <module>../org.springframework.test</module>
-    <!--
-    <module>../org.springframework.integration-tests</module>
-    -->
-
-
-  </modules>
-
-  <url>http://static.springframework.org/docs</url>
-  <organization>
-    <name>SpringSource</name>
-    <url>http://www.springsource.com</url>
-  </organization>
   <pluginRepositories>
     <pluginRepository>
       <id>com.springsource.repository.bundles.milestone</id>
diff --git a/org.springframework.test/pom.xml b/org.springframework.test/pom.xml
index 44ffeafea07..8bad03d96a9 100644
--- a/org.springframework.test/pom.xml
+++ b/org.springframework.test/pom.xml
@@ -4,12 +4,12 @@
   <groupId>org.springframework</groupId>
   <artifactId>spring-test</artifactId>
   <packaging>jar</packaging>
-  <version>3.0.0.M3</version>
+  <version>3.0.0.BUILD-SNAPSHOT</version>
   <parent>
     <groupId>org.springframework</groupId>
-    <artifactId>org.springframework.parent</artifactId>
-    <relativePath>../build-spring-framework</relativePath>
-    <version>3.0.0.M3</version>
+    <artifactId>spring-parent</artifactId>
+    <relativePath>../org.springframework.spring-parent</relativePath>
+    <version>3.0.0.BUILD-SNAPSHOT</version>
   </parent>
 
   <dependencies>
@@ -89,61 +89,61 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-beans</artifactId>
-      <version>3.0.0.M3</version>
+      <version>${project.version}</version>
       <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-context</artifactId>
-      <version>3.0.0.M3</version>
+      <version>${project.version}</version>
       <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-core</artifactId>
-      <version>3.0.0.M3</version>
+      <version>${project.version}</version>
       <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-instrument-classloading</artifactId>
-      <version>3.0.0.M3</version>
+      <version>${project.version}</version>
       <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-jdbc</artifactId>
-      <version>3.0.0.M3</version>
+      <version>${project.version}</version>
       <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-orm</artifactId>
-      <version>3.0.0.M3</version>
+      <version>${project.version}</version>
       <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-tx</artifactId>
-      <version>3.0.0.M3</version>
+      <version>${project.version}</version>
       <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-web</artifactId>
-      <version>3.0.0.M3</version>
+      <version>${project.version}</version>
       <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-web-portlet</artifactId>
-      <version>3.0.0.M3</version>
+      <version>${project.version}</version>
       <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-webmvc</artifactId>
-      <version>3.0.0.M3</version>
+      <version>${project.version}</version>
       <optional>true</optional>
     </dependency>
     <dependency>
@@ -159,17 +159,4 @@
       <optional>true</optional>
     </dependency>
   </dependencies>
-  <build>
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-surefire-plugin</artifactId>
-          <configuration>
-            <junitArtifactName>junit:junit</junitArtifactName>
-          </configuration>
-        </plugin>
-      </plugins>
-    </pluginManagement>
-  </build>
 </project>
diff --git a/org.springframework.transaction/pom.xml b/org.springframework.transaction/pom.xml
index c58445158cd..1bb85c17ef1 100644
--- a/org.springframework.transaction/pom.xml
+++ b/org.springframework.transaction/pom.xml
@@ -4,12 +4,12 @@
   <groupId>org.springframework</groupId>
   <artifactId>spring-tx</artifactId>
   <packaging>jar</packaging>
-  <version>3.0.0.M3</version>
+  <version>3.0.0.BUILD-SNAPSHOT</version>
   <parent>
     <groupId>org.springframework</groupId>
-    <artifactId>org.springframework.parent</artifactId>
-    <relativePath>../build-spring-framework</relativePath>
-    <version>3.0.0.M3</version>
+    <artifactId>spring-parent</artifactId>
+    <relativePath>../org.springframework.spring-parent</relativePath>
+    <version>3.0.0.BUILD-SNAPSHOT</version>
   </parent>
 
   <dependencies>
@@ -54,25 +54,25 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-aop</artifactId>
-      <version>3.0.0.M3</version>
+      <version>${project.version}</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-beans</artifactId>
-      <version>3.0.0.M3</version>
+      <version>${project.version}</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-context</artifactId>
-      <version>3.0.0.M3</version>
+      <version>${project.version}</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-core</artifactId>
-      <version>3.0.0.M3</version>
+      <version>${project.version}</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -112,17 +112,4 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
-  <build>
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-surefire-plugin</artifactId>
-          <configuration>
-            <junitArtifactName>junit:junit</junitArtifactName>
-          </configuration>
-        </plugin>
-      </plugins>
-    </pluginManagement>
-  </build>
 </project>
diff --git a/org.springframework.web.portlet/pom.xml b/org.springframework.web.portlet/pom.xml
index d9cc595b1ae..f0f1dcef662 100644
--- a/org.springframework.web.portlet/pom.xml
+++ b/org.springframework.web.portlet/pom.xml
@@ -2,14 +2,14 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.springframework</groupId>
-  <artifactId>spring-web-portlet</artifactId>
+  <artifactId>spring-webmvc-portlet</artifactId>
   <packaging>jar</packaging>
-  <version>3.0.0.M3</version>
+  <version>3.0.0.BUILD-SNAPSHOT</version>
   <parent>
     <groupId>org.springframework</groupId>
-    <artifactId>org.springframework.parent</artifactId>
-    <relativePath>../build-spring-framework</relativePath>
-    <version>3.0.0.M3</version>
+    <artifactId>spring-parent</artifactId>
+    <relativePath>../org.springframework.spring-parent</relativePath>
+    <version>3.0.0.BUILD-SNAPSHOT</version>
   </parent>
 
   <dependencies>
@@ -58,37 +58,37 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-beans</artifactId>
-      <version>3.0.0.M3</version>
+      <version>${project.version}</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-context</artifactId>
-      <version>3.0.0.M3</version>
+      <version>${project.version}</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-core</artifactId>
-      <version>3.0.0.M3</version>
+      <version>${project.version}</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-web</artifactId>
-      <version>3.0.0.M3</version>
+      <version>${project.version}</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-webmvc</artifactId>
-      <version>3.0.0.M3</version>
+      <version>${project.version}</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-asm</artifactId>
-      <version>3.0.0.M3</version>
+      <version>${project.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/org.springframework.web.servlet/pom.xml b/org.springframework.web.servlet/pom.xml
index 7a23562f759..e235f8f4260 100644
--- a/org.springframework.web.servlet/pom.xml
+++ b/org.springframework.web.servlet/pom.xml
@@ -4,12 +4,12 @@
   <groupId>org.springframework</groupId>
   <artifactId>spring-webmvc</artifactId>
   <packaging>jar</packaging>
-  <version>3.0.0.M3</version>
+  <version>3.0.0.BUILD-SNAPSHOT</version>
   <parent>
     <groupId>org.springframework</groupId>
-    <artifactId>org.springframework.parent</artifactId>
-    <relativePath>../build-spring-framework</relativePath>
-    <version>3.0.0.M3</version>
+    <artifactId>spring-parent</artifactId>
+    <relativePath>../org.springframework.spring-parent</relativePath>
+    <version>3.0.0.BUILD-SNAPSHOT</version>
   </parent>
 
   <dependencies>
@@ -118,37 +118,37 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-beans</artifactId>
-      <version>3.0.0.M3</version>
+      <version>${project.version}</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-context</artifactId>
-      <version>3.0.0.M3</version>
+      <version>${project.version}</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-context-support</artifactId>
-      <version>3.0.0.M3</version>
+      <version>${project.version}</version>
       <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-core</artifactId>
-      <version>3.0.0.M3</version>
+      <version>${project.version}</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-oxm</artifactId>
-      <version>3.0.0.M3</version>
+      <version>${project.version}</version>
       <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-web</artifactId>
-      <version>3.0.0.M3</version>
+      <version>${project.version}</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -166,7 +166,7 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-asm</artifactId>
-      <version>3.0.0.M3</version>
+      <version>${project.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -194,17 +194,4 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
-  <build>
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-surefire-plugin</artifactId>
-          <configuration>
-            <junitArtifactName>junit:junit</junitArtifactName>
-          </configuration>
-        </plugin>
-      </plugins>
-    </pluginManagement>
-  </build>
 </project>
diff --git a/org.springframework.web/pom.xml b/org.springframework.web/pom.xml
index d85eb4c3424..9f1042f687a 100644
--- a/org.springframework.web/pom.xml
+++ b/org.springframework.web/pom.xml
@@ -4,12 +4,12 @@
   <groupId>org.springframework</groupId>
   <artifactId>spring-web</artifactId>
   <packaging>jar</packaging>
-  <version>3.0.0.M3</version>
+  <version>3.0.0.BUILD-SNAPSHOT</version>
   <parent>
     <groupId>org.springframework</groupId>
-    <artifactId>org.springframework.parent</artifactId>
-    <relativePath>../build-spring-framework</relativePath>
-    <version>3.0.0.M3</version>
+    <artifactId>spring-parent</artifactId>
+    <relativePath>../org.springframework.spring-parent</relativePath>
+    <version>3.0.0.BUILD-SNAPSHOT</version>
   </parent>
 
   <dependencies>
@@ -98,31 +98,31 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-aop</artifactId>
-      <version>3.0.0.M3</version>
+      <version>${project.version}</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-beans</artifactId>
-      <version>3.0.0.M3</version>
+      <version>${project.version}</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-context</artifactId>
-      <version>3.0.0.M3</version>
+      <version>${project.version}</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-core</artifactId>
-      <version>3.0.0.M3</version>
+      <version>${project.version}</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-oxm</artifactId>
-      <version>3.0.0.M3</version>
+      <version>${project.version}</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -162,17 +162,4 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
-  <build>
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-surefire-plugin</artifactId>
-          <configuration>
-            <junitArtifactName>junit:junit</junitArtifactName>
-          </configuration>
-        </plugin>
-      </plugins>
-    </pluginManagement>
-  </build>
 </project>