You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dw...@apache.org on 2010/02/17 23:45:23 UTC

svn commit: r911204 - in /geronimo/plugins/openjpa2/branches/2.2/jpa-tests: jpa-ear/pom.xml jpa-ejb/pom.xml jpa-war/pom.xml pom.xml

Author: dwoods
Date: Wed Feb 17 22:45:23 2010
New Revision: 911204

URL: http://svn.apache.org/viewvc?rev=911204&view=rev
Log:
update versions missed by the release plugin

Modified:
    geronimo/plugins/openjpa2/branches/2.2/jpa-tests/jpa-ear/pom.xml
    geronimo/plugins/openjpa2/branches/2.2/jpa-tests/jpa-ejb/pom.xml
    geronimo/plugins/openjpa2/branches/2.2/jpa-tests/jpa-war/pom.xml
    geronimo/plugins/openjpa2/branches/2.2/jpa-tests/pom.xml

Modified: geronimo/plugins/openjpa2/branches/2.2/jpa-tests/jpa-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/openjpa2/branches/2.2/jpa-tests/jpa-ear/pom.xml?rev=911204&r1=911203&r2=911204&view=diff
==============================================================================
--- geronimo/plugins/openjpa2/branches/2.2/jpa-tests/jpa-ear/pom.xml (original)
+++ geronimo/plugins/openjpa2/branches/2.2/jpa-tests/jpa-ear/pom.xml Wed Feb 17 22:45:23 2010
@@ -27,29 +27,25 @@
     <parent>
         <groupId>org.apache.geronimo.plugins.openjpa2</groupId>
         <artifactId>jpa-tests</artifactId>
-        <version>2.2-beta-SNAPSHOT</version>
+        <version>2.2-SNAPSHOT</version>
     </parent>
     
     <artifactId>jpa-ear</artifactId>
     <name>Geronimo TestSuite :: Enterprise Testsuite :: JPA - EAR</name>
     <packaging>ear</packaging>
 
-    <!--
-    FIXME: Split this module up... one to build the ear, one to run the tests.
-    -->
-    
     <dependencies>
         <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.2/jpa-tests/jpa-ejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/openjpa2/branches/2.2/jpa-tests/jpa-ejb/pom.xml?rev=911204&r1=911203&r2=911204&view=diff
==============================================================================
--- geronimo/plugins/openjpa2/branches/2.2/jpa-tests/jpa-ejb/pom.xml (original)
+++ geronimo/plugins/openjpa2/branches/2.2/jpa-tests/jpa-ejb/pom.xml Wed Feb 17 22:45:23 2010
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins.openjpa2</groupId>
         <artifactId>jpa-tests</artifactId>
-        <version>2.2-beta-SNAPSHOT</version>
+        <version>2.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>jpa-ejb</artifactId>

Modified: geronimo/plugins/openjpa2/branches/2.2/jpa-tests/jpa-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/openjpa2/branches/2.2/jpa-tests/jpa-war/pom.xml?rev=911204&r1=911203&r2=911204&view=diff
==============================================================================
--- geronimo/plugins/openjpa2/branches/2.2/jpa-tests/jpa-war/pom.xml (original)
+++ geronimo/plugins/openjpa2/branches/2.2/jpa-tests/jpa-war/pom.xml Wed Feb 17 22:45:23 2010
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins.openjpa2</groupId>
         <artifactId>jpa-tests</artifactId>
-        <version>2.2-beta-SNAPSHOT</version>
+        <version>2.2-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>
         

Modified: geronimo/plugins/openjpa2/branches/2.2/jpa-tests/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/openjpa2/branches/2.2/jpa-tests/pom.xml?rev=911204&r1=911203&r2=911204&view=diff
==============================================================================
--- geronimo/plugins/openjpa2/branches/2.2/jpa-tests/pom.xml (original)
+++ geronimo/plugins/openjpa2/branches/2.2/jpa-tests/pom.xml Wed Feb 17 22:45:23 2010
@@ -34,7 +34,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>openjpa2</artifactId>
-        <version>2.2-beta-SNAPSHOT</version>
+        <version>2.2-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.geronimo.plugins.openjpa2</groupId>
@@ -43,11 +43,6 @@
     
     <name>Geronimo TestSuite :: Enterprise Testsuite :: JPA Tests</name>
 
-    <properties>
-        <openjpaVersion>2.0.0-beta</openjpaVersion>
-        <jpa2specVersion>1.0</jpa2specVersion>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>org.apache.geronimo.testsupport</groupId>



Re: svn commit: r911204 - in /geronimo/plugins/openjpa2/branches/2.2/jpa-tests: jpa-ear/pom.xml jpa-ejb/pom.xml jpa-war/pom.xml pom.xml

Posted by David Jencks <da...@yahoo.com>.
I found I could avoid problems like this by having a "all" profile  
that includes these modules and if necessary configuring the deploy  
plugin to skip the module if I didn't want it released.

thanks
david jencks

On Feb 17, 2010, at 2:45 PM, dwoods@apache.org wrote:

