geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dwo...@apache.org
Subject svn commit: r834146 - in /geronimo/plugins/openjpa2/branches: 2.1/ 2.1/geronimo-openjpa2/ 2.1/geronimo-persistence-jpa20-builder/ 2.1/geronimo-persistence-jpa20/ 2.1/openjpa2/ 2.1/persistence-jpa20-deployer/ 2.2/persistence-jpa20-deployer/
Date Mon, 09 Nov 2009 17:01:31 GMT
Author: dwoods
Date: Mon Nov  9 17:01:07 2009
New Revision: 834146

URL: http://svn.apache.org/viewvc?rev=834146&view=rev
Log:
GERONIMO-4946 build updates

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/openjpa2/pom.xml
    geronimo/plugins/openjpa2/branches/2.1/persistence-jpa20-deployer/pom.xml
    geronimo/plugins/openjpa2/branches/2.1/pom.xml
    geronimo/plugins/openjpa2/branches/2.2/persistence-jpa20-deployer/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=834146&r1=834145&r2=834146&view=diff
==============================================================================
--- geronimo/plugins/openjpa2/branches/2.1/README.txt (original)
+++ geronimo/plugins/openjpa2/branches/2.1/README.txt Mon Nov  9 17:01:07 2009
@@ -1,4 +1,4 @@
-Apache OpenJPA 2.0 Plugin for Apache Geronimo 2.2 Server
+Apache OpenJPA 2.0 Plugin for Apache Geronimo 2.1 Server
 Copyright 2003-2009 The Apache Software Foundation
 --------------------------------------------------------------------------------
 
@@ -15,12 +15,12 @@
 
 Building -
 ----------
-The build requires access to the latest Geronimo 2.2-SNAPSHOT server artifacts.
+The build requires access to the Geronimo 2.1.4 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/branches/2.2/
+    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:
-    Maven 2.0.10 or later
+    Maven 2.0.9 or later
     Java SE 6 - Note: Some features in OpenJPA 2.0 require Java SE 6
 To build, run:
     mvn clean install

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=834146&r1=834145&r2=834146&view=diff
==============================================================================
--- geronimo/plugins/openjpa2/branches/2.1/geronimo-openjpa2/pom.xml (original)
+++ geronimo/plugins/openjpa2/branches/2.1/geronimo-openjpa2/pom.xml Mon Nov  9 17:01:07 2009
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>openjpa2</artifactId>
-        <version>2.1.4-SNAPSHOT</version>
+        <version>2.1.4-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=834146&r1=834145&r2=834146&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 Mon
Nov  9 17:01:07 2009
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>openjpa2</artifactId>
-        <version>2.1.4-SNAPSHOT</version>
+        <version>2.1.4-M3-SNAPSHOT</version>
     </parent>
     
     <groupId>org.apache.geronimo.modules</groupId>
@@ -44,7 +44,7 @@
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-persistence-jpa20</artifactId>
-            <version>${version}</version>
+            <version>${pom.version}</version>
         </dependency>
     </dependencies>
 

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=834146&r1=834145&r2=834146&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 Mon Nov  9 17:01:07
2009
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>openjpa2</artifactId>
-        <version>2.1.4-SNAPSHOT</version>
+        <version>2.1.4-M3-SNAPSHOT</version>
     </parent>
     
     <groupId>org.apache.geronimo.modules</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=834146&r1=834145&r2=834146&view=diff
==============================================================================
--- geronimo/plugins/openjpa2/branches/2.1/openjpa2/pom.xml (original)
+++ geronimo/plugins/openjpa2/branches/2.1/openjpa2/pom.xml Mon Nov  9 17:01:07 2009
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>openjpa2</artifactId>
-        <version>2.1.4-SNAPSHOT</version>
+        <version>2.1.4-M3-SNAPSHOT</version>
     </parent>
     
     <groupId>org.apache.geronimo.configs</groupId>
@@ -49,12 +49,18 @@
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-openjpa2</artifactId>
-            <version>${version}</version>
+            <version>${pom.version}</version>
         </dependency>
 
         <dependency>
             <groupId>net.sourceforge.serp</groupId>
             <artifactId>serp</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>junit</groupId>
+                    <artifactId>junit</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>
@@ -73,7 +79,6 @@
             <artifactId>transaction</artifactId>
             <version>${geronimoVersion}</version>
             <type>car</type>
