Changeset: 8be741555fa6
Author:    jlahoda
Date:      2017-02-13 09:37 +0100
URL:       http://hg.openjdk.java.net/jigsaw/jake/langtools/rev/8be741555fa6

8173777: Merge javac -Xmodule into javac--patch-module
Summary: Merging -Xmodule: functionality into --patch-module.
Reviewed-by: jjg, mchung, rfield

! src/java.compiler/share/classes/javax/tools/StandardLocation.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/api/ClientCodeWrapper.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/code/ClassFinder.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/code/ModuleFinder.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/code/Symbol.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Modules.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/file/JavacFileManager.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/file/Locations.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/main/Arguments.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/main/JavaCompiler.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/main/Option.java
! 
src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties
! src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/ToolOption.java
! 
src/jdk.javadoc/share/classes/com/sun/tools/javadoc/resources/javadoc.properties
! src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/ToolOption.java
! 
src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/resources/javadoc.properties
! src/jdk.jshell/share/classes/jdk/jshell/MemoryFileManager.java
! test/tools/javac/6627362/T6627362.java
- test/tools/javac/6627362/x/Object.java
+ test/tools/javac/6627362/x/java/lang/Object.java
! test/tools/javac/diags/Example.java
! test/tools/javac/diags/examples.not-yet.txt
+ 
test/tools/javac/diags/examples/ModuleInfoWithPatchedModuleClassoutput/ModuleInfoWithPatchedModuleClassoutput.java
+ 
test/tools/javac/diags/examples/ModuleInfoWithPatchedModuleClassoutput/additional/module-info.java
+ 
test/tools/javac/diags/examples/ModuleInfoWithPatchedModuleClassoutput/patchmodule/java.compiler/javax/lang/model/element/Extra.java
+ 
test/tools/javac/diags/examples/ModuleInfoWithPatchedModuleSourcepath/ModuleInfoWithPatchedModule.java
+ 
test/tools/javac/diags/examples/ModuleInfoWithPatchedModuleSourcepath/patchmodule/java.compiler/javax/lang/model/element/Extra.java
+ 
test/tools/javac/diags/examples/ModuleInfoWithPatchedModuleSourcepath/patchmodule/java.compiler/module-info.java
- test/tools/javac/diags/examples/ModuleInfoWithXModuleSourcePath/Extra.java
- 
test/tools/javac/diags/examples/ModuleInfoWithXModuleSourcePath/module-info.java
- 
test/tools/javac/diags/examples/ModuleInfoWithXmoduleClasspath/ModuleInfoWithXmoduleClasspath.java
- 
test/tools/javac/diags/examples/ModuleInfoWithXmoduleClasspath/additional/module-info.java
- test/tools/javac/diags/examples/NoSuperclass.java
+ test/tools/javac/diags/examples/NoSuperclass/NoSuperclass.java
+ 
test/tools/javac/diags/examples/NoSuperclass/patchmodule/java.base/java/lang/Object.java
+ 
test/tools/javac/diags/examples/TooManyPatchedModules/TooManyPatchedModules.java
+ 
test/tools/javac/diags/examples/TooManyPatchedModules/patchmodule/java.compiler/p/C.java
+ 
test/tools/javac/diags/examples/TooManyPatchedModules/patchmodule/jdk.compiler/p/C.java
- 
test/tools/javac/diags/examples/XModuleWithModulePath/XModuleWithModulePath.java
- test/tools/javac/meth/BadPolySig.java
+ test/tools/javac/meth/BadPolySig/BadPolySig.java
+ test/tools/javac/meth/BadPolySig/java.base/java/lang/invoke/MethodHandle.java
! test/tools/javac/modules/AddLimitMods.java
! test/tools/javac/modules/AddReadsTest.java
+ test/tools/javac/modules/CompileModulePatchTest.java
! test/tools/javac/modules/InheritRuntimeEnvironmentTest.java
! test/tools/javac/modules/PatchModulesTest.java
- test/tools/javac/modules/XModuleTest.java
! test/tools/javac/synthesize/Main.java
! test/tools/jdeps/jdkinternals/RemovedJDKInternals.java

Changeset: 162b521af7bb
Author:    jlahoda
Date:      2017-02-13 11:57 +0100
URL:       http://hg.openjdk.java.net/jigsaw/jake/langtools/rev/162b521af7bb

8174245: Javadoc is not working for some methods
Summary: Parsing source file as if they were part of their corresponding 
modules.
Reviewed-by: rfield

! 
src/jdk.compiler/share/classes/jdk/internal/shellsupport/doc/JavadocHelper.java
! src/jdk.jshell/share/classes/jdk/internal/jshell/tool/ConsoleIOContext.java
! test/jdk/jshell/JavadocTest.java

Changeset: f9168e271f7d
Author:    lana
Date:      2017-02-16 17:13 +0000
URL:       http://hg.openjdk.java.net/jigsaw/jake/langtools/rev/f9168e271f7d

Added tag jdk-9+157 for changeset 162b521af7bb

! .hgtags

Changeset: 33de8aa75ab9
Author:    alanb
Date:      2017-02-16 18:01 +0000
URL:       http://hg.openjdk.java.net/jigsaw/jake/langtools/rev/33de8aa75ab9

Merge

! .hgtags
! src/java.compiler/share/classes/javax/tools/StandardLocation.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/api/ClientCodeWrapper.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/code/ClassFinder.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/code/ModuleFinder.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/code/Symbol.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Modules.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/file/JavacFileManager.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/file/Locations.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/main/Arguments.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/main/JavaCompiler.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/main/Option.java
! 
src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties
! src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/ToolOption.java
! 
src/jdk.javadoc/share/classes/com/sun/tools/javadoc/resources/javadoc.properties
! src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/ToolOption.java
! 
src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/resources/javadoc.properties
! test/tools/javac/6627362/T6627362.java
- test/tools/javac/6627362/x/Object.java
! test/tools/javac/diags/Example.java
- test/tools/javac/diags/examples/ModuleInfoWithXModuleSourcePath/Extra.java
- 
test/tools/javac/diags/examples/ModuleInfoWithXModuleSourcePath/module-info.java
- 
test/tools/javac/diags/examples/ModuleInfoWithXmoduleClasspath/ModuleInfoWithXmoduleClasspath.java
- 
test/tools/javac/diags/examples/ModuleInfoWithXmoduleClasspath/additional/module-info.java
- test/tools/javac/diags/examples/NoSuperclass.java
- 
test/tools/javac/diags/examples/XModuleWithModulePath/XModuleWithModulePath.java
- test/tools/javac/meth/BadPolySig.java
! test/tools/javac/modules/AddLimitMods.java
! test/tools/javac/modules/AddReadsTest.java
+ test/tools/javac/modules/CompileModulePatchTest.java
! test/tools/javac/modules/PatchModulesTest.java
- test/tools/javac/modules/XModuleTest.java
! test/tools/javac/synthesize/Main.java

Reply via email to