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/08/30 11:44:20 UTC
svn commit: r809286 - in /maven/plugins/branches/maven-site-plugin-3.x/src:
it/full-reporting/pom.xml
main/java/org/apache/maven/plugins/site/DefaultMavenReportExecutor.java
Author: olamy
Date: Sun Aug 30 09:44:19 2009
New Revision: 809286
URL: http://svn.apache.org/viewvc?rev=809286&view=rev
Log:
temporary hack to fix it
Modified:
maven/plugins/branches/maven-site-plugin-3.x/src/it/full-reporting/pom.xml
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/src/it/full-reporting/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/it/full-reporting/pom.xml?rev=809286&r1=809285&r2=809286&view=diff
==============================================================================
--- maven/plugins/branches/maven-site-plugin-3.x/src/it/full-reporting/pom.xml (original)
+++ maven/plugins/branches/maven-site-plugin-3.x/src/it/full-reporting/pom.xml Sun Aug 30 09:44:19 2009
@@ -12,6 +12,10 @@
<version>1.0-SNAPSHOT</version>
<name>surefire-report</name>
<url>http://maven.apache.org</url>
+ <properties>
+ <!-- SNAPSHOT use due to MJAVADOC-251 -->
+ <javadocPluginVersion>2.6.1-SNAPSHOT</javadocPluginVersion>
+ </properties>
<dependencies>
<dependency>
<groupId>junit</groupId>
@@ -27,6 +31,12 @@
<artifactId>maven-site-plugin</artifactId>
<version>@project.version@</version>
</plugin>
+ <plugin>
+
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>${javadocPluginVersion}</version>
+ </plugin>
</plugins>
</build>
<reporting>
@@ -36,6 +46,25 @@
<artifactId>maven-surefire-report-plugin</artifactId>
<version>2.4.3</version>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>${javadocPluginVersion}</version>
+ </plugin>
</plugins>
</reporting>
+ <profiles>
+ <profile>
+ <id>foo</id>
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>${javadocPluginVersion}</version>
+ </plugin>
+ </plugins>
+ </reporting>
+ </profile>
+ </profiles>
</project>
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=809286&r1=809285&r2=809286&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 Sun Aug 30 09:44:19 2009
@@ -119,11 +119,13 @@
MojoExecution mojoExecution = new MojoExecution( plugin, goal, "report:" + goal );
mojoExecution.setConfiguration( convert( mojoDescriptor ) );
+ //lifecycleExecutor.populateDefaultConfigurationForPlugin( plugin, repositoryRequest );
mojoExecution.setMojoDescriptor( mojoDescriptor );
mavenPluginManager.setupPluginRealm( pluginDescriptor,
mavenReportExecutorRequest.getMavenSession(),
Thread.currentThread().getContextClassLoader(), imports );
+
lifecycleExecutor.calculateForkedExecutions( mojoExecution,
mavenReportExecutorRequest.getMavenSession() );
if ( !mojoExecution.getForkedExecutions().isEmpty() )