hg: jdk/sandbox: Merge

daniel.fuchs at oracle.com daniel.fuchs at oracle.com
Tue Jun 19 16:25:46 UTC 2018


Changeset: 7add69e2fb68
Author:    dfuchs
Date:      2018-06-19 16:33 +0100
URL:       http://hg.openjdk.java.net/jdk/sandbox/rev/7add69e2fb68

Merge

! make/common/Modules.gmk
! src/java.base/share/classes/module-info.java
- src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/algorithms/implementations/package.html
- src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/algorithms/package.html
- src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/c14n/helper/package.html
- src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/Canonicalizer11.java
- src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/package.html
- src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/c14n/package.html
- src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/AbstractSerializer.java
- src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/AgreementMethod.java
- src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/CipherData.java
- src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/CipherReference.java
- src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/CipherValue.java
- src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/DocumentSerializer.java
- src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/EncryptedData.java
- src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/EncryptedKey.java
- src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/EncryptedType.java
- src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/EncryptionMethod.java
- src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/EncryptionProperties.java
- src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/EncryptionProperty.java
- src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/Reference.java
- src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/ReferenceList.java
- src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/Serializer.java
- src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/Transforms.java
- src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/XMLCipher.java
- src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/XMLCipherInput.java
- src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/XMLCipherParameters.java
- src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/XMLEncryptionException.java
- src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/encryption/package.html
- src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/exceptions/package.html
- src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/content/keyvalues/package.html
- src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/content/package.html
- src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/content/x509/package.html
- src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/EncryptedKeyResolver.java
- src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/package.html
- src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/package.html
- src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/package.html
- src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/storage/implementations/package.html
- src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/keys/storage/package.html
- src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/package.html
- src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/resource/package.html
- src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/signature/package.html
- src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/package.html
- src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/transforms/package.html
- src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/ElementChecker.java
- src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/ElementCheckerImpl.java
- src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/EncryptionElementProxy.java
- src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/package.html
- src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/implementations/package.html
- src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/package.html
- src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMCryptoBinary.java
- test/hotspot/jtreg/runtime/exceptionMsgs/IncompatibleClassChangeError/ICC_B.jasm
! test/jdk/ProblemList.txt
- test/jdk/sanity/releaseFile/CheckSource.java



More information about the jdk-sandbox-changes mailing list