Log Message
Overwrite stuff of codehaus parent. Fix javadoc generation with Java 8.
Modified Paths
Diff
Modified: trunk/pom.xml (2316 => 2317)
--- trunk/pom.xml 2015-02-02 17:58:40 UTC (rev 2316)
+++ trunk/pom.xml 2015-02-02 23:19:08 UTC (rev 2317)
@@ -44,6 +44,15 @@
</properties>
</profile>
<profile>
+ <id>jdk18ge</id>
+ <activation>
+ <jdk>[1.8,)</jdk>
+ </activation>
+ <properties>
+ <javadoc.xdoclint>-Xdoclint:-missing</javadoc.xdoclint>
+ </properties>
+ </profile>
+ <profile>
<id>jdk15-ge</id>
<activation>
<jdk>[1.5,)</jdk>
@@ -91,6 +100,8 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
+ <!-- overwrite codehaus-parent -->
+ <version>${version.plugin.maven.enforcer}</version>
<executions>
<execution>
<id>enforce-java-version</id>
@@ -111,10 +122,27 @@
</build>
</profile>
<profile>
- <id>release</id>
+ <id>xstream-release</id>
<properties>
<version.java.enforced>[1.8;1.9)</version.java.enforced>
</properties>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-gpg-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>sign-artifacts</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>sign</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</profile>
</profiles>
@@ -466,6 +494,11 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-gpg-plugin</artifactId>
+ <version>${version.plugin.maven.gpg}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
<version>${version.plugin.maven.install}</version>
</plugin>
@@ -494,7 +527,17 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>${version.plugin.maven.javadoc}</version>
+ <executions>
+ <execution>
+ <id>attach-javadocs</id>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
<configuration>
+ <detectJavaApiLink>false</detectJavaApiLink>
+ <additionalparam>${javadoc.xdoclint}</additionalparam>
<source>${version.java.source}</source>
<links>
<link>${link.javadoc.javase}</link>
@@ -517,6 +560,8 @@
<configuration>
<goals>deploy</goals>
<autoVersionSubmodules>true</autoVersionSubmodules>
+ <!-- overwrite codehaus-parent -->
+ <arguments>-Pxstream-release</arguments>
</configuration>
</plugin>
<plugin>
@@ -709,9 +754,10 @@
<version.plugin.maven.dependency>2.1</version.plugin.maven.dependency>
<version.plugin.maven.deploy>2.3</version.plugin.maven.deploy>
<version.plugin.maven.enforcer>1.4</version.plugin.maven.enforcer>
+ <version.plugin.maven.gpg>1.4</version.plugin.maven.gpg>
<version.plugin.maven.install>2.2</version.plugin.maven.install>
<version.plugin.maven.jar>2.2</version.plugin.maven.jar>
- <version.plugin.maven.javadoc>2.7</version.plugin.maven.javadoc>
+ <version.plugin.maven.javadoc>2.10</version.plugin.maven.javadoc>
<version.plugin.maven.release>2.1</version.plugin.maven.release>
<version.plugin.maven.resources>2.2</version.plugin.maven.resources>
<version.plugin.maven.site>2.0-beta-6</version.plugin.maven.site>
@@ -753,5 +799,7 @@
<version.xpp3>1.1.4c</version.xpp3>
<link.javadoc.javase>http://docs.oracle.com/javase/8/docs/api/</link.javadoc.javase>
+
+ <javadoc.xdoclint>-Xmaxerrs 100</javadoc.xdoclint>
</properties>
</project>
Modified: trunk/xstream/pom.xml (2316 => 2317)
--- trunk/xstream/pom.xml 2015-02-02 17:58:40 UTC (rev 2316)
+++ trunk/xstream/pom.xml 2015-02-02 23:19:08 UTC (rev 2317)
@@ -139,21 +139,6 @@
</dependencies>
<build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <excludePackageNames>com.thoughtworks.xstream.core.util</excludePackageNames>
- <source>${version.java.source}</source>
- <links>
- <link>${link.javadoc.javase}</link>
- </links>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -225,15 +210,9 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-javadocs</id>
- <phase>package</phase>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
+ <configuration>
+ <excludePackageNames>com.thoughtworks.xstream.core.util</excludePackageNames>
+ </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -357,6 +336,8 @@
<version>${version.plugin.maven.javadoc}</version>
<configuration>
<excludePackageNames>com.thoughtworks.xstream.core.util</excludePackageNames>
+ <additionalparam>${javadoc.xdoclint}</additionalparam>
+ <detectJavaApiLink>false</detectJavaApiLink>
<source>${version.java.source}</source>
<links>
<link>${link.javadoc.javase}</link>
Modified: trunk/xstream-benchmark/pom.xml (2316 => 2317)
--- trunk/xstream-benchmark/pom.xml 2015-02-02 17:58:40 UTC (rev 2316)
+++ trunk/xstream-benchmark/pom.xml 2015-02-02 23:19:08 UTC (rev 2317)
@@ -22,34 +22,13 @@
<description>Benchmark suite of XStream.</description>
<build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <excludePackageNames>com.thoughtworks.xstream.tools.benchmark.model</excludePackageNames>
- <source>${version.java.source}</source>
- <links>
- <link>${link.javadoc.javase}</link>
- </links>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-javadocs</id>
- <phase>package</phase>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
+ <configuration>
+ <excludePackageNames>com.thoughtworks.xstream.tools.benchmark.model</excludePackageNames>
+ </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -91,6 +70,8 @@
<version>${version.plugin.maven.javadoc}</version>
<configuration>
<excludePackageNames>com.thoughtworks.xstream.tools.benchmark.model</excludePackageNames>
+ <detectJavaApiLink>false</detectJavaApiLink>
+ <additionalparam>${javadoc.xdoclint}</additionalparam>
<source>${version.java.source}</source>
<links>
<link>${link.javadoc.javase}</link>
Modified: trunk/xstream-hibernate/pom.xml (2316 => 2317)
--- trunk/xstream-hibernate/pom.xml 2015-02-02 17:58:40 UTC (rev 2316)
+++ trunk/xstream-hibernate/pom.xml 2015-02-02 23:19:08 UTC (rev 2317)
@@ -33,15 +33,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-javadocs</id>
- <phase>package</phase>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -71,20 +62,6 @@
</profiles>
<build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <source>${version.java.source}</source>
- <links>
- <link>${link.javadoc.javase}</link>
- </links>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -122,6 +99,8 @@
<artifactId>maven-javadoc-plugin</artifactId>
<version>${version.plugin.maven.javadoc}</version>
<configuration>
+ <additionalparam>${javadoc.xdoclint}</additionalparam>
+ <detectJavaApiLink>false</detectJavaApiLink>
<source>${version.java.source}</source>
<links>
<link>${link.javadoc.javase}</link>
To unsubscribe from this list please visit:
