geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dwo...@apache.org
Subject svn commit: r835018 - in /geronimo/plugins/openjpa2/branches/2.1: ./ geronimo-openjpa2/ geronimo-persistence-jpa20-builder/ geronimo-persistence-jpa20/ jpa-tests/ jpa-tests/jpa-ear/ jpa-tests/jpa-ejb/ jpa-tests/jpa-war/ openjpa2/ openjpa2/src/main/hist...
Date Wed, 11 Nov 2009 19:14:57 GMT
Author: dwoods
Date: Wed Nov 11 19:14:57 2009
New Revision: 835018

URL: http://svn.apache.org/viewvc?rev=835018&view=rev
Log:
GERONIMO-4946 update 2.1 branch to build against 2.1.3 server, so we can support 2.1.3, 2.1.4
and 2.1.5-SNAPSHOT users

Modified:
    geronimo/plugins/openjpa2/branches/2.1/README.txt
    geronimo/plugins/openjpa2/branches/2.1/geronimo-openjpa2/pom.xml
    geronimo/plugins/openjpa2/branches/2.1/geronimo-persistence-jpa20-builder/pom.xml
    geronimo/plugins/openjpa2/branches/2.1/geronimo-persistence-jpa20/pom.xml
    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/openjpa2/pom.xml
    geronimo/plugins/openjpa2/branches/2.1/openjpa2/src/main/history/dependencies.xml
    geronimo/plugins/openjpa2/branches/2.1/persistence-jpa20-deployer/pom.xml
    geronimo/plugins/openjpa2/branches/2.1/persistence-jpa20-deployer/src/main/history/dependencies.xml
    geronimo/plugins/openjpa2/branches/2.1/pom.xml

Modified: geronimo/plugins/openjpa2/branches/2.1/README.txt
URL: http://svn.apache.org/viewvc/geronimo/plugins/openjpa2/branches/2.1/README.txt?rev=835018&r1=835017&r2=835018&view=diff
==============================================================================
--- geronimo/plugins/openjpa2/branches/2.1/README.txt (original)
+++ geronimo/plugins/openjpa2/branches/2.1/README.txt Wed Nov 11 19:14:57 2009
@@ -15,11 +15,11 @@
 
 Building -
 ----------
-The build requires access to the Geronimo 2.1.4 server artifacts.
+The build requires access to the Geronimo 2.1.3 server artifacts.
 The most dependable way to build, is to build the server locally first, by
 checking out from svn at -
-    https://svn.apache.org/repos/asf/geronimo/server/tags/2.1.4/
-You will need the same build tools as the 2.2 Server, such as:
+    https://svn.apache.org/repos/asf/geronimo/server/tags/2.1.3/
+You will need the same build tools as the 2.1.3 Server, such as:
     Maven 2.0.9 or later
     Java SE 6 - Note: Some features in OpenJPA 2.0 require Java SE 6
 To build, run:
@@ -28,8 +28,10 @@
 
 Installing -
 ------------
-Note:  Installing the OpenJPA2 plugins will replace the existing OpenJPA plugin. 
+The OpenJPA2 plugins can be installed on these levels of the Geronimo Server -
+    2.1.3, 2.1.4, 2.1.5-SNAPSHOT
 
+Note:  Installing the OpenJPA2 plugins will replace the existing OpenJPA plugin. 
 Using the Admin Console -
 1) Start the server and log into the Admin Console -
     http://localhost:8080/console/

Modified: geronimo/plugins/openjpa2/branches/2.1/geronimo-openjpa2/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/openjpa2/branches/2.1/geronimo-openjpa2/pom.xml?rev=835018&r1=835017&r2=835018&view=diff
==============================================================================
--- geronimo/plugins/openjpa2/branches/2.1/geronimo-openjpa2/pom.xml (original)
+++ geronimo/plugins/openjpa2/branches/2.1/geronimo-openjpa2/pom.xml Wed Nov 11 19:14:57 2009
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>openjpa2</artifactId>
-        <version>2.1.4-M3-SNAPSHOT</version>
+        <version>2.1.3-M3-SNAPSHOT</version>
     </parent>
     
     <groupId>org.apache.geronimo.modules</groupId>

