geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r420371 - /geronimo/sandbox/svkmerge/m2migration/pom.xml
Date Sun, 09 Jul 2006 23:11:19 GMT
Author: jdillon
Date: Sun Jul  9 16:11:19 2006
New Revision: 420371

URL: http://svn.apache.org/viewvc?rev=420371&view=rev
Log:
Use Genesis project-config as parent to pick up global build state

Modified:
    geronimo/sandbox/svkmerge/m2migration/pom.xml

Modified: geronimo/sandbox/svkmerge/m2migration/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/pom.xml?rev=420371&r1=420370&r2=420371&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/pom.xml Sun Jul  9 16:11:19 2006
@@ -21,27 +21,22 @@
     
     <modelVersion>4.0.0</modelVersion>
     
+    <parent>
+        <groupId>org.apache.geronimo.genesis.config</groupId>
+        <artifactId>project-config</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+    </parent>
+    
     <groupId>org.apache.geronimo</groupId>
-    <artifactId>geronimo-parent</artifactId>
+    <artifactId>geronimo-parent</artifactId> <!-- FIXME: Drop all -parent
bits -->
     <name>Geronimo</name>
     <packaging>pom</packaging>
     
     <version>1.2-SNAPSHOT</version>
     
-    <url>http://geronimo.apache.org</url>
-    
-    <organization>
-        <name>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>
+    <description>
+        Apache Geronimo, the J2EE server project of the Apache Software Foundation.
+    </description>
     
     <scm>
         <connection>scm:svn:https://svn.apache.org/repos/asf/geronimo</connection>
@@ -49,54 +44,6 @@
         <url>https://svn.apache.org/repos/asf/geronimo</url>
     </scm>
     
-    <mailingLists>
-        <mailingList>
-            <name>Geronimo User List</name>
-            <subscribe>user-subscribe@geronimo.apache.org</subscribe>
-            <unsubscribe>user-unsubscribe@geronimo.apache.org</unsubscribe>
-            <post>mailto:user@geronimo.apache.org</post>
-            <archive>http://mail-archives.apache.org/mod_mbox/geronimo-user</archive>
-            <otherArchives>
-                <otherArchive>http://www.nabble.com/Apache-Geronimo---Users-f135.html</otherArchive>
-            </otherArchives>
-        </mailingList>
-        
-        <mailingList>
-            <name>Geronimo Developer List</name>
-            <subscribe>dev-subscribe@geronimo.apache.org</subscribe>
-            <unsubscribe>dev-unsubscribe@geronimo.apache.org</unsubscribe>
-            <post>mailto:dev@geronimo.apache.org</post>
-            <archive>http://mail-archives.apache.org/mod_mbox/geronimo-dev</archive>
-            <otherArchives>
-                <otherArchive>http://www.nabble.com/Apache-Geronimo---Dev-f136.html</otherArchive>
-            </otherArchives>
-        </mailingList>
-        
-        <mailingList>
-            <name>Source Control List</name>
-            <subscribe>scm-subscribe@geronimo.apache.org</subscribe>
-            <unsubscribe>scm-unsubscribe@geronimo.apache.org</unsubscribe>
-            <archive>http://mail-archives.apache.org/mod_mbox/geronimo-scm</archive>
-        </mailingList>
-    </mailingLists>
-    
-    <issueManagement>
-        <system>jira</system>
-        <url>http://issues.apache.org/jira/browse/GERONIMO</url>
-    </issueManagement>
-    
-    <ciManagement>
-        <system>continuum</system>
-        <notifiers>
-            <notifier>
-                <type>mail</type>
-                <sendOnError/>
-                <sendOnFailure/>
-                <address>dev@geronimo.apache.org</address>
-            </notifier>
-        </notifiers>
-    </ciManagement>
-    
     <properties>
         <genesis.version>1.0.0-SNAPSHOT</genesis.version>
         
@@ -703,29 +650,7 @@
         </dependencies>
     </dependencyManagement>
     
-    <dependencies>
-        
-        <!-- Test Dependencies -->
-        
-        <dependency>
-            <groupId>org.apache.geronimo.genesis.config</groupId>
-            <artifactId>logging-config</artifactId>
-            <version>${genesis.version}</version>
-            <type>jar</type>
-            <scope>test</scope>
-        </dependency>
-        
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-        
-    </dependencies>
-    
     <build>
-        <defaultGoal>install</defaultGoal>
-        
         <!-- FIXME: Need to reorganize modules to use the standard maven module layout
-->
         
         <sourceDirectory>src/java</sourceDirectory>
