hg: jdk9/dev/jdk: 2 new changesets

[alan.bateman at oracle.com]

Changeset: 9aedd62148d4
Author:    alanb
Date:      2016-12-16 06:19 +0000
URL:       http://hg.openjdk.java.net/jdk9/dev/jdk/rev/9aedd62148d4

8170987: Module system implementation refresh (12/2016)
8170859: Run time and tool support for ModuleResolution
Reviewed-by: redestad, mchung, alanb
Contributed-by: alan.bateman at oracle.com, mandy.chung at oracle.com, chris.hegarty at oracle.com, mark.reinhold at oracle.com, john.r.rose at oracle.com

! src/java.base/share/classes/com/sun/java/util/jar/pack/PackerImpl.java
! src/java.base/share/classes/com/sun/java/util/jar/pack/intrinsic.properties
! src/java.base/share/classes/java/lang/StackTraceElement.java
! src/java.base/share/classes/java/lang/invoke/MethodHandles.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/ModuleInfo.java
- src/java.base/share/classes/java/lang/module/ModulePath.java
! src/java.base/share/classes/java/lang/module/ModuleReference.java
- src/java.base/share/classes/java/lang/module/ModuleReferences.java
! src/java.base/share/classes/java/lang/module/Resolver.java
- src/java.base/share/classes/java/lang/module/SystemModuleFinder.java
! src/java.base/share/classes/java/lang/reflect/AccessibleObject.java
! src/java.base/share/classes/java/lang/reflect/Layer.java
! src/java.base/share/classes/java/lang/reflect/Module.java
! src/java.base/share/classes/jdk/internal/jimage/decompressor/StringSharingDecompressor.java
! src/java.base/share/classes/jdk/internal/misc/JavaLangModuleAccess.java
! src/java.base/share/classes/jdk/internal/misc/JavaLangReflectModuleAccess.java
! src/java.base/share/classes/jdk/internal/module/Builder.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/ClassFileConstants.java
! src/java.base/share/classes/jdk/internal/module/ModuleBootstrap.java
! src/java.base/share/classes/jdk/internal/module/ModuleHashes.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/ModulePatcher.java
+ src/java.base/share/classes/jdk/internal/module/ModulePath.java
+ src/java.base/share/classes/jdk/internal/module/ModuleReferenceImpl.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/SystemModuleFinder.java
! src/java.base/share/classes/jdk/internal/module/SystemModules.java
! src/java.base/share/classes/jdk/internal/org/objectweb/asm/ClassReader.java
! src/java.base/share/classes/jdk/internal/org/objectweb/asm/ClassWriter.java
! src/java.base/share/classes/jdk/internal/org/objectweb/asm/Item.java
! src/java.base/share/classes/jdk/internal/reflect/Reflection.java
! src/java.compact1/share/classes/module-info.java
! src/java.compact2/share/classes/module-info.java
! src/java.compact3/share/classes/module-info.java
! src/jdk.crypto.pkcs11/share/classes/module-info.java
! src/jdk.jartool/share/classes/sun/tools/jar/GNUStyleOptions.java
! src/jdk.jartool/share/classes/sun/tools/jar/Main.java
! src/jdk.jartool/share/classes/sun/tools/jar/resources/jar.properties
! src/jdk.jlink/share/classes/jdk/tools/jlink/internal/JlinkTask.java
! src/jdk.jlink/share/classes/jdk/tools/jlink/internal/ResourcePoolConfiguration.java
! src/jdk.jlink/share/classes/jdk/tools/jlink/internal/TaskHelper.java
- src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/SystemModuleDescriptorPlugin.java
+ src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/SystemModulesPlugin.java
! src/jdk.jlink/share/classes/jdk/tools/jmod/JmodTask.java
! src/jdk.jlink/share/classes/jdk/tools/jmod/resources/jmod.properties
! src/jdk.jlink/share/classes/module-info.java
! src/jdk.pack200/share/classes/module-info.java
+ test/java/lang/invoke/DropLookupModeTest.java
! test/java/lang/invoke/MethodHandles/privateLookupIn/test/p/PrivateLookupInTests.java
! test/java/lang/module/ModuleDescriptorTest.java
+ test/java/lang/module/ModuleNamesTest.java
! test/java/lang/module/ModuleReader/ModuleReaderTest.java
! test/java/lang/module/ModuleReferenceTest.java
! test/java/lang/reflect/Module/AnnotationsTest.java
+ test/jdk/modules/incubator/DefaultImage.java
+ test/jdk/modules/incubator/ImageModules.java
+ test/jdk/modules/incubator/src/cp/listmods/ListModules.java
+ test/jdk/modules/incubator/src/cp/test/ConvertToLowerCase.java
+ test/jdk/modules/incubator/src/cp/test/WriteUpperCase.java
+ test/jdk/modules/incubator/src/message.converter/converter/MessageConverter.java
+ test/jdk/modules/incubator/src/message.converter/module-info.java
+ test/jdk/modules/incubator/src/message.writer/module-info.java
+ test/jdk/modules/incubator/src/message.writer/writer/MessageWriter.java
! test/lib/testlibrary/ModuleUtils.java
! test/tools/jar/compat/CLICompatibility.java
! test/tools/jar/modularJar/src/bar/jdk/test/bar/Bar.java
! test/tools/jimage/VerifyJimage.java
+ test/tools/jlink/plugins/SystemModuleDescriptors/CompiledVersionTest.java
! test/tools/jlink/plugins/SystemModuleDescriptors/SystemModulesTest.java
! test/tools/jlink/plugins/SystemModuleDescriptors/UserModuleTest.java
+ test/tools/jlink/plugins/SystemModuleDescriptors/src/test/jdk/test/Main.java
+ test/tools/jlink/plugins/SystemModuleDescriptors/src/test/module-info.java
! test/tools/jmod/JmodTest.java
! test/tools/jmod/hashes/HashesTest.java
! test/tools/pack200/pack200-verifier/src/xmlkit/ClassReader.java

Changeset: 0bfb13e2ba08
Author:    alanb
Date:      2016-12-16 08:17 +0000
URL:       http://hg.openjdk.java.net/jdk9/dev/jdk/rev/0bfb13e2ba08

Merge

! src/java.base/share/classes/java/lang/StackTraceElement.java
- src/java.base/share/classes/java/lang/module/ModuleInfo.java
- src/java.base/share/classes/java/lang/module/ModulePath.java
- src/java.base/share/classes/java/lang/module/ModuleReferences.java
- src/java.base/share/classes/java/lang/module/SystemModuleFinder.java
! src/java.base/share/classes/jdk/internal/module/ModuleBootstrap.java
! src/jdk.crypto.token/share/classes/module-info.java
- src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/SystemModuleDescriptorPlugin.java
! src/jdk.jlink/share/classes/jdk/tools/jmod/JmodTask.java
! src/jdk.jlink/share/classes/jdk/tools/jmod/resources/jmod.properties
! src/jdk.jlink/share/classes/module-info.java
! src/jdk.pack/share/classes/module-info.java