-            <scope>provided</scope>
         </dependency>
     </dependencies>
 
@@ -82,7 +87,6 @@
             <plugin>
                 <groupId>org.apache.geronimo.buildsupport</groupId>
                 <artifactId>car-maven-plugin</artifactId>
-                <!-- Install as extention to allow 'car' packaging to be used. -->
                 <extensions>true</extensions>
                 <configuration>
                     <category>Persistence</category>
@@ -96,9 +100,13 @@
                                 <groupId>org.apache.geronimo.configs</groupId>
                                 <artifactId>openjpa</artifactId>
                             </obsoletes>
+                            <obsoletes>
+                                <groupId>org.apache.geronimo.configs</groupId>
+                                <artifactId>openjpa2</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/2.1.3/car">org.apache.geronimo.configs/openjpa2/${version}/car</artifact-alias>
-                            <artifact-alias key="org.apache.geronimo.configs/openjpa/2.1.4/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>
                             <artifact-alias key="org.apache.geronimo.configs/openjpa/2.1.5-SNAPSHOT/car">org.apache.geronimo.configs/openjpa2/${version}/car</artifact-alias>
                         </plugin-artifact>
                     </instance>

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=834146&r1=834145&r2=834146&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 Mon Nov  9 17:01:07
2009
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>openjpa2</artifactId>
-        <version>2.1.4-SNAPSHOT</version>
+        <version>2.1.4-M3-SNAPSHOT</version>
     </parent>
     
     <groupId>org.apache.geronimo.configs</groupId>
@@ -33,7 +33,7 @@
     <name>Geronimo Plugins, OpenJPA2 :: Deployer</name>
     <packaging>car</packaging>
 
-    <description>Geronimo JPA2 Persistence Unit deployer</description>
+    <description>Geronimo JPA 2.0 Persistence Unit deployer</description>
 
     <dependencies>
         <dependency>
@@ -46,7 +46,7 @@
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-persistence-jpa20-builder</artifactId>
-            <version>${version}</version>
+            <version>${pom.version}</version>
         </dependency>
 
         <dependency>
@@ -67,12 +67,16 @@
                 <configuration>
                     <category>Persistence</category>
                     <useMavenDependencies>
+                        <value>true</value>
+                        <includeVersion>true</includeVersion>
+                    </useMavenDependencies>
+<!--
+                    <useMavenDependencies>
                         <value>false</value>
                     </useMavenDependencies>
                     <dependencies>
                         <dependency>
                             <groupId>org.apache.geronimo.configs</groupId>
-                            <!--<artifactId>transaction-1_6</artifactId>-->
                             <artifactId>transaction</artifactId>
                             <version>${geronimoVersion}</version>
                             <type>car</type>
@@ -81,7 +85,7 @@
                         <dependency>
                             <groupId>org.apache.geronimo.modules</groupId>
                             <artifactId>geronimo-persistence-jpa20-builder</artifactId>
-                            <version>${version}</version>
+                            <version>${pom.version}</version>
                             <type>jar</type>
                             <import>classes</import>
                         </dependency>
@@ -92,6 +96,7 @@
                             <type>car</type>
                         </dependency>
                     </dependencies>
+-->
                     <instance>
                         <plugin-artifact>
                             <config-xml-content>
@@ -142,9 +147,13 @@
                                 <groupId>org.apache.geronimo.configs</groupId>
                                 <artifactId>persistence-jpa10-deployer</artifactId>
                             </obsoletes>
+                            <obsoletes>
+                                <groupId>org.apache.geronimo.configs</groupId>
+                                <artifactId>persistence-jpa20-deployer</artifactId>
+                            </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/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/2.1.4/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>
                             <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>
                         </plugin-artifact>
                     </instance>

Modified: geronimo/plugins/openjpa2/branches/2.1/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/openjpa2/branches/2.1/pom.xml?rev=834146&r1=834145&r2=834146&view=diff
==============================================================================
--- geronimo/plugins/openjpa2/branches/2.1/pom.xml (original)
+++ geronimo/plugins/openjpa2/branches/2.1/pom.xml Mon Nov  9 17:01:07 2009
@@ -22,24 +22,46 @@
 
     <modelVersion>4.0.0</modelVersion>
 
+    <!--
     <parent>
         <groupId>org.apache.geronimo.genesis</groupId>
         <artifactId>genesis-java5-flava</artifactId>
         <version>2.0</version>
     </parent>
