geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dwo...@apache.org
Subject svn commit: r835007 - in /geronimo/plugins/openjpa2/branches/2.1: geronimo-openjpa2/pom.xml geronimo-persistence-jpa20/pom.xml openjpa2/pom.xml persistence-jpa20-deployer/pom.xml
Date Wed, 11 Nov 2009 18:42:11 GMT
Author: dwoods
Date: Wed Nov 11 18:42:11 2009
New Revision: 835007

URL: http://svn.apache.org/viewvc?rev=835007&view=rev
Log:
GERONIMO-4946 dependency updates.  plugins can now be installed on 2.1.5-SNAPSHOT and jpa-tests
passes.

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

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=835007&r1=835006&r2=835007&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 18:42:11 2009
@@ -37,7 +37,6 @@
             <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-j2ee</artifactId>
             <version>${geronimoVersion}</version>
-            <scope>provided</scope>
         </dependency>
 
         <dependency>

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=835007&r1=835006&r2=835007&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 18:42:11
2009
@@ -38,7 +38,6 @@
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-connector</artifactId>
             <version>${geronimoVersion}</version>
-            <scope>provided</scope>
         </dependency>
 
         <dependency>

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=835007&r1=835006&r2=835007&view=diff
==============================================================================
--- geronimo/plugins/openjpa2/branches/2.1/openjpa2/pom.xml (original)
+++ geronimo/plugins/openjpa2/branches/2.1/openjpa2/pom.xml Wed Nov 11 18:42:11 2009
@@ -39,11 +39,15 @@
     
     <dependencies>
         <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>geronimo-gbean-deployer</artifactId>
-            <version>${geronimoVersion}</version>
-            <type>car</type>
-            <scope>provided</scope>
+            <groupId>org.apache.openjpa</groupId>
+            <artifactId>openjpa</artifactId>
+            <version>${openjpa2Version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-openjpa2</artifactId>
+            <version>${version}</version>
         </dependency>
 
         <dependency>
@@ -114,9 +118,13 @@
                             <config-xml-content server="offline" />
                             <!-- handle openjpa to openjpa2 CAR alias -->
                             <artifact-alias key="org.apache.geronimo.configs/openjpa//car">org.apache.geronimo.configs/openjpa2/${version}/car</artifact-alias>
+                            <artifact-alias key="org.apache.geronimo.configs/openjpa/2.1.3/car">org.apache.geronimo.configs/openjpa2/${version}/car</artifact-alias>
                             <artifact-alias key="org.apache.geronimo.configs/openjpa/${geronimoVersion}/car">org.apache.geronimo.configs/openjpa2/${version}/car</artifact-alias>
+                            <artifact-alias key="org.apache.geronimo.configs/openjpa/2.1.5-SNAPSHOT/car">org.apache.geronimo.configs/openjpa2/${version}/car</artifact-alias>
                             <artifact-alias server="client" key="org.apache.geronimo.configs/openjpa//car">org.apache.geronimo.configs/openjpa2/${version}/car</artifact-alias>
+                            <artifact-alias server="client" key="org.apache.geronimo.configs/openjpa/2.1.3/car">org.apache.geronimo.configs/openjpa2/${version}/car</artifact-alias>
                             <artifact-alias server="client" key="org.apache.geronimo.configs/openjpa/${geronimoVersion}/car">org.apache.geronimo.configs/openjpa2/${version}/car</artifact-alias>
+                            <artifact-alias server="client" key="org.apache.geronimo.configs/openjpa/2.1.5-SNAPSHOT/car">org.apache.geronimo.configs/openjpa2/${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>

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=835007&r1=835006&r2=835007&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 18:42:11
2009
@@ -50,6 +50,12 @@
         </dependency>
 
         <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-persistence-jpa20</artifactId>
+            <version>${version}</version>
+        </dependency>
+
+        <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-jpa_2.0_spec</artifactId>
         </dependency>
@@ -68,11 +74,10 @@
                 <groupId>org.apache.geronimo.buildsupport</groupId>
                 <artifactId>car-maven-plugin</artifactId>
                 <configuration>
-                    <category>Persistence</category>
                     <useMavenDependencies>
-                        <value>true</value>
-                        <includeVersion>true</includeVersion>
+                        <value>false</value>
                     </useMavenDependencies>
+                    <category>Persistence</category>
                     <dependencies>
                         <dependency>
                             <groupId>org.apache.geronimo.configs</groupId>
@@ -81,6 +86,26 @@
                             <type>car</type>
                             <import>classes</import>
                         </dependency>
+                        <dependency>
+                            <groupId>org.apache.geronimo.modules</groupId>
+                            <artifactId>geronimo-persistence-jpa20-builder</artifactId>
+                            <version>${version}</version>
+                            <type>jar</type>
+                            <import>classes</import>
+                        </dependency>
+                        <dependency>
+                            <groupId>org.apache.geronimo.modules</groupId>
+                            <artifactId>geronimo-persistence-jpa20</artifactId>
+                            <version>${version}</version>
+                            <type>jar</type>
+                            <import>classes</import>
+                        </dependency>
+                        <dependency>
+                            <groupId>org.apache.geronimo.configs</groupId>
+                            <artifactId>j2ee-deployer</artifactId>
+                            <version>${geronimoVersion}</version>
+                            <type>car</type>
+                        </dependency>
                     </dependencies>
                     <instance>
                         <plugin-artifact>
@@ -138,14 +163,22 @@
                             </config-xml-content>
                             <!-- handle persistence-jpa10-deployer to jpa20 -->
                             <artifact-alias key="org.apache.geronimo.configs/persistence-jpa10-deployer//car">org.apache.geronimo.configs/persistence-jpa20-deployer/${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/${version}/car</artifact-alias>
                             <artifact-alias key="org.apache.geronimo.configs/persistence-jpa10-deployer/${geronimoVersion}/car">org.apache.geronimo.configs/persistence-jpa20-deployer/${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/${version}/car</artifact-alias>
                             <artifact-alias server="client" key="org.apache.geronimo.configs/persistence-jpa10-deployer//car">org.apache.geronimo.configs/persistence-jpa20-deployer/${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/${version}/car</artifact-alias>
                             <artifact-alias server="client" key="org.apache.geronimo.configs/persistence-jpa10-deployer/${geronimoVersion}/car">org.apache.geronimo.configs/persistence-jpa20-deployer/${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/${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/${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/${version}/jar</artifact-alias>
                             <artifact-alias key="org.apache.geronimo.modules/geronimo-persistence-jpa10/${geronimoVersion}/jar">org.apache.geronimo.modules/geronimo-persistence-jpa20/${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/${version}/jar</artifact-alias>
                             <artifact-alias server="client" key="org.apache.geronimo.modules/geronimo-persistence-jpa10//jar">org.apache.geronimo.modules/geronimo-persistence-jpa20/${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/${version}/jar</artifact-alias>
                             <artifact-alias server="client" key="org.apache.geronimo.modules/geronimo-persistence-jpa10/${geronimoVersion}/jar">org.apache.geronimo.modules/geronimo-persistence-jpa20/${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/${version}/jar</artifact-alias>
                         </plugin-artifact>
                     </instance>
                 </configuration>



Mime
View raw message