From 010870ed56f6610196252d635b248b30fde0d09f Mon Sep 17 00:00:00 2001
From: Donald Woods <dwoods@apache.org>
Date: Fri, 6 Aug 2010 18:49:38 +0000
Subject: [PATCH] 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                    | 10 +++++++---
 openjpa-examples/pom.xml               | 15 +++++++++------
 openjpa-integration/daytrader/pom.xml  |  1 +
 openjpa-integration/examples/pom.xml   | 12 ++++++++----
 openjpa-integration/pom.xml            | 11 ++++++++---
 openjpa-integration/tck/pom.xml        | 12 ++++++++----
 openjpa-integration/validation/pom.xml |  2 ++
 openjpa-jdbc/pom.xml                   | 15 +++++++++------
 openjpa-kernel/pom.xml                 | 15 +++++++++------
 openjpa-lib/pom.xml                    | 15 +++++++++------
 openjpa-persistence/pom.xml            | 15 +++++++++------
 openjpa-project/pom.xml                | 12 ++++++++----
 pom.xml                                |  2 +-
 13 files changed, 88 insertions(+), 49 deletions(-)

diff --git a/openjpa-all/pom.xml b/openjpa-all/pom.xml
index eb3140daf..a8f34ea48 100644
--- a/openjpa-all/pom.xml
+++ b/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>
             <!--
diff --git a/openjpa-examples/pom.xml b/openjpa-examples/pom.xml
index eac2834e0..1641223e1 100644
--- a/openjpa-examples/pom.xml
+++ b/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>
diff --git a/openjpa-integration/daytrader/pom.xml b/openjpa-integration/daytrader/pom.xml
index 98a350405..b0c8f5576 100644
--- a/openjpa-integration/daytrader/pom.xml
+++ b/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>
diff --git a/openjpa-integration/examples/pom.xml b/openjpa-integration/examples/pom.xml
index 27235ff14..213798190 100644
--- a/openjpa-integration/examples/pom.xml
+++ b/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>
diff --git a/openjpa-integration/pom.xml b/openjpa-integration/pom.xml
index 4c0240273..d768861d0 100644
--- a/openjpa-integration/pom.xml
+++ b/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>
diff --git a/openjpa-integration/tck/pom.xml b/openjpa-integration/tck/pom.xml
index 4f207a44f..5c8b0d618 100644
--- a/openjpa-integration/tck/pom.xml
+++ b/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>
diff --git a/openjpa-integration/validation/pom.xml b/openjpa-integration/validation/pom.xml
index 2d201cf6a..e82cd177a 100644
--- a/openjpa-integration/validation/pom.xml
+++ b/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>
diff --git a/openjpa-jdbc/pom.xml b/openjpa-jdbc/pom.xml
index 47439cc95..97ebde25f 100644
--- a/openjpa-jdbc/pom.xml
+++ b/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>
diff --git a/openjpa-kernel/pom.xml b/openjpa-kernel/pom.xml
index d5cdfc409..6c8c94de4 100644
--- a/openjpa-kernel/pom.xml
+++ b/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>
diff --git a/openjpa-lib/pom.xml b/openjpa-lib/pom.xml
index 3a7a010c4..b797de904 100644
--- a/openjpa-lib/pom.xml
+++ b/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>
diff --git a/openjpa-persistence/pom.xml b/openjpa-persistence/pom.xml
index fda7a8db6..ebe8321c7 100644
--- a/openjpa-persistence/pom.xml
+++ b/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>
diff --git a/openjpa-project/pom.xml b/openjpa-project/pom.xml
index f1e7a4b63..e77637e1c 100644
--- a/openjpa-project/pom.xml
+++ b/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
diff --git a/pom.xml b/pom.xml
index 3177f4409..fb88e5d4d 100644
--- a/pom.xml
+++ b/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>