@@ -741,106 +666,43 @@
             <testResource>
                 <directory>src/test-data</directory>
             </testResource>
+            
             <testResource>
                 <directory>src/test-resources</directory>
             </testResource>
         </testResources>
         
-        <extensions>
-            <extension>
-                <groupId>org.apache.geronimo.genesis.config</groupId>
-                <artifactId>clover-config</artifactId>
-                <version>${genesis.version}</version>
-            </extension>
-            
-            <extension>
-                <groupId>org.apache.geronimo.genesis.config</groupId>
-                <artifactId>checkstyle-config</artifactId>
-                <version>${genesis.version}</version>
-            </extension>
-            
-            <extension>
-                <groupId>org.apache.maven.wagon</groupId>
-                <artifactId>wagon-ssh</artifactId>
-                <version>1.0-beta-1</version>
-            </extension>
-        </extensions>
-            
         <pluginManagement>
             <plugins>
                 <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-surefire-plugin</artifactId>
-                    <version>2.2</version>
+                    <groupId>org.codehaus.mojo</groupId>
+                    <artifactId>xmlbeans-maven-plugin</artifactId>
+                    <version>2.0.1-SNAPSHOT</version>
+                    
+                    <executions>
+                        <execution>
+                            <goals>
+                                <goal>xmlbeans</goal>
+                            </goals>
+                        </execution>
+                    </executions>
+                    
                     <configuration>
