You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jd...@apache.org on 2006/07/08 01:39:24 UTC
svn commit: r420014 - /geronimo/sandbox/svkmerge/m2migration/pom.xml
Author: jdillon
Date: Fri Jul 7 16:39:23 2006
New Revision: 420014
URL: http://svn.apache.org/viewvc?rev=420014&view=rev
Log:
Added release profile, activated by -Denv=release
Moved distributionManagement configuration to release profile, so it will remind folks to use -Denv=release
Added more explicit versions for plugins
Upgraded some plugin versions
Added more project metadata and reporting plugins for site generation
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=420014&r1=420013&r2=420014&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/pom.xml Fri Jul 7 16:39:23 2006
@@ -17,13 +17,10 @@
<!-- $Rev$ $Date$ -->
-<project
- xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
-
+
<groupId>org.apache.geronimo</groupId>
<artifactId>geronimo-parent</artifactId>
<name>Geronimo</name>
@@ -32,70 +29,74 @@
<version>1.2-SNAPSHOT</version>
<url>http://geronimo.apache.org</url>
-
- <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>
+
+ <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>
+
+ <scm>
+ <connection>scm:svn:https://svn.apache.org/repos/asf/geronimo</connection>
+ <developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo</developerConnection>
+ <url>https://svn.apache.org/repos/asf/geronimo</url>
+ </scm>
<mailingLists>
- <!--
- | TODO: Use the Nabble archive as the default... its easier to use
- -->
-
<mailingList>
<name>Geronimo User List</name>
<subscribe>user-subscribe@geronimo.apache.org</subscribe>
<unsubscribe>user-unsubscribe@geronimo.apache.org</unsubscribe>
- <archive>http://mail-archives.apache.org/mod_mbox/geronimo-user/</archive>
+ <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>
- <archive>http://mail-archives.apache.org/mod_mbox/geronimo-dev/</archive>
+ <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>
+ <archive>http://mail-archives.apache.org/mod_mbox/geronimo-scm</archive>
</mailingList>
</mailingLists>
-
- <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:https://svn.apache.org/repos/asf/geronimo/</connection>
- <developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo/</developerConnection>
- <url>https://svn.apache.org/repos/asf/geronimo/</url>
- </scm>
-
- <organization>
- <name>Geronimo</name>
- <url>http://geronimo.apache.org/</url>
- </organization>
-
+
+ <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>
<!--
| HACK: Short-term disable all of the tests until the surefire configuration is updated
@@ -124,7 +125,7 @@
<geronimoSpecQnameVersion>1.0.1</geronimoSpecQnameVersion>
<geronimoSpecSaajVersion>1.0.1</geronimoSpecSaajVersion>
<geronimoSpecServletVersion>1.0.1</geronimoSpecServletVersion>
-
+
<!--
|
| External dependency versions
@@ -198,7 +199,7 @@
<wadiActiveClusterVersion>1.2-20051115174934</wadiActiveClusterVersion>
<wadiSpringVersion>1.5.2</wadiSpringVersion>
<wadiVersion>2.0M1</wadiVersion>
-
+
<wsdl4jVersion>1.5.2</wsdl4jVersion>
<xercesVersion>2.6.2</xercesVersion>
<xfireVersion>20050202</xfireVersion>
@@ -210,7 +211,7 @@
<xpp3Version>1.1.3.3</xpp3Version>
<xstreamVersion>1.1.3</xstreamVersion>
</properties>
-
+
<dependencyManagement>
<dependencies>
<!--
@@ -230,97 +231,97 @@
<artifactId>geronimo-spec-corba</artifactId>
<version>${geronimoSpecCorbaVersion}</version>
</dependency>
-
+
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-ejb_2.1_spec</artifactId>
<version>${geronimoSpecEjbVersion}</version>
</dependency>
-
+
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-j2ee_1.4_spec</artifactId>
<version>${geronimoSpecJ2eeVersion}</version>
</dependency>
-
+
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
<version>${geronimoSpecJ2eeConnectorVersion}</version>
</dependency>
-
+
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-j2ee-deployment_1.1_spec</artifactId>
<version>${geronimoSpecJ2eeDeploymentVersion}</version>
</dependency>
-
+
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-j2ee-jacc_1.0_spec</artifactId>
<version>${geronimoSpecJ2eeJaccVersion}</version>
</dependency>
-
+
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-j2ee-management_1.0_spec</artifactId>
<version>${geronimoSpecJ2eeManagementVersion}</version>
</dependency>
-
+
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-javamail_1.3.1_spec</artifactId>
<version>${geronimoSpecJavamailVersion}</version>
</dependency>
-
+
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jaxr_1.0_spec</artifactId>
<version>${geronimoSpecJaxrVersion}</version>
</dependency>
-
+
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jaxrpc_1.1_spec</artifactId>
<version>${geronimoSpecJaxrpcVersion}</version>
</dependency>
-
+
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jsp_2.0_spec</artifactId>
<version>${geronimoSpecJspVersion}</version>
</dependency>
-
+
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jms_1.1_spec</artifactId>
<version>${geronimoSpecJmsVersion}</version>
</dependency>
-
+
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jta_1.0.1B_spec</artifactId>
<version>${geronimoSpecJtaVersion}</version>
</dependency>
-
+
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-qname_1.1_spec</artifactId>
<version>${geronimoSpecQnameVersion}</version>
</dependency>
-
+
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-saaj_1.1_spec</artifactId>
<version>${geronimoSpecSaajVersion}</version>
</dependency>
-
+
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-servlet_2.4_spec</artifactId>
<version>${geronimoSpecServletVersion}</version>
</dependency>
-
+
<!--
|
| External dependency versions
@@ -713,7 +714,7 @@
</dependencies>
</dependencyManagement>
-
+
<dependencies>
<dependency>
<groupId>junit</groupId>
@@ -721,7 +722,7 @@
<scope>test</scope>
</dependency>
</dependencies>
-
+
<build>
<defaultGoal>install</defaultGoal>
@@ -729,13 +730,13 @@
<sourceDirectory>src/java</sourceDirectory>
<testSourceDirectory>src/test</testSourceDirectory>
-
+
<resources>
<resource>
<directory>src/resources</directory>
</resource>
</resources>
-
+
<testResources>
<testResource>
<directory>src/test-data</directory>
@@ -748,20 +749,9 @@
<extensions>
<extension>
<groupId>org.apache.maven.wagon</groupId>
- <artifactId>wagon-ssh-external</artifactId>
- <version>1.0-alpha-5</version>
- </extension>
-
- <!--
-
- TODO: Investigate why ssh-external is used instead of...
-
- <extension>
- <groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-ssh</artifactId>
- <version>1.0-alpha-7</version>
+ <version>1.0-beta-1</version>
</extension>
- -->
<!--
| NOTE: Include custom G modules to provide default resource-based configuration
@@ -774,66 +764,70 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.1.3</version>
+ <version>2.2</version>
<configuration>
<forkMode>once</forkMode>
- <!-- FIXME: Should really use ${pom.basedir}/target -->
- <workingDirectory>${pom.basedir}</workingDirectory>
+ <workingDirectory>${pom.basedir}/target</workingDirectory>
</configuration>
</plugin>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <version>1.0</version>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-clean-plugin</artifactId>
+ <version>2.1</version>
</plugin>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>dependency-maven-plugin</artifactId>
+ <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-clean-plugin</artifactId>
- <version>2.1</version>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-clover-plugin</artifactId>
+ <artifactId>maven-assembly-plugin</artifactId>
<version>2.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-one-plugin</artifactId>
- <version>1.0</version>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <version>1.1</version>
+ <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>
- <executions>
- <execution>
- <configuration>
- <remoteRepositoryUrl>
- scpexe://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-war-plugin</artifactId>
+ <version>2.0.1</version>
+ <configuration>
+ <warSourceDirectory>${pom.basedir}/src/webapp</warSourceDirectory>
+ <webXml>${pom.basedir}/target/jspweb.xml</webXml>
+ <archiveClasses>true</archiveClasses>
+ </configuration>
</plugin>
<plugin>
@@ -855,16 +849,16 @@
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-war-plugin</artifactId>
- <version>2.0</version>
- <configuration>
- <warSourceDirectory>${pom.basedir}/src/webapp</warSourceDirectory>
- <webXml>${pom.basedir}/target/jspweb.xml</webXml>
- <archiveClasses>true</archiveClasses>
- </configuration>
+ <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>
@@ -894,13 +888,49 @@
<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-compiler-plugin</artifactId>
<configuration>
<source>1.4</source>
<target>1.4</target>
</configuration>
</plugin>
-
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-idea-plugin</artifactId>
@@ -913,6 +943,7 @@
</build>
<repositories>
+ <!-- TODO: Remove; setup mirror configuration for central instead. -->
<repository>
<id>mergere</id>
<name>Mergere Repository</name>
@@ -988,7 +1019,7 @@
<enabled>true</enabled>
</releases>
</repository>
-
+
<repository>
<id>codehaus-snapshots</id>
<name>Codehaus Snapshots Repository</name>
@@ -1021,6 +1052,7 @@
</repositories>
<pluginRepositories>
+ <!-- TODO: Remove; setup mirror configuration for central instead. -->
<pluginRepository>
<id>mergere</id>
<name>Mergere Repository</name>
@@ -1035,7 +1067,7 @@
<enabled>true</enabled>
</releases>
</pluginRepository>
-
+
<pluginRepository>
<id>codehaus</id>
<name>Codehaus Repository</name>
@@ -1048,7 +1080,7 @@
<enabled>true</enabled>
</releases>
</pluginRepository>
-
+
<pluginRepository>
<id>codehaus-snapshots</id>
<name>Codehaus Snapshots Repository</name>
@@ -1065,35 +1097,6 @@
</pluginRepository>
</pluginRepositories>
- <distributionManagement>
- <repository>
- <id>apache-repo</id>
- <name>Apache CVS Repository</name>
- <url>scpexe://cvs.apache.org/www/cvs.apache.org/maven-snapshot-repository</url>
- </repository>
-
- <snapshotRepository>
- <id>apache-snapshots</id>
- <name>Apache CVS Development Repository</name>
- <url>scpexe://cvs.apache.org/www/cvs.apache.org/maven-snapshot-repository</url>
- </snapshotRepository>
-
- <site>
- <id>geronimo-website</id>
- <url>scpexe://people.apache.org/www/geronimo.apache.org/maven/</url>
- </site>
- </distributionManagement>
-
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-report-plugin</artifactId>
- <version>2.0</version>
- </plugin>
- </plugins>
- </reporting>
-
<profiles>
<profile>
<id>default</id>
@@ -1101,7 +1104,7 @@
<activation>
<activeByDefault>true</activeByDefault>
</activation>
-
+
<modules>
<module>modules</module>
<module>m2-plugins</module>
@@ -1117,10 +1120,7 @@
| NOTE: The staged build is used to get around a problem with Maven
| and extention plugins.
|
- | http://jira.codehaus.org/browse/MNG-1911
- |
- | When this problem has been fixed, then we can remove the need
- | for these stages.
+ | See http://issues.apache.org/jira/browse/GERONIMO-2172 for more details.
-->
<profile>
@@ -1164,7 +1164,105 @@
-->
</modules>
</profile>
+
+ <profile>
+ <id>release-environment</id>
+ <activation>
+ <property>
+ <name>env</name>
+ <value>release</value>
+ </property>
+ </activation>
+
+ <!--
+ | TODO: Verfiy that these are the correct URL's
+ -->
+ <distributionManagement>
+ <repository>
+ <id>apache-repo</id>
+ <name>Apache CVS Repository</name>
+ <url>scp://cvs.apache.org/www/cvs.apache.org/maven-snapshot-repository</url>
+ </repository>
+
+ <snapshotRepository>
+ <id>apache-snapshots</id>
+ <name>Apache CVS Development Repository</name>
+ <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>
+ </site>
+ </distributionManagement>
+
+ <build>
+ <defaultGoal>deploy</defaultGoal>
+
+ <plugins>
+ <plugin>
+ <artifactId>maven-release-plugin</artifactId>
+ <configuration>
+ <tagBase>https://svn.apache.org/repos/asf/geronimo/tags</tagBase>
+ </configuration>
+ </plugin>
+ </plugins>
+ </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>
+ </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.1</version>
+ </plugin>
+ -->
+
+ <!--
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <version>2.0</version>
+ <configuration>
+ <configLocation>org/apache/geronimo/build/checkstyle.xml</configLocation>
+ </configuration>
+ </plugin>
+ -->
+ </plugins>
+ </reporting>
</project>