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/22 22:21:27 UTC
svn commit: r817818 - in /maven/plugins/branches/maven-site-plugin-3.x:
pom.xml src/it/empty-report-set/verify.bsh
src/main/java/org/apache/maven/plugins/site/DefaultMavenReportExecutor.java
Author: olamy
Date: Tue Sep 22 20:21:22 2009
New Revision: 817818
URL: http://svn.apache.org/viewvc?rev=817818&view=rev
Log:
fix empty-report it.
Modified:
maven/plugins/branches/maven-site-plugin-3.x/pom.xml
maven/plugins/branches/maven-site-plugin-3.x/src/it/empty-report-set/verify.bsh
maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/DefaultMavenReportExecutor.java
Modified: maven/plugins/branches/maven-site-plugin-3.x/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/pom.xml?rev=817818&r1=817817&r2=817818&view=diff
==============================================================================
--- maven/plugins/branches/maven-site-plugin-3.x/pom.xml (original)
+++ maven/plugins/branches/maven-site-plugin-3.x/pom.xml Tue Sep 22 20:21:22 2009
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugins</artifactId>
- <version>13</version>
+ <version>14</version>
</parent>
<artifactId>maven-site-plugin</artifactId>
@@ -543,32 +543,7 @@
</pluginManagement>
</build>
</profile>
- <profile>
- <!-- this should become 'apache-release' when maven-parent-12 is used -->
- <id>release</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>single</goal>
- </goals>
- <phase>package</phase>
- <configuration>
- <descriptors>
- <descriptor>src/main/assembly/source-release.xml</descriptor>
- </descriptors>
- <tarLongFileMode>gnu</tarLongFileMode>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
+
<profile>
<id>dev</id>
<build>
Modified: maven/plugins/branches/maven-site-plugin-3.x/src/it/empty-report-set/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/it/empty-report-set/verify.bsh?rev=817818&r1=817817&r2=817818&view=diff
==============================================================================
--- maven/plugins/branches/maven-site-plugin-3.x/src/it/empty-report-set/verify.bsh (original)
+++ maven/plugins/branches/maven-site-plugin-3.x/src/it/empty-report-set/verify.bsh Tue Sep 22 20:21:22 2009
@@ -6,3 +6,5 @@
{
throw new Exception( "Detected unwanted file " + indexHtml );
}
+
+return true;
Modified: maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/DefaultMavenReportExecutor.java
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/DefaultMavenReportExecutor.java?rev=817818&r1=817817&r2=817818&view=diff
==============================================================================
--- maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/DefaultMavenReportExecutor.java (original)
+++ maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/DefaultMavenReportExecutor.java Tue Sep 22 20:21:22 2009
@@ -98,6 +98,11 @@
if ( reportPlugin.getReportSets().isEmpty() )
{
+ continue;
+ }
+
+ if ( reportPlugin.getReportSets() == null )
+ {
List<MojoDescriptor> mojoDescriptors = pluginDescriptor.getMojos();
for ( MojoDescriptor mojoDescriptor : mojoDescriptors )
{