geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dwo...@apache.org
Subject svn commit: r833691 - in /geronimo/plugins/openjpa2/branches/2.2: ./ geronimo-openjpa2/ geronimo-persistence-jpa20-builder/ geronimo-persistence-jpa20/ openjpa2/ openjpa2/src/main/history/ persistence-jpa20-deployer/
Date Sat, 07 Nov 2009 15:02:24 GMT
Author: dwoods
Date: Sat Nov  7 15:02:23 2009
New Revision: 833691

URL: http://svn.apache.org/viewvc?rev=833691&view=rev
Log:
GERONIMO-4946 Build updates to create a plugin for the 2.2 server, since a common 2.1/2.2
plugin can't be built, due to all of the required CAR artifact-alias entries missing from
2.2

Modified:
    geronimo/plugins/openjpa2/branches/2.2/geronimo-openjpa2/pom.xml
    geronimo/plugins/openjpa2/branches/2.2/geronimo-persistence-jpa20-builder/pom.xml
    geronimo/plugins/openjpa2/branches/2.2/geronimo-persistence-jpa20/pom.xml
    geronimo/plugins/openjpa2/branches/2.2/openjpa2/pom.xml
    geronimo/plugins/openjpa2/branches/2.2/openjpa2/src/main/history/dependencies.xml
    geronimo/plugins/openjpa2/branches/2.2/persistence-jpa20-deployer/pom.xml
    geronimo/plugins/openjpa2/branches/2.2/pom.xml

Modified: geronimo/plugins/openjpa2/branches/2.2/geronimo-openjpa2/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/openjpa2/branches/2.2/geronimo-openjpa2/pom.xml?rev=833691&r1=833690&r2=833691&view=diff
==============================================================================
--- geronimo/plugins/openjpa2/branches/2.2/geronimo-openjpa2/pom.xml (original)
+++ geronimo/plugins/openjpa2/branches/2.2/geronimo-openjpa2/pom.xml Sat Nov  7 15:02:23 2009
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>openjpa2</artifactId>
-        <version>2.2-SNAPSHOT</version>
+        <version>2.2-M3-SNAPSHOT</version>
     </parent>
     
     <groupId>org.apache.geronimo.modules</groupId>
@@ -36,7 +36,7 @@
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-j2ee</artifactId>
-            <version>${version}</version>
+            <version>${geronimoVersion}</version>
             <scope>provided</scope>
         </dependency>
 
@@ -44,6 +44,11 @@
             <groupId>org.apache.openjpa</groupId>
             <artifactId>openjpa</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+        </dependency>
     </dependencies>
 
 </project>

Modified: geronimo/plugins/openjpa2/branches/2.2/geronimo-persistence-jpa20-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/openjpa2/branches/2.2/geronimo-persistence-jpa20-builder/pom.xml?rev=833691&r1=833690&r2=833691&view=diff
==============================================================================
--- geronimo/plugins/openjpa2/branches/2.2/geronimo-persistence-jpa20-builder/pom.xml (original)
+++ geronimo/plugins/openjpa2/branches/2.2/geronimo-persistence-jpa20-builder/pom.xml Sat
Nov  7 15:02:23 2009
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>openjpa2</artifactId>
-        <version>2.2-SNAPSHOT</version>
+        <version>2.2-M3-SNAPSHOT</version>
     </parent>
     
     <groupId>org.apache.geronimo.modules</groupId>
@@ -38,7 +38,7 @@
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-naming-builder</artifactId>
-            <version>${version}</version>
+            <version>${geronimoVersion}</version>
         </dependency>
         
         <dependency>

Modified: geronimo/plugins/openjpa2/branches/2.2/geronimo-persistence-jpa20/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/openjpa2/branches/2.2/geronimo-persistence-jpa20/pom.xml?rev=833691&r1=833690&r2=833691&view=diff
==============================================================================
--- geronimo/plugins/openjpa2/branches/2.2/geronimo-persistence-jpa20/pom.xml (original)
+++ geronimo/plugins/openjpa2/branches/2.2/geronimo-persistence-jpa20/pom.xml Sat Nov  7 15:02:23
2009
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>openjpa2</artifactId>
-        <version>2.2-SNAPSHOT</version>
+        <version>2.2-M3-SNAPSHOT</version>
     </parent>
     
     <groupId>org.apache.geronimo.modules</groupId>