Modified: geronimo/plugins/openjpa2/branches/2.1/geronimo-persistence-jpa20-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/openjpa2/branches/2.1/geronimo-persistence-jpa20-builder/pom.xml?rev=835018&r1=835017&r2=835018&view=diff
==============================================================================
--- geronimo/plugins/openjpa2/branches/2.1/geronimo-persistence-jpa20-builder/pom.xml (original)
+++ geronimo/plugins/openjpa2/branches/2.1/geronimo-persistence-jpa20-builder/pom.xml Wed
Nov 11 19:14:57 2009
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>openjpa2</artifactId>
-        <version>2.1.4-M3-SNAPSHOT</version>
+        <version>2.1.3-M3-SNAPSHOT</version>
     </parent>
     
     <groupId>org.apache.geronimo.modules</groupId>

Modified: geronimo/plugins/openjpa2/branches/2.1/geronimo-persistence-jpa20/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/openjpa2/branches/2.1/geronimo-persistence-jpa20/pom.xml?rev=835018&r1=835017&r2=835018&view=diff
==============================================================================
--- geronimo/plugins/openjpa2/branches/2.1/geronimo-persistence-jpa20/pom.xml (original)
+++ geronimo/plugins/openjpa2/branches/2.1/geronimo-persistence-jpa20/pom.xml Wed Nov 11 19:14:57
2009
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>openjpa2</artifactId>
-        <version>2.1.4-M3-SNAPSHOT</version>
+        <version>2.1.3-M3-SNAPSHOT</version>
     </parent>
     
     <groupId>org.apache.geronimo.modules</groupId>

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=835018&r1=835017&r2=835018&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 19:14:57 2009
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins.openjpa2</groupId>
         <artifactId>jpa-tests</artifactId>
-        <version>2.1.4-M3-SNAPSHOT</version>
+        <version>2.1.3-M3-SNAPSHOT</version>
     </parent>
     
     <artifactId>jpa-ear</artifactId>

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=835018&r1=835017&r2=835018&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 19:14:57 2009
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins.openjpa2</groupId>
         <artifactId>jpa-tests</artifactId>
-        <version>2.1.4-M3-SNAPSHOT</version>
+        <version>2.1.3-M3-SNAPSHOT</version>
     </parent>
 
     <artifactId>jpa-ejb</artifactId>

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=835018&r1=835017&r2=835018&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 19:14:57 2009
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins.openjpa2</groupId>
         <artifactId>jpa-tests</artifactId>
-        <version>2.1.4-M3-SNAPSHOT</version>
+        <version>2.1.3-M3-SNAPSHOT</version>
     </parent>
 
     <artifactId>jpa-war</artifactId>

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=835018&r1=835017&r2=835018&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 19:14:57 2009
@@ -34,7 +34,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>openjpa2</artifactId>
-        <version>2.1.4-M3-SNAPSHOT</version>
+        <version>2.1.3-M3-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.geronimo.plugins.openjpa2</groupId>

Modified: geronimo/plugins/openjpa2/branches/2.1/openjpa2/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/openjpa2/branches/2.1/openjpa2/pom.xml?rev=835018&r1=835017&r2=835018&view=diff
==============================================================================
--- geronimo/plugins/openjpa2/branches/2.1/openjpa2/pom.xml (original)
+++ geronimo/plugins/openjpa2/branches/2.1/openjpa2/pom.xml Wed Nov 11 19:14:57 2009
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>openjpa2</artifactId>
-        <version>2.1.4-M3-SNAPSHOT</version>
+        <version>2.1.3-M3-SNAPSHOT</version>
     </parent>
     
     <groupId>org.apache.geronimo.configs</groupId>

Modified: geronimo/plugins/openjpa2/branches/2.1/openjpa2/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/openjpa2/branches/2.1/openjpa2/src/main/history/dependencies.xml?rev=835018&r1=835017&r2=835018&view=diff
==============================================================================
--- geronimo/plugins/openjpa2/branches/2.1/openjpa2/src/main/history/dependencies.xml (original)
+++ geronimo/plugins/openjpa2/branches/2.1/openjpa2/src/main/history/dependencies.xml Wed
Nov 11 19:14:57 2009
@@ -3,7 +3,7 @@
     <module-id>
         <groupId>org.apache.geronimo.configs</groupId>
         <artifactId>openjpa2</artifactId>
-        <version>2.2-SNAPSHOT</version>
+        <version>2.1.3-M3-SNAPSHOT</version>
         <type>car</type>
     </module-id>
     <dependency>

Modified: geronimo/plugins/openjpa2/branches/2.1/persistence-jpa20-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/openjpa2/branches/2.1/persistence-jpa20-deployer/pom.xml?rev=835018&r1=835017&r2=835018&view=diff
==============================================================================
--- geronimo/plugins/openjpa2/branches/2.1/persistence-jpa20-deployer/pom.xml (original)
+++ geronimo/plugins/openjpa2/branches/2.1/persistence-jpa20-deployer/pom.xml Wed Nov 11 19:14:57
2009
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>openjpa2</artifactId>
-        <version>2.1.4-M3-SNAPSHOT</version>
+        <version>2.1.3-M3-SNAPSHOT</version>
     </parent>
     
     <groupId>org.apache.geronimo.configs</groupId>

Modified: geronimo/plugins/openjpa2/branches/2.1/persistence-jpa20-deployer/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/openjpa2/branches/2.1/persistence-jpa20-deployer/src/main/history/dependencies.xml?rev=835018&r1=835017&r2=835018&view=diff
==============================================================================
--- geronimo/plugins/openjpa2/branches/2.1/persistence-jpa20-deployer/src/main/history/dependencies.xml
(original)
+++ geronimo/plugins/openjpa2/branches/2.1/persistence-jpa20-deployer/src/main/history/dependencies.xml
Wed Nov 11 19:14:57 2009
@@ -3,7 +3,7 @@
     <module-id>
         <groupId>org.apache.geronimo.configs</groupId>
         <artifactId>persistence-jpa20-deployer</artifactId>
-        <version>2.2-SNAPSHOT</version>
+        <version>2.1.3-M3-SNAPSHOT</version>
         <type>car</type>
     </module-id>
     <dependency>

Modified: geronimo/plugins/openjpa2/branches/2.1/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/openjpa2/branches/2.1/pom.xml?rev=835018&r1=835017&r2=835018&view=diff
==============================================================================
--- geronimo/plugins/openjpa2/branches/2.1/pom.xml (original)
+++ geronimo/plugins/openjpa2/branches/2.1/pom.xml Wed Nov 11 19:14:57 2009
@@ -32,12 +32,12 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>plugins</artifactId>
-        <version>2.1.4</version>
+        <version>2.1.3</version>
     </parent>
 
     <groupId>org.apache.geronimo.plugins</groupId>
     <artifactId>openjpa2</artifactId>
-    <version>2.1.4-M3-SNAPSHOT</version>
+    <version>2.1.3-M3-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>Geronimo Plugins, OpenJPA2</name>
@@ -66,12 +66,12 @@
 
     <properties>
         <!-- plugin version, which has to match pom version above -->
-        <version>2.1.4-M3-SNAPSHOT</version>
+        <version>2.1.3-M3-SNAPSHOT</version>
 
         <openjpa2Version>2.0.0-M3</openjpa2Version>
         <jpa2specVersion>1.0-PFD2</jpa2specVersion>
         <bvspecVersion>1.0-CR5</bvspecVersion>
-        <geronimoVersion>2.1.4</geronimoVersion>
+        <geronimoVersion>2.1.3</geronimoVersion>
 
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
@@ -335,6 +335,7 @@
                     </useMavenDependencies>
                     <commonInstance>
                         <plugin-artifact>
+                            <geronimo-version>2.1.3</geronimo-version>
                             <geronimo-version>2.1.4</geronimo-version>
                             <geronimo-version>2.1.5-SNAPSHOT</geronimo-version>
                             <jvm-version>1.5</jvm-version>



Mime
View raw message