Sync from SUSE:SLFO:Main java-17-openjdk revision cbc45933fb818fc9e82dfcb3c6db0fe6
This commit is contained in:
parent
2c025da14a
commit
7c8c8d100c
@ -1,78 +0,0 @@
|
|||||||
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlDocletWriter.java
|
|
||||||
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlDocletWriter.java
|
|
||||||
@@ -1015,6 +1015,9 @@ public class HtmlDocletWriter {
|
|
||||||
// @see reference label...
|
|
||||||
label = ref.subList(1, ref.size());
|
|
||||||
}
|
|
||||||
+ case ERRONEOUS -> {
|
|
||||||
+ return HtmlTree.SPAN(Text.of(resources.getText("doclet.tag.invalid_input", seeText)));
|
|
||||||
+ }
|
|
||||||
default ->
|
|
||||||
throw new IllegalStateException(ref.get(0).getKind().toString());
|
|
||||||
}
|
|
||||||
--- a/test/langtools/jdk/javadoc/doclet/testSeeTag/TestSeeTag.java
|
|
||||||
+++ b/test/langtools/jdk/javadoc/doclet/testSeeTag/TestSeeTag.java
|
|
||||||
@@ -23,15 +23,19 @@
|
|
||||||
|
|
||||||
/*
|
|
||||||
* @test
|
|
||||||
- * @bug 8017191 8182765 8200432 8239804 8250766 8262992
|
|
||||||
+ * @bug 8017191 8182765 8200432 8239804 8250766 8262992 8281944
|
|
||||||
* @summary Javadoc is confused by at-link to imported classes outside of the set of generated packages
|
|
||||||
- * @library ../../lib
|
|
||||||
+ * @library /tools/lib ../../lib
|
|
||||||
* @modules jdk.javadoc/jdk.javadoc.internal.tool
|
|
||||||
- * @build javadoc.tester.*
|
|
||||||
+ * @build toolbox.ToolBox javadoc.tester.*
|
|
||||||
* @run main TestSeeTag
|
|
||||||
*/
|
|
||||||
|
|
||||||
import javadoc.tester.JavadocTester;
|
|
||||||
+import toolbox.ToolBox;
|
|
||||||
+
|
|
||||||
+import java.io.IOException;
|
|
||||||
+import java.nio.file.Path;
|
|
||||||
|
|
||||||
public class TestSeeTag extends JavadocTester {
|
|
||||||
|
|
||||||
@@ -105,4 +109,40 @@ public class TestSeeTag extends JavadocTester {
|
|
||||||
</dd>
|
|
||||||
</dl>""");
|
|
||||||
}
|
|
||||||
+
|
|
||||||
+ ToolBox tb = new ToolBox();
|
|
||||||
+
|
|
||||||
+ @Test
|
|
||||||
+ public void testErroneous() throws IOException {
|
|
||||||
+ Path src = Path.of("erroneous", "src");
|
|
||||||
+ tb.writeJavaFiles(src, """
|
|
||||||
+ package erroneous;
|
|
||||||
+ /**
|
|
||||||
+ * Comment.
|
|
||||||
+ * @see <a href="
|
|
||||||
+ */
|
|
||||||
+ public class C {
|
|
||||||
+ private C() { }
|
|
||||||
+ }
|
|
||||||
+ """);
|
|
||||||
+
|
|
||||||
+ javadoc("-d", Path.of("erroneous", "api").toString(),
|
|
||||||
+ "-sourcepath", src.toString(),
|
|
||||||
+ "--no-platform-links",
|
|
||||||
+ "erroneous");
|
|
||||||
+ checkExit(Exit.ERROR);
|
|
||||||
+
|
|
||||||
+ checkOutput("erroneous/C.html", true,
|
|
||||||
+ """
|
|
||||||
+ <dl class="notes">
|
|
||||||
+ <dt>See Also:</dt>
|
|
||||||
+ <dd>
|
|
||||||
+ <ul class="see-list">
|
|
||||||
+ <li><span>invalid input: '<a href="'</span></li>
|
|
||||||
+ </ul>
|
|
||||||
+ </dd>
|
|
||||||
+ </dl>
|
|
||||||
+ """);
|
|
||||||
+
|
|
||||||
+ }
|
|
||||||
}
|
|
File diff suppressed because it is too large
Load Diff
@ -1,7 +1,7 @@
|
|||||||
#
|
#
|
||||||
# spec file for package java-17-openjdk
|
# spec file for package java-17-openjdk
|
||||||
#
|
#
|
||||||
# Copyright (c) 2024 SUSE LLC
|
# Copyright (c) 2025 SUSE LLC
|
||||||
#
|
#
|
||||||
# All modifications and additions to the file contributed by third parties
|
# All modifications and additions to the file contributed by third parties
|
||||||
# remain the property of their copyright owners, unless otherwise agreed
|
# remain the property of their copyright owners, unless otherwise agreed
|
||||||
@ -33,7 +33,7 @@
|
|||||||
# Standard JPackage naming and versioning defines.
|
# Standard JPackage naming and versioning defines.
|
||||||
%global featurever 17
|
%global featurever 17
|
||||||
%global interimver 0
|
%global interimver 0
|
||||||
%global updatever 12
|
%global updatever 14
|
||||||
%global buildver 7
|
%global buildver 7
|
||||||
%global openjdk_repo jdk17u
|
%global openjdk_repo jdk17u
|
||||||
%global openjdk_tag jdk-%{featurever}.%{interimver}.%{updatever}%{?patchver:.%{patchver}}+%{buildver}
|
%global openjdk_tag jdk-%{featurever}.%{interimver}.%{updatever}%{?patchver:.%{patchver}}+%{buildver}
|
||||||
@ -170,12 +170,12 @@ Patch17: reproducible-jlink.patch
|
|||||||
Patch20: loadAssistiveTechnologies.patch
|
Patch20: loadAssistiveTechnologies.patch
|
||||||
#
|
#
|
||||||
Patch21: reproducible-javadoc-timestamp.patch
|
Patch21: reproducible-javadoc-timestamp.patch
|
||||||
|
Patch22: reproducible-directory-mtime.patch
|
||||||
#
|
#
|
||||||
# OpenJDK specific patches
|
# OpenJDK specific patches
|
||||||
#
|
#
|
||||||
Patch200: ppc_stack_overflow_fix.patch
|
Patch200: ppc_stack_overflow_fix.patch
|
||||||
#
|
#
|
||||||
Patch300: JDK-8282944.patch
|
|
||||||
Patch301: JDK-8303509.patch
|
Patch301: JDK-8303509.patch
|
||||||
Patch302: disable-doclint-by-default.patch
|
Patch302: disable-doclint-by-default.patch
|
||||||
Patch303: unsigned-sni-server-name.patch
|
Patch303: unsigned-sni-server-name.patch
|
||||||
@ -416,10 +416,10 @@ rm -rvf src/java.desktop/share/native/liblcms/lcms2*
|
|||||||
%patch -P 20 -p1
|
%patch -P 20 -p1
|
||||||
|
|
||||||
%patch -P 21 -p1
|
%patch -P 21 -p1
|
||||||
|
%patch -P 22 -p1
|
||||||
|
|
||||||
%patch -P 200 -p1
|
%patch -P 200 -p1
|
||||||
|
|
||||||
%patch -P 300 -p1
|
|
||||||
%patch -P 301 -p1
|
%patch -P 301 -p1
|
||||||
%patch -P 302 -p1
|
%patch -P 302 -p1
|
||||||
%patch -P 303 -p1
|
%patch -P 303 -p1
|
||||||
|
BIN
jdk-17.0.12+7.tar.gz
(Stored with Git LFS)
BIN
jdk-17.0.12+7.tar.gz
(Stored with Git LFS)
Binary file not shown.
BIN
jdk-17.0.14+7.tar.gz
(Stored with Git LFS)
Normal file
BIN
jdk-17.0.14+7.tar.gz
(Stored with Git LFS)
Normal file
Binary file not shown.
15
reproducible-directory-mtime.patch
Normal file
15
reproducible-directory-mtime.patch
Normal file
@ -0,0 +1,15 @@
|
|||||||
|
--- a/src/java.base/share/classes/java/io/File.java
|
||||||
|
+++ b/src/java.base/share/classes/java/io/File.java
|
||||||
|
@@ -1376,7 +1376,11 @@ public class File
|
||||||
|
if (isInvalid()) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
- return fs.createDirectory(this);
|
||||||
|
+ boolean result = fs.createDirectory(this);
|
||||||
|
+ if ( result && System.getenv("SOURCE_DATE_EPOCH") != null ) {
|
||||||
|
+ fs.setLastModifiedTime(this, 1000 * Long.parseLong(System.getenv("SOURCE_DATE_EPOCH")));
|
||||||
|
+ }
|
||||||
|
+ return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
Loading…
x
Reference in New Issue
Block a user