@@ -36,16 +36,15 @@
         <!-- g-transaction, g-system come from this -->
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
-            <!--<artifactId>geronimo-connector-1_6</artifactId>-->
             <artifactId>geronimo-connector</artifactId>
-            <version>${version}</version>
+            <version>${geronimoVersion}</version>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-transformer</artifactId>
-            <version>${version}</version>
+            <version>${geronimoVersion}</version>
         </dependency>
 
         <dependency>
@@ -62,7 +61,6 @@
 
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <!--<artifactId>geronimo-ejb_3.1_spec</artifactId>-->
             <artifactId>geronimo-ejb_3.0_spec</artifactId>
             <scope>provided</scope>
         </dependency>

Modified: geronimo/plugins/openjpa2/branches/2.2/openjpa2/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/openjpa2/branches/2.2/openjpa2/pom.xml?rev=833691&r1=833690&r2=833691&view=diff
==============================================================================
--- geronimo/plugins/openjpa2/branches/2.2/openjpa2/pom.xml (original)
+++ geronimo/plugins/openjpa2/branches/2.2/openjpa2/pom.xml Sat Nov  7 15:02:23 2009
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>openjpa2</artifactId>
-        <version>2.2-SNAPSHOT</version>
+        <version>2.2-M3-SNAPSHOT</version>
     </parent>
     
     <groupId>org.apache.geronimo.configs</groupId>
@@ -41,7 +41,7 @@
         <dependency>
             <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-gbean-deployer</artifactId>
-            <version>${version}</version>
+            <version>${geronimoVersion}</version>
             <type>car</type>
             <scope>provided</scope>
         </dependency>
@@ -55,6 +55,12 @@
         <dependency>
             <groupId>net.sourceforge.serp</groupId>
             <artifactId>serp</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>junit</groupId>
+                    <artifactId>junit</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>
@@ -69,9 +75,8 @@
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <!--<artifactId>transaction-1_6</artifactId>-->
             <artifactId>transaction</artifactId>
-            <version>${version}</version>
+            <version>${geronimoVersion}</version>
             <type>car</type>
         </dependency>
     </dependencies>
@@ -85,14 +90,13 @@
                     <category>Persistence</category>
                     <instance>
                         <plugin-artifact>
-                            <config-xml-content server="default" />
-                            <config-xml-content server="offline" />
                             <obsoletes>
                                 <groupId>org.apache.geronimo.configs</groupId>
                                 <artifactId>openjpa</artifactId>
                             </obsoletes>
                             <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/${version}/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>
                         </plugin-artifact>
                     </instance>
                 </configuration>

Modified: geronimo/plugins/openjpa2/branches/2.2/openjpa2/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/openjpa2/branches/2.2/openjpa2/src/main/history/dependencies.xml?rev=833691&r1=833690&r2=833691&view=diff
==============================================================================
--- geronimo/plugins/openjpa2/branches/2.2/openjpa2/src/main/history/dependencies.xml (original)
+++ geronimo/plugins/openjpa2/branches/2.2/openjpa2/src/main/history/dependencies.xml Sat
Nov  7 15:02:23 2009
@@ -3,7 +3,7 @@
     <module-id>
         <groupId>org.apache.geronimo.configs</groupId>
         <artifactId>openjpa2</artifactId>
-        <version>2.2-SNAPSHOT</version>
+        <version>2.2-M3-SNAPSHOT</version>
         <type>car</type>
     </module-id>
     <dependency>
@@ -23,7 +23,6 @@
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.configs</groupId>
-        <!--<artifactId>transaction-1_6</artifactId>-->
         <artifactId>transaction</artifactId>
         <type>car</type>
     </dependency>

Modified: geronimo/plugins/openjpa2/branches/2.2/persistence-jpa20-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/openjpa2/branches/2.2/persistence-jpa20-deployer/pom.xml?rev=833691&r1=833690&r2=833691&view=diff
==============================================================================
--- geronimo/plugins/openjpa2/branches/2.2/persistence-jpa20-deployer/pom.xml (original)
+++ geronimo/plugins/openjpa2/branches/2.2/persistence-jpa20-deployer/pom.xml Sat Nov  7 15:02:23
2009
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>openjpa2</artifactId>
-        <version>2.2-SNAPSHOT</version>
+        <version>2.2-M3-SNAPSHOT</version>
     </parent>
     
     <groupId>org.apache.geronimo.configs</groupId>
