diff --git a/8167014-jdeps-failed-with-Missing-message-warn-skippen-entry.patch b/8167014-jdeps-failed-with-Missing-message-warn-skippen-entry.patch new file mode 100755 index 0000000000000000000000000000000000000000..0759d09e15b9cf2d53612cbbfd9c4d74798faeaf --- /dev/null +++ b/8167014-jdeps-failed-with-Missing-message-warn-skippen-entry.patch @@ -0,0 +1,65 @@ +From 6456acbb0412f0a0f3e7374b27e66a504ece36ff Mon Sep 17 00:00:00 2001 +From: c00229008 +Date: Wed, 4 Aug 2021 09:43:49 +0800 +Subject: [PATCH 01/23] 8167014: jdeps failed with "Missing message: + warn.skipped.entry" + +DTS/AR: DTS2021080411519 +Summary: : jdeps failed with "Missing message: warn.skipped.entry" +LLT: tomcat-websocket-10.0.8.jar +Patch Type: backport +Bug url: https://bugs.openjdk.java.net/browse/JDK-8167014 +--- + .../share/classes/com/sun/tools/jdeps/ClassFileReader.java | 5 ++++- + .../src/share/classes/com/sun/tools/jdeps/JdepsTask.java | 6 ++++-- + .../classes/com/sun/tools/jdeps/resources/jdeps.properties | 1 + + 3 files changed, 9 insertions(+), 3 deletions(-) + +diff --git a/langtools/src/share/classes/com/sun/tools/jdeps/ClassFileReader.java b/langtools/src/share/classes/com/sun/tools/jdeps/ClassFileReader.java +index f41f2d0ba..07da40357 100644 +--- a/langtools/src/share/classes/com/sun/tools/jdeps/ClassFileReader.java ++++ b/langtools/src/share/classes/com/sun/tools/jdeps/ClassFileReader.java +@@ -337,7 +337,10 @@ public class ClassFileReader { + cf = reader.readClassFile(jf, nextEntry); + return true; + } catch (ClassFileError | IOException ex) { +- skippedEntries.add(nextEntry.getName()); ++ skippedEntries.add(String.format("%s: %s (%s)", ++ ex.getMessage(), ++ nextEntry.getName(), ++ jf.getName())); + } + nextEntry = nextEntry(); + } +diff --git a/langtools/src/share/classes/com/sun/tools/jdeps/JdepsTask.java b/langtools/src/share/classes/com/sun/tools/jdeps/JdepsTask.java +index 91002d319..97dba138e 100644 +--- a/langtools/src/share/classes/com/sun/tools/jdeps/JdepsTask.java ++++ b/langtools/src/share/classes/com/sun/tools/jdeps/JdepsTask.java +@@ -559,8 +559,10 @@ class JdepsTask { + a.addClass(d.getOrigin()); + } + } +- for (String name : a.reader().skippedEntries()) { +- warning("warn.skipped.entry", name, a.getPathName()); ++ if (!options.nowarning) { ++ for (String name : a.reader().skippedEntries()) { ++ warning("warn.skipped.entry", name, a.getPathName()); ++ } + } + } + } +diff --git a/langtools/src/share/classes/com/sun/tools/jdeps/resources/jdeps.properties b/langtools/src/share/classes/com/sun/tools/jdeps/resources/jdeps.properties +index 51d11b88a..501c4d6cd 100644 +--- a/langtools/src/share/classes/com/sun/tools/jdeps/resources/jdeps.properties ++++ b/langtools/src/share/classes/com/sun/tools/jdeps/resources/jdeps.properties +@@ -92,6 +92,7 @@ err.option.unsupported={0} not supported: {1} + err.profiles.msg=No profile information + err.invalid.path=invalid path: {0} + warn.invalid.arg=Invalid classname or pathname not exist: {0} ++warn.skipped.entry={0} + warn.split.package=package {0} defined in {1} {2} + warn.replace.useJDKInternals=\ + JDK internal APIs are unsupported and private to JDK implementation that are\n\ +-- +2.22.0 + diff --git a/openjdk-1.8.0.spec b/openjdk-1.8.0.spec index 53e16ab330600616b296895e5a97d61552bbdc6a..ee749281fbd80f904b68cd816b6dd6625eb6e005 100644 --- a/openjdk-1.8.0.spec +++ b/openjdk-1.8.0.spec @@ -916,7 +916,7 @@ Provides: java-%{javaver}-%{origin}-accessibility%{?1} = %{epoch}:%{version}-%{r Name: java-%{javaver}-%{origin} Version: %{javaver}.%{updatever}.%{buildver} -Release: 2 +Release:333 # java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons # and this change was brought into RHEL-4. java-1.5.0-ibm packages # also included the epoch in their virtual provides. This created a @@ -1103,6 +1103,7 @@ Patch202: Fix-RSACipher-memory-usage.patch Patch203: fix-lock-ordering-issue-when-calling-JVMTI-GetLoaded.patch Patch204: 8069191.patch Patch205: fix_g1uncommit_ygc_expand_crash.patch +Patch206: 8167014-jdeps-failed-with-Missing-message-warn-skippen-entry.patch ############################################# # @@ -1554,6 +1555,7 @@ pushd %{top_level_dir_name} %patch203 -p1 %patch204 -p1 %patch205 -p1 +%patch206 -p1 popd # System library fixes @@ -2169,6 +2171,9 @@ require "copy_jdk_configs.lua" %endif %changelog +* Fri Sep 17 2021 kuenking111 - 1:1.8.0.302-b07.3 +- add 8167014-jdeps-failed-with-Missing-message-warn-skippen-entry.patch + * Fri Aug 20 2021 kuenking111 - 1:1.8.0.302-b07.2 - add fix_g1uncommit_ygc_expand_crash.patch