hg: amber/amber: manual merge with default

vicente.romero at oracle.com vicente.romero at oracle.com
Fri Sep 28 22:07:51 UTC 2018


Changeset: 7e8eae7c150f
Author:    vromero
Date:      2018-09-28 14:52 -0700
URL:       http://hg.openjdk.java.net/amber/amber/rev/7e8eae7c150f

manual merge with default

! make/autoconf/spec.gmk.in
! src/java.base/share/classes/module-info.java
- src/java.desktop/share/classes/com/sun/awt/SecurityWarning.java
- src/java.desktop/share/classes/sun/applet/AppletClassLoader.java
- src/java.desktop/share/classes/sun/applet/AppletSecurity.java
- src/java.desktop/share/classes/sun/applet/AppletThreadGroup.java
- src/java.desktop/share/classes/sun/awt/HToolkit.java
- src/java.desktop/unix/native/libawt_xawt/awt/HPkeysym.h
! src/jdk.compiler/share/classes/com/sun/tools/javac/code/Flags.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassReader.java
! src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/TagletWriterImpl.java
! src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/BaseConfiguration.java
! src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/doclets.properties
- test/jdk/com/sun/awt/SecurityWarning/CustomSecurityManager.java
- test/jdk/com/sun/awt/SecurityWarning/GetSizeShouldNotReturnZero.java
- test/jdk/com/sun/awt/TEST.properties
- test/jdk/com/sun/jdi/RedefineException.sh
- test/jdk/com/sun/jdi/RedefineFinal.sh
- test/jdk/com/sun/jdi/RedefineIntConstantToLong.sh
- test/jdk/com/sun/jdi/RedefineMulti.sh
- test/jdk/com/sun/jdi/RedefinePop.sh
- test/jdk/com/sun/jdi/RedefineStep.sh
- test/jdk/com/sun/jdi/RedefineTTYLineNumber.sh
- test/jdk/com/sun/jdi/StringConvertTest.sh
- test/jdk/com/sun/jdi/WatchFramePop.sh
- test/jdk/java/awt/dnd/BadSerializaionTest/BadSerializationTest.java
- test/jdk/java/awt/dnd/BadSerializaionTest/badAction
- test/jdk/java/awt/dnd/BadSerializaionTest/good
- test/jdk/java/awt/dnd/BadSerializaionTest/noEvents
- test/jdk/java/awt/dnd/BadSerializaionTest/nullComponent
- test/jdk/java/awt/dnd/BadSerializaionTest/nullDragSource
- test/jdk/java/awt/dnd/BadSerializaionTest/nullOrigin
- test/jdk/lib/testlibrary/jdk/testlibrary/Asserts.java
- test/langtools/tools/javadoc/api/basic/IsSupportedOptionTest.java



More information about the amber-dev mailing list