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/04/22 18:34:56 UTC

svn commit: r936944 - in /geronimo/plugins/openjpa2/branches/2.1: openjpa2/pom.xml persistence-jpa20-deployer/pom.xml pom.xml

Author: dwoods
Date: Thu Apr 22 16:34:56 2010
New Revision: 936944

URL: http://svn.apache.org/viewvc?rev=936944&view=rev
Log:
update to support 2.1.5 and 2.1.6-SNAPSHOT servers

Modified:
    geronimo/plugins/openjpa2/branches/2.1/openjpa2/pom.xml
    geronimo/plugins/openjpa2/branches/2.1/persistence-jpa20-deployer/pom.xml
    geronimo/plugins/openjpa2/branches/2.1/pom.xml

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=936944&r1=936943&r2=936944&view=diff
==============================================================================
--- geronimo/plugins/openjpa2/branches/2.1/openjpa2/pom.xml (original)
+++ geronimo/plugins/openjpa2/branches/2.1/openjpa2/pom.xml Thu Apr 22 16:34:56 2010
@@ -121,24 +121,24 @@
                             <!-- config.xml and offline-deployer-config.xml -->
                             <config-xml-content server="default" />
                             <config-xml-content server="offline" />
-                            <!-- handle upgrading prior openjpa2 2.1-M3 CAR -->
-                            <artifact-alias key="org.apache.geronimo.configs/openjpa2/2.1.3-M3-SNAPSHOT/car">org.apache.geronimo.configs/openjpa2/${pom.version}/car</artifact-alias>
-                            <artifact-alias key="org.apache.geronimo.configs/openjpa2/2.1.3-beta-SNAPSHOT/car">org.apache.geronimo.configs/openjpa2/${pom.version}/car</artifact-alias>
+                            <!-- handle upgrading prior openjpa2 2.1-beta -->
+                            <artifact-alias key="org.apache.geronimo.configs/openjpa2/2.1.3-SNAPSHOT/car">org.apache.geronimo.configs/openjpa2/${pom.version}/car</artifact-alias>
                             <artifact-alias key="org.apache.geronimo.configs/openjpa2/2.1.3-beta/car">org.apache.geronimo.configs/openjpa2/${pom.version}/car</artifact-alias>
-                            <artifact-alias server="client" key="org.apache.geronimo.configs/openjpa2/2.1.3-M3-SNAPSHOT/car">org.apache.geronimo.configs/openjpa2/${pom.version}/car</artifact-alias>
-                            <artifact-alias server="client" key="org.apache.geronimo.configs/openjpa2/2.1.3-beta-SNAPSHOT/car">org.apache.geronimo.configs/openjpa2/${pom.version}/car</artifact-alias>
+                            <artifact-alias server="client" key="org.apache.geronimo.configs/openjpa2/2.1.3-SNAPSHOT/car">org.apache.geronimo.configs/openjpa2/${pom.version}/car</artifact-alias>
                             <artifact-alias server="client" key="org.apache.geronimo.configs/openjpa2/2.1.3-beta/car">org.apache.geronimo.configs/openjpa2/${pom.version}/car</artifact-alias>
                             <!-- handle openjpa to openjpa2 CAR alias -->
                             <artifact-alias key="org.apache.geronimo.configs/openjpa//car">org.apache.geronimo.configs/openjpa2/${pom.version}/car</artifact-alias>
                             <artifact-alias key="org.apache.geronimo.configs/openjpa/2.1.2/car">org.apache.geronimo.configs/openjpa2/${pom.version}/car</artifact-alias>
                             <artifact-alias key="org.apache.geronimo.configs/openjpa/2.1.3/car">org.apache.geronimo.configs/openjpa2/${pom.version}/car</artifact-alias>
                             <artifact-alias key="org.apache.geronimo.configs/openjpa/2.1.4/car">org.apache.geronimo.configs/openjpa2/${pom.version}/car</artifact-alias>