-                        <forkMode>once</forkMode>
-                        <argLine>-enableassertions</argLine>
-                        <workingDirectory>${pom.basedir}/target</workingDirectory>
-                        
-                        <!-- Override the default, do not accept Test* as test classes
-->
-                        <excludes>
-                            <exclude>**/Abstract*.java</exclude>
-                            <exclude>**/Test*.java</exclude>
-                        </excludes>
-                        <includes>
-                            <include>**/*Test.java</include>
-                        </includes>
+                        <schemaDirectory>${pom.basedir}/src/schema</schemaDirectory>
+                        <xmlConfigs>
+                            <xmlConfig implementation="java.io.File">${pom.basedir}/src/schema/xmlconfig.xml</xmlConfig>
+                        </xmlConfigs>
+                        <download>true</download>
+                        <quiet>false</quiet>
                     </configuration>
                 </plugin>
                 
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-clean-plugin</artifactId>
-                    <version>2.1</version>
-                </plugin>
-                
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-clover-plugin</artifactId>
-                    <version>2.2</version>
-                </plugin>
-                
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-one-plugin</artifactId>
-                    <version>1.0</version>
-                </plugin>
-                
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-antrun-plugin</artifactId>
-                    <version>1.1</version>
-                </plugin>
-                
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-assembly-plugin</artifactId>
-                    <version>2.1</version>
-                </plugin>
-                
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-javadoc-plugin</artifactId>
-                    <version>2.0</version>
-                </plugin>
-                
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-release-plugin</artifactId>
-                    <version>2.0-beta-4</version>
-                </plugin>
+                <!--
                 
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-one-plugin</artifactId>
-                    <version>1.0</version>
-                </plugin>
+                NOTE: WAR & JSPC are overridden here (from project-config) to specify
non-standard paths.
+                      Remove once modules have been reorganized to use the m2 standard layout.
                 
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-rar-plugin</artifactId>
-                    <version>2.1</version>
-                </plugin>
+                -->
                 
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
@@ -870,102 +732,12 @@
                         </execution>
                     </executions>
                 </plugin>
-                
-                <plugin>
-                    <groupId>org.codehaus.mojo</groupId>
-                    <artifactId>build-helper-maven-plugin</artifactId>
-                    <version>1.0</version>
-                </plugin>
-                
-                <plugin>
-                    <groupId>org.codehaus.mojo</groupId>
-                    <artifactId>dependency-maven-plugin</artifactId>
-                    <version>1.0</version>
-                </plugin>
-                
-                <plugin>
-                    <groupId>org.codehaus.mojo</groupId>
-                    <artifactId>xmlbeans-maven-plugin</artifactId>
-                    <version>2.0.1-SNAPSHOT</version>
-                    
-                    <executions>
-                        <execution>
-                            <goals>
-                                <goal>xmlbeans</goal>
-                            </goals>
-                        </execution>
-                    </executions>
-                    
-                    <configuration>
-                        <schemaDirectory>${pom.basedir}/src/schema</schemaDirectory>
-                        <xmlConfigs>
-                            <xmlConfig implementation="java.io.File">${pom.basedir}/src/schema/xmlconfig.xml</xmlConfig>
-                        </xmlConfigs>
-                        <download>true</download>
-                        <quiet>false</quiet>
-                    </configuration>
-                </plugin>
             </plugins>
         </pluginManagement>
         
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-clean-plugin</artifactId>
-                <configuration>
-                    <filesets>
-                        <fileset>
-                            <directory>${pom.basedir}</directory>
-                            <includes>
-                                <include>*.log</include>
-                            </includes>
-                        </fileset>
-                    </filesets>
-                </configuration>
-            </plugin>
-            
-            <!--
-            
-            TODO: See if this is still needed, if not drop as it will just slow down the
build
-            
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-one-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <configuration>
-                            <remoteRepositoryUrl>scp://cvs.apache.org/www/cvs.apache.org/repository</remoteRepositoryUrl>
-                        </configuration>
-                        <goals>
-                            <goal>install-maven-one-repository</goal>
-                            <goal>deploy-maven-one-repository</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            -->
-            
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-clover-plugin</artifactId>
-                <configuration>
-                    <generateHtml>true</generateHtml>
-                    <jdk>1.4</jdk>
-                    <!-- Pulled as resource from clover-config plugin -->
-                    <licenseLocation>org/apache/geronimo/clover.license</licenseLocation>
-                </configuration>
-                <executions>
-                    <execution>
-                        <phase>pre-site</phase>
-                        <goals>
-                            <goal>instrument</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
                     <source>1.4</source>
@@ -1209,6 +981,7 @@
         
         <profile>
             <id>release-environment</id>
+            
             <activation>
                 <property>
                     <name>env</name>
@@ -1220,6 +993,10 @@
                | TODO: Verfiy that these are the correct URL's
              -->
             <distributionManagement>
+                <!--
+                
+                TODO: See if these get picked up; these should not change project to project
+                
                 <repository>
                     <id>apache-repo</id>
                     <name>Apache CVS Repository</name>
@@ -1232,6 +1009,8 @@
                     <url>scp://cvs.apache.org/www/cvs.apache.org/maven-snapshot-repository</url>
                 </snapshotRepository>
                 
+                -->
+                
                 <site>
                     <id>geronimo-website</id>
                     <url>scp://people.apache.org/www/geronimo.apache.org/maven</url>
@@ -1243,6 +1022,7 @@
                 
                 <plugins>
                     <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-release-plugin</artifactId>
                         <configuration>
                             <tagBase>https://svn.apache.org/repos/asf/geronimo/tags</tagBase>
@@ -1252,77 +1032,6 @@
             </build>
         </profile>
     </profiles>
-    
-    <reporting>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-report-plugin</artifactId>
-                <version>2.0</version>
-            </plugin>
-            
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <version>2.0</version>
-                <configuration>
-                    <minmemory>128m</minmemory>
-                    <maxmemory>512</maxmemory>
-                    <breakiterator>true</breakiterator>
-                    <quiet>true</quiet>
-                    <verbose>false</verbose>
-                    <source>1.4</source>
-                    <!--
-                    
-                    FIXME: This worked in m1, but m2 complains about it being an invalid
flag
-                    <additionalparam>-J-Djava.awt.headless=true</additionalparam>
-                    -->
-                    <linksource>true</linksource>
-                    <links>
-                        <link>http://java.sun.com/j2se/1.5.0/docs/api/</link>
-                        <link>http://java.sun.com/j2se/1.4.2/docs/api/</link>
-                        <link>http://java.sun.com/j2se/1.3/docs/api/</link>
-                        <link>http://java.sun.com/j2ee/1.4/docs/api/</link>
-                        <link>http://java.sun.com/j2ee/sdk_1.3/techdocs/api/</link>
-                    </links>
-                </configuration>
-            </plugin>
-            
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jxr-plugin</artifactId>
-                <version>2.0</version>
-            </plugin>
-            
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-pmd-plugin</artifactId>
-                <version>2.0</version>
-            </plugin>
-            
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-project-info-reports-plugin</artifactId>
-                <version>2.0.1</version>
-            </plugin>
-            
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-clover-plugin</artifactId>
-                <version>2.2</version>
-            </plugin>
-            
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-checkstyle-plugin</artifactId>
-                <version>2.1</version>
-                <configuration>
-                    <!-- Pulled as resource from checkstyle-config plugin -->
-                    <configLocation>org/apache/geronimo/checkstyle.xml</configLocation>
-                </configuration>
-            </plugin>
-        </plugins>
-    </reporting>
     
 </project>
 



Mime
View raw message