hg: jdk9/dev/jdk: 2 new changesets

[alan.bateman at oracle.com]

Changeset: 73113c19a5df
Author:    alanb
Date:      2017-05-04 07:26 +0000
URL:       http://hg.openjdk.java.net/jdk9/dev/jdk/rev/73113c19a5df

8178380: Module system implementation refresh (5/2017)
Reviewed-by: mchung, alanb, sspitsyn
Contributed-by: alan.bateman at oracle.com, mandy.chung at oracle.com, chris.hegarty at oracle.com

! make/mapfiles/libinstrument/mapfile-vers
! src/java.base/share/classes/java/lang/ClassLoader.java
! src/java.base/share/classes/java/lang/Module.java
! src/java.base/share/classes/java/lang/SecurityManager.java
! src/java.base/share/classes/java/lang/System.java
! src/java.base/share/classes/java/lang/invoke/MethodHandles.java
! src/java.base/share/classes/java/lang/module/Configuration.java
! src/java.base/share/classes/java/lang/module/ModuleDescriptor.java
! src/java.base/share/classes/java/lang/module/ModuleFinder.java
! src/java.base/share/classes/java/lang/module/Resolver.java
! src/java.base/share/classes/java/nio/file/FileSystems.java
! src/java.base/share/classes/jdk/internal/loader/BuiltinClassLoader.java
! src/java.base/share/classes/jdk/internal/misc/JavaLangAccess.java
! src/java.base/share/classes/jdk/internal/module/Checks.java
! src/java.base/share/classes/jdk/internal/module/ClassFileAttributes.java
! src/java.base/share/classes/jdk/internal/module/ModuleBootstrap.java
! src/java.base/share/classes/jdk/internal/module/ModuleHashesBuilder.java
! src/java.base/share/classes/jdk/internal/module/ModuleInfo.java
! src/java.base/share/classes/jdk/internal/module/ModuleInfoExtender.java
! src/java.base/share/classes/jdk/internal/module/ModuleInfoWriter.java
! src/java.base/share/classes/jdk/internal/module/ModuleLoaderMap.java
! src/java.base/share/classes/jdk/internal/module/ModulePatcher.java
! src/java.base/share/classes/jdk/internal/module/ModulePath.java
! src/java.base/share/classes/jdk/internal/module/ModuleReferences.java
! src/java.base/share/classes/jdk/internal/module/ModuleResolution.java
! src/java.base/share/classes/jdk/internal/module/ModuleTarget.java
! src/java.base/share/classes/jdk/internal/module/Modules.java
! src/java.base/share/classes/jdk/internal/module/Resources.java
! src/java.base/share/classes/module-info.java
! src/java.base/share/classes/sun/launcher/LauncherHelper.java
! src/java.base/share/classes/sun/launcher/resources/launcher.properties
! src/java.base/share/native/libjli/emessages.h
! src/java.base/share/native/libjli/java.c
! src/java.instrument/share/classes/java/lang/instrument/Instrumentation.java
! src/java.instrument/share/classes/java/lang/instrument/package.html
! src/java.instrument/share/classes/module-info.java
! src/java.instrument/share/classes/sun/instrument/InstrumentationImpl.java
! src/java.instrument/share/native/libinstrument/InstrumentationImplNativeMethods.c
! src/java.instrument/share/native/libinstrument/InvocationAdapter.c
! src/java.management/share/classes/java/lang/management/ThreadInfo.java
! src/jdk.attach/aix/classes/sun/tools/attach/VirtualMachineImpl.java
! src/jdk.attach/linux/classes/sun/tools/attach/VirtualMachineImpl.java
! src/jdk.attach/macosx/classes/sun/tools/attach/VirtualMachineImpl.java
! src/jdk.attach/share/classes/sun/tools/attach/HotSpotVirtualMachine.java
! src/jdk.attach/solaris/classes/sun/tools/attach/VirtualMachineImpl.java
! src/jdk.attach/windows/classes/sun/tools/attach/VirtualMachineImpl.java
! src/jdk.jartool/share/classes/sun/tools/jar/Main.java
! src/jdk.jartool/share/classes/sun/tools/jar/Validator.java
! src/jdk.jartool/share/classes/sun/tools/jar/resources/jar.properties
! src/jdk.jlink/share/classes/jdk/tools/jlink/builder/DefaultImageBuilder.java
! src/jdk.jlink/share/classes/jdk/tools/jlink/internal/ImagePluginStack.java
! src/jdk.jlink/share/classes/jdk/tools/jlink/internal/Platform.java
! src/jdk.jlink/share/classes/jdk/tools/jlink/internal/ResourcePoolManager.java
! src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/ReleaseInfoPlugin.java
! src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/SystemModulesPlugin.java
! src/jdk.jlink/share/classes/jdk/tools/jlink/plugin/ResourcePoolModule.java
! src/jdk.jlink/share/classes/jdk/tools/jmod/JmodTask.java
! src/jdk.jlink/share/classes/jdk/tools/jmod/resources/jmod.properties
! test/com/sun/management/HotSpotDiagnosticMXBean/CheckOrigin.java
+ test/com/sun/tools/attach/AttachSelf.java
! test/com/sun/tools/attach/RunnerUtil.java
! test/com/sun/tools/attach/java.policy.allow
+ test/com/sun/tools/attach/modules/Agent.java
+ test/com/sun/tools/attach/modules/Driver.java
+ test/com/sun/tools/attach/modules/m/module-info.java
+ test/com/sun/tools/attach/modules/m/p/Main.java
+ test/java/lang/instrument/executableJAR/Agent.java
+ test/java/lang/instrument/executableJAR/AgentHelper.java
+ test/java/lang/instrument/executableJAR/ExecJarWithAgent.java
+ test/java/lang/instrument/executableJAR/Main.java
! test/java/lang/invoke/DefineClassTest.java
! test/java/lang/module/AutomaticModulesTest.java
! test/java/lang/module/ConfigurationTest.java
! test/java/lang/module/ModuleDescriptorTest.java
+ test/java/lang/module/customfs/ModulesInCustomFileSystem.java
+ test/java/lang/module/customfs/m1/module-info.java
+ test/java/lang/module/customfs/m1/p/Main.java
+ test/java/lang/module/customfs/m2/module-info.java
+ test/java/lang/module/customfs/m2/q/Hello.java
! test/java/nio/file/spi/SetDefaultProvider.java
! test/java/nio/file/spi/TestProvider.java
+ test/java/nio/file/spi/m/module-info.java
+ test/java/nio/file/spi/m/p/Main.java
! test/java/util/logging/TestLoggerWeakRefLeak.java
! test/lib/testlibrary/ModuleTargetHelper.java
! test/sun/management/jmxremote/bootstrap/JvmstatCountersTest.java
! test/tools/jar/mmrjar/Basic.java
! test/tools/jar/modularJar/Basic.java
+ test/tools/jar/multiRelease/whitebox/Driver.java
+ test/tools/jar/multiRelease/whitebox/jdk.jartool/sun/tools/jar/ValidatorComparatorTest.java
! test/tools/jlink/IntegrationTest.java
! test/tools/jlink/JLinkNegativeTest.java
! test/tools/jlink/plugins/SystemModuleDescriptors/SystemModulesTest.java
! test/tools/jlink/plugins/SystemModuleDescriptors/UserModuleTest.java
! test/tools/jlink/plugins/SystemModuleDescriptors/src/m1/p1/Main.java
! test/tools/jlink/plugins/SystemModuleDescriptors/src/m4/p4/Main.java
! test/tools/jmod/JmodTest.java
+ test/tools/launcher/modules/describe/DescribeModuleTest.java
! test/tools/launcher/modules/listmods/ListModsTest.java
- test/tools/launcher/modules/listmods/src/java.transaction/javax/transaction/atomic/Atomic.java
! test/tools/launcher/modules/listmods/src/java.transaction/module-info.java
! test/tools/launcher/modules/patch/systemmodules/PatchSystemModules.java
+ test/tools/launcher/modules/showmoduleresolution/ShowModuleResolutionTest.java
+ test/tools/launcher/modules/validate/ValidateModulesTest.java
! test/tools/pack200/pack200-verifier/src/xmlkit/ClassReader.java

Changeset: ab86e2c522db
Author:    alanb
Date:      2017-05-04 09:43 +0100
URL:       http://hg.openjdk.java.net/jdk9/dev/jdk/rev/ab86e2c522db

Merge

! src/java.base/share/classes/java/lang/ClassLoader.java
! src/java.base/share/classes/java/lang/System.java
! src/java.base/share/classes/java/lang/invoke/MethodHandles.java
! src/java.management/share/classes/java/lang/management/ThreadInfo.java
- test/tools/launcher/modules/listmods/src/java.transaction/javax/transaction/atomic/Atomic.java