Skip to content

Commit d9eff66

Browse files
authored
Merge pull request #162 from leadpony/fix_javadoc11
Fix build failure with JDK 11.0.2. Thanks @jansupol for checking it.
2 parents 5b44888 + 95c3587 commit d9eff66

File tree

3 files changed

+21
-8
lines changed

3 files changed

+21
-8
lines changed

api/pom.xml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
4-
Copyright (c) 2011, 2018 Oracle and/or its affiliates. All rights reserved.
4+
Copyright (c) 2011, 2019 Oracle and/or its affiliates. All rights reserved.
55
66
This program and the accompanying materials are made available under the
77
terms of the Eclipse Public License v. 2.0, which is available at
@@ -57,17 +57,14 @@
5757
</group>
5858
</groups>
5959
<bottom>
60-
<![CDATA[Copyright &#169; 2012-2018,
60+
<![CDATA[Copyright &#169; 2012-2019,
6161
<a href="http://www.oracle.com">Oracle</a>
6262
and/or its affiliates. All Rights Reserved.
6363
Use is subject to
6464
<a href="{@docRoot}/doc-files/speclicense.html" target="_top">license terms</a>.
6565
<br>Comments to : [email protected]
6666
]]>
6767
</bottom>
68-
<links>
69-
<link>http://docs.oracle.com/javase/8/docs/api/</link>
70-
</links>
7168
</configuration>
7269

7370
<executions>

demos/customprovider-jdk9/pom.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<!--
22
3-
Copyright (c) 2017 Oracle and/or its affiliates. All rights reserved.
3+
Copyright (c) 2017, 2019 Oracle and/or its affiliates. All rights reserved.
44
55
This program and the accompanying materials are made available under the
66
terms of the Eclipse Distribution License v. 1.0, which is available at
@@ -52,7 +52,6 @@
5252
<plugin>
5353
<groupId>org.apache.maven.plugins</groupId>
5454
<artifactId>maven-surefire-plugin</artifactId>
55-
<version>2.20</version>
5655
<executions>
5756
<execution>
5857
<goals>

pom.xml

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
4-
Copyright (c) 2011, 2018 Oracle and/or its affiliates. All rights reserved.
4+
Copyright (c) 2011, 2019 Oracle and/or its affiliates. All rights reserved.
55
66
This program and the accompanying materials are made available under the
77
terms of the Eclipse Public License v. 2.0, which is available at
@@ -79,6 +79,7 @@
7979
<new_impl_version>1.2.0</new_impl_version>
8080
<non.final>false</non.final>
8181
<legal.doc.source>${maven.multiModuleProjectDirectory}</legal.doc.source>
82+
<javadoc.link.jdk>http://docs.oracle.com/javase/8/docs/api</javadoc.link.jdk>
8283
</properties>
8384

8485
<build>
@@ -178,6 +179,12 @@
178179
<groupId>org.apache.maven.plugins</groupId>
179180
<artifactId>maven-javadoc-plugin</artifactId>
180181
<version>3.0.1</version>
182+
<configuration>
183+
<detectJavaApiLink>false</detectJavaApiLink>
184+
<links>
185+
<link>${javadoc.link.jdk}</link>
186+
</links>
187+
</configuration>
181188
</plugin>
182189
<plugin>
183190
<groupId>org.apache.maven.plugins</groupId>
@@ -431,6 +438,16 @@
431438
</modules>
432439
</profile>
433440

441+
<profile>
442+
<id>jdk11-setup</id>
443+
<activation>
444+
<jdk>[11,)</jdk>
445+
</activation>
446+
<properties>
447+
<javadoc.link.jdk>https://docs.oracle.com/en/java/javase/11/docs/api</javadoc.link.jdk>
448+
</properties>
449+
</profile>
450+
434451
<profile>
435452
<id>all</id>
436453
<activation>

0 commit comments

Comments
 (0)