@@ -39,7 +39,7 @@
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>j2ee-deployer</artifactId>
-            <version>${version}</version>
+            <version>${geronimoVersion}</version>
             <type>car</type>
         </dependency>
 
@@ -51,17 +51,10 @@
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <!--<artifactId>transaction-1_6</artifactId>-->
             <artifactId>transaction</artifactId>
             <type>car</type>
-            <version>${version}</version>
+            <version>${geronimoVersion}</version>
         </dependency>
-
-        <!--todo get the schema classes in a config -->
-        <!--<dependency>-->
-        <!--<groupId>org.apache.geronimo.schema</groupId>-->
-        <!--<artifactId>geronimo-schema-jee_5</artifactId>-->
-        <!--</dependency>-->
     </dependencies>
 
     <build>
@@ -74,7 +67,6 @@
                     <dependencies>
                         <dependency>
                             <groupId>org.apache.geronimo.configs</groupId>
-                            <!--<artifactId>transaction-1_6</artifactId>-->
                             <artifactId>transaction</artifactId>
                             <type>car</type>
                             <import>classes</import>
@@ -132,6 +124,7 @@
                             </obsoletes>
                             <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/${version}/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>
                         </plugin-artifact>
                     </instance>
                 </configuration>

Modified: geronimo/plugins/openjpa2/branches/2.2/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/openjpa2/branches/2.2/pom.xml?rev=833691&r1=833690&r2=833691&view=diff
==============================================================================
--- geronimo/plugins/openjpa2/branches/2.2/pom.xml (original)
+++ geronimo/plugins/openjpa2/branches/2.2/pom.xml Sat Nov  7 15:02:23 2009
@@ -27,10 +27,20 @@
         <artifactId>plugins</artifactId>
         <version>2.2-SNAPSHOT</version>
     </parent>
+<!--
+    <parent>
+        <groupId>org.apache.geronimo.genesis</groupId>
+        <artifactId>genesis-java5-flava</artifactId>
+        <version>2.0</version>
+    </parent>
+-->
 
+    <groupId>org.apache.geronimo.plugins</groupId>
     <artifactId>openjpa2</artifactId>
-    <name>Geronimo Plugins, OpenJPA2</name>
+    <version>2.2-M3-SNAPSHOT</version>
     <packaging>pom</packaging>
+
+    <name>Geronimo Plugins, OpenJPA2</name>
     <description>Apache OpenJPA2 plugin</description>
 
     <properties>
@@ -38,10 +48,27 @@
         <openjpa2Version>2.0.0-M3</openjpa2Version>
         <jpa2specVersion>1.0-PFD2</jpa2specVersion>
         <bvspecVersion>1.0-CR5</bvspecVersion>
+        <geronimoVersion>2.2-SNAPSHOT</geronimoVersion>
     </properties>
 
+    <scm>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/plugins/openjpa2/branches/2.2</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/plugins/openjpa2/branches/2.2</developerConnection>
+        <url>http://svn.apache.org/viewvc/geronimo/plugins/openjpa2/branches/2.2</url>
+    </scm>
+
     <dependencyManagement>
         <dependencies>
+            <!-- Import Geronimo Server used dependency versions
+            <dependency>
+                <groupId>org.apache.geronimo</groupId>
+                <artifactId>geronimo</artifactId>
+                <version>${geronimoVersion}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+            -->
+
             <dependency>
                 <groupId>org.apache.openjpa</groupId>
                 <artifactId>openjpa</artifactId>
@@ -138,4 +165,28 @@
         <module>persistence-jpa20-deployer</module>
     </modules>
 
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.geronimo.testsupport</groupId>
+            <artifactId>testsupport-common</artifactId>
+            <version>${geronimoVersion}</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <pluginManagement>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.geronimo.buildsupport</groupId>
+                <artifactId>car-maven-plugin</artifactId>
+                <version>${geronimoVersion}</version>
+                <extensions>true</extensions>
+                <configuration>
+                    <category>Persistence</category>
+                </configuration>
+            </plugin>
+        </plugins>
+        </pluginManagement>
+    </build>
 </project>



Mime
View raw message