geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dwo...@apache.org
Subject svn commit: r834750 - in /geronimo/plugins/openjpa2/branches/2.1: jpa-tests/ jpa-tests/jpa-ear/pom.xml jpa-tests/jpa-ejb/pom.xml jpa-tests/jpa-war/pom.xml jpa-tests/pom.xml pom.xml
Date Wed, 11 Nov 2009 03:17:09 GMT
Author: dwoods
Date: Wed Nov 11 03:17:08 2009
New Revision: 834750

URL: http://svn.apache.org/viewvc?rev=834750&view=rev
Log:
GERONIMO-4946 add copy of testsuite/enterprise-testsuite/jpa-tests from 2.1.4 server for testing

Added:
    geronimo/plugins/openjpa2/branches/2.1/jpa-tests/
      - copied from r834639, geronimo/plugins/openjpa2/branches/2.2/jpa-tests/
Modified:
    geronimo/plugins/openjpa2/branches/2.1/jpa-tests/jpa-ear/pom.xml
    geronimo/plugins/openjpa2/branches/2.1/jpa-tests/jpa-ejb/pom.xml
    geronimo/plugins/openjpa2/branches/2.1/jpa-tests/jpa-war/pom.xml
    geronimo/plugins/openjpa2/branches/2.1/jpa-tests/pom.xml
    geronimo/plugins/openjpa2/branches/2.1/pom.xml

Modified: geronimo/plugins/openjpa2/branches/2.1/jpa-tests/jpa-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/openjpa2/branches/2.1/jpa-tests/jpa-ear/pom.xml?rev=834750&r1=834639&r2=834750&view=diff
==============================================================================
--- geronimo/plugins/openjpa2/branches/2.1/jpa-tests/jpa-ear/pom.xml (original)
+++ geronimo/plugins/openjpa2/branches/2.1/jpa-tests/jpa-ear/pom.xml Wed Nov 11 03:17:08 2009
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins.openjpa2</groupId>
         <artifactId>jpa-tests</artifactId>
-        <version>2.2-M3-SNAPSHOT</version>
+        <version>2.1.4-M3-SNAPSHOT</version>
     </parent>
     
     <artifactId>jpa-ear</artifactId>
@@ -42,14 +42,14 @@
         <dependency>
             <groupId>org.apache.geronimo.plugins.openjpa2</groupId>
             <artifactId>jpa-ejb</artifactId>
-            <version>${version}</version>
+            <version>${pom.version}</version>
             <type>ejb</type>
         </dependency>
         
         <dependency>
             <groupId>org.apache.geronimo.plugins.openjpa2</groupId>
             <artifactId>jpa-war</artifactId>
-            <version>${version}</version>
+            <version>${pom.version}</version>
             <type>war</type>
         </dependency>
     </dependencies>

Modified: geronimo/plugins/openjpa2/branches/2.1/jpa-tests/jpa-ejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/openjpa2/branches/2.1/jpa-tests/jpa-ejb/pom.xml?rev=834750&r1=834639&r2=834750&view=diff
==============================================================================
--- geronimo/plugins/openjpa2/branches/2.1/jpa-tests/jpa-ejb/pom.xml (original)
+++ geronimo/plugins/openjpa2/branches/2.1/jpa-tests/jpa-ejb/pom.xml Wed Nov 11 03:17:08 2009
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins.openjpa2</groupId>
         <artifactId>jpa-tests</artifactId>
-        <version>2.2-M3-SNAPSHOT</version>
+        <version>2.1.4-M3-SNAPSHOT</version>
     </parent>
 
     <artifactId>jpa-ejb</artifactId>
@@ -61,12 +61,6 @@
             <scope>provided</scope>
         </dependency>
         
-        <dependency>
-          <groupId>org.apache.openejb</groupId>
-          <artifactId>ejb31-api-experimental</artifactId>
-          <scope>provided</scope>
-       </dependency>
-
         <!-- the enhancer seems to need xerces -->
         <dependency>
             <groupId>xerces</groupId>

Modified: geronimo/plugins/openjpa2/branches/2.1/jpa-tests/jpa-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/openjpa2/branches/2.1/jpa-tests/jpa-war/pom.xml?rev=834750&r1=834639&r2=834750&view=diff
==============================================================================
--- geronimo/plugins/openjpa2/branches/2.1/jpa-tests/jpa-war/pom.xml (original)
+++ geronimo/plugins/openjpa2/branches/2.1/jpa-tests/jpa-war/pom.xml Wed Nov 11 03:17:08 2009
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins.openjpa2</groupId>
         <artifactId>jpa-tests</artifactId>
