You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jd...@apache.org on 2008/08/26 00:25:53 UTC
svn commit: r688905 [3/3] - in /maven/components/branches/maven-2.0.x: ./
apache-maven/ apache-maven/src/bin/ apache-maven/src/conf/
apache-maven/src/site/ bootstrap/ maven-artifact-manager/
maven-artifact-manager/src/site/ maven-artifact-test/ maven-a...
Propchange: maven/components/branches/maven-2.0.x/maven-monitor/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Aug 25 15:25:50 2008
@@ -10,3 +10,4 @@
cobertura.ser
.settings
target-eclipse
+bin
Modified: maven/components/branches/maven-2.0.x/maven-monitor/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-monitor/pom.xml?rev=688905&r1=688904&r2=688905&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.x/maven-monitor/pom.xml (original)
+++ maven/components/branches/maven-2.0.x/maven-monitor/pom.xml Mon Aug 25 15:25:50 2008
@@ -23,7 +23,7 @@
<parent>
<artifactId>maven</artifactId>
<groupId>org.apache.maven</groupId>
- <version>2.0.9</version>
+ <version>2.0.11-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>maven-monitor</artifactId>
Propchange: maven/components/branches/maven-2.0.x/maven-plugin-api/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Aug 25 15:25:50 2008
@@ -10,3 +10,4 @@
cobertura.ser
.settings
target-eclipse
+bin
Modified: maven/components/branches/maven-2.0.x/maven-plugin-api/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-plugin-api/pom.xml?rev=688905&r1=688904&r2=688905&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.x/maven-plugin-api/pom.xml (original)
+++ maven/components/branches/maven-2.0.x/maven-plugin-api/pom.xml Mon Aug 25 15:25:50 2008
@@ -23,7 +23,7 @@
<parent>
<artifactId>maven</artifactId>
<groupId>org.apache.maven</groupId>
- <version>2.0.9</version>
+ <version>2.0.11-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>maven-plugin-api</artifactId>
Propchange: maven/components/branches/maven-2.0.x/maven-plugin-descriptor/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Aug 25 15:25:50 2008
@@ -10,3 +10,4 @@
cobertura.ser
.settings
target-eclipse
+bin
Modified: maven/components/branches/maven-2.0.x/maven-plugin-descriptor/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-plugin-descriptor/pom.xml?rev=688905&r1=688904&r2=688905&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.x/maven-plugin-descriptor/pom.xml (original)
+++ maven/components/branches/maven-2.0.x/maven-plugin-descriptor/pom.xml Mon Aug 25 15:25:50 2008
@@ -23,7 +23,7 @@
<parent>
<artifactId>maven</artifactId>
<groupId>org.apache.maven</groupId>
- <version>2.0.9</version>
+ <version>2.0.11-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>maven-plugin-descriptor</artifactId>
Propchange: maven/components/branches/maven-2.0.x/maven-plugin-parameter-documenter/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Aug 25 15:25:50 2008
@@ -8,3 +8,4 @@
cobertura.ser
.settings
target-eclipse
+bin
Modified: maven/components/branches/maven-2.0.x/maven-plugin-parameter-documenter/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-plugin-parameter-documenter/pom.xml?rev=688905&r1=688904&r2=688905&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.x/maven-plugin-parameter-documenter/pom.xml (original)
+++ maven/components/branches/maven-2.0.x/maven-plugin-parameter-documenter/pom.xml Mon Aug 25 15:25:50 2008
@@ -23,7 +23,7 @@
<parent>
<artifactId>maven</artifactId>
<groupId>org.apache.maven</groupId>
- <version>2.0.9</version>
+ <version>2.0.11-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>maven-plugin-parameter-documenter</artifactId>
Propchange: maven/components/branches/maven-2.0.x/maven-plugin-registry/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Aug 25 15:25:50 2008
@@ -10,3 +10,4 @@
cobertura.ser
.settings
target-eclipse
+bin
Modified: maven/components/branches/maven-2.0.x/maven-plugin-registry/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-plugin-registry/pom.xml?rev=688905&r1=688904&r2=688905&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.x/maven-plugin-registry/pom.xml (original)
+++ maven/components/branches/maven-2.0.x/maven-plugin-registry/pom.xml Mon Aug 25 15:25:50 2008
@@ -21,7 +21,7 @@
<parent>
<artifactId>maven</artifactId>
<groupId>org.apache.maven</groupId>
- <version>2.0.9</version>
+ <version>2.0.11-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.maven</groupId>
Propchange: maven/components/branches/maven-2.0.x/maven-profile/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Aug 25 15:25:50 2008
@@ -10,3 +10,4 @@
cobertura.ser
.settings
target-eclipse
+bin
Modified: maven/components/branches/maven-2.0.x/maven-profile/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-profile/pom.xml?rev=688905&r1=688904&r2=688905&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.x/maven-profile/pom.xml (original)
+++ maven/components/branches/maven-2.0.x/maven-profile/pom.xml Mon Aug 25 15:25:50 2008
@@ -23,7 +23,7 @@
<parent>
<artifactId>maven</artifactId>
<groupId>org.apache.maven</groupId>
- <version>2.0.9</version>
+ <version>2.0.11-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>maven-profile</artifactId>
Propchange: maven/components/branches/maven-2.0.x/maven-project/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Aug 25 15:25:50 2008
@@ -10,3 +10,4 @@
cobertura.ser
.settings
target-eclipse
+bin
Modified: maven/components/branches/maven-2.0.x/maven-project/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-project/pom.xml?rev=688905&r1=688904&r2=688905&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.x/maven-project/pom.xml (original)
+++ maven/components/branches/maven-2.0.x/maven-project/pom.xml Mon Aug 25 15:25:50 2008
@@ -23,7 +23,7 @@
<parent>
<artifactId>maven</artifactId>
<groupId>org.apache.maven</groupId>
- <version>2.0.9</version>
+ <version>2.0.11-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>maven-project</artifactId>
@@ -59,6 +59,10 @@
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-interpolation</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
</dependency>
<dependency>
Propchange: maven/components/branches/maven-2.0.x/maven-reporting/maven-reporting-api/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Aug 25 15:25:50 2008
@@ -8,3 +8,4 @@
cobertura.ser
.settings
target-eclipse
+bin
Modified: maven/components/branches/maven-2.0.x/maven-reporting/maven-reporting-api/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-reporting/maven-reporting-api/pom.xml?rev=688905&r1=688904&r2=688905&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.x/maven-reporting/maven-reporting-api/pom.xml (original)
+++ maven/components/branches/maven-2.0.x/maven-reporting/maven-reporting-api/pom.xml Mon Aug 25 15:25:50 2008
@@ -23,7 +23,7 @@
<parent>
<artifactId>maven-reporting</artifactId>
<groupId>org.apache.maven.reporting</groupId>
- <version>2.0.9</version>
+ <version>2.0.11-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>maven-reporting-api</artifactId>
@@ -43,7 +43,6 @@
<dependency>
<groupId>org.apache.maven.doxia</groupId>
<artifactId>doxia-sink-api</artifactId>
- <version>1.0-alpha-10</version>
</dependency>
</dependencies>
</project>
Modified: maven/components/branches/maven-2.0.x/maven-reporting/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-reporting/pom.xml?rev=688905&r1=688904&r2=688905&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.x/maven-reporting/pom.xml (original)
+++ maven/components/branches/maven-2.0.x/maven-reporting/pom.xml Mon Aug 25 15:25:50 2008
@@ -23,7 +23,7 @@
<parent>
<artifactId>maven</artifactId>
<groupId>org.apache.maven</groupId>
- <version>2.0.9</version>
+ <version>2.0.11-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.maven.reporting</groupId>
Propchange: maven/components/branches/maven-2.0.x/maven-repository-metadata/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Aug 25 15:25:50 2008
@@ -8,3 +8,4 @@
cobertura.ser
.settings
target-eclipse
+bin
Modified: maven/components/branches/maven-2.0.x/maven-repository-metadata/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-repository-metadata/pom.xml?rev=688905&r1=688904&r2=688905&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.x/maven-repository-metadata/pom.xml (original)
+++ maven/components/branches/maven-2.0.x/maven-repository-metadata/pom.xml Mon Aug 25 15:25:50 2008
@@ -23,7 +23,7 @@
<parent>
<artifactId>maven</artifactId>
<groupId>org.apache.maven</groupId>
- <version>2.0.9</version>
+ <version>2.0.11-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>maven-repository-metadata</artifactId>
@@ -34,7 +34,6 @@
<plugin>
<groupId>org.codehaus.modello</groupId>
<artifactId>modello-maven-plugin</artifactId>
- <version>1.0-alpha-8</version>
<configuration>
<version>1.0.0</version>
<model>src/main/mdo/metadata.mdo</model>
Modified: maven/components/branches/maven-2.0.x/maven-repository-metadata/src/main/mdo/metadata.mdo
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-repository-metadata/src/main/mdo/metadata.mdo?rev=688905&r1=688904&r2=688905&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.x/maven-repository-metadata/src/main/mdo/metadata.mdo (original)
+++ maven/components/branches/maven-2.0.x/maven-repository-metadata/src/main/mdo/metadata.mdo Mon Aug 25 15:25:50 2008
@@ -36,19 +36,19 @@
<name>groupId</name>
<version>1.0.0</version>
<type>String</type>
- <description>The groupId that is directory represents, if any.</description>
+ <description>The groupId that this directory represents, if any.</description>
</field>
<field>
<name>artifactId</name>
<version>1.0.0</version>
<type>String</type>
- <description>The artifactId that is directory represents, if any.</description>
+ <description>The artifactId that this directory represents, if any.</description>
</field>
<field>
<name>version</name>
<version>1.0.0</version>
<type>String</type>
- <description>The version that is directory represents, if any.</description>
+ <description>The version that this directory represents, if any.</description>
</field>
<field>
<name>versioning</name>
@@ -61,7 +61,7 @@
<field>
<name>plugins</name>
<version>1.0.0</version>
- <description>The set of plugin mappings for the group</description>
+ <description>The set of plugin mappings for the group.</description>
<association>
<type>Plugin</type>
<multiplicity>*</multiplicity>
@@ -201,19 +201,19 @@
<class>
<name>Versioning</name>
<version>1.0.0</version>
- <description>Versioning information for an artifact</description>
+ <description>Versioning information for an artifact.</description>
<fields>
<field>
<name>latest</name>
<version>1.0.0</version>
<type>String</type>
- <description>What the latest version in the directory is, including snapshots</description>
+ <description>What the latest version in the directory is, including snapshots.</description>
</field>
<field>
<name>release</name>
<version>1.0.0</version>
<type>String</type>
- <description>What the latest version in the directory is, of the releases</description>
+ <description>What the latest version in the directory is, of the releases.</description>
</field>
<field>
<name>snapshot</name>
@@ -221,12 +221,12 @@
<association>
<type>Snapshot</type>
</association>
- <description>The current snapshot data in use for this version</description>
+ <description>The current snapshot data in use for this version.</description>
</field>
<field>
<name>versions</name>
<version>1.0.0</version>
- <description>Versions available for the artifact</description>
+ <description>Versions available for the artifact.</description>
<association>
<type>String</type>
<multiplicity>*</multiplicity>
@@ -236,25 +236,25 @@
<name>lastUpdated</name>
<version>1.0.0</version>
<type>String</type>
- <description>When the metadata was last updated</description>
+ <description>When the metadata was last updated.</description>
</field>
</fields>
<codeSegments>
<codeSegment>
<version>1.0.0</version>
<code>
- public void updateTimestamp()
- {
- setLastUpdatedTimestamp( new java.util.Date() );
- }
+ public void updateTimestamp()
+ {
+ setLastUpdatedTimestamp( new java.util.Date() );
+ }
- public void setLastUpdatedTimestamp( java.util.Date date )
- {
- java.util.TimeZone timezone = java.util.TimeZone.getTimeZone( "UTC" );
- java.text.DateFormat fmt = new java.text.SimpleDateFormat( "yyyyMMddHHmmss" );
- fmt.setTimeZone( timezone );
- setLastUpdated( fmt.format( date ) );
- }
+ public void setLastUpdatedTimestamp( java.util.Date date )
+ {
+ java.util.TimeZone timezone = java.util.TimeZone.getTimeZone( "UTC" );
+ java.text.DateFormat fmt = new java.text.SimpleDateFormat( "yyyyMMddHHmmss" );
+ fmt.setTimeZone( timezone );
+ setLastUpdated( fmt.format( date ) );
+ }
</code>
</codeSegment>
</codeSegments>
@@ -262,24 +262,24 @@
<class>
<name>Snapshot</name>
<version>1.0.0</version>
- <description>Snapshot data for the current version</description>
+ <description>Snapshot data for the current version.</description>
<fields>
<field>
<name>timestamp</name>
<version>1.0.0</version>
- <description>The time it was deployed</description>
+ <description>The time it was deployed.</description>
<type>String</type>
</field>
<field>
<name>buildNumber</name>
<version>1.0.0</version>
- <description>The incremental build number</description>
+ <description>The incremental build number.</description>
<type>int</type>
</field>
<field>
<name>localCopy</name>
<version>1.0.0</version>
- <description>Whether to use a local copy instead (with filename that includes the base version)</description>
+ <description>Whether to use a local copy instead (with filename that includes the base version).</description>
<type>boolean</type>
<defaultValue>false</defaultValue>
</field>
@@ -288,7 +288,7 @@
<class>
<name>Plugin</name>
<version>1.0.0</version>
- <description>Mapping information for a single plugin within this group</description>
+ <description>Mapping information for a single plugin within this group.</description>
<comment>NOTE: plugin version is _NOT_ included here, since it is resolved using a separate algorithm.</comment>
<fields>
<field>
@@ -303,14 +303,14 @@
<type>String</type>
<required>true</required>
<version>1.0.0</version>
- <description>The plugin invocation prefix (i.e. eclipse for eclipse:eclipse)</description>
+ <description>The plugin invocation prefix (i.e. eclipse for eclipse:eclipse).</description>
</field>
<field>
<name>artifactId</name>
<type>String</type>
<required>true</required>
<version>1.0.0</version>
- <description>The plugin artifactId</description>
+ <description>The plugin artifactId.</description>
</field>
</fields>
</class>
Propchange: maven/components/branches/maven-2.0.x/maven-script/maven-script-ant/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Aug 25 15:25:50 2008
@@ -7,3 +7,4 @@
.project
.settings
target-eclipse
+bin
Modified: maven/components/branches/maven-2.0.x/maven-script/maven-script-ant/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-script/maven-script-ant/pom.xml?rev=688905&r1=688904&r2=688905&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.x/maven-script/maven-script-ant/pom.xml (original)
+++ maven/components/branches/maven-2.0.x/maven-script/maven-script-ant/pom.xml Mon Aug 25 15:25:50 2008
@@ -23,13 +23,23 @@
<parent>
<artifactId>maven-script</artifactId>
<groupId>org.apache.maven</groupId>
- <version>2.0.9</version>
+ <version>2.0.11-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>maven-script-ant</artifactId>
<name>Maven Ant Mojo Support</name>
<dependencies>
<dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant</artifactId>
+ <version>1.7.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant-launcher</artifactId>
+ <version>1.7.1</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
</dependency>
@@ -37,6 +47,19 @@
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-ant-factory</artifactId>
<version>1.0-alpha-2</version>
+ <!-- We need to exclude this artifact's dependency on Ant, -->
+ <!-- because it has a different groupId that the version of Ant -->
+ <!-- we want to use now. -->
+ <exclusions>
+ <exclusion>
+ <groupId>ant</groupId>
+ <artifactId>ant</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>ant</groupId>
+ <artifactId>ant-launcher</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
Propchange: maven/components/branches/maven-2.0.x/maven-script/maven-script-beanshell/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Aug 25 15:25:50 2008
@@ -10,3 +10,4 @@
cobertura.ser
.settings
target-eclipse
+bin
Modified: maven/components/branches/maven-2.0.x/maven-script/maven-script-beanshell/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-script/maven-script-beanshell/pom.xml?rev=688905&r1=688904&r2=688905&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.x/maven-script/maven-script-beanshell/pom.xml (original)
+++ maven/components/branches/maven-2.0.x/maven-script/maven-script-beanshell/pom.xml Mon Aug 25 15:25:50 2008
@@ -23,7 +23,7 @@
<parent>
<artifactId>maven-script</artifactId>
<groupId>org.apache.maven</groupId>
- <version>2.0.9</version>
+ <version>2.0.11-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>maven-script-beanshell</artifactId>
Modified: maven/components/branches/maven-2.0.x/maven-script/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-script/pom.xml?rev=688905&r1=688904&r2=688905&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.x/maven-script/pom.xml (original)
+++ maven/components/branches/maven-2.0.x/maven-script/pom.xml Mon Aug 25 15:25:50 2008
@@ -23,7 +23,7 @@
<parent>
<artifactId>maven</artifactId>
<groupId>org.apache.maven</groupId>
- <version>2.0.9</version>
+ <version>2.0.11-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.maven</groupId>
Modified: maven/components/branches/maven-2.0.x/maven-settings/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-settings/pom.xml?rev=688905&r1=688904&r2=688905&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.x/maven-settings/pom.xml (original)
+++ maven/components/branches/maven-2.0.x/maven-settings/pom.xml Mon Aug 25 15:25:50 2008
@@ -23,7 +23,7 @@
<parent>
<artifactId>maven</artifactId>
<groupId>org.apache.maven</groupId>
- <version>2.0.9</version>
+ <version>2.0.11-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>maven-settings</artifactId>
@@ -47,6 +47,10 @@
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-interpolation</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
</dependency>
<dependency>
Propchange: maven/components/branches/maven-2.0.x/maven-toolchain/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Aug 25 15:25:50 2008
@@ -9,3 +9,4 @@
.settings
nbproject
target-eclipse
+bin
Modified: maven/components/branches/maven-2.0.x/maven-toolchain/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-toolchain/pom.xml?rev=688905&r1=688904&r2=688905&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.x/maven-toolchain/pom.xml (original)
+++ maven/components/branches/maven-2.0.x/maven-toolchain/pom.xml Mon Aug 25 15:25:50 2008
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven</artifactId>
- <version>2.0.9</version>
+ <version>2.0.11-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>maven-toolchain</artifactId>
@@ -38,12 +38,10 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
- <version>2.0.9</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-artifact</artifactId>
- <version>2.0.9</version>
</dependency>
</dependencies>
<build>
Modified: maven/components/branches/maven-2.0.x/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/pom.xml?rev=688905&r1=688904&r2=688905&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.x/pom.xml (original)
+++ maven/components/branches/maven-2.0.x/pom.xml Mon Aug 25 15:25:50 2008
@@ -24,12 +24,12 @@
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven-parent</artifactId>
- <version>8</version>
+ <version>9-SNAPSHOT</version>
<relativePath>../pom/maven/pom.xml</relativePath>
</parent>
<artifactId>maven</artifactId>
- <version>2.0.9</version>
+ <version>2.0.11-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Maven</name>
@@ -117,12 +117,25 @@
</mailingLists>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/maven/components/tags/maven-2.0.9</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/components/tags/maven-2.0.9</developerConnection>
- <url>https://svn.apache.org/repos/asf/maven/components/tags/maven-2.0.9</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/maven/components/branches/maven-2.0.x</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/components/branches/maven-2.0.x</developerConnection>
+ <url>http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x</url>
</scm>
<build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>clirr-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
<pluginManagement>
<plugins>
<plugin>
@@ -136,10 +149,6 @@
<version>2.0.2</version>
</plugin>
<plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>2.4</version>
- </plugin>
- <plugin>
<artifactId>maven-assembly-plugin</artifactId>
<version>2.2-beta-1</version>
</plugin>
@@ -186,7 +195,7 @@
<plugin>
<groupId>org.codehaus.modello</groupId>
<artifactId>modello-maven-plugin</artifactId>
- <version>1.0-alpha-13</version>
+ <version>1.0-alpha-20</version>
<executions>
<execution>
<id>site-docs</id>
@@ -206,6 +215,27 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>clirr-maven-plugin</artifactId>
+ <version>2.2.1</version>
+ <configuration>
+ <!-- needed for release: default value "(,${project.version})" for 2.0.10 is 2.0.10-SNAPSHOT -->
+ <comparisonVersion>2.0.9</comparisonVersion>
+ <excludes>
+ <!-- TODO: These represent method ADDITIONS from 2.0.9, and should be removed after
+ 2.0.10 is released. -->
+ <exclude>org/apache/maven/lifecycle/LifecycleExecutor*</exclude>
+ <exclude>org/apache/maven/artifact/metadata/ArtifactMetadataSource*</exclude>
+ <exclude>org/apache/maven/project/MavenProjectBuilder*</exclude>
+ <exclude>org/apache/maven/project/ProjectBuilderConfiguration*</exclude>
+ <exclude>org/apache/maven/project/interpolation/ModelInterpolator*</exclude>
+ <exclude>org/apache/maven/project/inheritance/ModelInheritanceAssembler*</exclude>
+ <exclude>org/apache/maven/execution/MavenExecutionRequest*</exclude>
+ <exclude>org/apache/maven/plugin/DefaultPluginManager*</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
</plugins>
</pluginManagement>
</build>
@@ -232,6 +262,12 @@
<module>apache-maven</module>
</modules>
+ <properties>
+ <mavenVersion>2.0.11-SNAPSHOT</mavenVersion>
+ <wagonVersion>1.0-beta-4-SNAPSHOT</wagonVersion>
+ </properties>
+
+ <!--start-->
<dependencies>
<dependency>
<groupId>junit</groupId>
@@ -241,14 +277,11 @@
</dependency>
</dependencies>
- <properties>
- <mavenVersion>2.0.9</mavenVersion>
- <!-- Can't use. bootstrap-mini isn't smart enough: <wagonVersion>1.0-beta-2</wagonVersion> -->
- </properties>
-
<dependencyManagement>
+ <!--end-->
<dependencies>
<!-- Maven -->
+ <!--start-->
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-descriptor</artifactId>
@@ -309,7 +342,6 @@
<artifactId>maven-toolchain</artifactId>
<version>${mavenVersion}</version>
</dependency>
-
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-parameter-documenter</artifactId>
@@ -340,36 +372,52 @@
<artifactId>maven-toolchain</artifactId>
<version>${mavenVersion}</version>
</dependency>
+ <!--end-->
+ <dependency>
+ <groupId>commons-cli</groupId>
+ <artifactId>commons-cli</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.doxia</groupId>
+ <artifactId>doxia-sink-api</artifactId>
+ <version>1.0-beta-1-SNAPSHOT</version>
+ </dependency>
<!-- Plexus -->
<dependency>
<groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-interpolation</artifactId>
+ <version>1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-container-default</artifactId>
<version>1.0-alpha-9-stable-1</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
- <version>1.5.1</version>
+ <version>1.5.5</version>
</dependency>
<dependency>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-provider-api</artifactId>
- <version>1.0-beta-2</version> <!-- Can't use. bootstrap-mini isn't smart enough: <version>${wagonVersion}</version> -->
+ <version>${wagonVersion}</version>
</dependency>
<dependency>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-ssh</artifactId>
- <version>1.0-beta-2</version> <!-- Can't use. bootstrap-mini isn't smart enough: <version>${wagonVersion}</version> -->
+ <version>${wagonVersion}</version>
</dependency>
<dependency>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-ssh-external</artifactId>
- <version>1.0-beta-2</version> <!-- Can't use. bootstrap-mini isn't smart enough: <version>${wagonVersion}</version> -->
+ <version>${wagonVersion}</version>
</dependency>
<dependency>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-file</artifactId>
- <version>1.0-beta-2</version> <!-- Can't use. bootstrap-mini isn't smart enough: <version>${wagonVersion}</version> -->
+ <version>${wagonVersion}</version>
</dependency>
<dependency>
<groupId>org.apache.maven.wagon</groupId>
@@ -379,7 +427,7 @@
<dependency>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-http-lightweight</artifactId>
- <version>1.0-beta-2</version> <!-- Can't use. bootstrap-mini isn't smart enough: <version>${wagonVersion}</version> -->
+ <version>${wagonVersion}</version>
</dependency>
<dependency>
<groupId>easymock</groupId>
@@ -393,7 +441,9 @@
<version>1.1</version>
</dependency>
</dependencies>
+ <!--start-->
</dependencyManagement>
+ <!--end-->
<distributionManagement>
<site>
@@ -438,13 +488,37 @@
</profile>
<profile>
- <!-- To generate aggregate reports, calling twice mvn site -Preporting, mvn site -Preporting-aggregate -->
+ <id>reporting</id>
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>clirr-maven-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </reporting>
+ </profile>
+
+ <profile>
<id>reporting-aggregate</id>
+ <!-- To generate aggregate reports -->
+ <!-- To deploy both aggregate reports for top-level project and standalone reports for modules, call
+ mvn site -Preporting
+ mvn site:deploy
+ mvn site -Preporting-aggregate
+ mvn -N site:deploy
+ -->
<reporting>
<plugins>
<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-jxr-plugin</artifactId>
+ <version>2.1</version>
<configuration>
<aggregate>true</aggregate>
</configuration>
@@ -452,6 +526,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.4</version>
<configuration>
<links>
<link>http://java.sun.com/j2se/1.4.2/docs/api</link>