-                            <artifact-alias key="org.apache.geronimo.configs/openjpa/2.1.5-SNAPSHOT/car">org.apache.geronimo.configs/openjpa2/${pom.version}/car</artifact-alias>
+                            <artifact-alias key="org.apache.geronimo.configs/openjpa/2.1.5/car">org.apache.geronimo.configs/openjpa2/${pom.version}/car</artifact-alias>
+                            <artifact-alias key="org.apache.geronimo.configs/openjpa/2.1.6-SNAPSHOT/car">org.apache.geronimo.configs/openjpa2/${pom.version}/car</artifact-alias>
                             <artifact-alias server="client" key="org.apache.geronimo.configs/openjpa//car">org.apache.geronimo.configs/openjpa2/${pom.version}/car</artifact-alias>
                             <artifact-alias server="client" key="org.apache.geronimo.configs/openjpa/2.1.2/car">org.apache.geronimo.configs/openjpa2/${pom.version}/car</artifact-alias>
                             <artifact-alias server="client" key="org.apache.geronimo.configs/openjpa/2.1.3/car">org.apache.geronimo.configs/openjpa2/${pom.version}/car</artifact-alias>
                             <artifact-alias server="client" key="org.apache.geronimo.configs/openjpa/2.1.4/car">org.apache.geronimo.configs/openjpa2/${pom.version}/car</artifact-alias>
-                            <artifact-alias server="client" key="org.apache.geronimo.configs/openjpa/2.1.5-SNAPSHOT/car">org.apache.geronimo.configs/openjpa2/${pom.version}/car</artifact-alias>
+                            <artifact-alias server="client" key="org.apache.geronimo.configs/openjpa/2.1.5/car">org.apache.geronimo.configs/openjpa2/${pom.version}/car</artifact-alias>
+                            <artifact-alias server="client" key="org.apache.geronimo.configs/openjpa/2.1.6-SNAPSHOT/car">org.apache.geronimo.configs/openjpa2/${pom.version}/car</artifact-alias>
                             <!-- handle geronimo-jpa_3.0 to 2.0 JAR alias -->
                             <artifact-alias key="org.apache.geronimo.specs/geronimo-jpa_3.0_spec//jar">org.apache.geronimo.specs/geronimo-jpa_2.0_spec/${jpa2specVersion}/jar</artifact-alias>
                             <artifact-alias key="org.apache.geronimo.specs/geronimo-jpa_3.0_spec/1.1.1/jar">org.apache.geronimo.specs/geronimo-jpa_2.0_spec/${jpa2specVersion}/jar</artifact-alias>
@@ -160,15 +160,15 @@
                             <artifact-alias key="org.apache.openjpa/openjpa/1.0.3/jar">org.apache.openjpa/openjpa/${openjpa2Version}/jar</artifact-alias>
                             <artifact-alias key="org.apache.openjpa/openjpa/1.2.1/jar">org.apache.openjpa/openjpa/${openjpa2Version}/jar</artifact-alias>
                             <artifact-alias key="org.apache.openjpa/openjpa/1.2.2/jar">org.apache.openjpa/openjpa/${openjpa2Version}/jar</artifact-alias>
-                            <artifact-alias key="org.apache.openjpa/openjpa/2.0.0-M3/jar">org.apache.openjpa/openjpa/${openjpa2Version}/jar</artifact-alias>
                             <artifact-alias key="org.apache.openjpa/openjpa/2.0.0-beta/jar">org.apache.openjpa/openjpa/${openjpa2Version}/jar</artifact-alias>