+    -->
+    <parent>
+        <groupId>org.apache.geronimo.plugins</groupId>
+        <artifactId>plugins</artifactId>
+        <version>2.1.4</version>
+    </parent>
 
     <groupId>org.apache.geronimo.plugins</groupId>
     <artifactId>openjpa2</artifactId>
-    <version>2.1.4-SNAPSHOT</version>
+    <version>2.1.4-M3-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>Geronimo Plugins, OpenJPA2</name>
     <description>Apache OpenJPA2 plugin</description>
 
+    <url>http://geronimo.apache.org</url>
+
+    <organization>
+        <name>The Apache Software Foundation</name>
+        <url>http://www.apache.org</url>
+    </organization>
+
+    <licenses>
+        <license>
+            <name>The Apache Software License, Version 2.0</name>
+            <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+            <distribution>repo</distribution>
+        </license>
+    </licenses>
+
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/plugins/openjpa2/trunk</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/plugins/openjpa2/trunk</developerConnection>
-        <url>http://svn.apache.org/viewvc/geronimo/plugins/openjpa2/trunk</url>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/plugins/openjpa2/branches/2.1</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/plugins/openjpa2/branches/2.1</developerConnection>
+        <url>http://svn.apache.org/viewvc/geronimo/plugins/openjpa2/branches/2.1</url>
     </scm>
 
     <properties>
@@ -48,32 +70,15 @@
         <bvspecVersion>1.0-CR5</bvspecVersion>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
-        <!-- set siteId to artifactId for any "top level" project rooting a webs
-ite -->
-        <siteId>daytrader</siteId>
+        <!-- set siteId to artifactId for any "top level" project rooting a website -->
+        <siteId>openjpa2</siteId>
 
-        <!-- Geronimo server properties for car-maven-plugin -->
         <geronimoVersion>2.1.4</geronimoVersion>
-        <geronimoSchemaVersion>1.2</geronimoSchemaVersion>
-        <gbeanDeployerBootstrap>org.apache.geronimo.framework/geronimo-gbean-deployer-bootstrap/${geronimoVersion}/car</gbeanDeployerBootstrap>
-        <gbeanDeployer>org.apache.geronimo.framework/geronimo-gbean-deployer/${geronimoVersion}/car</gbeanDeployer>
-        <j2eeDeployer>org.apache.geronimo.configs/j2ee-deployer/${geronimoVersion}/car</j2eeDeployer>
-        <clientDeployer>org.apache.geronimo.configs/client-deployer/${geronimoVersion}/car</clientDeployer>
-        <connectorDeployer>org.apache.geronimo.configs/connector-deployer/${geronimoVersion}/car</connectorDeployer>
-        <openejbDeployer>org.apache.geronimo.configs/openejb-deployer/${geronimoVersion}/car</openejbDeployer>
-        <openejbcorbaDeployer>org.apache.geronimo.configs/openejb-corba-deployer/${geronimoVersion}/car</openejbcorbaDeployer>
-        <axisDeployer>org.apache.geronimo.configs/axis-deployer/${geronimoVersion}/car</axisDeployer>
-        <cxfDeployer>org.apache.geronimo.configs/cxf-deployer/${geronimoVersion}/car</cxfDeployer>
-        <axis2Deployer>org.apache.geronimo.configs/axis2-deployer/${geronimoVersion}/car</axis2Deployer>
-        <tomcatDeployer>org.apache.geronimo.configs/tomcat6-deployer/${geronimoVersion}/car</tomcatDeployer>
-        <jetty6Deployer>org.apache.geronimo.configs/jetty6-deployer/${geronimoVersion}/car</jetty6Deployer>
-        <jasperDeployer>org.apache.geronimo.configs/jasper-deployer/${geronimoVersion}/car</jasperDeployer>
-        <jpaDeployer>org.apache.geronimo.configs/persistence-jpa20-deployer/${version}/car</jpaDeployer>
     </properties>
 
     <dependencyManagement>
         <dependencies>
-            <!-- Import Geronimo Server used dependency versions -->
+            <!-- Import Geronimo Server used dependency versions
             <dependency>
                 <groupId>org.apache.geronimo</groupId>
                 <artifactId>geronimo</artifactId>
@@ -81,6 +86,7 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
+            -->
 
             <!-- project depends -->
             <dependency>
