diff --git a/pom.xml b/pom.xml
index 3a19c27fa..8ad1527ca 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,20 +21,24 @@
     Maven release plugin requires the project tag to be on a single line. 
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
     <parent>
       <groupId>org.apache</groupId>
       <artifactId>apache</artifactId>
       <version>6</version>
     </parent>
-    <modelVersion>4.0.0</modelVersion>
-    <prerequisites>
-        <maven>2.0.4</maven>
-    </prerequisites>
+
     <groupId>org.apache.openjpa</groupId>
     <artifactId>openjpa-parent</artifactId>
     <packaging>pom</packaging>
     <name>OpenJPA Parent POM</name>
     <description>Apache OpenJPA implementation of JSR-317 JPA 2.0</description>
+    <!--
+        Changing this version needs to also be done in all children poms
+        See: http://jira.codehaus.org/browse/MNG-624
+    -->
+    <version>2.0.0-SNAPSHOT</version>
 
     <properties>
         <openjpa.version>${pom.version}</openjpa.version>
@@ -50,17 +54,28 @@
         <hsqldb.version>1.8.0.10</hsqldb.version>
     </properties>
 
-    <!--
-        Changing this version needs to also be done in all children poms
-        See: http://jira.codehaus.org/browse/MNG-624
-    -->
-    <version>2.0.0-SNAPSHOT</version>
+    <licenses>
+        <license>
+            <name>Apache Software License 2.0</name>
+            <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+            <distribution>repo</distribution>
+        </license>
+    </licenses>
+
+    <organization>
+        <name>Apache Software Foundation</name>
+        <url>http://www.apache.org</url>
+    </organization>
+
     <url>http://openjpa.apache.org</url>
+
     <issueManagement>
         <system>jira</system>
         <url>http://issues.apache.org/jira/browse/OPENJPA</url>
     </issueManagement>
+
     <inceptionYear>2006</inceptionYear>
+
     <mailingLists>
         <mailingList>
             <name>OpenJPA Developer List</name>
@@ -84,17 +99,29 @@
             <archive>http://mail-archives.apache.org/mod_mbox/openjpa-commits/</archive>
         </mailingList>
     </mailingLists>
-    <licenses>
-        <license>
-            <name>Apache Software License 2.0</name>
-            <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-            <distribution>repo</distribution>
-        </license>
-    </licenses>
-    <organization>
-        <name>Apache Software Foundation</name>
-        <url>http://www.apache.org</url>
-    </organization>
+
+    <distributionManagement>
+      <repository>
+        <id>local-repository</id>
+        <url>scp://people.apache.org/home/${user.name}/public_html/openjpa/${pom.version}/staging-repo</url>
+      </repository>
+      <snapshotRepository>
+        <id>local-repository</id>
+        <url>scp://people.apache.org/home/${user.name}/public_html/openjpa/${pom.version}/staging-repo</url>
+        <uniqueVersion>false</uniqueVersion>
+      </snapshotRepository>
+      <site>
+        <id>people.apache.org</id>
+        <url>scp://people.apache.org/home/${user.name}/public_html/openjpa/${pom.version}/staging-site</url>
+      </site>
+    </distributionManagement>
+
+    <scm>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/openjpa/trunk</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/openjpa/trunk</developerConnection>
+        <url>http://svn.apache.org/repos/asf/openjpa/trunk</url>
+    </scm>
+
     <modules>
         <module>openjpa-lib</module>
         <module>openjpa-kernel</module>
@@ -895,6 +922,7 @@
                 </plugin>
             </plugins>
         </pluginManagement>
+
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -1032,44 +1060,4 @@
         </plugins>
     </reporting>
 
-    <distributionManagement>
-      <repository>
-        <id>local-repository</id>
-        <url>scp://people.apache.org/home/${user.name}/public_html/openjpa/${pom.version}/staging-repo</url>
-      </repository>
-      <snapshotRepository>
-        <id>local-repository</id>
-        <url>scp://people.apache.org/home/${user.name}/public_html/openjpa/${pom.version}/staging-repo</url>
-        <uniqueVersion>false</uniqueVersion>
-      </snapshotRepository>
-      <site>
-        <id>people.apache.org</id>
-        <url>scp://people.apache.org/home/${user.name}/public_html/openjpa/${pom.version}/staging-site</url>
-      </site>
-    </distributionManagement>
-
-    <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/openjpa/trunk</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/openjpa/trunk</developerConnection>
-        <url>http://svn.apache.org/repos/asf/openjpa/trunk</url>
-    </scm>
-
-    <!-- added so the build can find geronimo-validation_1.0_spec-1.0 -->
-    <repositories>
-        <repository>
-            <id>apache.nexus.staging</id>
-            <name>Apache Staging Repository</name>
-            <layout>default</layout>
-            <url>https://repository.apache.org/content/repositories/staging/</url>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-            <releases>
-                <enabled>true</enabled>
-                <updatePolicy>always</updatePolicy>
-                <checksumPolicy>warn</checksumPolicy>
-            </releases>
-        </repository>
-    </repositories>
-
 </project>