Merge master jdk-23+29 into openj9-staging #9
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…AfterStartDragTest.html test failed Reviewed-by: serb, dnguyen, tr
Reviewed-by: joehw, scolebourne, rriggs
Reviewed-by: wkemper, ysr, rkennke
…java failing intermittently when main thread is a virtual thread Reviewed-by: ssahoo, ascarpino
Reviewed-by: prr, dmarkov, aivanov
Reviewed-by: chagedorn
Reviewed-by: jlahoda
Reviewed-by: clanger, mdoerr
Reviewed-by: liach, asotona
Reviewed-by: prr, tr, iris, serb, aivanov
…ssFile API Reviewed-by: asotona
Reviewed-by: asotona
Reviewed-by: jjg
Reviewed-by: jjg
Reviewed-by: prappo, liach, jjg
Reviewed-by: mgronlun
…ypes are disjoint Reviewed-by: mcimadamore
8329296: Update Elements for '///' documentation comments Co-authored-by: Jim Laskey <jlaskey@openjdk.org> Reviewed-by: prappo, darcy, hannesw
Reviewed-by: kvn, thartmann
…I docs Reviewed-by: abhiscxk, aivanov, prr
Reviewed-by: naoto
…tric Reviewed-by: roland, thartmann
Reviewed-by: alanb
Reviewed-by: prappo, erikj
… painted red with the GTK L&F 8298153: Colored text is not shown on disabled checkbox and radio button with GTK LAF for bug4314194 Reviewed-by: tr, psadhukhan
…Error: Some tests failed Reviewed-by: jpai, stefank
…imeException: '\\A\\Z' missing from stderr Reviewed-by: jpai, stefank, dholmes
…t, byte) and setTTL/getTTL methods on DatagramSocketImpl and MulticastSocket Reviewed-by: dfuchs, iris, alanb
…data Reviewed-by: psandoz
Reviewed-by: asotona
Reviewed-by: clanger Backport-of: 6753acf73792d536793351e0c89843c274a30f0c
Reviewed-by: jpai Backport-of: a35895765baef678f1105b63b50f2c548971ab11
Reviewed-by: prappo Backport-of: 77534fc75ac4092f1318aadb0e3e452bbd9094c2
…om nested class Reviewed-by: liach, mcimadamore
…cation CLASS Reviewed-by: asotona Backport-of: 4a5ef154de1e90ac0c30c7a271c3b335607ea757
…ject Reviewed-by: prr Backport-of: be7f663143fbcf807b7c01d3d5741ab8bd800974
… "Events are not ordered! Reuse = false" Reviewed-by: mgronlun Backport-of: e2f266591cb352c08d980ce0cdf9c3b1f59b92ba
Reviewed-by: mdoerr Backport-of: f1c926e00af359ff9900be0659c5aa68a0161fa2
The Strict profile for FIPS 140-3 which only allows the approved cryptography in the OpenJCEPlusFIPS provider along with other non-cryptographic algorithms commonly used. The Weakly-Enforced profile for FIPS 140-3 which allows for all algorithms within the OpenJCEPlusFIPS provider. Also, update the profile disabledAlgorithms with non-FIPS ciphers. Signed-off-by: Tao Liu <tao.liu@ibm.com>
Reviewed-by: aivanov Backport-of: 2649ccc759c31485efda0c231f02b48cb48bab2b
Reviewed-by: chagedorn, qamai Backport-of: a4985b130a086f53c723ea3293f4d85b055b1b3e
Update OpenJCEPlusFIPS Strict and Weakly-Enforced profiles
Reviewed-by: thartmann, sviswanathan Backport-of: f6cfe8c63f6dfbf50bbdda1d5de3925467239d3c
Signed-off-by: Keith W. Campbell <keithc@ca.ibm.com>
Back-port changes to .copyrightignore from the head stream
keithc-ca
requested changes
Jul 3, 2024
test/jdk/security/infra/java/security/cert/CertPathValidator/certification/CAInterop.java
Outdated
Show resolved
Hide resolved
src/java.base/share/classes/sun/security/util/math/intpoly/MontgomeryIntegerPolynomialP256.java
Show resolved
Hide resolved
JasonFengJ9
force-pushed
the
mergestaging
branch
2 times, most recently
from
ca06d7b to
565a8e9
Compare
|
There are new tags since this PR was opened, I will handle that in another PR if there are merging conflicts. |
keithc-ca
requested changes
Jul 16, 2024
JasonFengJ9
force-pushed
the
mergestaging
branch
from
565a8e9 to
8312816
Compare
keithc-ca
reviewed
Jul 16, 2024
Conflicts: .gitignore closed/custom/modules/jdk.jcmd/Java.gmk closed/make/modules/openj9.dtfj/Java.gmk closed/src/java.base/share/classes/sun/security/provider/NativeMD5.java closed/src/java.base/share/classes/sun/security/provider/NativeSHA.java make/autoconf/flags-cflags.m4 make/autoconf/flags-ldflags.m4 make/autoconf/jdk-options.m4 make/autoconf/jvm-features.m4 make/autoconf/toolchain.m4 make/common/native/Link.gmk make/common/native/Paths.gmk make/conf/version-numbers.conf make/modules/java.base/Lib.gmk make/modules/java.base/lib/CoreLibraries.gmk make/modules/java.desktop/lib/ClientLibraries.gmk make/modules/jdk.jcmd/Java.gmk make/test/JtregNativeJdk.gmk src/java.base/aix/classes/jdk/internal/loader/ClassLoaderHelper.java src/java.base/share/classes/com/sun/crypto/provider/SunJCE.java src/java.base/share/classes/java/lang/String.java src/java.base/share/classes/java/lang/reflect/ProxyGenerator.java src/java.base/share/classes/jdk/internal/access/JavaxSecurityAccess.java src/java.base/share/classes/jdk/internal/foreign/layout/ValueLayouts.java src/java.base/share/classes/sun/security/util/math/intpoly/IntegerPolynomialModBinP.java src/java.base/share/classes/sun/security/util/math/intpoly/MontgomeryIntegerPolynomialP256.java src/java.desktop/windows/native/libawt/windows/awt_PrintJob.cpp src/java.management.rmi/share/classes/javax/management/remote/rmi/RMIConnectionImpl.java src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Key.java src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/SunPKCS11.java src/jdk.jdeps/share/classes/com/sun/tools/javap/ClassWriter.java src/jdk.jfr/share/classes/jdk/jfr/internal/HiddenWait.java src/jdk.jfr/share/classes/jdk/jfr/internal/Level.java src/jdk.jfr/share/classes/jdk/jfr/internal/instrument/JIInstrumentationMethod.java src/jdk.jfr/share/classes/jdk/jfr/internal/instrument/JIInstrumentationTarget.java src/jdk.jfr/share/classes/jdk/jfr/internal/instrument/JITypeMapping.java src/utils/IdealGraphVisualizer/Data/src/main/java/com/sun/hotspot/igv/data/services/GroupCallback.java test/hotspot/jtreg/ProblemList.txt test/hotspot/jtreg/compiler/lib/ir_framework/Setup.java test/hotspot/jtreg/compiler/lib/ir_framework/driver/irmatching/parser/hotspot/WriterThread.java test/hotspot/jtreg/compiler/predicates/TestAssertionPredicateDoesntConstantFold.java test/hotspot/jtreg/serviceability/jvmti/vthread/BreakpointInYieldTest/libBreakpointInYieldTest.cpp test/hotspot/jtreg/serviceability/jvmti/vthread/NullAsCurrentThreadTest/libNullAsCurrentThreadTest.cpp test/hotspot/jtreg/serviceability/jvmti/vthread/VThreadTest/libVThreadTest.cpp test/hotspot/jtreg/serviceability/jvmti/vthread/VThreadUnsupportedTest/libVThreadUnsupportedTest.cpp test/jdk/ProblemList-FIPS140_3_OpenJcePlus.txt test/jdk/ProblemList.txt test/jdk/java/awt/InputMethods/SpanishDiacriticsTest/SpanishDiacriticsTest.java test/jdk/java/awt/print/PrinterJob/PageDialogCancelTest.java test/jdk/java/foreign/critical/TestCriticalUpcall.java test/jdk/java/foreign/nested/libNested.c test/jdk/java/foreign/shared.h test/jdk/java/io/IO/IO.java test/jdk/java/io/IO/input.exp test/jdk/java/io/IO/output.exp test/jdk/java/lang/String/CompactString/MaxSizeUTF16String.java test/jdk/java/lang/Thread/virtual/stress/Skynet.java test/jdk/javax/management/monitor/ThreadPoolAccTest.java test/jdk/javax/management/remote/mandatory/notif/NotificationAccessControllerTest.java test/jdk/javax/management/remote/mandatory/passwordAccessFile/NonJMXPrincipalsTest.java test/jdk/javax/management/remote/mandatory/passwordAccessFile/PasswordAccessFileTest.java test/jdk/javax/management/remote/mandatory/passwordAuthenticator/RMIAltAuthTest.java test/jdk/javax/management/remote/mandatory/passwordAuthenticator/RMIPasswdAuthTest.java test/jdk/javax/management/security/AuthorizationTest.java test/jdk/javax/print/CustomMediaSizeNameOOMETest.java test/jdk/jdk/jfr/api/consumer/filestream/TestOrdered.java test/jdk/jdk/jfr/api/consumer/recordingstream/TestStop.java test/jdk/jni/nullCaller/CallHelper.hpp test/jdk/security/infra/java/security/cert/CertPathValidator/certification/CAInterop.java test/jdk/security/infra/javax/net/ssl/HttpsURLConnectionTest.java test/jdk/sun/management/jmxremote/bootstrap/RmiBootstrapTest.java test/micro/org/openjdk/bench/vm/compiler/CMove.java Signed-off-by: Jason Feng <fengj@ca.ibm.com>
Signed-off-by: Jason Feng <fengj@ca.ibm.com>
JasonFengJ9
force-pushed
the
mergestaging
branch
from
8312816 to
5eeb47b
Compare
keithc-ca
approved these changes
Jul 16, 2024
|
Update OPENJDK_TAG to merged level jdk-23+31 succeeded w/o merging conflict. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Merge master jdk-23+29 into openj9-staging
Conflicts:
Signed-off-by: Jason Feng fengj@ca.ibm.com