@@ -180,6 +186,65 @@
     </modules>
 
     <build>
+        <defaultGoal>install</defaultGoal>
+
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-dependency-plugin</artifactId>
+                    <configuration>
+                        <silent>true</silent>
+                    </configuration>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.geronimo.buildsupport</groupId>
+                    <artifactId>car-maven-plugin</artifactId>
+                    <version>${geronimoVersion}</version>
+                    <extensions>true</extensions>
+                </plugin>
+                <plugin>
+                    <groupId>org.codehaus.mojo</groupId>
+                    <artifactId>ianal-maven-plugin</artifactId>
+                    <version>1.0-alpha-1</version>
+                </plugin>
+                <plugin>
+                    <groupId>com.google.code.maven-license-plugin</groupId>
+                    <artifactId>maven-license-plugin</artifactId>
+                    <version>1.4.0</version>
+                    <executions>
+                        <execution>
+                            <goals>
+                                <goal>check</goal>
+                            </goals>
+                        </execution>
+                    </executions>
+                    <configuration>
+                        <aggregate>true</aggregate>
+                        <header>${project.basedir}/src/etc/license-header.txt</header>
+                        <encoding>UTF-8</encoding>
+                        <useDefaultExcludes>true</useDefaultExcludes>
+                        <excludes>
+                            <exclude>**/README.txt</exclude>
+                            <exclude>**/LICENSE.txt</exclude>
+                            <exclude>**/NOTICE.txt</exclude>
+                            <exclude>**/*.psd</exclude>
+                            <exclude>**/*.mdxml</exclude>
+                        </excludes>
+                        <useDefaultMapping>true</useDefaultMapping>
+                        <mapping>
+                            <jjt>JAVADOC_STYLE</jjt>
+                        </mapping>
+                    </configuration>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-dependency-plugin</artifactId>
+                    <version>2.1</version>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+
         <plugins>
             <plugin>
                 <groupId>org.apache.geronimo.buildsupport</groupId>
@@ -199,11 +264,8 @@
                     </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>
-                            <geronimo-version>2.2-SNAPSHOT</geronimo-version>
-                            <geronimo-version>2.2</geronimo-version>
                             <jvm-version>1.5</jvm-version>
                             <jvm-version>1.6</jvm-version>
                             <source-repository>http://repo1.maven.org/maven2/</source-repository>
@@ -213,138 +275,85 @@
                     </commonInstance>
                 </configuration>
             </plugin>
-        </plugins>
-
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.apache.geronimo.buildsupport</groupId>
-                    <artifactId>geronimo-maven-plugin</artifactId>
-                    <version>${geronimoVersion}</version>
 
