hg: amber/amber: Automatic merge with default
maurizio.cimadamore at oracle.com
maurizio.cimadamore at oracle.com
Fri Apr 10 17:11:06 UTC 2020
Changeset: 3bfc07a643ca
Author: mcimadamore
Date: 2020-04-10 17:10 +0000
URL: https://hg.openjdk.java.net/amber/amber/rev/3bfc07a643ca
Automatic merge with default
- make/launcher/Launcher-jdk.rmic.gmk
- src/hotspot/os_cpu/linux_aarch64/os_linux_aarch64.inline.hpp
- src/jdk.incubator.jpackage/macosx/classes/jdk/incubator/jpackage/internal/resources/MacAppStore.entitlements
- src/jdk.incubator.jpackage/macosx/classes/jdk/incubator/jpackage/internal/resources/MacAppStore_Inherit.entitlements
- src/jdk.rmic/share/classes/module-info.java
- src/jdk.rmic/share/classes/sun/rmi/rmic/BatchEnvironment.java
- src/jdk.rmic/share/classes/sun/rmi/rmic/Constants.java
- src/jdk.rmic/share/classes/sun/rmi/rmic/Generator.java
- src/jdk.rmic/share/classes/sun/rmi/rmic/IndentingWriter.java
- src/jdk.rmic/share/classes/sun/rmi/rmic/Main.java
- src/jdk.rmic/share/classes/sun/rmi/rmic/Names.java
- src/jdk.rmic/share/classes/sun/rmi/rmic/RMIConstants.java
- src/jdk.rmic/share/classes/sun/rmi/rmic/RMIGenerator.java
- src/jdk.rmic/share/classes/sun/rmi/rmic/RemoteClass.java
- src/jdk.rmic/share/classes/sun/rmi/rmic/Util.java
- src/jdk.rmic/share/classes/sun/rmi/rmic/resources/rmic.properties
- src/jdk.rmic/share/classes/sun/rmi/rmic/resources/rmic_ja.properties
- src/jdk.rmic/share/classes/sun/rmi/rmic/resources/rmic_zh_CN.properties
- src/jdk.rmic/share/classes/sun/tools/asm/ArrayData.java
- src/jdk.rmic/share/classes/sun/tools/asm/Assembler.java
- src/jdk.rmic/share/classes/sun/tools/asm/CatchData.java
- src/jdk.rmic/share/classes/sun/tools/asm/ClassConstantData.java
- src/jdk.rmic/share/classes/sun/tools/asm/ConstantPool.java
- src/jdk.rmic/share/classes/sun/tools/asm/ConstantPoolData.java
- src/jdk.rmic/share/classes/sun/tools/asm/Cover.java
- src/jdk.rmic/share/classes/sun/tools/asm/FieldConstantData.java
- src/jdk.rmic/share/classes/sun/tools/asm/Instruction.java
- src/jdk.rmic/share/classes/sun/tools/asm/Label.java
- src/jdk.rmic/share/classes/sun/tools/asm/LocalVariable.java
- src/jdk.rmic/share/classes/sun/tools/asm/LocalVariableTable.java
- src/jdk.rmic/share/classes/sun/tools/asm/NameAndTypeConstantData.java
- src/jdk.rmic/share/classes/sun/tools/asm/NameAndTypeData.java
- src/jdk.rmic/share/classes/sun/tools/asm/NumberConstantData.java
- src/jdk.rmic/share/classes/sun/tools/asm/StringConstantData.java
- src/jdk.rmic/share/classes/sun/tools/asm/StringExpressionConstantData.java
- src/jdk.rmic/share/classes/sun/tools/asm/SwitchData.java
- src/jdk.rmic/share/classes/sun/tools/asm/TryData.java
- src/jdk.rmic/share/classes/sun/tools/java/AmbiguousClass.java
- src/jdk.rmic/share/classes/sun/tools/java/AmbiguousMember.java
- src/jdk.rmic/share/classes/sun/tools/java/ArrayType.java
- src/jdk.rmic/share/classes/sun/tools/java/BinaryAttribute.java
- src/jdk.rmic/share/classes/sun/tools/java/BinaryClass.java
- src/jdk.rmic/share/classes/sun/tools/java/BinaryCode.java
- src/jdk.rmic/share/classes/sun/tools/java/BinaryConstantPool.java
- src/jdk.rmic/share/classes/sun/tools/java/BinaryExceptionHandler.java
- src/jdk.rmic/share/classes/sun/tools/java/BinaryMember.java
- src/jdk.rmic/share/classes/sun/tools/java/ClassDeclaration.java
- src/jdk.rmic/share/classes/sun/tools/java/ClassDefinition.java
- src/jdk.rmic/share/classes/sun/tools/java/ClassFile.java
- src/jdk.rmic/share/classes/sun/tools/java/ClassNotFound.java
- src/jdk.rmic/share/classes/sun/tools/java/ClassPath.java
- src/jdk.rmic/share/classes/sun/tools/java/ClassType.java
- src/jdk.rmic/share/classes/sun/tools/java/CompilerError.java
- src/jdk.rmic/share/classes/sun/tools/java/Constants.java
- src/jdk.rmic/share/classes/sun/tools/java/Environment.java
- src/jdk.rmic/share/classes/sun/tools/java/FileClassFile.java
- src/jdk.rmic/share/classes/sun/tools/java/Identifier.java
- src/jdk.rmic/share/classes/sun/tools/java/IdentifierToken.java
- src/jdk.rmic/share/classes/sun/tools/java/Imports.java
- src/jdk.rmic/share/classes/sun/tools/java/MemberDefinition.java
- src/jdk.rmic/share/classes/sun/tools/java/MethodSet.java
- src/jdk.rmic/share/classes/sun/tools/java/MethodType.java
- src/jdk.rmic/share/classes/sun/tools/java/Package.java
- src/jdk.rmic/share/classes/sun/tools/java/Parser.java
- src/jdk.rmic/share/classes/sun/tools/java/ParserActions.java
- src/jdk.rmic/share/classes/sun/tools/java/PathClassFile.java
- src/jdk.rmic/share/classes/sun/tools/java/RuntimeConstants.java
- src/jdk.rmic/share/classes/sun/tools/java/Scanner.java
- src/jdk.rmic/share/classes/sun/tools/java/ScannerInputReader.java
- src/jdk.rmic/share/classes/sun/tools/java/SyntaxError.java
- src/jdk.rmic/share/classes/sun/tools/java/Type.java
- src/jdk.rmic/share/classes/sun/tools/java/ZipClassFile.java
- src/jdk.rmic/share/classes/sun/tools/javac/BatchEnvironment.java
- src/jdk.rmic/share/classes/sun/tools/javac/BatchParser.java
- src/jdk.rmic/share/classes/sun/tools/javac/CompilerMember.java
- src/jdk.rmic/share/classes/sun/tools/javac/ErrorConsumer.java
- src/jdk.rmic/share/classes/sun/tools/javac/ErrorMessage.java
- src/jdk.rmic/share/classes/sun/tools/javac/Main.java
- src/jdk.rmic/share/classes/sun/tools/javac/SourceClass.java
- src/jdk.rmic/share/classes/sun/tools/javac/SourceMember.java
- src/jdk.rmic/share/classes/sun/tools/javac/resources/javac.properties
- src/jdk.rmic/share/classes/sun/tools/javac/resources/javac_ja.properties
- src/jdk.rmic/share/classes/sun/tools/javac/resources/javac_zh_CN.properties
- src/jdk.rmic/share/classes/sun/tools/tree/AddExpression.java
- src/jdk.rmic/share/classes/sun/tools/tree/AndExpression.java
- src/jdk.rmic/share/classes/sun/tools/tree/ArrayAccessExpression.java
- src/jdk.rmic/share/classes/sun/tools/tree/ArrayExpression.java
- src/jdk.rmic/share/classes/sun/tools/tree/AssignAddExpression.java
- src/jdk.rmic/share/classes/sun/tools/tree/AssignBitAndExpression.java
- src/jdk.rmic/share/classes/sun/tools/tree/AssignBitOrExpression.java
- src/jdk.rmic/share/classes/sun/tools/tree/AssignBitXorExpression.java
- src/jdk.rmic/share/classes/sun/tools/tree/AssignDivideExpression.java
- src/jdk.rmic/share/classes/sun/tools/tree/AssignExpression.java
- src/jdk.rmic/share/classes/sun/tools/tree/AssignMultiplyExpression.java
- src/jdk.rmic/share/classes/sun/tools/tree/AssignOpExpression.java
- src/jdk.rmic/share/classes/sun/tools/tree/AssignRemainderExpression.java
- src/jdk.rmic/share/classes/sun/tools/tree/AssignShiftLeftExpression.java
- src/jdk.rmic/share/classes/sun/tools/tree/AssignShiftRightExpression.java
- src/jdk.rmic/share/classes/sun/tools/tree/AssignSubtractExpression.java
- src/jdk.rmic/share/classes/sun/tools/tree/AssignUnsignedShiftRightExpression.java
- src/jdk.rmic/share/classes/sun/tools/tree/BinaryArithmeticExpression.java
- src/jdk.rmic/share/classes/sun/tools/tree/BinaryAssignExpression.java
- src/jdk.rmic/share/classes/sun/tools/tree/BinaryBitExpression.java
- src/jdk.rmic/share/classes/sun/tools/tree/BinaryCompareExpression.java
- src/jdk.rmic/share/classes/sun/tools/tree/BinaryEqualityExpression.java
- src/jdk.rmic/share/classes/sun/tools/tree/BinaryExpression.java
- src/jdk.rmic/share/classes/sun/tools/tree/BinaryLogicalExpression.java
- src/jdk.rmic/share/classes/sun/tools/tree/BinaryShiftExpression.java
- src/jdk.rmic/share/classes/sun/tools/tree/BitAndExpression.java
- src/jdk.rmic/share/classes/sun/tools/tree/BitNotExpression.java
- src/jdk.rmic/share/classes/sun/tools/tree/BitOrExpression.java
- src/jdk.rmic/share/classes/sun/tools/tree/BitXorExpression.java
- src/jdk.rmic/share/classes/sun/tools/tree/BooleanExpression.java
- src/jdk.rmic/share/classes/sun/tools/tree/BreakStatement.java
- src/jdk.rmic/share/classes/sun/tools/tree/ByteExpression.java
- src/jdk.rmic/share/classes/sun/tools/tree/CaseStatement.java
- src/jdk.rmic/share/classes/sun/tools/tree/CastExpression.java
- src/jdk.rmic/share/classes/sun/tools/tree/CatchStatement.java
- src/jdk.rmic/share/classes/sun/tools/tree/CharExpression.java
- src/jdk.rmic/share/classes/sun/tools/tree/CheckContext.java
- src/jdk.rmic/share/classes/sun/tools/tree/CodeContext.java
- src/jdk.rmic/share/classes/sun/tools/tree/CommaExpression.java
- src/jdk.rmic/share/classes/sun/tools/tree/CompoundStatement.java
- src/jdk.rmic/share/classes/sun/tools/tree/ConditionVars.java
- src/jdk.rmic/share/classes/sun/tools/tree/ConditionalExpression.java
- src/jdk.rmic/share/classes/sun/tools/tree/ConstantExpression.java
- src/jdk.rmic/share/classes/sun/tools/tree/Context.java
- src/jdk.rmic/share/classes/sun/tools/tree/ContinueStatement.java
- src/jdk.rmic/share/classes/sun/tools/tree/ConvertExpression.java
- src/jdk.rmic/share/classes/sun/tools/tree/DeclarationStatement.java
- src/jdk.rmic/share/classes/sun/tools/tree/DivRemExpression.java
- src/jdk.rmic/share/classes/sun/tools/tree/DivideExpression.java
- src/jdk.rmic/share/classes/sun/tools/tree/DoStatement.java
- src/jdk.rmic/share/classes/sun/tools/tree/DoubleExpression.java
- src/jdk.rmic/share/classes/sun/tools/tree/EqualExpression.java
- src/jdk.rmic/share/classes/sun/tools/tree/ExprExpression.java
- src/jdk.rmic/share/classes/sun/tools/tree/Expression.java
- src/jdk.rmic/share/classes/sun/tools/tree/ExpressionStatement.java
- src/jdk.rmic/share/classes/sun/tools/tree/FieldExpression.java
- src/jdk.rmic/share/classes/sun/tools/tree/FieldUpdater.java
- src/jdk.rmic/share/classes/sun/tools/tree/FinallyStatement.java
- src/jdk.rmic/share/classes/sun/tools/tree/FloatExpression.java
- src/jdk.rmic/share/classes/sun/tools/tree/ForStatement.java
- src/jdk.rmic/share/classes/sun/tools/tree/GreaterExpression.java
- src/jdk.rmic/share/classes/sun/tools/tree/GreaterOrEqualExpression.java
- src/jdk.rmic/share/classes/sun/tools/tree/IdentifierExpression.java
- src/jdk.rmic/share/classes/sun/tools/tree/IfStatement.java
- src/jdk.rmic/share/classes/sun/tools/tree/IncDecExpression.java
- src/jdk.rmic/share/classes/sun/tools/tree/InlineMethodExpression.java
- src/jdk.rmic/share/classes/sun/tools/tree/InlineNewInstanceExpression.java
- src/jdk.rmic/share/classes/sun/tools/tree/InlineReturnStatement.java
- src/jdk.rmic/share/classes/sun/tools/tree/InstanceOfExpression.java
- src/jdk.rmic/share/classes/sun/tools/tree/IntExpression.java
- src/jdk.rmic/share/classes/sun/tools/tree/IntegerExpression.java
- src/jdk.rmic/share/classes/sun/tools/tree/LengthExpression.java
- src/jdk.rmic/share/classes/sun/tools/tree/LessExpression.java
- src/jdk.rmic/share/classes/sun/tools/tree/LessOrEqualExpression.java
- src/jdk.rmic/share/classes/sun/tools/tree/LocalMember.java
- src/jdk.rmic/share/classes/sun/tools/tree/LongExpression.java
- src/jdk.rmic/share/classes/sun/tools/tree/MethodExpression.java
- src/jdk.rmic/share/classes/sun/tools/tree/MultiplyExpression.java
- src/jdk.rmic/share/classes/sun/tools/tree/NaryExpression.java
- src/jdk.rmic/share/classes/sun/tools/tree/NegativeExpression.java
- src/jdk.rmic/share/classes/sun/tools/tree/NewArrayExpression.java
- src/jdk.rmic/share/classes/sun/tools/tree/NewInstanceExpression.java
- src/jdk.rmic/share/classes/sun/tools/tree/Node.java
- src/jdk.rmic/share/classes/sun/tools/tree/NotEqualExpression.java
- src/jdk.rmic/share/classes/sun/tools/tree/NotExpression.java
- src/jdk.rmic/share/classes/sun/tools/tree/NullExpression.java
- src/jdk.rmic/share/classes/sun/tools/tree/OrExpression.java
- src/jdk.rmic/share/classes/sun/tools/tree/PositiveExpression.java
- src/jdk.rmic/share/classes/sun/tools/tree/PostDecExpression.java
- src/jdk.rmic/share/classes/sun/tools/tree/PostIncExpression.java
- src/jdk.rmic/share/classes/sun/tools/tree/PreDecExpression.java
- src/jdk.rmic/share/classes/sun/tools/tree/PreIncExpression.java
- src/jdk.rmic/share/classes/sun/tools/tree/RemainderExpression.java
- src/jdk.rmic/share/classes/sun/tools/tree/ReturnStatement.java
- src/jdk.rmic/share/classes/sun/tools/tree/ShiftLeftExpression.java
- src/jdk.rmic/share/classes/sun/tools/tree/ShiftRightExpression.java
- src/jdk.rmic/share/classes/sun/tools/tree/ShortExpression.java
- src/jdk.rmic/share/classes/sun/tools/tree/Statement.java
- src/jdk.rmic/share/classes/sun/tools/tree/StringExpression.java
- src/jdk.rmic/share/classes/sun/tools/tree/SubtractExpression.java
- src/jdk.rmic/share/classes/sun/tools/tree/SuperExpression.java
- src/jdk.rmic/share/classes/sun/tools/tree/SwitchStatement.java
- src/jdk.rmic/share/classes/sun/tools/tree/SynchronizedStatement.java
- src/jdk.rmic/share/classes/sun/tools/tree/ThisExpression.java
- src/jdk.rmic/share/classes/sun/tools/tree/ThrowStatement.java
- src/jdk.rmic/share/classes/sun/tools/tree/TryStatement.java
- src/jdk.rmic/share/classes/sun/tools/tree/TypeExpression.java
- src/jdk.rmic/share/classes/sun/tools/tree/UnaryExpression.java
- src/jdk.rmic/share/classes/sun/tools/tree/UnsignedShiftRightExpression.java
- src/jdk.rmic/share/classes/sun/tools/tree/UplevelReference.java
- src/jdk.rmic/share/classes/sun/tools/tree/VarDeclarationStatement.java
- src/jdk.rmic/share/classes/sun/tools/tree/Vset.java
- src/jdk.rmic/share/classes/sun/tools/tree/WhileStatement.java
- src/jdk.rmic/share/classes/sun/tools/util/CommandLine.java
- src/jdk.rmic/share/classes/sun/tools/util/ModifierFilter.java
- src/jdk.rmic/share/man/rmic.1
- test/hotspot/jtreg/vmTestbase/nsk/monitoring/ThreadMBean/findMonitorDeadlockedThreads/find001.java
- test/hotspot/jtreg/vmTestbase/nsk/monitoring/ThreadMBean/isCurrentThreadCpuTimeSupported/curthcputime001.java
- test/hotspot/jtreg/vmTestbase/nsk/monitoring/ThreadMBean/isThreadContentionMonitoringSupported/thcontmonitor001.java
- test/hotspot/jtreg/vmTestbase/nsk/monitoring/ThreadMBean/isThreadCpuTimeSupported/thcputime001.java
- test/hotspot/jtreg/vmTestbase/nsk/monitoring/ThreadMBean/resetPeakThreadCount/reset001.java
- test/jdk/sun/rmi/rmic/RMIGenerator/RmicDefault.java
- test/jdk/sun/rmi/rmic/RMIGenerator/packagedir/AppletServer.java
- test/jdk/sun/rmi/rmic/RMIGenerator/packagedir/RmicMeImpl.java
- test/jdk/sun/rmi/rmic/RMIGenerator/packagedir/RmicMeInterface.java
- test/jdk/sun/rmi/rmic/classFileVersion/G1.java
- test/jdk/sun/rmi/rmic/classFileVersion/G1Impl.java
- test/jdk/sun/rmi/rmic/classFileVersion/run.sh
- test/jdk/sun/rmi/rmic/classpath/RMICClassPathTest.java
- test/jdk/sun/rmi/rmic/covariantReturns/G2.java
- test/jdk/sun/rmi/rmic/covariantReturns/G2Impl.java
- test/jdk/sun/rmi/rmic/covariantReturns/G5.java
- test/jdk/sun/rmi/rmic/covariantReturns/G5Impl.java
- test/jdk/sun/rmi/rmic/covariantReturns/run.sh
- test/jdk/sun/rmi/rmic/defaultStubVersion/G1.java
- test/jdk/sun/rmi/rmic/defaultStubVersion/G1Impl.java
- test/jdk/sun/rmi/rmic/defaultStubVersion/run.sh
- test/jdk/sun/rmi/rmic/extraCompilation/run.sh
- test/jdk/sun/rmi/rmic/manifestClassPath/Util.sh
- test/jdk/sun/rmi/rmic/manifestClassPath/run.sh
- test/jdk/sun/rmi/rmic/minimizeWrapperInstances/P.java
- test/jdk/sun/rmi/rmic/minimizeWrapperInstances/PImpl.java
- test/jdk/sun/rmi/rmic/minimizeWrapperInstances/Test.java
- test/jdk/sun/rmi/rmic/minimizeWrapperInstances/run.sh
- test/jdk/sun/rmi/rmic/oldjavacRemoved/Foo.java
- test/jdk/sun/rmi/rmic/oldjavacRemoved/sunToolsJavacMain.sh
- test/jdk/sun/tools/java/CFCTest.java
More information about the amber-dev
mailing list