# HG changeset patch
# User aoqi
# Date 1603529040 -28800
# Node ID b8a6df910f59274c56bdbb213e21e365dc78f481
# Parent e35b261f5d37fa3264dc18029688f6cc0291f230# Parent 68a2632bf926ed13c20af12d3c5d1b3e79f3acb9
Merge
diff -r e35b261f5d37 -r b8a6df910f59 .hgtags
--- a/.hgtags Sat Oct 24 16:18:48 2020 +0800
+++ b/.hgtags Sat Oct 24 16:44:00 2020 +0800
@@ -1070,8 +1070,23 @@
6df22f7cfdf1154526a79982cb99fbd7684b0bbd jdk8u262-b03
094173db293ac68326b38333a3570bdb0d407b43 jdk8u262-b04
07fc22e7080d7440c5e8bea06dc36548bcb065b2 jdk8u262-b05
+07fc22e7080d7440c5e8bea06dc36548bcb065b2 jdk8u272-b00
26690d83c12ed384b919f7c67b70d2000f999bdf jdk8u262-b06
774e6c9b92965430835ea842724348c39692c542 jdk8u262-b07
ac5fce89162167996468e6466abe5cfcc8185bde jdk8u262-b08
747fe2026aa872ee5444e6c24653d054b1aef58c jdk8u262-b09
+fd4d3f8b2c2de81cac967f56ec69f82a7c6b0e9d jdk8u262-b10
+fd4d3f8b2c2de81cac967f56ec69f82a7c6b0e9d jdk8u262-ga
0c0a27687e23c5c2b6e4bb64e2eed33d7e9340a0 mips-jdk8u262-b10
+fd4d3f8b2c2de81cac967f56ec69f82a7c6b0e9d jdk8u265-b00
+e0342245812afc794e3537380c7025683424d07e jdk8u265-b01
+e0342245812afc794e3537380c7025683424d07e jdk8u265-ga
+a51cd1abb0c93552857885b1ba53592c786714d2 jdk8u272-b01
+54f67143c9566104641b6c69ce33f541d0f5f350 jdk8u272-b02
+4e02b68de4582b99db1331852cb731914a47adba jdk8u272-b03
+a317abfcbd909b1c094e250afb0cb618e363e938 jdk8u272-b04
+f1fa9a70296a0ce38c6e315fb3ee107aa32f6b42 jdk8u272-b05
+b974f43a589fa0ca7be9d0a62673929229a2a4e7 jdk8u272-b06
+a56fbe019ae89f55aae083d29b24f83290affe5d jdk8u272-b07
+462446582ece03a945b8d6b7714ac3c19f07ff25 jdk8u272-b08
+acab1eb3dc4c828f87500709d05ea2293baed60c jdk8u272-b09
diff -r e35b261f5d37 -r b8a6df910f59 THIRD_PARTY_README
--- a/THIRD_PARTY_README Sat Oct 24 16:18:48 2020 +0800
+++ b/THIRD_PARTY_README Sat Oct 24 16:44:00 2020 +0800
@@ -2240,7 +2240,7 @@
-------------------------------------------------------------------------------
-%% This notice is provided with respect to PC/SC Lite v1.8.24,
+%% This notice is provided with respect to PC/SC Lite v1.8.26,
which may be included with JRE 8, JDK 8, and OpenJDK 8 on Linux and Solaris.
--- begin of LICENSE ---
@@ -3028,8 +3028,7 @@
Apache Commons Math 3.2
Apache Derby 10.11.1.2
Apache Jakarta BCEL 5.1
- Apache Jakarta Regexp 1.4
- Apache Santuario XML Security for Java 1.5.4
+ Apache Santuario XML Security for Java 2.1.1
Apache Xalan-Java 2.7.2
Apache Xerces Java 2.10.0
Apache XML Resolver 1.1
@@ -3243,3 +3242,41 @@
-------------------------------------------------------------------------------
+%% This notice is provided with respect to OASIS PKCS #11 Cryptographic Token
+Interface v2.40, which may be included with JRE 8, JDK 8, and OpenJDK 8.
+
+--- begin of LICENSE ---
+
+Copyright (c) OASIS Open 2016. All Rights Reserved.
+
+All capitalized terms in the following text have the meanings assigned to them
+in the OASIS Intellectual Property Rights Policy (the "OASIS IPR Policy"). The
+full Policy may be found at the OASIS website:
+[http://www.oasis-open.org/policies-guidelines/ipr]
+
+This document and translations of it may be copied and furnished to others, and
+derivative works that comment on or otherwise explain it or assist in its
+implementation may be prepared, copied, published, and distributed, in whole or
+in part, without restriction of any kind, provided that the above copyright
+notice and this section are included on all such copies and derivative works.
+However, this document itself may not be modified in any way, including by
+removing the copyright notice or references to OASIS, except as needed for the
+purpose of developing any document or deliverable produced by an OASIS
+Technical Committee (in which case the rules applicable to copyrights, as set
+forth in the OASIS IPR Policy, must be followed) or as required to translate it
+into languages other than English.
+
+The limited permissions granted above are perpetual and will not be revoked by
+OASIS or its successors or assigns.
+
+This document and the information contained herein is provided on an "AS IS"
+basis and OASIS DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT
+LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION HEREIN WILL NOT
+INFRINGE ANY OWNERSHIP RIGHTS OR ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR
+FITNESS FOR A PARTICULAR PURPOSE. OASIS AND ITS MEMBERS WILL NOT BE LIABLE FOR
+ANY DIRECT, INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE
+OF THIS DOCUMENT OR ANY PART THEREOF.
+
+--- end of LICENSE ---
+
+-------------------------------------------------------------------------------
diff -r e35b261f5d37 -r b8a6df910f59 src/share/classes/com/sun/tools/doclets/formats/html/HtmlDocletWriter.java
--- a/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDocletWriter.java Sat Oct 24 16:18:48 2020 +0800
+++ b/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDocletWriter.java Sat Oct 24 16:44:00 2020 +0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -1441,7 +1441,8 @@
}
}
if (configuration.currentcd != containing) {
- refMemName = containing.name() + "." + refMemName;
+ refMemName = (refMem instanceof ConstructorDoc) ?
+ refMemName : containing.name() + "." + refMemName;
}
if (refMem instanceof ExecutableMemberDoc) {
if (refMemName.indexOf('(') < 0) {
diff -r e35b261f5d37 -r b8a6df910f59 src/share/classes/com/sun/tools/javac/resources/legacy.properties
--- a/src/share/classes/com/sun/tools/javac/resources/legacy.properties Sat Oct 24 16:18:48 2020 +0800
+++ b/src/share/classes/com/sun/tools/javac/resources/legacy.properties Sat Oct 24 16:44:00 2020 +0800
@@ -143,6 +143,7 @@
com.sun.jndi.ldap.ext = tiger legacy
com.sun.jndi.ldap.pool = tiger legacy
com.sun.jndi.ldap.sasl = tiger legacy
+com.sun.jndi.ldap.spi = tiger legacy
com.sun.jndi.rmi.registry = tiger legacy
com.sun.jndi.toolkit.corba = tiger legacy
com.sun.jndi.toolkit.ctx = tiger legacy
diff -r e35b261f5d37 -r b8a6df910f59 src/share/classes/com/sun/tools/javac/sym/CreateSymbols.java
--- a/src/share/classes/com/sun/tools/javac/sym/CreateSymbols.java Sat Oct 24 16:18:48 2020 +0800
+++ b/src/share/classes/com/sun/tools/javac/sym/CreateSymbols.java Sat Oct 24 16:44:00 2020 +0800
@@ -502,6 +502,7 @@
"org.w3c.dom.css",
"org.w3c.dom.events",
"org.w3c.dom.views",
+ "com.sun.jndi.ldap.spi",
"com.sun.management",
"com.sun.security.auth",
"com.sun.security.auth.callback",
diff -r e35b261f5d37 -r b8a6df910f59 src/share/classes/com/sun/tools/javadoc/SeeTagImpl.java
--- a/src/share/classes/com/sun/tools/javadoc/SeeTagImpl.java Sat Oct 24 16:18:48 2020 +0800
+++ b/src/share/classes/com/sun/tools/javadoc/SeeTagImpl.java Sat Oct 24 16:44:00 2020 +0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -399,7 +399,8 @@
private MemberDoc findExecutableMember(String memName, String[] paramarr,
ClassDoc referencedClass) {
- if (memName.equals(referencedClass.name())) {
+ String className = referencedClass.name();
+ if (memName.equals(className.substring(className.lastIndexOf(".") + 1))) {
return ((ClassDocImpl)referencedClass).findConstructor(memName,
paramarr);
} else { // it's a method.
diff -r e35b261f5d37 -r b8a6df910f59 test/com/sun/javadoc/testConstructors/TestConstructors.java
--- a/test/com/sun/javadoc/testConstructors/TestConstructors.java Sat Oct 24 16:18:48 2020 +0800
+++ b/test/com/sun/javadoc/testConstructors/TestConstructors.java Sat Oct 24 16:44:00 2020 +0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
/*
* @test
- * @bug 8025524
+ * @bug 8025524 8031625
* @summary Test for constructor name which should be a non-qualified name.
* @author Bhavesh Patel
* @library ../lib/
@@ -38,6 +38,21 @@
//Input for string search tests.
private static final String[][] TEST = {
{BUG_ID + FS + "pkg1" + FS + "Outer.html",
+ "See Also:" + NL +
+ "Inner(), " + NL +
+ "Inner(int), " + NL +
+ "NestedInner(), " + NL +
+ "NestedInner(int), " + NL +
+ "Outer(), " + NL +
+ "Outer(int)"
+ },
+ {BUG_ID + FS + "pkg1" + FS + "Outer.html",
+ "Link: Inner(), " +
+ "Outer(int), " +
+ "" +
+ "NestedInner(int)"
+ },
+ {BUG_ID + FS + "pkg1" + FS + "Outer.html",
"Outer()"
},
{BUG_ID + FS + "pkg1" + FS + "Outer.html",
@@ -87,6 +102,18 @@
},
{BUG_ID + FS + "pkg1" + FS + "Outer.Inner.NestedInner.html",
"Outer.Inner.NestedInner-int-"
+ },
+ {BUG_ID + FS + "pkg1" + FS + "Outer.html",
+ "Outer.Inner()"
+ },
+ {BUG_ID + FS + "pkg1" + FS + "Outer.html",
+ "Outer.Inner(int)"
+ },
+ {BUG_ID + FS + "pkg1" + FS + "Outer.html",
+ "Outer.Inner.NestedInner()"
+ },
+ {BUG_ID + FS + "pkg1" + FS + "Outer.html",
+ "Outer.Inner.NestedInner(int)"
}
};
diff -r e35b261f5d37 -r b8a6df910f59 test/com/sun/javadoc/testConstructors/pkg1/Outer.java
--- a/test/com/sun/javadoc/testConstructors/pkg1/Outer.java Sat Oct 24 16:18:48 2020 +0800
+++ b/test/com/sun/javadoc/testConstructors/pkg1/Outer.java Sat Oct 24 16:44:00 2020 +0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -23,6 +23,17 @@
package pkg1;
+/**
+ * Test link tag.
+ * Link: {@link pkg1.Outer.Inner#Inner()}, {@link pkg1.Outer#Outer(int)}, {@link pkg1.Outer.Inner.NestedInner#NestedInner(int)}
+ *
+ * @see Outer.Inner#Inner()
+ * @see Outer.Inner#Inner(int)
+ * @see Outer.Inner.NestedInner#NestedInner()
+ * @see Outer.Inner.NestedInner#NestedInner(int)
+ * @see Outer#Outer()
+ * @see Outer#Outer(int)
+ */
public class Outer {
/**