Merge pull request #162 from leadpony/fix_javadoc11
Fix build failure with JDK 11.0.2. Thanks @jansupol for checking it.
diff --git a/api/pom.xml b/api/pom.xml
index e5decb8..7030159 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2011, 2018 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2011, 2019 Oracle and/or its affiliates. All rights reserved.
This program and the accompanying materials are made available under the
terms of the Eclipse Public License v. 2.0, which is available at
@@ -57,7 +57,7 @@
</group>
</groups>
<bottom>
-<![CDATA[Copyright © 2012-2018,
+<![CDATA[Copyright © 2012-2019,
<a href="http://www.oracle.com">Oracle</a>
and/or its affiliates. All Rights Reserved.
Use is subject to
@@ -65,9 +65,6 @@
<br>Comments to : jsonp-dev@eclipse.org
]]>
</bottom>
- <links>
- <link>http://docs.oracle.com/javase/8/docs/api/</link>
- </links>
</configuration>
<executions>
diff --git a/demos/customprovider-jdk9/pom.xml b/demos/customprovider-jdk9/pom.xml
index 0ad0a5c..9835b21 100644
--- a/demos/customprovider-jdk9/pom.xml
+++ b/demos/customprovider-jdk9/pom.xml
@@ -1,6 +1,6 @@
<!--
- Copyright (c) 2017 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2017, 2019 Oracle and/or its affiliates. All rights reserved.
This program and the accompanying materials are made available under the
terms of the Eclipse Distribution License v. 1.0, which is available at
@@ -52,7 +52,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.20</version>
<executions>
<execution>
<goals>
diff --git a/pom.xml b/pom.xml
index d75bcbc..9f9dae2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2011, 2018 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2011, 2019 Oracle and/or its affiliates. All rights reserved.
This program and the accompanying materials are made available under the
terms of the Eclipse Public License v. 2.0, which is available at
@@ -79,6 +79,7 @@
<new_impl_version>1.2.0</new_impl_version>
<non.final>false</non.final>
<legal.doc.source>${maven.multiModuleProjectDirectory}</legal.doc.source>
+ <javadoc.link.jdk>http://docs.oracle.com/javase/8/docs/api</javadoc.link.jdk>
</properties>
<build>
@@ -178,6 +179,12 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.0.1</version>
+ <configuration>
+ <detectJavaApiLink>false</detectJavaApiLink>
+ <links>
+ <link>${javadoc.link.jdk}</link>
+ </links>
+ </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -432,6 +439,16 @@
</profile>
<profile>
+ <id>jdk11-setup</id>
+ <activation>
+ <jdk>[11,)</jdk>
+ </activation>
+ <properties>
+ <javadoc.link.jdk>https://docs.oracle.com/en/java/javase/11/docs/api</javadoc.link.jdk>
+ </properties>
+ </profile>
+
+ <profile>
<id>all</id>
<activation>
<activeByDefault>true</activeByDefault>
