Author: rfscholte
Date: Tue Oct 10 21:39:23 2017
New Revision: 1811773
URL: http://svn.apache.org/viewvc?rev=1811773&view=rev
Log:
[MSITE-796] Unable to generate site with JDK9
Upgrade doxia-sitetools to 1.9.5
Fix ITs depending on non-Java9 compatible plugins
Modified:
maven/plugins/trunk/maven-site-plugin/pom.xml
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-484/parent-usage-test/pom.xml
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-484/pom.xml
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-497/pom.xml
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-506/pom.xml
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-507/pom.xml
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-512/parent-usage-test/pom.xml
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-665/pom.xml
Modified: maven/plugins/trunk/maven-site-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/pom.xml?rev=1811773&r1=1811772&r2=1811773&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-site-plugin/pom.xml Tue Oct 10 21:39:23 2017
@@ -191,7 +191,7 @@ under the License.
<properties>
<doxiaVersion>1.8-SNAPSHOT</doxiaVersion>
- <doxiaSitetoolsVersion>1.7.4</doxiaSitetoolsVersion>
+ <doxiaSitetoolsVersion>1.7.5</doxiaSitetoolsVersion>
<mavenVersion>3.0</mavenVersion>
<prerequisiteMavenVersion>2.2.1</prerequisiteMavenVersion>
<wagonVersion>1.0</wagonVersion>
@@ -556,6 +556,10 @@ under the License.
<goal>clean</goal>
<goal>${project.groupId}:${project.artifactId}:${project.version}:site</goal>
</goals>
+ <properties>
+
<maven.compiler.source>${maven.compiler.source}</maven.compiler.source>
+
<maven.compiler.target>${maven.compiler.target}</maven.compiler.target>
+ </properties>
</configuration>
</plugin>
</plugins>
Modified:
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-484/parent-usage-test/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/MSITE-484/parent-usage-test/pom.xml?rev=1811773&r1=1811772&r2=1811773&view=diff
==============================================================================
---
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-484/parent-usage-test/pom.xml
(original)
+++
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-484/parent-usage-test/pom.xml
Tue Oct 10 21:39:23 2017
@@ -53,7 +53,6 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.6.1</version>
<configuration>
<stylesheetfile>${basedir}/src/main/javadoc/stylesheet.css</stylesheetfile>
</configuration>
Modified: maven/plugins/trunk/maven-site-plugin/src/it/MSITE-484/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/MSITE-484/pom.xml?rev=1811773&r1=1811772&r2=1811773&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/it/MSITE-484/pom.xml (original)
+++ maven/plugins/trunk/maven-site-plugin/src/it/MSITE-484/pom.xml Tue Oct 10
21:39:23 2017
@@ -66,7 +66,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.6.1</version>
+ <version>3.0.0-M1</version>
<reportSets>
<reportSet>
<reports>
Modified: maven/plugins/trunk/maven-site-plugin/src/it/MSITE-497/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/MSITE-497/pom.xml?rev=1811773&r1=1811772&r2=1811773&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/it/MSITE-497/pom.xml (original)
+++ maven/plugins/trunk/maven-site-plugin/src/it/MSITE-497/pom.xml Tue Oct 10
21:39:23 2017
@@ -65,7 +65,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.7</version>
+ <version>3.0.0-M1</version>
</plugin>
</plugins>
</reporting>
Modified: maven/plugins/trunk/maven-site-plugin/src/it/MSITE-506/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/MSITE-506/pom.xml?rev=1811773&r1=1811772&r2=1811773&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/it/MSITE-506/pom.xml (original)
+++ maven/plugins/trunk/maven-site-plugin/src/it/MSITE-506/pom.xml Tue Oct 10
21:39:23 2017
@@ -57,7 +57,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.9.1</version>
+ <version>3.0.0-M1</version>
<configuration>
<includeDependencySources>true</includeDependencySources>
<detectOfflineLinks>false</detectOfflineLinks>
Modified: maven/plugins/trunk/maven-site-plugin/src/it/MSITE-507/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/MSITE-507/pom.xml?rev=1811773&r1=1811772&r2=1811773&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/it/MSITE-507/pom.xml (original)
+++ maven/plugins/trunk/maven-site-plugin/src/it/MSITE-507/pom.xml Tue Oct 10
21:39:23 2017
@@ -349,8 +349,6 @@ under the License.
<artifactId>maven-compiler-plugin</artifactId>
<version>2.3.2</version>
<configuration>
- <source>1.5</source>
- <target>1.5</target>
<encoding>utf-8</encoding>
</configuration>
</plugin>
@@ -643,7 +641,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.7</version>
+ <version>3.0.0-M1</version>
<configuration>
<encoding>utf-8</encoding>
<stylesheetfile>javadoc/cedarsoft.css</stylesheetfile>
@@ -740,12 +738,6 @@ under the License.
</plugin>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>cobertura-maven-plugin</artifactId>
- <version>2.4</version>
- </plugin>
-
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-report-plugin</artifactId>
<version>2.6</version>
@@ -759,5 +751,24 @@ under the License.
</plugins>
</reporting>
+
+ <profiles>
+ <profile>
+ <id>pre-jdk9</id>
+ <activation>
+ <jdk>(,9)</jdk>
+ </activation>
+ <reporting>
+ <plugins>
+ <!-- no Java9-ready version available yet -->
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>cobertura-maven-plugin</artifactId>
+ <version>2.4</version>
+ </plugin>
+ </plugins>
+ </reporting>
+ </profile>
+ </profiles>
</project>
Modified:
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-512/parent-usage-test/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/MSITE-512/parent-usage-test/pom.xml?rev=1811773&r1=1811772&r2=1811773&view=diff
==============================================================================
---
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-512/parent-usage-test/pom.xml
(original)
+++
maven/plugins/trunk/maven-site-plugin/src/it/MSITE-512/parent-usage-test/pom.xml
Tue Oct 10 21:39:23 2017
@@ -57,7 +57,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.7</version>
+ <version>3.0.0-M1</version>
<reportSets>
<reportSet>
<id>single</id>
Modified: maven/plugins/trunk/maven-site-plugin/src/it/MSITE-665/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/MSITE-665/pom.xml?rev=1811773&r1=1811772&r2=1811773&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/it/MSITE-665/pom.xml (original)
+++ maven/plugins/trunk/maven-site-plugin/src/it/MSITE-665/pom.xml Tue Oct 10
21:39:23 2017
@@ -40,10 +40,6 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -86,7 +82,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.9.1</version>
+ <version>3.0.0-M1</version>
<reportSets>
<reportSet>
<reports>
