From f51ead3fb521a287392e38dde4d0117e1ac3dabb Mon Sep 17 00:00:00 2001
From: Donald Woods <dwoods@apache.org>
Date: Tue, 17 Aug 2010 15:25:27 +0000
Subject: [PATCH] OPENJPA-1712 more openjpa-maven-plugin tweaks

git-svn-id: https://svn.apache.org/repos/asf/openjpa/branches/2.0.x@986357 13f79535-47bb-0310-9956-ffa450edef68
---
 openjpa-integration/daytrader/pom.xml |  3 ++-
 openjpa-xmlstore/pom.xml              |  2 +-
 pom.xml                               | 12 ------------
 3 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/openjpa-integration/daytrader/pom.xml b/openjpa-integration/daytrader/pom.xml
index 3c448bd44..096b1d2d6 100644
--- a/openjpa-integration/daytrader/pom.xml
+++ b/openjpa-integration/daytrader/pom.xml
@@ -155,9 +155,10 @@
                     </execution>
                 </executions>
                 <dependencies>
+                    <!-- use o-p-j instead of openjpa to avoid cyclical dependency in maven graph -->
                     <dependency>
                         <groupId>org.apache.openjpa</groupId>
-                        <artifactId>openjpa</artifactId>
+                        <artifactId>openjpa-persistence-jdbc</artifactId>
                         <version>${project.version}</version>
                     </dependency>
                 </dependencies>
diff --git a/openjpa-xmlstore/pom.xml b/openjpa-xmlstore/pom.xml
index 8125daefa..59441b52c 100644
--- a/openjpa-xmlstore/pom.xml
+++ b/openjpa-xmlstore/pom.xml
@@ -103,9 +103,9 @@
                     </execution>
                 </executions>
                 <dependencies>
+                    <!-- use o-p-j instead of openjpa to avoid cyclical dependency in maven graph -->
                     <dependency>
                         <groupId>org.apache.openjpa</groupId>
-                        <!-- use o-p-j instead of openjpa to avoid cyclical dependency in maven graph -->
                         <artifactId>openjpa-persistence-jdbc</artifactId>
                         <version>${project.version}</version>
                     </dependency>
diff --git a/pom.xml b/pom.xml
index 24b0ac538..02f1b7192 100644
--- a/pom.xml
+++ b/pom.xml
@@ -576,18 +576,6 @@
                 <artifactId>jmock-junit3</artifactId>
                 <version>2.5.1</version>
             </dependency>
-            <dependency>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>openjpa-maven-plugin</artifactId>
-                <version>1.1</version>
-                <exclusions>
-                    <!-- remove cyclical dependency -->
-                    <exclusion>
-                        <groupId>org.apache.openjpa</groupId>
-                         <artifactId>openjpa</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
         </dependencies>
     </dependencyManagement>