-                    <configuration>
-                        <assemblies>
-                            <assembly>
-                                <id>jetty</id>
-                                <groupId>org.apache.geronimo.assemblies</groupId>
-                                <artifactId>geronimo-jetty6-javaee5</artifactId>
-                                <version>${geronimoVersion}</version>
-                                <classifier>bin</classifier>
-                                <type>zip</type>
-                            </assembly>
-
-                            <assembly>
-                                <id>jetty-minimal</id>
-                                <groupId>org.apache.geronimo.assemblies</groupId>
-                                <artifactId>geronimo-jetty6-minimal</artifactId>
-                                <version>${geronimoVersion}</version>
-                                <classifier>bin</classifier>
-                                <type>zip</type>
-                            </assembly>
-
-                            <assembly>
-                                <id>tomcat</id>
-                                <groupId>org.apache.geronimo.assemblies</groupId>
-                                <artifactId>geronimo-tomcat6-javaee5</artifactId>
-                                <version>${geronimoVersion}</version>
-                                <classifier>bin</classifier>
-                                <type>zip</type>
-                            </assembly>
-
-                            <assembly>
-                                <id>tomcat-minimal</id>
-                                <groupId>org.apache.geronimo.assemblies</groupId>
-                                <artifactId>geronimo-tomcat6-minimal</artifactId>
-                                <version>${geronimoVersion}</version>
-                                <classifier>bin</classifier>
-                                <type>zip</type>
-                            </assembly>
-
-                            <assembly>
-                                <id>framework</id>
-                                <groupId>org.apache.geronimo.assemblies</groupId>
-                                <artifactId>geronimo-framework</artifactId>
-                                <version>${geronimoVersion}</version>
-                                <classifier>bin</classifier>
-                                <type>zip</type>
-                            </assembly>
-                        </assemblies>
-
-                        <defaultAssemblyId>tomcat</defaultAssemblyId>
-
-                        <optionSets>
-                            <optionSet>
-                                <id>morememory</id>
-                                <options>
-                                    <option>-Xmx1024m</option>
-                                    <option>-XX:MaxPermSize=512m</option>
-                                </options>
-                            </optionSet>
-                            <optionSet>
-                                <id>debug</id>
-                                <options>
-                                    <option>-Xdebug</option>
-                                    <option>-Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=n</option>
-                                </options>
-                            </optionSet>
-                        </optionSets>
-                    </configuration>
-                    <executions>
-                        <execution>
-                            <id>start</id>
-                            <phase>pre-integration-test</phase>
-                            <goals>
-                                <goal>start-server</goal>
-                            </goals>
-                            <configuration>
-                                <assemblyId>${it-server}</assemblyId>
-                                <logOutput>true</logOutput>
-                                <background>true</background>
-                                <verifyTimeout>300</verifyTimeout>
-                                <refresh>true</refresh>
-                                <optionSets>
-                                    <optionSet>
-                                        <id>default</id>
-                                        <options>
-                                            <option>-Xmx512m</option>
-                                            <option>-XX:MaxPermSize=256m</option>
-                                        </options>
-                                    </optionSet>
-                                    <optionSet>
-                                        <id>morememory</id>
-                                        <options>
-                                            <option>-Xmx1024m</option>
-                                            <option>-XX:MaxPermSize=512m</option>
-                                        </options>
-                                    </optionSet>
-                                    <optionSet>
-                                        <id>debug</id>
-                                        <options>
-                                            <option>-Xdebug</option>
-                                            <option>-Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=n</option>
-                                        </options>
-                                    </optionSet>
-                                </optionSets>
-                            </configuration>
-                        </execution>
-                        <execution>
-                            <id>install-plugin</id>
-                            <phase>install</phase>
-                            <goals>
-                                <goal>install-plugin</goal>
-                            </goals>
-                        </execution>
-                        <execution>
-                            <id>stop</id>
-                            <phase>install</phase>
-                            <goals>
-                                <goal>stop-server</goal>
-                            </goals>
-                        </execution>
-                    </executions>
-                </plugin>
-            </plugins>
-        </pluginManagement>
+            <!-- plugin overrides to match 2.2.x server builds -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-enforcer-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>validate</phase>
+                        <goals>
+                            <goal>enforce</goal>
+                        </goals>
+                        <configuration>
+                            <rules>
+                                <!-- Allow any Java >= 1.5 -->
+                                <requireJavaVersion>
+                                    <version>[1.5,)</version>
+                                </requireJavaVersion>
+                                <!-- Require Maven 2.0.9+ -->
+                                <requireMavenVersion>
+                                    <version>[2.0.9,)</version>
+                                </requireMavenVersion>
+                            </rules>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>1.5</source>
+                    <target>1.5</target>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-remote-resources-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>process</goal>
+                        </goals>
+                        <configuration>
+                            <resourceBundles>
+                                <resourceBundle>org.apache:apache-jar-resource-bundle:1.4</resourceBundle>
+                            </resourceBundles>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>ianal-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>verify-legal-files</goal>
+                        </goals>
+                        <configuration>
+                            <strict>true</strict>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.geronimo.genesis.plugins</groupId>
+                <artifactId>tools-maven-plugin</artifactId>
+                <executions>
+                    <!-- Need to disable this plugin used in 2.1.x -->
+                    <execution>
+                        <id>install-legal-files</id>
+                        <phase>none</phase>
+                    </execution>
+                    <execution>
+                        <id>verify-legal-files</id>
+                        <phase>none</phase>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
     </build>
-
 </project>

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=834146&r1=834145&r2=834146&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 Mon Nov  9 17:01:07
2009
@@ -124,6 +124,10 @@
                                 <groupId>org.apache.geronimo.configs</groupId>
                                 <artifactId>persistence-jpa10-deployer</artifactId>
                             </obsoletes>
+                            <obsoletes>
+                                <groupId>org.apache.geronimo.configs</groupId>
+                                <artifactId>persistence-jpa20-deployer</artifactId>
+                            </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>



Mime
View raw message