-        <version>2.2-M3-SNAPSHOT</version>
+        <version>2.1.4-M3-SNAPSHOT</version>
     </parent>
 
     <artifactId>jpa-war</artifactId>
@@ -38,7 +38,7 @@
         <dependency>
             <groupId>org.apache.geronimo.plugins.openjpa2</groupId>
             <artifactId>jpa-ejb</artifactId>
-            <version>${version}</version>
+            <version>${pom.version}</version>
             <optional>true</optional>
         </dependency>
         
@@ -55,12 +55,6 @@
         </dependency>
         
         <dependency>
-          <groupId>org.apache.openejb</groupId>
-          <artifactId>ejb31-api-experimental</artifactId>
-          <scope>provided</scope>
-       </dependency>
-        
-        <dependency>
             <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-security</artifactId>
             <version>${geronimoVersion}</version>

Modified: geronimo/plugins/openjpa2/branches/2.1/jpa-tests/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/openjpa2/branches/2.1/jpa-tests/pom.xml?rev=834750&r1=834639&r2=834750&view=diff
==============================================================================
--- geronimo/plugins/openjpa2/branches/2.1/jpa-tests/pom.xml (original)
+++ geronimo/plugins/openjpa2/branches/2.1/jpa-tests/pom.xml Wed Nov 11 03:17:08 2009
@@ -28,18 +28,18 @@
     <parent>
         <groupId>org.apache.geronimo.testsuite</groupId>
         <artifactId>enterprise-testsuite</artifactId>
-        <version>2.2-SNAPSHOT</version>
+        <version>2.1.4</version>
     </parent>
     -->
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>openjpa2</artifactId>
-        <version>2.2-M3-SNAPSHOT</version>
+        <version>2.1.4-M3-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.geronimo.plugins.openjpa2</groupId>
     <artifactId>jpa-tests</artifactId>
-    <version>2.2-M3-SNAPSHOT</version>
+    <version>2.1.4-M3-SNAPSHOT</version>
     <packaging>pom</packaging>
     
     <name>Geronimo TestSuite :: Enterprise Testsuite :: JPA Tests</name>
@@ -56,11 +56,13 @@
             <version>${geronimoVersion}</version>
             <scope>test</scope>
         </dependency>
+        <!--
         <dependency>
             <groupId>org.codehaus.groovy.maven.support</groupId>
             <artifactId>slf4j-gossip</artifactId>
             <scope>test</scope>
         </dependency>
+        -->
     </dependencies>
 
     <modules>
@@ -70,6 +72,37 @@
     </modules>
 
     <build>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <artifactId>maven-ear-plugin</artifactId>
+                    <configuration>
+                        <resourcesDir>${project.build.outputDirectory}</resourcesDir>
+                    </configuration>
+                </plugin>
+                <!--
+                     Need to reset the default values here since our
+                     Geronimo Server parent sets up wars for use with jspc.
+                 -->
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-war-plugin</artifactId>
+                    <configuration>
+                        <webXml>${pom.basedir}/src/main/webapp/WEB-INF/web.xml</webXml>
+                        <webResources>
+                            <resource>
+                                <directory>${pom.basedir}/src/main/webapp</directory>
+                                <filtering>true</filtering>
+                            </resource>
+                            <resource>
+                                <directory>${project.build.outputDirectory}</directory>
+                            </resource>
+                        </webResources>
+                    </configuration>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+
         <plugins>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>

Modified: geronimo/plugins/openjpa2/branches/2.1/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/openjpa2/branches/2.1/pom.xml?rev=834750&r1=834749&r2=834750&view=diff
==============================================================================
--- geronimo/plugins/openjpa2/branches/2.1/pom.xml (original)
+++ geronimo/plugins/openjpa2/branches/2.1/pom.xml Wed Nov 11 03:17:08 2009
@@ -87,6 +87,7 @@
         <organization.logo>http://www.apache.org/images/asf_logo_wide.gif</organization.logo>
     </properties>
 
+    <!-- New Nexus repo settings from apache-6.pom -->
     <distributionManagement>
         <site>
             <id>apache-website</id>
@@ -249,6 +250,7 @@
         <module>geronimo-persistence-jpa20</module>
         <module>geronimo-persistence-jpa20-builder</module>
         <module>persistence-jpa20-deployer</module>
+        <module>jpa-tests</module>
     </modules>
 
     <build>



Mime
View raw message