OPENJPA-1712 Some POM cleanup

git-svn-id: https://svn.apache.org/repos/asf/openjpa/branches/2.0.x@983095 13f79535-47bb-0310-9956-ffa450edef68

openjpa-all/pom.xml

@@ -22,16 +22,20 @@
     the release plugin.
 -->
 <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>
-    <artifactId>openjpa-all</artifactId>
+
-    <packaging>jar</packaging>
-    <name>OpenJPA Aggregate Jar with Dependencies</name>
     <parent>
         <groupId>org.apache.openjpa</groupId>
         <artifactId>openjpa-parent</artifactId>
         <version>2.0.1-SNAPSHOT</version>
     </parent>
 
+    <groupId>org.apache.openjpa</groupId>
+    <artifactId>openjpa-all</artifactId>
+    <packaging>jar</packaging>
+    <name>OpenJPA Aggregate Jar with Dependencies</name>
+
     <build>
         <plugins>
             <!--

openjpa-examples/pom.xml

@@ -22,18 +22,21 @@
     the release plugin.
 -->
 <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>
-    <groupId>org.apache.openjpa</groupId>
+
-    <artifactId>openjpa-examples</artifactId>
-    <packaging>jar</packaging>
-    <name>OpenJPA Examples</name>
-    <description>OpenJPA Examples</description>
-    <url>http://openjpa.apache.org</url>
     <parent>
         <groupId>org.apache.openjpa</groupId>
         <artifactId>openjpa-parent</artifactId>
         <version>2.0.1-SNAPSHOT</version>
     </parent>
+
+    <groupId>org.apache.openjpa</groupId>
+    <artifactId>openjpa-examples</artifactId>
+    <packaging>jar</packaging>
+    <name>OpenJPA Examples</name>
+    <description>OpenJPA Examples</description>
+
     <dependencies>
         <dependency>
             <groupId>org.apache.openjpa</groupId>

openjpa-integration/daytrader/pom.xml

@@ -21,6 +21,7 @@
     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>

openjpa-integration/examples/pom.xml

@@ -31,17 +31,21 @@
     the release plugin.
 -->
 <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>
-    <artifactId>openjpa-integration-examples</artifactId>
+
-    <packaging>pom</packaging>
-    <name>OpenJPA Integration Tests - Examples</name>
-    <description>OpenJPA Integration Tests - Examples</description>
     <parent>
         <groupId>org.apache.openjpa</groupId>
         <artifactId>openjpa-integration</artifactId>
         <version>2.0.1-SNAPSHOT</version>
     </parent>
 
+    <groupId>org.apache.openjpa</groupId>
+    <artifactId>openjpa-integration-examples</artifactId>
+    <packaging>pom</packaging>
+    <name>OpenJPA Integration Tests - Examples</name>
+    <description>OpenJPA Integration Tests - Examples</description>
+
     <profiles>
     <profile>
     <id>examples-profile</id>

openjpa-integration/pom.xml

@@ -22,15 +22,20 @@
     the release plugin.
 -->
 <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>
-    <artifactId>openjpa-integration</artifactId>
+
-    <packaging>pom</packaging>
-    <name>OpenJPA Integration Tests</name>
     <parent>
         <groupId>org.apache.openjpa</groupId>
         <artifactId>openjpa-parent</artifactId>
         <version>2.0.1-SNAPSHOT</version>
     </parent>
+
+    <groupId>org.apache.openjpa</groupId>
+    <artifactId>openjpa-integration</artifactId>
+    <packaging>pom</packaging>
+    <name>OpenJPA Integration Tests</name>
+
     <modules>
         <module>daytrader</module>
         <module>examples</module>

openjpa-integration/tck/pom.xml

@@ -62,17 +62,21 @@
     the release plugin.
 -->
 <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>
-    <artifactId>openjpa-integration-tck</artifactId>
+
-    <packaging>pom</packaging>
-    <name>OpenJPA Integration Tests - JPA TCK</name>
-    <description>OpenJPA Integration Tests - JPA TCK</description>
     <parent>
         <groupId>org.apache.openjpa</groupId>
         <artifactId>openjpa-integration</artifactId>
         <version>2.0.1-SNAPSHOT</version>
     </parent>
 
+    <groupId>org.apache.openjpa</groupId>
+    <artifactId>openjpa-integration-tck</artifactId>
+    <packaging>pom</packaging>
+    <name>OpenJPA Integration Tests - JPA TCK</name>
+    <description>OpenJPA Integration Tests - JPA TCK</description>
+
     <properties>
         <openjpa.Log>DefaultLevel=WARN</openjpa.Log>
     </properties>

openjpa-integration/validation/pom.xml

@@ -21,6 +21,7 @@
     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>
@@ -29,6 +30,7 @@
         <version>2.0.1-SNAPSHOT</version>
     </parent>
 
+    <groupId>org.apache.openjpa</groupId>
     <artifactId>openjpa-integration-validation</artifactId>
     <packaging>jar</packaging>
     <name>OpenJPA Integration Tests - Bean Validation</name>

