You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ol...@apache.org on 2009/09/07 01:30:02 UTC
svn commit: r811953 - in /maven/plugins/trunk/maven-javadoc-plugin: ./
src/it/ src/it/MJAVADOC-110/ src/it/MJAVADOC-137/ src/it/MJAVADOC-172/
src/it/MJAVADOC-180/ src/it/MJAVADOC-181/ src/it/MJAVADOC-206/
src/it/MJAVADOC-257/
Author: olamy
Date: Sun Sep 6 23:30:02 2009
New Revision: 811953
URL: http://svn.apache.org/viewvc?rev=811953&view=rev
Log:
enable it for maven 3
Modified:
maven/plugins/trunk/maven-javadoc-plugin/pom.xml
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-110/pom.xml
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-137/pom.xml
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-172/pom.xml
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-180/pom.xml
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-181/pom.xml
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-206/pom.xml
maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-257/pom.xml
maven/plugins/trunk/maven-javadoc-plugin/src/it/settings.xml
Modified: maven/plugins/trunk/maven-javadoc-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/pom.xml?rev=811953&r1=811952&r2=811953&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/pom.xml Sun Sep 6 23:30:02 2009
@@ -58,6 +58,8 @@
<doxiaVersion>1.0</doxiaVersion>
<doxia-sitetoolsVersion>1.0</doxia-sitetoolsVersion>
<wagonVersion>1.0-beta-6</wagonVersion>
+ <sitePluginVersion>2.0.1</sitePluginVersion>
+ <projectInfoReportsPluginVersion>2.1.2</projectInfoReportsPluginVersion>
</properties>
<dependencies>
@@ -455,5 +457,18 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>maven-3</id>
+ <activation>
+ <file>
+ <!-- This employs that the basedir expression is only recognized by Maven 3.x (see MNG-2363) -->
+ <exists>${basedir}</exists>
+ </file>
+ </activation>
+ <properties>
+ <sitePluginVersion>3.0-beta-1-SNAPSHOT</sitePluginVersion>
+ <projectInfoReportsPluginVersion>2.2-SNAPSHOT</projectInfoReportsPluginVersion>
+ </properties>
+ </profile>
</profiles>
</project>
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-110/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-110/pom.xml?rev=811953&r1=811952&r2=811953&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-110/pom.xml (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-110/pom.xml Sun Sep 6 23:30:02 2009
@@ -37,7 +37,7 @@
</plugin>
<plugin>
<artifactId>maven-site-plugin</artifactId>
- <version>2.0.1</version>
+ <version>@sitePluginVersion@</version>
</plugin>
</plugins>
</pluginManagement>
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-137/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-137/pom.xml?rev=811953&r1=811952&r2=811953&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-137/pom.xml (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-137/pom.xml Sun Sep 6 23:30:02 2009
@@ -42,7 +42,7 @@
</plugin>
<plugin>
<artifactId>maven-site-plugin</artifactId>
- <version>2.0.1</version>
+ <version>@sitePluginVersion@</version>
</plugin>
</plugins>
</pluginManagement>
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-172/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-172/pom.xml?rev=811953&r1=811952&r2=811953&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-172/pom.xml (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-172/pom.xml Sun Sep 6 23:30:02 2009
@@ -38,7 +38,7 @@
</plugin>
<plugin>
<artifactId>maven-site-plugin</artifactId>
- <version>2.0.1</version>
+ <version>@sitePluginVersion@</version>
</plugin>
</plugins>
</pluginManagement>
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-180/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-180/pom.xml?rev=811953&r1=811952&r2=811953&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-180/pom.xml (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-180/pom.xml Sun Sep 6 23:30:02 2009
@@ -53,7 +53,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
- <version>2.0.1</version>
+ <version>@sitePluginVersion@</version>
</plugin>
</plugins>
</build>
@@ -63,7 +63,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.1.2</version>
+ <version>@projectInfoReportsPluginVersion@</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-181/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-181/pom.xml?rev=811953&r1=811952&r2=811953&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-181/pom.xml (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-181/pom.xml Sun Sep 6 23:30:02 2009
@@ -39,7 +39,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
- <version>2.0.1</version>
+ <version>@sitePluginVersion@</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -55,7 +55,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.1.2</version>
+ <version>@projectInfoReportsPluginVersion@</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-206/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-206/pom.xml?rev=811953&r1=811952&r2=811953&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-206/pom.xml (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-206/pom.xml Sun Sep 6 23:30:02 2009
@@ -42,7 +42,7 @@
</plugin>
<plugin>
<artifactId>maven-site-plugin</artifactId>
- <version>2.0.1</version>
+ <version>@sitePluginVersion@</version>
</plugin>
</plugins>
</pluginManagement>
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-257/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-257/pom.xml?rev=811953&r1=811952&r2=811953&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-257/pom.xml (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-257/pom.xml Sun Sep 6 23:30:02 2009
@@ -58,12 +58,12 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
- <version>2.0.1</version>
+ <version>@sitePluginVersion@</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.1.2</version>
+ <version>@projectInfoReportsPluginVersion@</version>
</plugin>
</plugins>
</pluginManagement>
@@ -74,7 +74,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.1.2</version>
+ <version>@projectInfoReportsPluginVersion@</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/it/settings.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/settings.xml?rev=811953&r1=811952&r2=811953&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/it/settings.xml (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/it/settings.xml Sun Sep 6 23:30:02 2009
@@ -40,7 +40,7 @@
<repository>
<id>apache.snapshots</id>
<name>Apache Snapshot Repository</name>
- <url>http://people.apache.org/repo/m2-snapshot-repository</url>
+ <url>http://repository.apache.org/content/groups/snapshots/</url>
<releases>
<enabled>false</enabled>
</releases>
@@ -60,6 +60,17 @@
<enabled>true</enabled>
</snapshots>
</pluginRepository>
+ <pluginRepository>
+ <id>apache.snapshots</id>
+ <name>Apache Snapshot Repository</name>
+ <url>http://repository.apache.org/content/groups/snapshots/</url>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </pluginRepository>
</pluginRepositories>
</profile>
</profiles>