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/09/13 19:53:01 UTC
svn commit: r996618 - in /openjpa/trunk/openjpa-integration:
daytrader/pom.xml jmx/pom.xml slf4j/pom.xml validation/pom.xml
Author: dwoods
Date: Mon Sep 13 17:53:00 2010
New Revision: 996618
URL: http://svn.apache.org/viewvc?rev=996618&view=rev
Log:
OPENJPA-1791 remove obsolete depends on openjpa-testsupport
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
Modified: openjpa/trunk/openjpa-integration/daytrader/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-integration/daytrader/pom.xml?rev=996618&r1=996617&r2=996618&view=diff
==============================================================================
--- openjpa/trunk/openjpa-integration/daytrader/pom.xml (original)
+++ openjpa/trunk/openjpa-integration/daytrader/pom.xml Mon Sep 13 17:53:00 2010
@@ -47,7 +47,7 @@
<dependencies>
<dependency>
<groupId>org.apache.openjpa</groupId>
- <artifactId>openjpa-all</artifactId>
+ <artifactId>openjpa</artifactId>
<version>${project.version}</version>
</dependency>
<!-- Maybe one day we can used published artifacts for this...
@@ -64,9 +64,25 @@
-->
<dependency>
<groupId>org.apache.openjpa</groupId>
- <artifactId>openjpa-testsupport</artifactId>
+ <artifactId>openjpa-persistence-jdbc</artifactId>
<version>${project.version}</version>
- <type>test-jar</type>
+ <classifier>tests</classifier>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-dbcp</groupId>
+ <artifactId>commons-dbcp</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derby</artifactId>
+ <version>${derby.version}</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: openjpa/trunk/openjpa-integration/jmx/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-integration/jmx/pom.xml?rev=996618&r1=996617&r2=996618&view=diff
==============================================================================
--- openjpa/trunk/openjpa-integration/jmx/pom.xml (original)
+++ openjpa/trunk/openjpa-integration/jmx/pom.xml Mon Sep 13 17:53:00 2010
@@ -54,7 +54,7 @@
</dependency>
<dependency>
<groupId>org.apache.openjpa</groupId>
- <artifactId>openjpa-testsupport</artifactId>
+ <artifactId>openjpa-persistence-jdbc</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
@@ -63,6 +63,33 @@
<build>
<plugins>
+ <!-- Extract the common test support files from o-p-j-tests.jar -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>unpack</id>
+ <phase>test-compile</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.apache.openjpa</groupId>
+ <artifactId>openjpa-persistence-jdbc</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ <outputDirectory>${project.build.testOutputDirectory}</outputDirectory>
+ <includes>org/apache/openjpa/persistence/test/*.class</includes>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
<plugin>
<!-- Use openjpa maven plugin to enhance the domain model classes -->
<groupId>org.codehaus.mojo</groupId>
Modified: openjpa/trunk/openjpa-integration/slf4j/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-integration/slf4j/pom.xml?rev=996618&r1=996617&r2=996618&view=diff
==============================================================================
--- openjpa/trunk/openjpa-integration/slf4j/pom.xml (original)
+++ openjpa/trunk/openjpa-integration/slf4j/pom.xml Mon Sep 13 17:53:00 2010
@@ -58,7 +58,7 @@
</dependency>
<dependency>
<groupId>org.apache.openjpa</groupId>
- <artifactId>openjpa-testsupport</artifactId>
+ <artifactId>openjpa-persistence-jdbc</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
@@ -67,6 +67,33 @@
<build>
<plugins>
+ <!-- Extract the common test support files from o-p-j-tests.jar -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>unpack</id>
+ <phase>test-compile</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.apache.openjpa</groupId>
+ <artifactId>openjpa-persistence-jdbc</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ <outputDirectory>${project.build.testOutputDirectory}</outputDirectory>
+ <includes>org/apache/openjpa/persistence/test/*.class</includes>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
<!-- new way of using openjpa-maven-plugin to enhance classes
<plugin>
<groupId>org.codehaus.mojo</groupId>
Modified: openjpa/trunk/openjpa-integration/validation/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-integration/validation/pom.xml?rev=996618&r1=996617&r2=996618&view=diff
==============================================================================
--- openjpa/trunk/openjpa-integration/validation/pom.xml (original)
+++ openjpa/trunk/openjpa-integration/validation/pom.xml Mon Sep 13 17:53:00 2010
@@ -141,7 +141,19 @@
<dependencies>
<dependency>
<groupId>org.apache.openjpa</groupId>
- <artifactId>openjpa-testsupport</artifactId>
+ <artifactId>openjpa</artifactId>
+ <version>${project.version}</version>
+ <!-- allow profiles to decide which validation spec to use -->
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-validation_1.0_spec</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openjpa</groupId>
+ <artifactId>openjpa-persistence-jdbc</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
@@ -155,6 +167,33 @@
<build>
<plugins>
+ <!-- Extract the common test support files from o-p-j-tests.jar -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>unpack</id>
+ <phase>test-compile</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.apache.openjpa</groupId>
+ <artifactId>openjpa-persistence-jdbc</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ <outputDirectory>${project.build.testOutputDirectory}</outputDirectory>
+ <includes>org/apache/openjpa/persistence/test/*.class</includes>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>