You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by rf...@apache.org on 2016/07/09 11:50:46 UTC
svn commit: r1751998 - in /maven/plugins/trunk/maven-javadoc-plugin: pom.xml
src/it/site-failOnError/pom.xml
Author: rfscholte
Date: Sat Jul 9 11:50:46 2016
New Revision: 1751998
URL: http://svn.apache.org/viewvc?rev=1751998&view=rev
Log:
[MJAVADOC-456] Upgrade to Maven3 plugin
- Remove M2.0 backwards compatible shading
- Reduce number of reports for site-failOnError (also required to run succesfully when invoker.mavenHome points to M3.0)
Modified:
maven/plugins/trunk/maven-javadoc-plugin/pom.xml
maven/plugins/trunk/maven-javadoc-plugin/src/it/site-failOnError/pom.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=1751998&r1=1751997&r2=1751998&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/pom.xml Sat Jul 9 11:50:46 2016
@@ -281,11 +281,6 @@ under the License.
<pluginManagement>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-shade-plugin</artifactId>
- <version>1.7.1</version>
- </plugin>
- <plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
<configuration>
@@ -339,40 +334,6 @@ under the License.
</systemProperties>
</configuration>
</plugin>
-
- <!-- Backward compatibility with Maven 2.0.x -->
- <plugin>
- <artifactId>maven-shade-plugin</artifactId>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>shade</goal>
- </goals>
- <configuration>
- <finalName>${project.build.finalName}</finalName>
- <createDependencyReducedPom>false</createDependencyReducedPom>
- <keepDependenciesWithProvidedScope>true</keepDependenciesWithProvidedScope>
- <transformers>
- <transformer implementation="org.apache.maven.plugins.shade.resource.ComponentsXmlResourceTransformer" />
- </transformers>
- <artifactSet>
- <includes>
- <include>org.apache.maven.wagon:wagon-provider-api</include>
- </includes>
- </artifactSet>
- <filters>
- <filter>
- <artifact>org.apache.maven.wagon:wagon-provider-api</artifact>
- <includes>
- <include>org/apache/maven/wagon/proxy/ProxyUtils.class</include>
- </includes>
- </filter>
- </filters>
- </configuration>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/it/site-failOnError/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/site-failOnError/pom.xml?rev=1751998&r1=1751997&r2=1751998&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/it/site-failOnError/pom.xml (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/it/site-failOnError/pom.xml Sat Jul 9 11:50:46 2016
@@ -68,6 +68,18 @@
</reportSet>
</reportSets>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ <version>2.9</version>
+ <reportSets>
+ <reportSet>
+ <reports>
+ <report>index</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ </plugin>
</plugins>
</reporting>
</project>