+                            <artifact-alias key="org.apache.openjpa/openjpa/2.0.0-SNAPSHOT/jar">org.apache.openjpa/openjpa/${openjpa2Version}/jar</artifact-alias>
                             <artifact-alias server="client" key="org.apache.openjpa/openjpa//jar">org.apache.openjpa/openjpa/${openjpa2Version}/jar</artifact-alias>
                             <artifact-alias server="client" key="org.apache.openjpa/openjpa/1.0.2/jar">org.apache.openjpa/openjpa/${openjpa2Version}/jar</artifact-alias>
                             <artifact-alias server="client" key="org.apache.openjpa/openjpa/1.0.3/jar">org.apache.openjpa/openjpa/${openjpa2Version}/jar</artifact-alias>
                             <artifact-alias server="client" key="org.apache.openjpa/openjpa/1.2.1/jar">org.apache.openjpa/openjpa/${openjpa2Version}/jar</artifact-alias>
                             <artifact-alias server="client" key="org.apache.openjpa/openjpa/1.2.2/jar">org.apache.openjpa/openjpa/${openjpa2Version}/jar</artifact-alias>
-                            <artifact-alias server="client" key="org.apache.openjpa/openjpa/2.0.0-M3/jar">org.apache.openjpa/openjpa/${openjpa2Version}/jar</artifact-alias>
                             <artifact-alias server="client" key="org.apache.openjpa/openjpa/2.0.0-beta/jar">org.apache.openjpa/openjpa/${openjpa2Version}/jar</artifact-alias>
+                            <artifact-alias server="client" key="org.apache.openjpa/openjpa/2.0.0-SNAPSHOT/jar">org.apache.openjpa/openjpa/${openjpa2Version}/jar</artifact-alias>
                         </plugin-artifact>
                     </instance>
                 </configuration>

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=936944&r1=936943&r2=936944&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 Thu Apr 22 16:34:56 2010
@@ -162,34 +162,36 @@
                                 </gbean>
                             </config-xml-content>
                             <!-- handle prior persistence-jpa20-deployer -->
-                            <artifact-alias key="org.apache.geronimo.configs/persistence-jpa20-deployer/2.1.3-M3-SNAPSHOT/car">org.apache.geronimo.configs/persistence-jpa20-deployer/${pom.version}/car</artifact-alias>
-                            <artifact-alias key="org.apache.geronimo.configs/persistence-jpa20-deployer/2.1.3-beta-SNAPSHOT/car">org.apache.geronimo.configs/persistence-jpa20-deployer/${pom.version}/car</artifact-alias>
+                            <artifact-alias key="org.apache.geronimo.configs/persistence-jpa20-deployer/2.1.3-SNAPSHOT/car">org.apache.geronimo.configs/persistence-jpa20-deployer/${pom.version}/car</artifact-alias>
                             <artifact-alias key="org.apache.geronimo.configs/persistence-jpa20-deployer/2.1.3-beta/car">org.apache.geronimo.configs/persistence-jpa20-deployer/${pom.version}/car</artifact-alias>
-                            <artifact-alias server="client" key="org.apache.geronimo.configs/persistence-jpa20-deployer/2.1.3-M3-SNAPSHOT/car">org.apache.geronimo.configs/persistence-jpa20-deployer/${pom.version}/car</artifact-alias>
-                            <artifact-alias server="client" key="org.apache.geronimo.configs/persistence-jpa20-deployer/2.1.3-beta-SNAPSHOT/car">org.apache.geronimo.configs/persistence-jpa20-deployer/${pom.version}/car</artifact-alias>
+                            <artifact-alias server="client" key="org.apache.geronimo.configs/persistence-jpa20-deployer/2.1.3-SNAPSHOT/car">org.apache.geronimo.configs/persistence-jpa20-deployer/${pom.version}/car</artifact-alias>
                             <artifact-alias server="client" key="org.apache.geronimo.configs/persistence-jpa20-deployer/2.1.3-beta/car">org.apache.geronimo.configs/persistence-jpa20-deployer/${pom.version}/car</artifact-alias>
                             <!-- handle persistence-jpa10-deployer to jpa20 -->
                             <artifact-alias key="org.apache.geronimo.configs/persistence-jpa10-deployer//car">org.apache.geronimo.configs/persistence-jpa20-deployer/${pom.version}/car</artifact-alias>
                             <artifact-alias key="org.apache.geronimo.configs/persistence-jpa10-deployer/2.1.2/car">org.apache.geronimo.configs/persistence-jpa20-deployer/${pom.version}/car</artifact-alias>
                             <artifact-alias key="org.apache.geronimo.configs/persistence-jpa10-deployer/2.1.3/car">org.apache.geronimo.configs/persistence-jpa20-deployer/${pom.version}/car</artifact-alias>
                             <artifact-alias key="org.apache.geronimo.configs/persistence-jpa10-deployer/2.1.4/car">org.apache.geronimo.configs/persistence-jpa20-deployer/${pom.version}/car</artifact-alias>
