Author: dwoods
Date: Tue Aug 17 15:25:27 2010
New Revision: 986357
URL: http://svn.apache.org/viewvc?rev=986357&view=rev
Log:
OPENJPA-1712 more openjpa-maven-plugin tweaks
Modified:
openjpa/branches/2.0.x/openjpa-integration/daytrader/pom.xml
openjpa/branches/2.0.x/openjpa-xmlstore/pom.xml
openjpa/branches/2.0.x/pom.xml
Modified: openjpa/branches/2.0.x/openjpa-integration/daytrader/pom.xml
URL:
http://svn.apache.org/viewvc/openjpa/branches/2.0.x/openjpa-integration/daytrader/pom.xml?rev=986357&r1=986356&r2=986357&view=diff
==============================================================================
--- openjpa/branches/2.0.x/openjpa-integration/daytrader/pom.xml (original)
+++ openjpa/branches/2.0.x/openjpa-integration/daytrader/pom.xml Tue Aug 17
15:25:27 2010
@@ -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>
Modified: openjpa/branches/2.0.x/openjpa-xmlstore/pom.xml
URL:
http://svn.apache.org/viewvc/openjpa/branches/2.0.x/openjpa-xmlstore/pom.xml?rev=986357&r1=986356&r2=986357&view=diff
==============================================================================
--- openjpa/branches/2.0.x/openjpa-xmlstore/pom.xml (original)
+++ openjpa/branches/2.0.x/openjpa-xmlstore/pom.xml Tue Aug 17 15:25:27 2010
@@ -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>
Modified: openjpa/branches/2.0.x/pom.xml
URL:
http://svn.apache.org/viewvc/openjpa/branches/2.0.x/pom.xml?rev=986357&r1=986356&r2=986357&view=diff
==============================================================================
--- openjpa/branches/2.0.x/pom.xml (original)
+++ openjpa/branches/2.0.x/pom.xml Tue Aug 17 15:25:27 2010
@@ -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>