> Author: dwoods
> Date: Wed Feb 17 22:45:23 2010
> New Revision: 911204
>
> URL: http://svn.apache.org/viewvc?rev=911204&view=rev
> Log:
> update versions missed by the release plugin
>
> Modified:
>    geronimo/plugins/openjpa2/branches/2.2/jpa-tests/jpa-ear/pom.xml
>    geronimo/plugins/openjpa2/branches/2.2/jpa-tests/jpa-ejb/pom.xml
>    geronimo/plugins/openjpa2/branches/2.2/jpa-tests/jpa-war/pom.xml
>    geronimo/plugins/openjpa2/branches/2.2/jpa-tests/pom.xml
>
> Modified: geronimo/plugins/openjpa2/branches/2.2/jpa-tests/jpa-ear/ 
> pom.xml
> URL: http://svn.apache.org/viewvc/geronimo/plugins/openjpa2/branches/2.2/jpa-tests/jpa-ear/pom.xml?rev=911204&r1=911203&r2=911204&view=diff
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> ======================================================================
> --- geronimo/plugins/openjpa2/branches/2.2/jpa-tests/jpa-ear/pom.xml  
> (original)
> +++ geronimo/plugins/openjpa2/branches/2.2/jpa-tests/jpa-ear/pom.xml  
> Wed Feb 17 22:45:23 2010
> @@ -27,29 +27,25 @@
>     <parent>
>         <groupId>org.apache.geronimo.plugins.openjpa2</groupId>
>         <artifactId>jpa-tests</artifactId>
> -        <version>2.2-beta-SNAPSHOT</version>
> +        <version>2.2-SNAPSHOT</version>
>     </parent>
>
>     <artifactId>jpa-ear</artifactId>
>     <name>Geronimo TestSuite :: Enterprise Testsuite :: JPA - EAR</ 
> name>
>     <packaging>ear</packaging>
>
> -    <!--
> -    FIXME: Split this module up... one to build the ear, one to run  
> the tests.
> -    -->
> -
>     <dependencies>
>         <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.2/jpa-tests/jpa-ejb/ 
> pom.xml
> URL: http://svn.apache.org/viewvc/geronimo/plugins/openjpa2/branches/2.2/jpa-tests/jpa-ejb/pom.xml?rev=911204&r1=911203&r2=911204&view=diff
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> ======================================================================
> --- geronimo/plugins/openjpa2/branches/2.2/jpa-tests/jpa-ejb/pom.xml  
> (original)
> +++ geronimo/plugins/openjpa2/branches/2.2/jpa-tests/jpa-ejb/pom.xml  
> Wed Feb 17 22:45:23 2010
> @@ -27,7 +27,7 @@
>     <parent>
>         <groupId>org.apache.geronimo.plugins.openjpa2</groupId>
>         <artifactId>jpa-tests</artifactId>
> -        <version>2.2-beta-SNAPSHOT</version>
> +        <version>2.2-SNAPSHOT</version>
>     </parent>
>
>     <artifactId>jpa-ejb</artifactId>
>
> Modified: geronimo/plugins/openjpa2/branches/2.2/jpa-tests/jpa-war/ 
> pom.xml
> URL: http://svn.apache.org/viewvc/geronimo/plugins/openjpa2/branches/2.2/jpa-tests/jpa-war/pom.xml?rev=911204&r1=911203&r2=911204&view=diff
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> ======================================================================
> --- geronimo/plugins/openjpa2/branches/2.2/jpa-tests/jpa-war/pom.xml  
> (original)
> +++ geronimo/plugins/openjpa2/branches/2.2/jpa-tests/jpa-war/pom.xml  
> Wed Feb 17 22:45:23 2010
> @@ -27,7 +27,7 @@
>     <parent>
>         <groupId>org.apache.geronimo.plugins.openjpa2</groupId>
>         <artifactId>jpa-tests</artifactId>
> -        <version>2.2-beta-SNAPSHOT</version>
> +        <version>2.2-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>
>
>
> Modified: geronimo/plugins/openjpa2/branches/2.2/jpa-tests/pom.xml
> URL: http://svn.apache.org/viewvc/geronimo/plugins/openjpa2/branches/2.2/jpa-tests/pom.xml?rev=911204&r1=911203&r2=911204&view=diff
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> ======================================================================
> --- geronimo/plugins/openjpa2/branches/2.2/jpa-tests/pom.xml  
> (original)
> +++ geronimo/plugins/openjpa2/branches/2.2/jpa-tests/pom.xml Wed Feb  
> 17 22:45:23 2010
> @@ -34,7 +34,7 @@
>     <parent>
>         <groupId>org.apache.geronimo.plugins</groupId>
>         <artifactId>openjpa2</artifactId>
> -        <version>2.2-beta-SNAPSHOT</version>
> +        <version>2.2-SNAPSHOT</version>
>     </parent>
>
>     <groupId>org.apache.geronimo.plugins.openjpa2</groupId>
> @@ -43,11 +43,6 @@
>
>     <name>Geronimo TestSuite :: Enterprise Testsuite :: JPA Tests</ 
> name>
>
> -    <properties>
> -        <openjpaVersion>2.0.0-beta</openjpaVersion>
> -        <jpa2specVersion>1.0</jpa2specVersion>
> -    </properties>
> -
>     <dependencies>
>         <dependency>
>             <groupId>org.apache.geronimo.testsupport</groupId>
>
>