hg: amber/amber: manual merge with default

vicente.romero at oracle.com vicente.romero at oracle.com
Thu Jul 19 23:03:59 UTC 2018


Changeset: ffdc48f1ef31
Author:    vromero
Date:      2018-07-19 15:49 -0700
URL:       http://hg.openjdk.java.net/amber/amber/rev/ffdc48f1ef31

manual merge with default

- make/data/symbols/java.base-6.sym.txt
- make/data/symbols/java.compiler-6.sym.txt
- make/data/symbols/java.desktop-6.sym.txt
- make/data/symbols/java.logging-6.sym.txt
- make/data/symbols/java.management-6.sym.txt
- make/data/symbols/java.rmi-6.sym.txt
- make/data/symbols/java.security.jgss-6.sym.txt
- make/data/symbols/java.sql-6.sym.txt
- make/data/symbols/java.sql.rowset-6.sym.txt
- make/data/symbols/java.xml-6.sym.txt
- make/data/symbols/java.xml.bind-6.sym.txt
- make/data/symbols/java.xml.ws-6.sym.txt
- make/data/symbols/java.xml.ws.annotation-6.sym.txt
- make/data/symbols/jdk.management-6.sym.txt
- make/data/symbols/jdk.sctp-6.sym.txt
- make/data/symbols/jdk.security.jgss-6.sym.txt
! src/jdk.compiler/share/classes/com/sun/tools/javac/code/Source.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Resolve.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavacParser.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties
- test/hotspot/jtreg/compiler/graalunit/JttLangMTest.java
- test/hotspot/jtreg/compiler/graalunit/JttReflectFTest.java
- test/hotspot/jtreg/runtime/appcds/MismatchedUseAppCDS.java
- test/hotspot/jtreg/runtime/appcds/test-classes/CheckIfShared.java
- test/hotspot/jtreg/serviceability/jvmti/HeapMonitor/MyPackage/HeapMonitorStatRateTest.java
- test/jdk/java/awt/Choice/SelectCurrentItemTest/SelectCurrentItemTest.html
- test/langtools/tools/javac/TryWithResources/WeirdTwr.out
- test/langtools/tools/javac/diags/examples/MethodInvokedWithWrongNumberOfArgs.java
- test/langtools/tools/javac/diags/examples/MulticatchNotSupported.java
- test/langtools/tools/javac/diags/examples/StringSwitchNotSupported.java
- test/langtools/tools/javac/diags/examples/TryResourceNotSupported.java
- test/langtools/tools/javac/diags/examples/TryWithoutCatchOrFinally.java
- test/langtools/tools/javac/diags/examples/UnsupportedBinaryLiteral.java
- test/langtools/tools/javac/diags/examples/UnsupportedUnderscoreLiteral.java
- test/langtools/tools/javac/warnings/6594914/T6594914b.out



More information about the amber-dev mailing list