Author: dwoods
Date: Wed Jun 10 15:55:14 2009
New Revision: 783404
URL: http://svn.apache.org/viewvc?rev=783404&view=rev
Log:
OPENJPA-1130 Use maven-jar-plugin to create a o-p-j-tests.jar to share base
TestCase classes across modules
Modified:
openjpa/trunk/openjpa-persistence-jdbc/pom.xml
openjpa/trunk/openjpa-slice/pom.xml
openjpa/trunk/openjpa/pom.xml
Modified: openjpa/trunk/openjpa-persistence-jdbc/pom.xml
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/pom.xml?rev=783404&r1=783403&r2=783404&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/pom.xml (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/pom.xml Wed Jun 10 15:55:14 2009
@@ -611,6 +611,33 @@
</execution>
</executions>
</plugin>
+ <!--
+ Create a o-p-j-tests.jar so we can reuse some of the base
+ TestCase classes in other modules, like openjpa-integration.
+ -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>test-jar</goal>
+ </goals>
+ <configuration>
+ <includes>
+ <!-- Note: Including entities in this jar will
+ cause problems for any modules that need
+ to enhance their own entities.
+ -->
+
<include>**/org/apache/openjpa/persistence/test/*.class</include>
+ <include>META-INF/LICENSE*</include>
+ <include>META-INF/NOTICE*</include>
+ <include>META-INF/DISCLAIM*</include>
+ </includes>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
@@ -779,10 +806,11 @@
<exclude>org/apache/openjpa/persistence/meta/TestSequenceAssigned.java</exclude>
<exclude>org/apache/openjpa/persistence/meta/TestValueStrategies.java</exclude>
<exclude>org/apache/openjpa/persistence/meta/TestXMLPersistenceMetaDataSerializer.java</exclude>
-
<!-- TestPMMemory creates heapdumps etc and there's no
real asserts within the test. -->
<exclude>org/apache/openjpa/persistence/kernel/TestPMMemory.java</exclude>
-
+ <!-- You can exclude the lockmgr test to save ~15 mins.
+
<exclude>org/apache/openjpa/persistence/lockmgr/*.java</exclude>
+ -->
</excludes>
<systemProperties>
<property>
@@ -803,7 +831,7 @@
</property>
<!-- following causes lockmgr test failures
<property>
- <name>derby.locks.deadlockTimeout</name>
+ <name>derby.locks.waitTimeout</name>
<value>6</value>
</property>
-->
Modified: openjpa/trunk/openjpa-slice/pom.xml
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-slice/pom.xml?rev=783404&r1=783403&r2=783404&view=diff
==============================================================================
--- openjpa/trunk/openjpa-slice/pom.xml (original)
+++ openjpa/trunk/openjpa-slice/pom.xml Wed Jun 10 15:55:14 2009
@@ -62,6 +62,13 @@
<version>${pom.version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.openjpa</groupId>
+ <artifactId>openjpa-persistence-jdbc</artifactId>
+ <version>${pom.version}</version>
+ <classifier>tests</classifier>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<profiles>
<!-- Profile for testing with Apache Derby -->
Modified: openjpa/trunk/openjpa/pom.xml
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa/pom.xml?rev=783404&r1=783403&r2=783404&view=diff
==============================================================================
--- openjpa/trunk/openjpa/pom.xml (original)
+++ openjpa/trunk/openjpa/pom.xml Wed Jun 10 15:55:14 2009
@@ -55,8 +55,10 @@
<include name="*/target/openjpa-*.jar"
/>
<exclude
name="*/target/openjpa-examples-*.jar" />
<exclude
name="*/target/openjpa-all-*.jar" />
+ <exclude name="**/*-tests.jar" />
<exclude name="**/*-sources.jar" />
<exclude name="**/*-javadoc.jar" />
+ <exclude
name="openjpa-integration/**/target/openjpa-all-*.jar" />
</fileset>
</unjar>
