+1 (to both) - Joakim
Brett Porter wrote: > Hi, > > This is a dependency for upcoming plugin releases. The changes to each > are attached to this message - it shifts the release profile to the > maven POM, adds some developers, and removes the need for the plugin > surrogate parent. > > SVN revision: 500513 > Maven Snapshot version: 5-20070127.114244-3 > Maven Plugins Snapshot version: 8-20070127.114249-2 > > [ ] +1 > [ ] +0 > [ ] -1 > > Cheers, > Brett > > ------------------------------------------------------------------------ > > --- > /Users/brett/.m2/repository/org/apache/maven/maven-parent/4/maven-parent-4.pom > 2007-01-25 14:38:45.000000000 +1100 > +++ pom.xml 2007-01-24 14:30:34.000000000 +1100 > @@ -1,20 +1,23 @@ > <?xml version="1.0" encoding="UTF-8"?> > > <!-- > - ~ Copyright 2005-2006 The Apache Software Foundation. > - ~ > - ~ Licensed under the Apache License, Version 2.0 (the "License"); > - ~ you may not use this file except in compliance with the License. > - ~ You may obtain a copy of the License at > - ~ > - ~ http://www.apache.org/licenses/LICENSE-2.0 > - ~ > - ~ Unless required by applicable law or agreed to in writing, software > - ~ distributed under the License is distributed on an "AS IS" BASIS, > - ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. > - ~ See the License for the specific language governing permissions and > - ~ limitations under the License. > - --> > +Licensed to the Apache Software Foundation (ASF) under one > +or more contributor license agreements. See the NOTICE file > +distributed with this work for additional information > +regarding copyright ownership. The ASF licenses this file > +to you under the Apache License, Version 2.0 (the > +"License"); you may not use this file except in compliance > +with the License. You may obtain a copy of the License at > + > + http://www.apache.org/licenses/LICENSE-2.0 > + > +Unless required by applicable law or agreed to in writing, > +software distributed under the License is distributed on an > +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY > +KIND, either express or implied. See the License for the > +specific language governing permissions and limitations > +under the License. > +--> > > <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> > @@ -26,7 +29,7 @@ > </parent> > <groupId>org.apache.maven</groupId> > <artifactId>maven-parent</artifactId> > - <version>4</version> > + <version>5-SNAPSHOT</version> > <packaging>pom</packaging> > <name>Apache Maven</name> > <description> > @@ -40,7 +43,7 @@ > </issueManagement> > <ciManagement> > <system>continuum</system> > - <url>http://maven.zones.apache.org:8080/continuum</url> > + <url>http://maven.zones.apache.org/continuum</url> > <notifiers> > <notifier> > <type>mail</type> > @@ -114,6 +117,7 @@ > <roles> > <role>PMC Member</role> > </roles> > + <timezone>+1</timezone> > </developer> > <developer> > <id>snicoll</id> > @@ -215,6 +219,45 @@ > </roles> > <timezone>+1</timezone> > </developer> > + <developer> > + <id>aheritier</id> > + <name>Arnaud Heritier</name> > + <email>[EMAIL PROTECTED]</email> > + <organization>ASF</organization> > + <roles> > + <role>PMC Member</role> > + </roles> > + <timezone>+1</timezone> > + </developer> > + <developer> > + <id>handyande</id> > + <name>Andrew Williams</name> > + <email>[EMAIL PROTECTED]</email> > + <roles> > + <role>Committer</role> > + </roles> > + <timezone>0</timezone> > + </developer> > + <developer> > + <id>jtolentino</id> > + <name>Ernesto Tolentino Jr.</name> > + <email>[EMAIL PROTECTED]</email> > + <organization>ASF</organization> > + <roles> > + <role>PMC Member</role> > + </roles> > + <timezone>+8</timezone> > + </developer> > + <developer> > + <id>joakime</id> > + <name>Joakim Erdfelt</name> > + <email>[EMAIL PROTECTED]</email> > + <organization>ASF</organization> > + <roles> > + <role>PMC Member</role> > + </roles> > + <timezone>-5</timezone> > + </developer> > </developers> > > <distributionManagement> > @@ -224,81 +267,131 @@ > </site> > </distributionManagement> > > -<!-- Disabled until projects have been made to comply > - <build> > - <plugins> > - <plugin> > - <groupId>org.apache.maven.plugins</groupId> > - <artifactId>maven-pmd-plugin</artifactId> > - <executions> > - <execution> > - <goals> > - <goal>cpd-check</goal> > - </goals> > - </execution> > - </executions> > - </plugin> > - </plugins> > - </build> > ---> > + <profiles> > + <profile> > + <id>ci</id> > + <build> > + <plugins> > + <plugin> > + <groupId>org.apache.maven.plugins</groupId> > + <artifactId>maven-pmd-plugin</artifactId> > + <executions> > + <execution> > + <goals> > + <goal>cpd-check</goal> > + </goals> > + </execution> > + </executions> > + </plugin> > + </plugins> > + </build> > + </profile> > + <profile> > + <id>reporting</id> > + <reporting> > + <plugins> > + <plugin> > + <groupId>org.apache.maven.plugins</groupId> > + <artifactId>maven-surefire-report-plugin</artifactId> > + </plugin> > + <plugin> > + <groupId>org.apache.maven.plugins</groupId> > + <artifactId>maven-checkstyle-plugin</artifactId> > + <configuration> > + > <configLocation>http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-checkstyle-plugin/src/main/resources/config/maven_checks.xml</configLocation> > + > <headerLocation>http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-checkstyle-plugin/src/main/resources/config/maven-header.txt</headerLocation> > + </configuration> > + </plugin> > + <plugin> > + <groupId>org.apache.maven.plugins</groupId> > + <artifactId>maven-pmd-plugin</artifactId> > + </plugin> > + <plugin> > + <groupId>org.codehaus.mojo</groupId> > + <artifactId>cobertura-maven-plugin</artifactId> > + </plugin> > + <plugin> > + <groupId>org.codehaus.mojo</groupId> > + <artifactId>taglist-maven-plugin</artifactId> > + </plugin> > + <plugin> > + <groupId>org.apache.maven.plugins</groupId> > + <artifactId>maven-jxr-plugin</artifactId> > + </plugin> > + <plugin> > + <groupId>org.apache.maven.plugins</groupId> > + <artifactId>maven-javadoc-plugin</artifactId> > + <configuration> > + <links> > + <link>http://java.sun.com/j2ee/1.4/docs/api</link> > + <link>http://java.sun.com/j2se/1.5.0/docs/api</link> > + > <link>http://jakarta.apache.org/commons/collections/apidocs-COLLECTIONS_3_0/</link> > + <link>http://jakarta.apache.org/commons/dbcp/apidocs/</link> > + > <link>http://jakarta.apache.org/commons/fileupload/apidocs/</link> > + > <link>http://jakarta.apache.org/commons/httpclient/apidocs/</link> > + > <link>http://jakarta.apache.org/commons/logging/apidocs/</link> > + <link>http://jakarta.apache.org/commons/pool/apidocs/</link> > + <link>http://www.junit.org/junit/javadoc/</link> > + <link>http://logging.apache.org/log4j/docs/api/</link> > + <link>http://jakarta.apache.org/regexp/apidocs/</link> > + <link>http://jakarta.apache.org/velocity/api/</link> > + </links> > + </configuration> > + </plugin> > + </plugins> > + </reporting> > + </profile> > > - <reporting> > - <plugins> > - <plugin> > - <groupId>org.apache.maven.plugins</groupId> > - <artifactId>maven-surefire-report-plugin</artifactId> > - </plugin> > - <plugin> > - <groupId>org.apache.maven.plugins</groupId> > - <artifactId>maven-checkstyle-plugin</artifactId> > - <configuration> > - > <configLocation>http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-checkstyle-plugin/src/main/resources/config/maven_checks.xml</configLocation> > - > <headerLocation>http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-checkstyle-plugin/src/main/resources/config/maven-header.txt</headerLocation> > - </configuration> > - </plugin> > - <plugin> > - <groupId>org.apache.maven.plugins</groupId> > - <artifactId>maven-pmd-plugin</artifactId> > - </plugin> > - <plugin> > - <groupId>org.codehaus.mojo</groupId> > - <artifactId>cobertura-maven-plugin</artifactId> > - </plugin> > - <plugin> > - <groupId>org.codehaus.mojo</groupId> > - <artifactId>taglist-maven-plugin</artifactId> > - </plugin> > - <plugin> > - <groupId>org.apache.maven.plugins</groupId> > - <artifactId>maven-jxr-plugin</artifactId> > - </plugin> > - <plugin> > - <groupId>org.apache.maven.plugins</groupId> > - <artifactId>maven-javadoc-plugin</artifactId> > - <configuration> > - <links> > - <link>http://java.sun.com/j2ee/1.4/docs/api</link> > - <link>http://java.sun.com/j2se/1.5.0/docs/api</link> > - > <link>http://jakarta.apache.org/commons/collections/apidocs-COLLECTIONS_3_0/</link> > - <link>http://jakarta.apache.org/commons/dbcp/apidocs/</link> > - > <link>http://jakarta.apache.org/commons/fileupload/apidocs/</link> > - > <link>http://jakarta.apache.org/commons/httpclient/apidocs/</link> > - <link>http://jakarta.apache.org/commons/logging/apidocs/</link> > - <link>http://jakarta.apache.org/commons/pool/apidocs/</link> > - <link>http://www.junit.org/junit/javadoc/</link> > - <link>http://logging.apache.org/log4j/docs/api/</link> > - <link>http://jakarta.apache.org/regexp/apidocs/</link> > - <link>http://jakarta.apache.org/velocity/api/</link> > - </links> > - </configuration> > - </plugin> > - </plugins> > - </reporting> > + <profile> > + <id>release-profile</id> > + <activation> > + <property> > + <name>performRelease</name> > + </property> > + </activation> > + <build> > + <plugins> > + <!-- We want to sign the artifact, the POM, and all attached > artifacts --> > + <plugin> > + <artifactId>maven-gpg-plugin</artifactId> > + <version>1.0-alpha-1</version> > + <configuration> > + <passphrase>${gpg.passphrase}</passphrase> > + </configuration> > + <executions> > + <execution> > + <goals> > + <goal>sign</goal> > + </goals> > + </execution> > + </executions> > + </plugin> > + <!-- We want to package up license resources in the JARs produced > --> > + <plugin> > + <artifactId>maven-remote-resources-plugin</artifactId> > + <version>1.0-alpha-1</version> > + <executions> > + <execution> > + <goals> > + <goal>process</goal> > + </goals> > + <configuration> > + <resourceBundles> > + > <resourceBundle>org.apache:apache-jar-resource-bundle:1.0</resourceBundle> > + </resourceBundles> > + </configuration> > + </execution> > + </executions> > + </plugin> > + </plugins> > + </build> > + </profile> > + </profiles> > > <scm> > - > <connection>scm:svn:http://svn.apache.org/repos/asf/maven/pom/maven/tags/maven-parent-4</connection> > - > <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/pom/maven/tags/maven-parent-4</developerConnection> > - > <url>http://svn.apache.org/viewvc/maven/pom/maven/tags/maven-parent-4</url> > + > <connection>scm:svn:http://svn.apache.org/repos/asf/maven/pom/trunk/maven</connection> > + > <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/pom/trunk/maven</developerConnection> > + <url>http://svn.apache.org/viewvc/maven/pom/trunk/maven</url> > </scm> > </project> > > > > ------------------------------------------------------------------------ > > > ------------------------------------------------------------------------ > > --- > /Users/brett/.m2/repository/org/apache/maven/plugins/maven-plugins/7/maven-plugins-7.pom > 2007-01-25 14:39:58.000000000 +1100 > +++ pom.xml 2007-01-24 14:30:34.000000000 +1100 > @@ -1,47 +1,61 @@ > -<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";> > +<?xml version="1.0" encoding="UTF-8"?> > + > +<!-- > +Licensed to the Apache Software Foundation (ASF) under one > +or more contributor license agreements. See the NOTICE file > +distributed with this work for additional information > +regarding copyright ownership. The ASF licenses this file > +to you under the Apache License, Version 2.0 (the > +"License"); you may not use this file except in compliance > +with the License. You may obtain a copy of the License at > + > + http://www.apache.org/licenses/LICENSE-2.0 > + > +Unless required by applicable law or agreed to in writing, > +software distributed under the License is distributed on an > +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY > +KIND, either express or implied. See the License for the > +specific language governing permissions and limitations > +under the License. > +--> > + > +<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> > <parent> > - <groupId>org.apache.maven</groupId> > - <artifactId>maven-plugin-surrogate-parent</artifactId> > - <version>5</version> > - <relativePath>../pom/maven-plugin-surrogate-parent/pom.xml</relativePath> > + <groupId>org.apache</groupId> > + <artifactId>apache</artifactId> > + <version>3</version> > + <relativePath>../asf/pom.xml</relativePath> > </parent> > - <groupId>org.apache.maven.plugins</groupId> > - <artifactId>maven-plugins</artifactId> > + <groupId>org.apache.maven</groupId> > + <artifactId>maven-parent</artifactId> > + <version>5-SNAPSHOT</version> > <packaging>pom</packaging> > - <version>7</version> > - <name>Maven Plugins</name> > - <description>Maven Plugins</description> > - <url>http://maven.apache.org/plugins/</url> > + <name>Apache Maven</name> > + <description> > + Maven is a software project management and comprehension tool. Based on > the concept of a project object model > + (POM), Maven can manage a project's build, reporting and documentation > from a central piece of information. > + </description> > + <url>http://maven.apache.org/</url> > + <issueManagement> > + <system>jira</system> > + <url>http://jira.codehaus.org/browse/MPA</url> > + </issueManagement> > + <ciManagement> > + <system>continuum</system> > + <url>http://maven.zones.apache.org/continuum</url> > + <notifiers> > + <notifier> > + <type>mail</type> > + <configuration> > + <address>notifications@maven.apache.org</address> > + </configuration> > + </notifier> > + </notifiers> > + </ciManagement> > + <inceptionYear>2002</inceptionYear> > <mailingLists> > <mailingList> > - <name>Maven User List</name> > - <subscribe>[EMAIL PROTECTED]</subscribe> > - <unsubscribe>[EMAIL PROTECTED]</unsubscribe> > - <post>users@maven.apache.org</post> > - <archive>http://mail-archives.apache.org/mod_mbox/maven-users</archive> > - <otherArchives> > - > <otherArchive>http://www.mail-archive.com/users@maven.apache.org/</otherArchive> > - > <otherArchive>http://www.nabble.com/Maven---Users-f178.html</otherArchive> > - </otherArchives> > - </mailingList> > - <mailingList> > - <name>Maven Developer List</name> > - <subscribe>[EMAIL PROTECTED]</subscribe> > - <unsubscribe>[EMAIL PROTECTED]</unsubscribe> > - <post>dev@maven.apache.org</post> > - <archive>http://mail-archives.apache.org/mod_mbox/maven-dev</archive> > - </mailingList> > - <mailingList> > - <name>Maven Commits List</name> > - <subscribe>[EMAIL PROTECTED]</subscribe> > - <unsubscribe>[EMAIL PROTECTED]</unsubscribe> > - <post>commits@maven.apache.org</post> > - <archive>http://mail-archives.apache.org/mod_mbox/maven-dev</archive> > - </mailingList> > - <!-- duplication from parent pom - temporary until they inherit properly > --> > - <mailingList> > <name>Maven Announcements List</name> > <post>announce@maven.apache.org</post> > <subscribe>[EMAIL PROTECTED]</subscribe> > @@ -63,88 +77,208 @@ > > <archive>http://mail-archives.apache.org/mod_mbox/maven-notifications/</archive> > </mailingList> > </mailingLists> > + > + <developers> > + <developer> > + <id>jvanzyl</id> > + <name>Jason van Zyl</name> > + <email>[EMAIL PROTECTED]</email> > + <organization>ASF</organization> > + <roles> > + <role>PMC Chair</role> > + </roles> > + <timezone>-5</timezone> > + </developer> > + <developer> > + <id>brett</id> > + <name>Brett Porter</name> > + <email>[EMAIL PROTECTED]</email> > + <organization>ASF</organization> > + <roles> > + <role>PMC Member</role> > + </roles> > + <timezone>+10</timezone> > + </developer> > + <developer> > + <id>evenisse</id> > + <name>Emmanuel Venisse</name> > + <email>[EMAIL PROTECTED]</email> > + <organization>ASF</organization> > + <roles> > + <role>PMC Member</role> > + </roles> > + <timezone>+1</timezone> > + </developer> > + <developer> > + <id>kenney</id> > + <name>Kenney Westerhof</name> > + <email>[EMAIL PROTECTED]</email> > + <organization>Neonics</organization> > + <roles> > + <role>PMC Member</role> > + </roles> > + <timezone>+1</timezone> > + </developer> > + <developer> > + <id>snicoll</id> > + <name>Stephane Nicoll</name> > + <email>[EMAIL PROTECTED]</email> > + <organization>ASF</organization> > + <roles> > + <role>PMC Member</role> > + </roles> > + <timezone>+1</timezone> > + </developer> > + <developer> > + <id>vmassol</id> > + <name>Vincent Massol</name> > + <email>[EMAIL PROTECTED]</email> > + <organization>ASF</organization> > + <roles> > + <role>PMC Member</role> > + </roles> > + <timezone>+1</timezone> > + </developer> > + <developer> > + <id>fgiust</id> > + <name>Fabrizio Giustina</name> > + <email>[EMAIL PROTECTED]</email> > + <organization>openmind</organization> > + <roles> > + <role>PMC Member</role> > + </roles> > + <timezone>+1</timezone> > + </developer> > + <developer> > + <id>epunzalan</id> > + <name>Edwin Punzalan</name> > + <email>[EMAIL PROTECTED]</email> > + <organization>Mergere</organization> > + <roles> > + <role>Committer</role> > + </roles> > + <timezone>+8</timezone> > + </developer> > + <developer> > + <id>mperham</id> > + <name>Mike Perham</name> > + <email>[EMAIL PROTECTED]</email> > + <organization>IBM</organization> > + <roles> > + <role>PMC Member</role> > + </roles> > + <timezone>-6</timezone> > + </developer> > + <developer> > + <id>jdcasey</id> > + <name>John Casey</name> > + <email>[EMAIL PROTECTED]</email> > + <organization>ASF</organization> > + <roles> > + <role>PMC Member</role> > + </roles> > + <timezone>-5</timezone> > + </developer> > + <developer> > + <id>trygvis</id> > + <name>Trygve Laugstol</name> > + <email>[EMAIL PROTECTED]</email> > + <organization>ASF</organization> > + <roles> > + <role>PMC Member</role> > + </roles> > + <timezone>+1</timezone> > + </developer> > + <developer> > + <id>vsiveton</id> > + <name>Vincent Siveton</name> > + <email>[EMAIL PROTECTED]</email> > + <organization>ASF</organization> > + <roles> > + <role>PMC Member</role> > + </roles> > + <timezone>-5</timezone> > + </developer> > + <developer> > + <id>carlos</id> > + <name>Carlos Sanchez</name> > + <email>[EMAIL PROTECTED]</email> > + <organization>ASF</organization> > + <roles> > + <role>PMC Member</role> > + </roles> > + <timezone>+1</timezone> > + </developer> > + <developer> > + <id>dennisl</id> > + <name>Dennis Lundberg</name> > + <email>[EMAIL PROTECTED]</email> > + <organization>ASF</organization> > + <roles> > + <role>PMC Member</role> > + </roles> > + <timezone>+1</timezone> > + </developer> > + <developer> > + <id>aheritier</id> > + <name>Arnaud Heritier</name> > + <email>[EMAIL PROTECTED]</email> > + <organization>ASF</organization> > + <roles> > + <role>PMC Member</role> > + </roles> > + <timezone>+1</timezone> > + </developer> > + <developer> > + <id>handyande</id> > + <name>Andrew Williams</name> > + <email>[EMAIL PROTECTED]</email> > + <roles> > + <role>Committer</role> > + </roles> > + <timezone>0</timezone> > + </developer> > + <developer> > + <id>jtolentino</id> > + <name>Ernesto Tolentino Jr.</name> > + <email>[EMAIL PROTECTED]</email> > + <organization>ASF</organization> > + <roles> > + <role>PMC Member</role> > + </roles> > + <timezone>+8</timezone> > + </developer> > + <developer> > + <id>joakime</id> > + <name>Joakim Erdfelt</name> > + <email>[EMAIL PROTECTED]</email> > + <organization>ASF</organization> > + <roles> > + <role>PMC Member</role> > + </roles> > + <timezone>-5</timezone> > + </developer> > + </developers> > + > <distributionManagement> > <site> > <id>apache.website</id> > - <url>scp://people.apache.org/www/maven.apache.org/plugins/</url> > + <url>scp://people.apache.org/www/maven.apache.org</url> > </site> > </distributionManagement> > - <modules> > - <module>maven-ant-plugin</module> > - <module>maven-antlr-plugin</module> > - <module>maven-antrun-plugin</module> > - <module>maven-assembly-plugin</module> > - <module>maven-changelog-plugin</module> > - <module>maven-changes-plugin</module> > - <module>maven-checkstyle-plugin</module> > - <module>maven-clean-plugin</module> > - <module>maven-clover-plugin</module> > - <module>maven-compiler-plugin</module> > - <module>maven-dependency-plugin</module> > - <module>maven-deploy-plugin</module> > - <module>maven-doap-plugin</module> > - <module>maven-docck-plugin</module> > - <module>maven-ear-plugin</module> > - <module>maven-eclipse-plugin</module> > - <module>maven-ejb-plugin</module> > - <module>maven-help-plugin</module> > - <module>maven-idea-plugin</module> > - <module>maven-install-plugin</module> > - <module>maven-jar-plugin</module> > - <module>maven-javadoc-plugin</module> > - <module>maven-jxr-plugin</module> > - <module>maven-one-plugin</module> > - <module>maven-plugin-plugin</module> > - <module>maven-pmd-plugin</module> > - <module>maven-project-info-reports-plugin</module> > - <module>maven-rar-plugin</module> > - <module>maven-repository-plugin</module> > - <module>maven-resources-plugin</module> > - <module>maven-site-plugin</module> > - <module>maven-source-plugin</module> > - <module>maven-war-plugin</module> > - <module>maven-verifier-plugin</module> > - </modules> > - <scm> > - > <connection>scm:svn:http://svn.apache.org/repos/asf/maven/plugins/trunk/</connection> > - > <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/plugins/trunk/</developerConnection> > - <url>http://svn.apache.org/viewcvs.cgi/maven/plugins/trunk/</url> > - </scm> > - <build> > - <pluginManagement> > - <plugins> > - <plugin> > - <artifactId>maven-release-plugin</artifactId> > - <version>2.0-beta-4</version> > - <configuration> > - > <tagBase>https://svn.apache.org/repos/asf/maven/plugins/tags</tagBase> > - </configuration> > - </plugin> > - </plugins> > - </pluginManagement> > - </build> > - <reporting> > - <plugins> > - </plugins> > - </reporting> > + > <profiles> > <profile> > - <id>ciProfile</id> > - <activation> > - <property> > - <name>enableCiProfile</name> > - <value>true</value> > - </property> > - </activation> > + <id>ci</id> > <build> > <plugins> > <plugin> > - <artifactId>maven-docck-plugin</artifactId> > - <version>1.0-beta-1</version> > + <groupId>org.apache.maven.plugins</groupId> > + <artifactId>maven-pmd-plugin</artifactId> > <executions> > <execution> > <goals> > - <goal>check</goal> > + <goal>cpd-check</goal> > </goals> > </execution> > </executions> > @@ -153,164 +287,70 @@ > </build> > </profile> > <profile> > - <id>sharedResources</id> > - <build> > + <id>reporting</id> > + <reporting> > <plugins> > <plugin> > - <artifactId>maven-remote-resources-plugin</artifactId> > - <version>1.0-alpha-1</version> > - <executions> > - <execution> > - <goals> > - <goal>process</goal> > - </goals> > - <configuration> > - <resourceBundles> > - > <resourceBundle>org.apache:apache-jar-resource-bundle:1.0</resourceBundle> > - </resourceBundles> > - </configuration> > - </execution> > - </executions> > + <groupId>org.apache.maven.plugins</groupId> > + <artifactId>maven-surefire-report-plugin</artifactId> > </plugin> > - </plugins> > - </build> > - </profile> > - <profile> > - <!-- Problems: it's not signing JavaDoc and Source JARs --> > - <id>staging</id> > - <build> > - <plugins> > - <!-- We want the sources JAR published with the release --> > <plugin> > - <inherited>true</inherited> > - <artifactId>maven-source-plugin</artifactId> > - <version>2.0.2</version> > - <executions> > - <execution> > - <id>attach-sources</id> > - <goals> > - <goal>jar</goal> > - </goals> > - </execution> > - </executions> > + <groupId>org.apache.maven.plugins</groupId> > + <artifactId>maven-checkstyle-plugin</artifactId> > + <configuration> > + > <configLocation>http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-checkstyle-plugin/src/main/resources/config/maven_checks.xml</configLocation> > + > <headerLocation>http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-checkstyle-plugin/src/main/resources/config/maven-header.txt</headerLocation> > + </configuration> > </plugin> > - <!-- We want the JavaDoc JAR published with the release --> > <plugin> > - <inherited>true</inherited> > - <artifactId>maven-javadoc-plugin</artifactId> > - <version>2.2</version> > - <executions> > - <execution> > - <id>attach-javadocs</id> > - <goals> > - <goal>jar</goal> > - </goals> > - </execution> > - </executions> > + <groupId>org.apache.maven.plugins</groupId> > + <artifactId>maven-pmd-plugin</artifactId> > </plugin> > - <!-- We want to deploy the artifact to a staging location for > perusal --> > <plugin> > - <inherited>true</inherited> > - <artifactId>maven-deploy-plugin</artifactId> > - <version>2.3-SNAPSHOT</version> > - <configuration> > - <updateReleaseInfo>true</updateReleaseInfo> > - > <altDeploymentRepository>${deploy.altRepository}</altDeploymentRepository> > - </configuration> > + <groupId>org.codehaus.mojo</groupId> > + <artifactId>cobertura-maven-plugin</artifactId> > </plugin> > - <!-- We want to deploy the site to a staging location for perusal > --> > <plugin> > - <artifactId>maven-site-plugin</artifactId> > - <version>2.0-beta-5</version> > - <executions> > - <execution> > - <goals> > - <goal>stage-deploy</goal> > - </goals> > - <configuration> > - <stagingSiteURL>${staging.siteURL}</stagingSiteURL> > - </configuration> > - </execution> > - </executions> > + <groupId>org.codehaus.mojo</groupId> > + <artifactId>taglist-maven-plugin</artifactId> > </plugin> > - <!-- We want to sign the artifact, the POM, and all attached > artifacts --> > <plugin> > - <artifactId>maven-gpg-plugin</artifactId> > - <version>1.0-alpha-1</version> > - <configuration> > - <passphrase>${gpg.passphrase}</passphrase> > - </configuration> > - <executions> > - <execution> > - <goals> > - <goal>sign</goal> > - </goals> > - </execution> > - </executions> > + <groupId>org.apache.maven.plugins</groupId> > + <artifactId>maven-jxr-plugin</artifactId> > </plugin> > - <!-- We want to package up license resources in the JARs produced > --> > <plugin> > - <artifactId>maven-remote-resources-plugin</artifactId> > - <version>1.0-alpha-1</version> > - <executions> > - <execution> > - <goals> > - <goal>process</goal> > - </goals> > - <configuration> > - <resourceBundles> > - > <resourceBundle>org.apache:apache-jar-resource-bundle:1.0</resourceBundle> > - </resourceBundles> > - </configuration> > - </execution> > - </executions> > + <groupId>org.apache.maven.plugins</groupId> > + <artifactId>maven-javadoc-plugin</artifactId> > + <configuration> > + <links> > + <link>http://java.sun.com/j2ee/1.4/docs/api</link> > + <link>http://java.sun.com/j2se/1.5.0/docs/api</link> > + > <link>http://jakarta.apache.org/commons/collections/apidocs-COLLECTIONS_3_0/</link> > + <link>http://jakarta.apache.org/commons/dbcp/apidocs/</link> > + > <link>http://jakarta.apache.org/commons/fileupload/apidocs/</link> > + > <link>http://jakarta.apache.org/commons/httpclient/apidocs/</link> > + > <link>http://jakarta.apache.org/commons/logging/apidocs/</link> > + <link>http://jakarta.apache.org/commons/pool/apidocs/</link> > + <link>http://www.junit.org/junit/javadoc/</link> > + <link>http://logging.apache.org/log4j/docs/api/</link> > + <link>http://jakarta.apache.org/regexp/apidocs/</link> > + <link>http://jakarta.apache.org/velocity/api/</link> > + </links> > + </configuration> > </plugin> > </plugins> > - </build> > + </reporting> > </profile> > + > <profile> > - <!-- > - | When doing a direct release to a production repository use the > following command to prepare the release: > - | > - | mvn -PdirectRelease release:prepare > - | > - | When doing a direct release to a production repository use the > following command to perform the release: > - | > - | mvn release:perform -DuseReleaseProfile=false > - | > - | You see here that we want to disable the profile that is buried in > the Super POM > - --> > - <id>directRelease</id> > + <id>release-profile</id> > + <activation> > + <property> > + <name>performRelease</name> > + </property> > + </activation> > <build> > <plugins> > - <!-- We want the sources JAR published with the release --> > - <plugin> > - <inherited>true</inherited> > - <artifactId>maven-source-plugin</artifactId> > - <version>2.0.2</version> > - <executions> > - <execution> > - <id>attach-sources</id> > - <goals> > - <goal>jar</goal> > - </goals> > - </execution> > - </executions> > - </plugin> > - <!-- We want the JavaDoc JAR published with the release --> > - <plugin> > - <inherited>true</inherited> > - <artifactId>maven-javadoc-plugin</artifactId> > - <version>2.2</version> > - <executions> > - <execution> > - <id>attach-javadocs</id> > - <goals> > - <goal>jar</goal> > - </goals> > - </execution> > - </executions> > - </plugin> > <!-- We want to sign the artifact, the POM, and all attached > artifacts --> > <plugin> > <artifactId>maven-gpg-plugin</artifactId> > @@ -343,19 +383,15 @@ > </execution> > </executions> > </plugin> > - <!-- Since we are ignoring the release profile we need to use the > deploy plugin with the update release info option --> > - <plugin> > - <inherited>true</inherited> > - <groupId>org.apache.maven.plugins</groupId> > - <artifactId>maven-deploy-plugin</artifactId> > - <!-- We don't need any staging for this --> > - <version>2.2.1</version> > - <configuration> > - <updateReleaseInfo>true</updateReleaseInfo> > - </configuration> > - </plugin> > </plugins> > </build> > </profile> > </profiles> > + > + <scm> > + > <connection>scm:svn:http://svn.apache.org/repos/asf/maven/pom/trunk/maven</connection> > + > <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/pom/trunk/maven</developerConnection> > + <url>http://svn.apache.org/viewvc/maven/pom/trunk/maven</url> > + </scm> > </project> > + > > > ------------------------------------------------------------------------ > > --------------------------------------------------------------------- > To unsubscribe, e-mail: [EMAIL PROTECTED] > For additional commands, e-mail: [EMAIL PROTECTED] --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
