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/10/01 22:24:41 UTC
svn commit: r1003634 - in /openjpa/trunk: ./ openjpa-integration/daytrader/
openjpa-integration/jmx/ openjpa-integration/slf4j/
openjpa-integration/validation/ openjpa-persistence-jdbc/
openjpa-persistence-locking/ openjpa-slice/
Author: dwoods
Date: Fri Oct 1 20:24:41 2010
New Revision: 1003634
URL: http://svn.apache.org/viewvc?rev=1003634&view=rev
Log:
minor pom updates
Modified:
openjpa/trunk/openjpa-integration/daytrader/pom.xml
openjpa/trunk/openjpa-integration/jmx/pom.xml
openjpa/trunk/openjpa-integration/slf4j/pom.xml
openjpa/trunk/openjpa-integration/validation/pom.xml
openjpa/trunk/openjpa-persistence-jdbc/pom.xml
openjpa/trunk/openjpa-persistence-locking/pom.xml
openjpa/trunk/openjpa-slice/pom.xml
openjpa/trunk/pom.xml
Modified: openjpa/trunk/openjpa-integration/daytrader/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-integration/daytrader/pom.xml?rev=1003634&r1=1003633&r2=1003634&view=diff
==============================================================================
--- openjpa/trunk/openjpa-integration/daytrader/pom.xml (original)
+++ openjpa/trunk/openjpa-integration/daytrader/pom.xml Fri Oct 1 20:24:41 2010
@@ -170,6 +170,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
+ <argLine>${surefire.jvm.args}</argLine>
<excludes>
<!-- exclude classes that end with 'Test'; these
are not test cases per OpenJPA standards -->
Modified: openjpa/trunk/openjpa-integration/jmx/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-integration/jmx/pom.xml?rev=1003634&r1=1003633&r2=1003634&view=diff
==============================================================================
--- openjpa/trunk/openjpa-integration/jmx/pom.xml (original)
+++ openjpa/trunk/openjpa-integration/jmx/pom.xml Fri Oct 1 20:24:41 2010
@@ -61,8 +61,8 @@
</dependency>
</dependencies>
- <build>
- <plugins>
+ <build>
+ <plugins>
<!-- Extract the common test support files from o-p-j-tests.jar -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -90,38 +90,41 @@
</executions>
</plugin>
- <plugin>
- <!-- Use openjpa maven plugin to enhance the domain model classes -->
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>openjpa-maven-plugin</artifactId>
- <configuration>
- <includes>org/apache/openjpa/integration/jmx/*.class</includes>
- <addDefaultConstructor>true</addDefaultConstructor>
- <enforcePropertyRestrictions>true</enforcePropertyRestrictions>
- <!-- persistenceXmlFile>${project.basedir}/src/test/resources/META-INF/persistence.xml</persistenceXmlFile-->
- </configuration>
- <executions>
- <execution>
- <id>enhancer</id>
- <phase>process-test-classes</phase>
- <goals>
- <goal>test-enhance</goal>
- </goals>
- </execution>
- </executions>
- <dependencies>
- <dependency>
- <groupId>org.apache.openjpa</groupId>
- <artifactId>openjpa-all</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
- </plugin>
- <plugin>
- <!-- The surefire plugin is used to run the jUnit tests -->
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
+ <plugin>
+ <!-- Use openjpa maven plugin to enhance the domain model classes -->
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>openjpa-maven-plugin</artifactId>
+ <configuration>
+ <includes>org/apache/openjpa/integration/jmx/*.class</includes>
+ <addDefaultConstructor>true</addDefaultConstructor>
+ <enforcePropertyRestrictions>true</enforcePropertyRestrictions>
+ <!-- persistenceXmlFile>${project.basedir}/src/test/resources/META-INF/persistence.xml</persistenceXmlFile-->
+ </configuration>
+ <executions>
+ <execution>
+ <id>enhancer</id>
+ <phase>process-test-classes</phase>
+ <goals>
+ <goal>test-enhance</goal>
+ </goals>
+ </execution>
+ </executions>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.openjpa</groupId>
+ <artifactId>openjpa-all</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ <plugin>
+ <!-- The surefire plugin is used to run the jUnit tests -->
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <argLine>${surefire.jvm.args}</argLine>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
Modified: openjpa/trunk/openjpa-integration/slf4j/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-integration/slf4j/pom.xml?rev=1003634&r1=1003633&r2=1003634&view=diff
==============================================================================
--- openjpa/trunk/openjpa-integration/slf4j/pom.xml (original)
+++ openjpa/trunk/openjpa-integration/slf4j/pom.xml Fri Oct 1 20:24:41 2010
@@ -137,6 +137,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
+ <argLine>${surefire.jvm.args}</argLine>
<excludes>
<!-- exclude classes that end with 'Test'; these
are not test cases per OpenJPA standards -->
Modified: openjpa/trunk/openjpa-integration/validation/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-integration/validation/pom.xml?rev=1003634&r1=1003633&r2=1003634&view=diff
==============================================================================
--- openjpa/trunk/openjpa-integration/validation/pom.xml (original)
+++ openjpa/trunk/openjpa-integration/validation/pom.xml Fri Oct 1 20:24:41 2010
@@ -194,7 +194,7 @@
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
- <phase>test-compile</phase>
+ <phase>process-test-classes</phase>
<configuration>
<tasks>
<ant antfile="src/main/ant/enhancer.xml" target="enhance" inheritRefs="true">
Modified: openjpa/trunk/openjpa-persistence-jdbc/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/pom.xml?rev=1003634&r1=1003633&r2=1003634&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/pom.xml (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/pom.xml Fri Oct 1 20:24:41 2010
@@ -55,6 +55,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
+ <argLine>${surefire.jvm.args}</argLine>
<includes>
<include>org/apache/openjpa/persistence/enhance/DynamicEnhancementSuite.java</include>
</includes>
@@ -775,7 +776,7 @@
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
- <phase>test-compile</phase>
+ <phase>process-test-classes</phase>
<configuration>
<tasks>
<ant antfile="src/main/ant/enhancer.xml" target="enhance" inheritRefs="true">
@@ -798,6 +799,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
+ <argLine>${surefire.jvm.args}</argLine>
<excludes>
<!-- exclude classes that end with 'Test'; these
are not test cases per OpenJPA standards -->
Modified: openjpa/trunk/openjpa-persistence-locking/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-locking/pom.xml?rev=1003634&r1=1003633&r2=1003634&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-locking/pom.xml (original)
+++ openjpa/trunk/openjpa-persistence-locking/pom.xml Fri Oct 1 20:24:41 2010
@@ -724,7 +724,7 @@
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
- <phase>test-compile</phase>
+ <phase>process-test-classes</phase>
<configuration>
<tasks>
<ant antfile="src/test/ant/enhancer.xml" target="enhance" inheritRefs="true">
@@ -747,6 +747,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
+ <argLine>${surefire.jvm.args}</argLine>
<excludes>
<!--
exclude classes that end with 'Test'; these are not test cases per OpenJPA standards
Modified: openjpa/trunk/openjpa-slice/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-slice/pom.xml?rev=1003634&r1=1003633&r2=1003634&view=diff
==============================================================================
--- openjpa/trunk/openjpa-slice/pom.xml (original)
+++ openjpa/trunk/openjpa-slice/pom.xml Fri Oct 1 20:24:41 2010
@@ -108,7 +108,7 @@
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
- <phase>test-compile</phase>
+ <phase>process-test-classes</phase>
<configuration>
<tasks>
<ant antfile="src/main/ant/enhancer.xml" target="enhance" inheritRefs="true">
Modified: openjpa/trunk/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/trunk/pom.xml?rev=1003634&r1=1003633&r2=1003634&view=diff
==============================================================================
--- openjpa/trunk/pom.xml (original)
+++ openjpa/trunk/pom.xml Fri Oct 1 20:24:41 2010
@@ -694,7 +694,7 @@
<argLine>${surefire.jvm.args}</argLine>
<useFile>false</useFile>
<trimStackTrace>false</trimStackTrace>
- <useSystemClassLoader>true</useSystemClassLoader>
+ <useSystemClassLoader>false</useSystemClassLoader>
<systemProperties>
<property>
<name>openjpa.Log</name>
@@ -733,14 +733,6 @@
<value>${derby.locks.waitTimeout}</value>
</property>
<property>
- <name>derby.storage.pageCacheSize</name>
- <value>10000</value>
- </property>
- <property>
- <name>derby.storage.initialPages</name>
- <value>10</value>
- </property>
- <property>
<name>openjpa.ConnectionProperties</name>
<value>${dbcp.args}</value>
</property>