-                            <artifact-alias key="org.apache.geronimo.configs/persistence-jpa10-deployer/2.1.5-SNAPSHOT/car">org.apache.geronimo.configs/persistence-jpa20-deployer/${pom.version}/car</artifact-alias>
+                            <artifact-alias key="org.apache.geronimo.configs/persistence-jpa10-deployer/2.1.5/car">org.apache.geronimo.configs/persistence-jpa20-deployer/${pom.version}/car</artifact-alias>
+                            <artifact-alias key="org.apache.geronimo.configs/persistence-jpa10-deployer/2.1.6-SNAPSHOT/car">org.apache.geronimo.configs/persistence-jpa20-deployer/${pom.version}/car</artifact-alias>
                             <artifact-alias server="client" key="org.apache.geronimo.configs/persistence-jpa10-deployer//car">org.apache.geronimo.configs/persistence-jpa20-deployer/${pom.version}/car</artifact-alias>
                             <artifact-alias server="client" key="org.apache.geronimo.configs/persistence-jpa10-deployer/2.1.2/car">org.apache.geronimo.configs/persistence-jpa20-deployer/${pom.version}/car</artifact-alias>
                             <artifact-alias server="client" key="org.apache.geronimo.configs/persistence-jpa10-deployer/2.1.3/car">org.apache.geronimo.configs/persistence-jpa20-deployer/${pom.version}/car</artifact-alias>
                             <artifact-alias server="client" key="org.apache.geronimo.configs/persistence-jpa10-deployer/2.1.4/car">org.apache.geronimo.configs/persistence-jpa20-deployer/${pom.version}/car</artifact-alias>
-                            <artifact-alias server="client" key="org.apache.geronimo.configs/persistence-jpa10-deployer/2.1.5-SNAPSHOT/car">org.apache.geronimo.configs/persistence-jpa20-deployer/${pom.version}/car</artifact-alias>
+                            <artifact-alias server="client" key="org.apache.geronimo.configs/persistence-jpa10-deployer/2.1.5/car">org.apache.geronimo.configs/persistence-jpa20-deployer/${pom.version}/car</artifact-alias>
+                            <artifact-alias server="client" key="org.apache.geronimo.configs/persistence-jpa10-deployer/2.1.6-SNAPSHOT/car">org.apache.geronimo.configs/persistence-jpa20-deployer/${pom.version}/car</artifact-alias>
                             <!-- handle geronimo-persistence-jpa10 to jpa20 -->
                             <artifact-alias key="org.apache.geronimo.modules/geronimo-persistence-jpa10//jar">org.apache.geronimo.modules/geronimo-persistence-jpa20/${pom.version}/jar</artifact-alias>
                             <artifact-alias key="org.apache.geronimo.modules/geronimo-persistence-jpa10/2.1.2/jar">org.apache.geronimo.modules/geronimo-persistence-jpa20/${pom.version}/jar</artifact-alias>
                             <artifact-alias key="org.apache.geronimo.modules/geronimo-persistence-jpa10/2.1.3/jar">org.apache.geronimo.modules/geronimo-persistence-jpa20/${pom.version}/jar</artifact-alias>
                             <artifact-alias key="org.apache.geronimo.modules/geronimo-persistence-jpa10/2.1.4/jar">org.apache.geronimo.modules/geronimo-persistence-jpa20/${pom.version}/jar</artifact-alias>
