Fri, 16 Jan 2015 13:51:52 -0800
Merge
1.1 --- a/src/share/classes/com/sun/source/doctree/package-info.java Thu Jan 15 11:21:55 2015 -0800 1.2 +++ b/src/share/classes/com/sun/source/doctree/package-info.java Fri Jan 16 13:51:52 2015 -0800 1.3 @@ -29,7 +29,7 @@ 1.4 * 1.5 * @author Jonathan Gibbons 1.6 * @since 1.8 1.7 - * @see <a href="http://download.oracle.com/javase/6/docs/technotes/tools/solaris/javadoc.html#javadoctags">http://download.oracle.com/javase/6/docs/technotes/tools/solaris/javadoc.html#javadoctags</a> 1.8 + * @see <a href="https://docs.oracle.com/javase/6/docs/technotes/tools/solaris/javadoc.html#javadoctags">https://docs.oracle.com/javase/6/docs/technotes/tools/solaris/javadoc.html#javadoctags</a> 1.9 */ 1.10 @jdk.Exported 1.11 package com.sun.source.doctree;
2.1 --- a/src/share/classes/com/sun/tools/classfile/BootstrapMethods_attribute.java Thu Jan 15 11:21:55 2015 -0800 2.2 +++ b/src/share/classes/com/sun/tools/classfile/BootstrapMethods_attribute.java Fri Jan 16 13:51:52 2015 -0800 2.3 @@ -29,7 +29,7 @@ 2.4 2.5 /** 2.6 * See JVMS 4.7.21 2.7 - * http://docs.oracle.com/javase/specs/jvms/se7/html/jvms-4.html#jvms-4.7.21 2.8 + * https://docs.oracle.com/javase/specs/jvms/se7/html/jvms-4.html#jvms-4.7.21 2.9 * 2.10 * <p><b>This is NOT part of any supported API. 2.11 * If you write code that depends on this, you do so at your own risk.
3.1 --- a/src/share/classes/com/sun/tools/javac/parser/DocCommentParser.java Thu Jan 15 11:21:55 2015 -0800 3.2 +++ b/src/share/classes/com/sun/tools/javac/parser/DocCommentParser.java Fri Jan 16 13:51:52 2015 -0800 3.3 @@ -1039,7 +1039,7 @@ 3.4 } 3.5 3.6 /** 3.7 - * @see <a href="http://docs.oracle.com/javase/7/docs/technotes/tools/solaris/javadoc.html#javadoctags">Javadoc Tags</a> 3.8 + * @see <a href="https://docs.oracle.com/javase/7/docs/technotes/tools/solaris/javadoc.html#javadoctags">Javadoc Tags</a> 3.9 */ 3.10 private void initTagParsers() { 3.11 TagParser[] parsers = {
4.1 --- a/src/share/classes/com/sun/tools/javac/util/Convert.java Thu Jan 15 11:21:55 2015 -0800 4.2 +++ b/src/share/classes/com/sun/tools/javac/util/Convert.java Fri Jan 16 13:51:52 2015 -0800 4.3 @@ -36,9 +36,9 @@ 4.4 * <p> 4.5 * See also: 4.6 * <ul> 4.7 - * <li><a href="http://docs.oracle.com/javase/specs/jvms/se7/html/jvms-4.html#jvms-4.4.7"> 4.8 + * <li><a href="https://docs.oracle.com/javase/specs/jvms/se7/html/jvms-4.html#jvms-4.4.7"> 4.9 * JVMS 4.4.7 </a></li> 4.10 - * <li><a href="http://docs.oracle.com/javase/7/docs/api/java/io/DataInput.html#modified-utf-8"> 4.11 + * <li><a href="https://docs.oracle.com/javase/7/docs/api/java/io/DataInput.html#modified-utf-8"> 4.12 java.io.DataInput: Modified UTF-8 </a></li> 4.13 <li><a href="https://en.wikipedia.org/wiki/UTF-8#Modified_UTF-8"> 4.14 Modified UTF-8 (wikipedia) </a></li>
5.1 --- a/test/com/sun/javadoc/testDocRootLink/TestDocRootLink.java Thu Jan 15 11:21:55 2015 -0800 5.2 +++ b/test/com/sun/javadoc/testDocRootLink/TestDocRootLink.java Fri Jan 16 13:51:52 2015 -0800 5.3 @@ -60,21 +60,21 @@ 5.4 }; 5.5 private static final String[][] NEGATED_TEST1 = { 5.6 {BUG_ID + FS + "pkg1" + FS + "C1.html", 5.7 - "<a href=\"http://download.oracle.com/javase/7/docs/technotes/guides/index.html\">" 5.8 + "<a href=\"https://docs.oracle.com/javase/7/docs/technotes/guides/index.html\">" 5.9 }, 5.10 {BUG_ID + FS + "pkg1" + FS + "C1.html", 5.11 - "<a href=\"http://download.oracle.com/javase/7/docs/pkg2/C2.html\">" 5.12 + "<a href=\"https://docs.oracle.com/javase/7/docs/pkg2/C2.html\">" 5.13 }, 5.14 {BUG_ID + FS + "pkg1" + FS + "package-summary.html", 5.15 - "<a href=\"http://download.oracle.com/javase/7/docs/technotes/guides/index.html\">" 5.16 + "<a href=\"https://docs.oracle.com/javase/7/docs/technotes/guides/index.html\">" 5.17 }, 5.18 {BUG_ID + FS + "pkg1" + FS + "package-summary.html", 5.19 - "<a href=\"http://download.oracle.com/javase/7/docs/pkg2/C2.html\">" 5.20 + "<a href=\"https://docs.oracle.com/javase/7/docs/pkg2/C2.html\">" 5.21 } 5.22 }; 5.23 private static final String[][] TEST2 = { 5.24 {BUG_ID + "-1" + FS + "pkg2" + FS + "C2.html", 5.25 - "Refer <a href=\"http://download.oracle.com/javase/7/docs/technotes/guides/index.html\">Here</a>" 5.26 + "Refer <a href=\"https://docs.oracle.com/javase/7/docs/technotes/guides/index.html\">Here</a>" 5.27 }, 5.28 {BUG_ID + "-1" + FS + "pkg2" + FS + "C2.html", 5.29 "This <a href=\"../pkg1/C1.html\">Here</a> should not be replaced" + NL + 5.30 @@ -85,7 +85,7 @@ 5.31 " <a href=\"../pkg1/C1.html\">Link 2</a>." 5.32 }, 5.33 {BUG_ID + "-1" + FS + "pkg2" + FS + "package-summary.html", 5.34 - "<a href=\"http://download.oracle.com/javase/7/docs/technotes/guides/index.html\">" + NL + 5.35 + "<a href=\"https://docs.oracle.com/javase/7/docs/technotes/guides/index.html\">" + NL + 5.36 " Test document 1</a>" 5.37 }, 5.38 {BUG_ID + "-1" + FS + "pkg2" + FS + "package-summary.html", 5.39 @@ -100,13 +100,13 @@ 5.40 "<a href=\"../../technotes/guides/index.html\">" 5.41 }, 5.42 {BUG_ID + "-1" + FS + "pkg2" + FS + "C2.html", 5.43 - "<a href=\"http://download.oracle.com/javase/7/docs/pkg1/C1.html\">" 5.44 + "<a href=\"https://docs.oracle.com/javase/7/docs/pkg1/C1.html\">" 5.45 }, 5.46 {BUG_ID + "-1" + FS + "pkg2" + FS + "package-summary.html", 5.47 "<a href=\"../../technotes/guides/index.html\">" 5.48 }, 5.49 {BUG_ID + "-1" + FS + "pkg2" + FS + "package-summary.html", 5.50 - "<a href=\"http://download.oracle.com/javase/7/docs/pkg1/C1.html\">" 5.51 + "<a href=\"https://docs.oracle.com/javase/7/docs/pkg1/C1.html\">" 5.52 } 5.53 }; 5.54 private static final String[] ARGS1 = 5.55 @@ -115,7 +115,7 @@ 5.56 }; 5.57 private static final String[] ARGS2 = 5.58 new String[]{ 5.59 - "-d", BUG_ID + "-1", "-Xdocrootparent", "http://download.oracle.com/javase/7/docs", "-sourcepath", SRC_DIR, "pkg1", "pkg2" 5.60 + "-d", BUG_ID + "-1", "-Xdocrootparent", "https://docs.oracle.com/javase/7/docs", "-sourcepath", SRC_DIR, "pkg1", "pkg2" 5.61 }; 5.62 5.63 /**