You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openjpa.apache.org by dw...@apache.org on 2010/08/19 23:40:58 UTC
svn commit: r987322 - in /openjpa/branches/2.0.x:
openjpa-testsupport/pom.xml pom.xml
Author: dwoods
Date: Thu Aug 19 21:40:57 2010
New Revision: 987322
URL: http://svn.apache.org/viewvc?rev=987322&view=rev
Log:
OPENJPA-1712 Use maven-dependency-plugin instead of maven-antrun-plugin for jar extractions
Modified:
openjpa/branches/2.0.x/openjpa-testsupport/pom.xml
openjpa/branches/2.0.x/pom.xml
Modified: openjpa/branches/2.0.x/openjpa-testsupport/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/branches/2.0.x/openjpa-testsupport/pom.xml?rev=987322&r1=987321&r2=987322&view=diff
==============================================================================
--- openjpa/branches/2.0.x/openjpa-testsupport/pom.xml (original)
+++ openjpa/branches/2.0.x/openjpa-testsupport/pom.xml Thu Aug 19 21:40:57 2010
@@ -42,6 +42,7 @@
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-persistence-jdbc</artifactId>
<version>${project.version}</version>
+ <scope>test</scope>
</dependency>
<!-- need a depend on o-p-j tests jar -->
<dependency>
@@ -61,26 +62,26 @@
<build>
<plugins>
<plugin>
- <!--
- Manually build a subset jar of o-p-j-tests.jar
- -->
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
+ <artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
- <id>extract-jar</id>
+ <id>unpack</id>
<phase>test-compile</phase>
<goals>
- <goal>run</goal>
+ <goal>unpack</goal>
</goals>
<configuration>
- <tasks>
- <unjar overwrite="true" dest="${project.build.testOutputDirectory}">
- <fileset dir="${basedir}/../openjpa-persistence-jdbc">
- <include name="target/openjpa-persistence-jdbc-${project.version}-tests.jar" />
- </fileset>
- </unjar>
- </tasks>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.apache.openjpa</groupId>
+ <artifactId>openjpa-persistence-jdbc</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ <overWrite>true</overWrite>
+ <outputDirectory>${project.build.testOutputDirectory}</outputDirectory>
+ </artifactItem>
+ </artifactItems>
</configuration>
</execution>
</executions>
@@ -88,6 +89,16 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>default-jar</id>
+ <phase>none</phase>
+ </execution>
+ <execution>
+ <id>attach-tests</id>
+ <goals>
+ <goal>test-jar</goal>
+ </goals>
<configuration>
<includes>
<!-- Note: Including entities in this jar will
@@ -100,6 +111,8 @@
<include>META-INF/persistence.xml</include>
</includes>
</configuration>
+ </execution>
+ </executions>
</plugin>
<!-- Don't run any of the extracted tests here... -->
<plugin>
Modified: openjpa/branches/2.0.x/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/branches/2.0.x/pom.xml?rev=987322&r1=987321&r2=987322&view=diff
==============================================================================
--- openjpa/branches/2.0.x/pom.xml (original)
+++ openjpa/branches/2.0.x/pom.xml Thu Aug 19 21:40:57 2010
@@ -672,6 +672,11 @@
</excludes>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>2.1</version>
+ </plugin>
<!-- inherited from apache-7.pom, but need config updates -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>