-                            <artifact-alias key="org.apache.geronimo.modules/geronimo-persistence-jpa10/2.1.5-SNAPSHOT/jar">org.apache.geronimo.modules/geronimo-persistence-jpa20/${pom.version}/jar</artifact-alias>
+                            <artifact-alias key="org.apache.geronimo.modules/geronimo-persistence-jpa10/2.1.5/jar">org.apache.geronimo.modules/geronimo-persistence-jpa20/${pom.version}/jar</artifact-alias>
+                            <artifact-alias key="org.apache.geronimo.modules/geronimo-persistence-jpa10/2.1.6-SNAPSHOT/jar">org.apache.geronimo.modules/geronimo-persistence-jpa20/${pom.version}/jar</artifact-alias>
                             <artifact-alias server="client" key="org.apache.geronimo.modules/geronimo-persistence-jpa10//jar">org.apache.geronimo.modules/geronimo-persistence-jpa20/${pom.version}/jar</artifact-alias>
                             <artifact-alias server="client" key="org.apache.geronimo.modules/geronimo-persistence-jpa10/2.1.2/jar">org.apache.geronimo.modules/geronimo-persistence-jpa20/${pom.version}/jar</artifact-alias>
                             <artifact-alias server="client" key="org.apache.geronimo.modules/geronimo-persistence-jpa10/2.1.3/jar">org.apache.geronimo.modules/geronimo-persistence-jpa20/${pom.version}/jar</artifact-alias>
                             <artifact-alias server="client" key="org.apache.geronimo.modules/geronimo-persistence-jpa10/2.1.4/jar">org.apache.geronimo.modules/geronimo-persistence-jpa20/${pom.version}/jar</artifact-alias>
-                            <artifact-alias server="client" key="org.apache.geronimo.modules/geronimo-persistence-jpa10/2.1.5-SNAPSHOT/jar">org.apache.geronimo.modules/geronimo-persistence-jpa20/${pom.version}/jar</artifact-alias>
+                            <artifact-alias server="client" key="org.apache.geronimo.modules/geronimo-persistence-jpa10/2.1.5/jar">org.apache.geronimo.modules/geronimo-persistence-jpa20/${pom.version}/jar</artifact-alias>
+                            <artifact-alias server="client" key="org.apache.geronimo.modules/geronimo-persistence-jpa10/2.1.6-SNAPSHOT/jar">org.apache.geronimo.modules/geronimo-persistence-jpa20/${pom.version}/jar</artifact-alias>
                         </plugin-artifact>
                     </instance>
                 </configuration>

Modified: geronimo/plugins/openjpa2/branches/2.1/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/openjpa2/branches/2.1/pom.xml?rev=936944&r1=936943&r2=936944&view=diff
==============================================================================
--- geronimo/plugins/openjpa2/branches/2.1/pom.xml (original)
+++ geronimo/plugins/openjpa2/branches/2.1/pom.xml Thu Apr 22 16:34:56 2010
@@ -463,7 +463,8 @@
                         <plugin-artifact>
                             <geronimo-version>2.1.3</geronimo-version>
                             <geronimo-version>2.1.4</geronimo-version>
-                            <geronimo-version>2.1.5-SNAPSHOT</geronimo-version>
+                            <geronimo-version>2.1.5</geronimo-version>
+                            <geronimo-version>2.1.6-SNAPSHOT</geronimo-version>
                             <jvm-version>1.5</jvm-version>
                             <jvm-version>1.6</jvm-version>
                             <source-repository>${PluginSrcRepoLocal}</source-repository>