openjpa-jdbc/pom.xml

@@ -21,18 +21,21 @@
     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>
-    <groupId>org.apache.openjpa</groupId>
+
-    <artifactId>openjpa-jdbc</artifactId>
-    <packaging>jar</packaging>
-    <name>OpenJPA JDBC</name>
-    <description>OpenJPA JDBC</description>
-    <url>http://openjpa.apache.org</url>
     <parent>
         <groupId>org.apache.openjpa</groupId>
         <artifactId>openjpa-parent</artifactId>
         <version>2.0.1-SNAPSHOT</version>
     </parent>
+
+    <groupId>org.apache.openjpa</groupId>
+    <artifactId>openjpa-jdbc</artifactId>
+    <packaging>jar</packaging>
+    <name>OpenJPA JDBC</name>
+    <description>OpenJPA JDBC</description>
+
     <dependencies>
         <dependency>
             <groupId>org.apache.openjpa</groupId>

openjpa-kernel/pom.xml

@@ -21,18 +21,21 @@
     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>
-    <groupId>org.apache.openjpa</groupId>
+
-    <artifactId>openjpa-kernel</artifactId>
-    <packaging>jar</packaging>
-    <name>OpenJPA Kernel</name>
-    <description>OpenJPA Kernel</description>
-    <url>http://openjpa.apache.org</url>
     <parent>
         <groupId>org.apache.openjpa</groupId>
         <artifactId>openjpa-parent</artifactId>
         <version>2.0.1-SNAPSHOT</version>
     </parent>
+
+    <groupId>org.apache.openjpa</groupId>
+    <artifactId>openjpa-kernel</artifactId>
+    <packaging>jar</packaging>
+    <name>OpenJPA Kernel</name>
+    <description>OpenJPA Kernel</description>
+
     <dependencies>
         <dependency>
             <groupId>org.apache.openjpa</groupId>

openjpa-lib/pom.xml

@@ -21,18 +21,21 @@
     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>
-    <groupId>org.apache.openjpa</groupId>
+
-    <artifactId>openjpa-lib</artifactId>
-    <packaging>jar</packaging>
-    <name>OpenJPA Utilities Library</name>
-    <description>OpenJPA Utilities Library</description>
-    <url>http://openjpa.apache.org</url>
     <parent>
         <groupId>org.apache.openjpa</groupId>
         <artifactId>openjpa-parent</artifactId>
         <version>2.0.1-SNAPSHOT</version>
     </parent>
+
+    <groupId>org.apache.openjpa</groupId>
+    <artifactId>openjpa-lib</artifactId>
+    <packaging>jar</packaging>
+    <name>OpenJPA Utilities Library</name>
+    <description>OpenJPA Utilities Library</description>
+
     <dependencies>
         <dependency>
             <groupId>jakarta-regexp</groupId>

openjpa-persistence/pom.xml

@@ -21,18 +21,21 @@
     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>
-    <groupId>org.apache.openjpa</groupId>
+
-    <artifactId>openjpa-persistence</artifactId>
-    <packaging>jar</packaging>
-    <name>OpenJPA Persistence</name>
-    <description>OpenJPA Persistence</description>
-    <url>http://openjpa.apache.org</url>
     <parent>
         <groupId>org.apache.openjpa</groupId>
         <artifactId>openjpa-parent</artifactId>
         <version>2.0.1-SNAPSHOT</version>
     </parent>
+
+    <groupId>org.apache.openjpa</groupId>
+    <artifactId>openjpa-persistence</artifactId>
+    <packaging>jar</packaging>
+    <name>OpenJPA Persistence</name>
+    <description>OpenJPA Persistence</description>
+
     <dependencies>
         <dependency>
             <groupId>org.apache.openjpa</groupId>

openjpa-project/pom.xml

@@ -33,17 +33,21 @@
         Note that to sign the release, you need to have "gpg" installed and
         create a key. See http://apache.org/dev/release-signing.html
     -->
+
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>apache-openjpa</artifactId>
+
-    <packaging>pom</packaging>
-    <name>OpenJPA Project Docs and Assemblies</name>
-    <description>OpenJPA Project Docs and Assemblies</description>
     <parent>
         <groupId>org.apache.openjpa</groupId>
         <artifactId>openjpa-parent</artifactId>
         <version>2.0.1-SNAPSHOT</version>
     </parent>
 
+    <groupId>org.apache.openjpa</groupId>
+    <artifactId>apache-openjpa</artifactId>
+    <packaging>pom</packaging>
+    <name>OpenJPA Project Docs and Assemblies</name>
+    <description>OpenJPA Project Docs and Assemblies</description>
+
     <properties>
         <openjpa.release.keyAlias>
             ${user.name}@apache.org

pom.xml

@@ -26,7 +26,7 @@
     <parent>
       <groupId>org.apache</groupId>
       <artifactId>apache</artifactId>
-      <version>6</version>
+      <version>7</version>
     </parent>
 
     <groupId>org.apache.openjpa</groupId>