8076543: Add @modules as needed to the langtools tests
authorakulyakh
Thu, 21 May 2015 11:41:04 -0700
changeset 30730 d3ce7619db2c
parent 30729 398f0f51917a
child 30731 38eaf2ca243e
child 30732 bce32ab8601e
8076543: Add @modules as needed to the langtools tests Reviewed-by: jjg, shurailine
langtools/test/com/sun/javadoc/5093723/T5093723.java
langtools/test/com/sun/javadoc/AccessAsciiArt/AccessAsciiArt.java
langtools/test/com/sun/javadoc/AccessFrameTitle/AccessFrameTitle.java
langtools/test/com/sun/javadoc/AccessH1/AccessH1.java
langtools/test/com/sun/javadoc/AccessSkipNav/AccessSkipNav.java
langtools/test/com/sun/javadoc/AccessSummary/AccessSummary.java
langtools/test/com/sun/javadoc/AuthorDD/AuthorDD.java
langtools/test/com/sun/javadoc/DocRootSlash/DocRootSlash.java
langtools/test/com/sun/javadoc/InheritDocForUserTags/DocTest.java
langtools/test/com/sun/javadoc/JavascriptWinTitle/JavascriptWinTitle.java
langtools/test/com/sun/javadoc/MetaTag/MetaTag.java
langtools/test/com/sun/javadoc/PackagesHeader/PackagesHeader.java
langtools/test/com/sun/javadoc/T6735320/T6735320.java
langtools/test/com/sun/javadoc/ValidHtml/ValidHtml.java
langtools/test/com/sun/javadoc/VersionNumber/VersionNumber.java
langtools/test/com/sun/javadoc/WindowTitles/WindowTitles.java
langtools/test/com/sun/javadoc/constantValues/TestConstantValuesDriver.java
langtools/test/com/sun/javadoc/dupThrowsTags/TestDupThrowsTags.java
langtools/test/com/sun/javadoc/testAbsLinkPath/TestAbsLinkPath.java
langtools/test/com/sun/javadoc/testAbstractMethod/TestAbstractMethod.java
langtools/test/com/sun/javadoc/testAnchorNames/TestAnchorNames.java
langtools/test/com/sun/javadoc/testAnnotationOptional/TestAnnotationOptional.java
langtools/test/com/sun/javadoc/testAnnotationTypes/TestAnnotationTypes.java
langtools/test/com/sun/javadoc/testBackSlashInLink/TestBackSlashInLink.java
langtools/test/com/sun/javadoc/testBadPackageFileInJar/TestBadPackageFileInJar.java
langtools/test/com/sun/javadoc/testBadSourceFile/TestBadSourceFile.java
langtools/test/com/sun/javadoc/testBaseClass/TestBaseClass.java
langtools/test/com/sun/javadoc/testBreakIterator/TestBreakIterator.java
langtools/test/com/sun/javadoc/testCRLineSeparator/TestCRLineSeparator.java
langtools/test/com/sun/javadoc/testCharset/TestCharset.java
langtools/test/com/sun/javadoc/testClassCrossReferences/TestClassCrossReferences.java
langtools/test/com/sun/javadoc/testClassTree/TestClassTree.java
langtools/test/com/sun/javadoc/testCmndLineClass/TestCmndLineClass.java
langtools/test/com/sun/javadoc/testCompletionFailure/TestCompletionFailure.java
langtools/test/com/sun/javadoc/testConstantValuesPage/TestConstantValuesPage.java
langtools/test/com/sun/javadoc/testConstructorIndent/TestConstructorIndent.java
langtools/test/com/sun/javadoc/testConstructors/TestConstructors.java
langtools/test/com/sun/javadoc/testCustomTag/TestCustomTag.java
langtools/test/com/sun/javadoc/testDeprecatedDocs/TestDeprecatedDocs.java
langtools/test/com/sun/javadoc/testDocEncoding/TestDocEncoding.java
langtools/test/com/sun/javadoc/testDocErrorReporter/TestDocErrorReporter.java
langtools/test/com/sun/javadoc/testDocFileDir/TestDocFileDir.java
langtools/test/com/sun/javadoc/testDocFiles/TestDocFiles.java
langtools/test/com/sun/javadoc/testDocRootInlineTag/TestDocRootInlineTag.java
langtools/test/com/sun/javadoc/testDocRootLink/TestDocRootLink.java
langtools/test/com/sun/javadoc/testDupParamWarn/TestDupParamWarn.java
langtools/test/com/sun/javadoc/testEmptyClass/TestEmptyClass.java
langtools/test/com/sun/javadoc/testEnclosingClass/TestEnclosingClass.java
langtools/test/com/sun/javadoc/testEncoding/TestEncoding.java
langtools/test/com/sun/javadoc/testExternalOverridenMethod/TestExternalOverridenMethod.java
langtools/test/com/sun/javadoc/testGeneratedBy/TestGeneratedBy.java
langtools/test/com/sun/javadoc/testGroupOption/TestGroupOption.java
langtools/test/com/sun/javadoc/testHeadings/TestHeadings.java
langtools/test/com/sun/javadoc/testHelpFile/TestHelpFile.java
langtools/test/com/sun/javadoc/testHelpOption/TestHelpOption.java
langtools/test/com/sun/javadoc/testHiddenMembers/TestHiddenMembers.java
langtools/test/com/sun/javadoc/testHref/TestHref.java
langtools/test/com/sun/javadoc/testHrefInDocComment/TestHrefInDocComment.java
langtools/test/com/sun/javadoc/testHtmlComments/TestHtmlComments.java
langtools/test/com/sun/javadoc/testHtmlDefinitionListTag/TestHtmlDefinitionListTag.java
langtools/test/com/sun/javadoc/testHtmlDocument/TestHtmlDocument.java
langtools/test/com/sun/javadoc/testHtmlStrongTag/TestHtmlStrongTag.java
langtools/test/com/sun/javadoc/testHtmlTableStyles/TestHtmlTableStyles.java
langtools/test/com/sun/javadoc/testHtmlTableTags/TestHtmlTableTags.java
langtools/test/com/sun/javadoc/testHtmlTag/TestHtmlTag.java
langtools/test/com/sun/javadoc/testHtmlVersion/TestHtmlVersion.java
langtools/test/com/sun/javadoc/testIndentation/TestIndentation.java
langtools/test/com/sun/javadoc/testIndex/TestIndex.java
langtools/test/com/sun/javadoc/testInlineLinkLabel/TestInlineLinkLabel.java
langtools/test/com/sun/javadoc/testInterface/TestInterface.java
langtools/test/com/sun/javadoc/testJavaFX/TestJavaFX.java
langtools/test/com/sun/javadoc/testJavascript/TestJavascript.java
langtools/test/com/sun/javadoc/testLambdaFeature/TestLambdaFeature.java
langtools/test/com/sun/javadoc/testLeadingSpaces/LeadingSpaces.java
langtools/test/com/sun/javadoc/testLegacyTaglet/TestLegacyTaglet.java
langtools/test/com/sun/javadoc/testLinkOption/TestBadLinkOption.java
langtools/test/com/sun/javadoc/testLinkOption/TestLinkOption.java
langtools/test/com/sun/javadoc/testLinkOption/TestNewLineInLink.java
langtools/test/com/sun/javadoc/testLinkTaglet/TestLinkTaglet.java
langtools/test/com/sun/javadoc/testLinkToSerialForm/TestLinkToSerialForm.java
langtools/test/com/sun/javadoc/testLiteralCodeInPre/TestLiteralCodeInPre.java
langtools/test/com/sun/javadoc/testMemberInheritence/TestMemberInheritence.java
langtools/test/com/sun/javadoc/testMemberSummary/TestMemberSummary.java
langtools/test/com/sun/javadoc/testMethodTypes/TestMethodTypes.java
langtools/test/com/sun/javadoc/testModifier/TestModifier.java
langtools/test/com/sun/javadoc/testNavigation/TestNavigation.java
langtools/test/com/sun/javadoc/testNestedGenerics/TestNestedGenerics.java
langtools/test/com/sun/javadoc/testNestedInlineTag/TestNestedInlineTag.java
langtools/test/com/sun/javadoc/testNewLanguageFeatures/TestNewLanguageFeatures.java
langtools/test/com/sun/javadoc/testNoPackagesFile/TestNoPackagesFile.java
langtools/test/com/sun/javadoc/testNotifications/TestNotifications.java
langtools/test/com/sun/javadoc/testOptions/TestOptions.java
langtools/test/com/sun/javadoc/testOrdering/TestOrdering.java
langtools/test/com/sun/javadoc/testOverridenMethods/TestMultiInheritence.java
langtools/test/com/sun/javadoc/testOverridenMethods/TestOverridenMethodDocCopy.java
langtools/test/com/sun/javadoc/testOverridenMethods/TestOverridenPrivateMethods.java
langtools/test/com/sun/javadoc/testOverridenMethods/TestOverridenPrivateMethodsWithPackageFlag.java
langtools/test/com/sun/javadoc/testOverridenMethods/TestOverridenPrivateMethodsWithPrivateFlag.java
langtools/test/com/sun/javadoc/testPackageDeprecation/TestPackageDeprecation.java
langtools/test/com/sun/javadoc/testPackagePage/TestPackagePage.java
langtools/test/com/sun/javadoc/testParamTaglet/TestParamTaglet.java
langtools/test/com/sun/javadoc/testPrivateClasses/TestPrivateClasses.java
langtools/test/com/sun/javadoc/testProfiles/TestProfiles.java
langtools/test/com/sun/javadoc/testProfiles/TestProfilesConfiguration.java
langtools/test/com/sun/javadoc/testRecurseSubPackages/TestRecurseSubPackages.java
langtools/test/com/sun/javadoc/testRelativeLinks/TestRelativeLinks.java
langtools/test/com/sun/javadoc/testRepeatedAnnotations/TestRepeatedAnnotations.java
langtools/test/com/sun/javadoc/testReturnTag/TestReturnTag.java
langtools/test/com/sun/javadoc/testSeeTag/TestSeeTag.java
langtools/test/com/sun/javadoc/testSerialVersionUID/TestSerialVersionUID.java
langtools/test/com/sun/javadoc/testSerializedForm/TestSerializedForm.java
langtools/test/com/sun/javadoc/testSerializedFormDeprecationInfo/TestSerializedFormDeprecationInfo.java
langtools/test/com/sun/javadoc/testSimpleTag/TestSimpleTag.java
langtools/test/com/sun/javadoc/testSimpleTagExclude/TestSimpleTagExclude.java
langtools/test/com/sun/javadoc/testSimpleTagInherit/TestSimpleTagInherit.java
langtools/test/com/sun/javadoc/testSinceTag/TestSinceTag.java
langtools/test/com/sun/javadoc/testSingleQuotedLink/TestSingleQuotedLink.java
langtools/test/com/sun/javadoc/testSourceTab/TestSourceTab.java
langtools/test/com/sun/javadoc/testStylesheet/TestStylesheet.java
langtools/test/com/sun/javadoc/testSubTitle/TestSubTitle.java
langtools/test/com/sun/javadoc/testSummaryHeading/TestSummaryHeading.java
langtools/test/com/sun/javadoc/testSuperclassInSerialForm/TestSuperClassInSerialForm.java
langtools/test/com/sun/javadoc/testSupplementary/TestSupplementary.java
langtools/test/com/sun/javadoc/testTagHolderMethod/TestTagHolderMethod.java
langtools/test/com/sun/javadoc/testTagInheritence/TestTagInheritence.java
langtools/test/com/sun/javadoc/testTagMisuse/TestTagMisuse.java
langtools/test/com/sun/javadoc/testTagOutput/TestTagOutput.java
langtools/test/com/sun/javadoc/testTaglets/TestTaglets.java
langtools/test/com/sun/javadoc/testThrowsHead/TestThrowsHead.java
langtools/test/com/sun/javadoc/testThrowsInheritence/TestThrowsTagInheritence.java
langtools/test/com/sun/javadoc/testThrowsTag/TestThrowsTag.java
langtools/test/com/sun/javadoc/testTitleInHref/TestTitleInHref.java
langtools/test/com/sun/javadoc/testTopOption/TestTopOption.java
langtools/test/com/sun/javadoc/testTypeAnnotations/TestTypeAnnotations.java
langtools/test/com/sun/javadoc/testTypeParams/TestTypeParameters.java
langtools/test/com/sun/javadoc/testUnnamedPackage/TestUnnamedPackage.java
langtools/test/com/sun/javadoc/testUseOption/TestUseOption.java
langtools/test/com/sun/javadoc/testValueTag/TestValueTag.java
langtools/test/com/sun/javadoc/testWarnBadParamNames/TestWarnBadParamNames.java
langtools/test/com/sun/javadoc/testWarnings/TestWarnings.java
langtools/test/com/sun/javadoc/testWindowTitle/TestWindowTitle.java
langtools/test/com/sun/javadoc/testXOption/TestXOption.java
langtools/test/com/sun/javadoc/typeAnnotations/smoke/TestSmoke.java
langtools/test/tools/all/RunCodingRules.java
langtools/test/tools/doclint/AccessTest.java
langtools/test/tools/doclint/AccessTest.package.out
langtools/test/tools/doclint/AccessTest.private.out
langtools/test/tools/doclint/AccessTest.protected.out
langtools/test/tools/doclint/AccessTest.public.out
langtools/test/tools/doclint/AccessibilityTest.java
langtools/test/tools/doclint/AccessibilityTest.out
langtools/test/tools/doclint/AnchorTest.java
langtools/test/tools/doclint/AnchorTest.out
langtools/test/tools/doclint/AnchorTest2.java
langtools/test/tools/doclint/AnchorTest2.out
langtools/test/tools/doclint/BadPackageCommentTest.java
langtools/test/tools/doclint/BadPackageCommentTest.out
langtools/test/tools/doclint/CoverageExtras.java
langtools/test/tools/doclint/CustomTagTest.java
langtools/test/tools/doclint/CustomTagTest.out
langtools/test/tools/doclint/CustomTagTestWithOption.out
langtools/test/tools/doclint/EmptyAuthorTest.java
langtools/test/tools/doclint/EmptyAuthorTest.out
langtools/test/tools/doclint/EmptyExceptionTest.java
langtools/test/tools/doclint/EmptyExceptionTest.out
langtools/test/tools/doclint/EmptyParamTest.java
langtools/test/tools/doclint/EmptyParamTest.out
langtools/test/tools/doclint/EmptyPreTest.java
langtools/test/tools/doclint/EmptyReturnTest.java
langtools/test/tools/doclint/EmptyReturnTest.out
langtools/test/tools/doclint/EmptySerialDataTest.java
langtools/test/tools/doclint/EmptySerialDataTest.out
langtools/test/tools/doclint/EmptySerialFieldTest.java
langtools/test/tools/doclint/EmptySerialFieldTest.out
langtools/test/tools/doclint/EmptySinceTest.java
langtools/test/tools/doclint/EmptySinceTest.out
langtools/test/tools/doclint/EmptyVersionTest.java
langtools/test/tools/doclint/EmptyVersionTest.out
langtools/test/tools/doclint/EndTagsTest.java
langtools/test/tools/doclint/EndTagsTest.out
langtools/test/tools/doclint/EndWithIdentifierTest.java
langtools/test/tools/doclint/EndWithIdentifierTest.out
langtools/test/tools/doclint/HtmlAttrsTest.java
langtools/test/tools/doclint/HtmlAttrsTest.out
langtools/test/tools/doclint/HtmlTagsTest.java
langtools/test/tools/doclint/HtmlTagsTest.out
langtools/test/tools/doclint/HtmlVersionTest.java
langtools/test/tools/doclint/LiteralTest.java
langtools/test/tools/doclint/LiteralTest.out
langtools/test/tools/doclint/MissingCommentTest.java
langtools/test/tools/doclint/MissingCommentTest.out
langtools/test/tools/doclint/MissingParamsTest.java
langtools/test/tools/doclint/MissingParamsTest.out
langtools/test/tools/doclint/MissingReturnTest.java
langtools/test/tools/doclint/MissingReturnTest.out
langtools/test/tools/doclint/MissingThrowsTest.java
langtools/test/tools/doclint/MissingThrowsTest.out
langtools/test/tools/doclint/OptionTest.java
langtools/test/tools/doclint/OverridesTest.java
langtools/test/tools/doclint/ParaTagTest.java
langtools/test/tools/doclint/ReferenceTest.java
langtools/test/tools/doclint/ReferenceTest.out
langtools/test/tools/doclint/ResourceTest.java
langtools/test/tools/doclint/RunTest.java
langtools/test/tools/doclint/SyntaxTest.java
langtools/test/tools/doclint/SyntaxTest.out
langtools/test/tools/doclint/SyntheticTest.java
langtools/test/tools/doclint/UnfinishedInlineTagTest.java
langtools/test/tools/doclint/UnfinishedInlineTagTest.out
langtools/test/tools/doclint/ValidTest.java
langtools/test/tools/doclint/ValueTest.java
langtools/test/tools/doclint/ValueTest.out
langtools/test/tools/doclint/anchorTests/p/Test.java
langtools/test/tools/doclint/anchorTests/p/Test.javac.out
langtools/test/tools/doclint/anchorTests/p/Test.out
langtools/test/tools/doclint/anchorTests/p/package-info.java
langtools/test/tools/doclint/anchorTests/p/package-info.javac.out
langtools/test/tools/doclint/anchorTests/p/package-info.out
langtools/test/tools/doclint/html/BlockTagsTest.java
langtools/test/tools/doclint/html/EntitiesTest.java
langtools/test/tools/doclint/html/EntitiesTest.out
langtools/test/tools/doclint/html/HtmlVersionTagsAttrsTest.java
langtools/test/tools/doclint/html/HtmlVersionTagsAttrsTestHtml4.out
langtools/test/tools/doclint/html/HtmlVersionTagsAttrsTestHtml5.out
langtools/test/tools/doclint/html/InlineTagsTest.java
langtools/test/tools/doclint/html/ListTagsTest.java
langtools/test/tools/doclint/html/ListTagsTest.out
langtools/test/tools/doclint/html/OtherTagsTest.java
langtools/test/tools/doclint/html/OtherTagsTest.out
langtools/test/tools/doclint/html/TableTagsTest.java
langtools/test/tools/doclint/html/TagNotAllowed.java
langtools/test/tools/doclint/html/TagNotAllowed.out
langtools/test/tools/doclint/html/TextNotAllowed.java
langtools/test/tools/doclint/html/TextNotAllowed.out
langtools/test/tools/doclint/packageTests/bad/Test.java
langtools/test/tools/doclint/packageTests/bad/Test.javac.out
langtools/test/tools/doclint/packageTests/bad/Test.out
langtools/test/tools/doclint/packageTests/bad/package-info.java
langtools/test/tools/doclint/packageTests/bad/package-info.javac.out
langtools/test/tools/doclint/packageTests/bad/package-info.out
langtools/test/tools/doclint/packageTests/good/Test.java
langtools/test/tools/doclint/packageTests/good/package-info.java
langtools/test/tools/doclint/tidy/AnchorAlreadyDefined.java
langtools/test/tools/doclint/tidy/AnchorAlreadyDefined.out
langtools/test/tools/doclint/tidy/BadEnd.java
langtools/test/tools/doclint/tidy/BadEnd.out
langtools/test/tools/doclint/tidy/InsertImplicit.java
langtools/test/tools/doclint/tidy/InsertImplicit.out
langtools/test/tools/doclint/tidy/InvalidEntity.java
langtools/test/tools/doclint/tidy/InvalidEntity.out
langtools/test/tools/doclint/tidy/InvalidName.java
langtools/test/tools/doclint/tidy/InvalidName.out
langtools/test/tools/doclint/tidy/InvalidTag.java
langtools/test/tools/doclint/tidy/InvalidTag.out
langtools/test/tools/doclint/tidy/InvalidURI.java
langtools/test/tools/doclint/tidy/InvalidURI.out
langtools/test/tools/doclint/tidy/MissingGT.java
langtools/test/tools/doclint/tidy/MissingGT.out
langtools/test/tools/doclint/tidy/MissingTag.java
langtools/test/tools/doclint/tidy/MissingTag.out
langtools/test/tools/doclint/tidy/NestedTag.java
langtools/test/tools/doclint/tidy/NestedTag.out
langtools/test/tools/doclint/tidy/ParaInPre.java
langtools/test/tools/doclint/tidy/ParaInPre.out
langtools/test/tools/doclint/tidy/RepeatedAttr.java
langtools/test/tools/doclint/tidy/RepeatedAttr.out
langtools/test/tools/doclint/tidy/TextNotAllowed.java
langtools/test/tools/doclint/tidy/TextNotAllowed.out
langtools/test/tools/doclint/tidy/TrimmingEmptyTag.java
langtools/test/tools/doclint/tidy/TrimmingEmptyTag.out
langtools/test/tools/doclint/tidy/UnescapedOrUnknownEntity.java
langtools/test/tools/doclint/tidy/UnescapedOrUnknownEntity.out
langtools/test/tools/doclint/tool/HelpTest.java
langtools/test/tools/doclint/tool/MaxDiagsTest.java
langtools/test/tools/doclint/tool/MaxDiagsTest.out
langtools/test/tools/doclint/tool/PathsTest.java
langtools/test/tools/doclint/tool/RunTest.java
langtools/test/tools/doclint/tool/StatsTest.java
langtools/test/tools/doclint/tool/StatsTest.out
langtools/test/tools/javac/4241573/T4241573.java
langtools/test/tools/javac/4846262/CheckEBCDICLocaleTest.java
langtools/test/tools/javac/6302184/HiddenOptionsShouldUseGivenEncodingTest.java
langtools/test/tools/javac/6304921/TestLog.java
langtools/test/tools/javac/6330997/T6330997.java
langtools/test/tools/javac/6341866/T6341866.java
langtools/test/tools/javac/6394683/T6394683.java
langtools/test/tools/javac/6400383/T6400383.java
langtools/test/tools/javac/6400872/T6400872.java
langtools/test/tools/javac/6402516/CheckClass.java
langtools/test/tools/javac/6402516/CheckIsAccessible.java
langtools/test/tools/javac/6402516/CheckLocalElements.java
langtools/test/tools/javac/6402516/CheckMethod.java
langtools/test/tools/javac/6403424/T6403424.java
langtools/test/tools/javac/6410653/T6410653.java
langtools/test/tools/javac/6440583/T6440583.java
langtools/test/tools/javac/6457284/T6457284.java
langtools/test/tools/javac/6508981/TestInferBinaryName.java
langtools/test/tools/javac/6567415/T6567415.java
langtools/test/tools/javac/6589361/T6589361.java
langtools/test/tools/javac/6627362/T6627362.java
langtools/test/tools/javac/6668794/badClass/Test.java
langtools/test/tools/javac/6863465/TestCircularClassfile.java
langtools/test/tools/javac/6889255/T6889255.java
langtools/test/tools/javac/6902720/Test.java
langtools/test/tools/javac/6917288/GraphicalInstallerTest.java
langtools/test/tools/javac/6917288/T6917288.java
langtools/test/tools/javac/7003595/T7003595.java
langtools/test/tools/javac/7079713/TestCircularClassfile.java
langtools/test/tools/javac/7118412/ShadowingTest.java
langtools/test/tools/javac/7129225/NegTest.out
langtools/test/tools/javac/7129225/TestImportStar.java
langtools/test/tools/javac/7129225/TestImportStar.out
langtools/test/tools/javac/7142086/T7142086.java
langtools/test/tools/javac/7144981/IgnoreIgnorableCharactersInInput.java
langtools/test/tools/javac/7153958/CPoolRefClassContainingInlinedCts.java
langtools/test/tools/javac/7166455/CheckACC_STRICTFlagOnclinitTest.java
langtools/test/tools/javac/7199823/InnerClassCannotBeVerified.java
langtools/test/tools/javac/8000518/DuplicateConstantPoolEntry.java
langtools/test/tools/javac/8005931/CheckACC_STRICTFlagOnPkgAccessClassTest.java
langtools/test/tools/javac/8009170/RedundantByteCodeInArrayTest.java
langtools/test/tools/javac/AnonymousSubclassTest.java
langtools/test/tools/javac/BadOptimization/DeadCode6.java
langtools/test/tools/javac/ClassPathTest/ClassPathTest.java
langtools/test/tools/javac/ConstFoldTest.java
langtools/test/tools/javac/DefiniteAssignment/DefAssignNestedArg.java
langtools/test/tools/javac/Diagnostics/6769027/T6769027.java
langtools/test/tools/javac/Diagnostics/7010608/Test.java
langtools/test/tools/javac/Diagnostics/7116676/T7116676.java
langtools/test/tools/javac/ExtDirs/ExtDirTest.java
langtools/test/tools/javac/FinalInitializer.java
langtools/test/tools/javac/IncorrectInheritance/IncorrectInheritanceTest.java
langtools/test/tools/javac/InnerMethSig.java
langtools/test/tools/javac/MethodParameters/AnnotationTest.java
langtools/test/tools/javac/MethodParameters/AnonymousClass.java
langtools/test/tools/javac/MethodParameters/Constructors.java
langtools/test/tools/javac/MethodParameters/EnumTest.java
langtools/test/tools/javac/MethodParameters/InstanceMethods.java
langtools/test/tools/javac/MethodParameters/LambdaTest.java
langtools/test/tools/javac/MethodParameters/LocalClassTest.java
langtools/test/tools/javac/MethodParameters/MemberClassTest.java
langtools/test/tools/javac/MethodParameters/StaticMethods.java
langtools/test/tools/javac/MethodParameters/UncommonParamNames.java
langtools/test/tools/javac/MethodParametersTest.java
langtools/test/tools/javac/MissingInclude/MissingIncludeTest.java
langtools/test/tools/javac/NoStringToLower.java
langtools/test/tools/javac/Paths/6638501/JarFromManifestFailure.java
langtools/test/tools/javac/Paths/AbsolutePathTest.java
langtools/test/tools/javac/Paths/TestCompileJARInClassPath.java
langtools/test/tools/javac/ProtectedInnerClass/ProtectedInnerClassesTest.java
langtools/test/tools/javac/StdoutCloseTest.java
langtools/test/tools/javac/T4965689/ClassLiteralWastesByteTest.java
langtools/test/tools/javac/T5053846/MethodRefDupInConstantPoolTest.java
langtools/test/tools/javac/T5090006/AssertionFailureTest.java
langtools/test/tools/javac/T6181889/EmptyFinallyTest.java
langtools/test/tools/javac/T6238612.java
langtools/test/tools/javac/T6265400.java
langtools/test/tools/javac/T6340549.java
langtools/test/tools/javac/T6351767.java
langtools/test/tools/javac/T6358024.java
langtools/test/tools/javac/T6358166.java
langtools/test/tools/javac/T6358168.java
langtools/test/tools/javac/T6361619.java
langtools/test/tools/javac/T6366196.java
langtools/test/tools/javac/T6395974.java
langtools/test/tools/javac/T6397044.java
langtools/test/tools/javac/T6397286.java
langtools/test/tools/javac/T6403466.java
langtools/test/tools/javac/T6405099.java
langtools/test/tools/javac/T6406771.java
langtools/test/tools/javac/T6407066.java
langtools/test/tools/javac/T6410706.java
langtools/test/tools/javac/T6411379.java
langtools/test/tools/javac/T6413876.java
langtools/test/tools/javac/T6423583.java
langtools/test/tools/javac/T6435291/T6435291.java
langtools/test/tools/javac/T6458749.java
langtools/test/tools/javac/T6458823/T6458823.java
langtools/test/tools/javac/T6472751.java
langtools/test/tools/javac/T6534287.java
langtools/test/tools/javac/T6558476.java
langtools/test/tools/javac/T6595666.java
langtools/test/tools/javac/T6625520.java
langtools/test/tools/javac/T6654037.java
langtools/test/tools/javac/T6665791.java
langtools/test/tools/javac/T6668802.java
langtools/test/tools/javac/T6695379/AnnotationsAreNotCopiedToBridgeMethodsTest.java
langtools/test/tools/javac/T6705935.java
langtools/test/tools/javac/T6725036.java
langtools/test/tools/javac/T6759996.java
langtools/test/tools/javac/T6855236.java
langtools/test/tools/javac/T6873845.java
langtools/test/tools/javac/T6873849.java
langtools/test/tools/javac/T6900149.java
langtools/test/tools/javac/T6942649.java
langtools/test/tools/javac/T6956462/T6956462.java
langtools/test/tools/javac/T6956638.java
langtools/test/tools/javac/T6970173/DebugPointerAtBadPositionTest.java
langtools/test/tools/javac/T6972327.java
langtools/test/tools/javac/T6985181.java
langtools/test/tools/javac/T6993301.java
langtools/test/tools/javac/T6999210.java
langtools/test/tools/javac/T7008643/InlinedFinallyConfuseDebuggersTest.java
langtools/test/tools/javac/T7040592/CoerceNullToMoreSpecificTypeTest.java
langtools/test/tools/javac/T7040592/T7040592.java
langtools/test/tools/javac/T7053059/DoubleCastTest.java
langtools/test/tools/javac/T7093325.java
langtools/test/tools/javac/T7142672/Bug.java
langtools/test/tools/javac/T7159016.java
langtools/test/tools/javac/T7165659/InnerClassAttrMustNotHaveStrictFPFlagTest.java
langtools/test/tools/javac/T8003967/DetectMutableStaticFields.java
langtools/test/tools/javac/T8009640/CheckRejectProfileBCPOptionsIfUsedTogetherTest.java
langtools/test/tools/javac/T8010659/CompilerCrashWhenMixingBinariesAndSourcesTest.java
langtools/test/tools/javac/T8010737/ParameterNamesAreNotCopiedToAnonymousInitTest.java
langtools/test/tools/javac/T8011181/EmptyUTF8ForInnerClassNameTest.java
langtools/test/tools/javac/T8013394/CompileErrorWithIteratorTest.java
langtools/test/tools/javac/T8019486/WrongLNTForLambdaTest.java
langtools/test/tools/javac/T8022162/IncorrectSignatureDeterminationForInnerClassesTest.java
langtools/test/tools/javac/T8022186/DeadCodeGeneratedForEmptyTryTest.java
langtools/test/tools/javac/T8024039/NoDeadCodeGenerationOnTrySmtTest.java
langtools/test/tools/javac/T8024437/ExceptionInferenceFromClassFileTest.java
langtools/test/tools/javac/T8028504/DontGenerateLVTForGNoneOpTest.java
langtools/test/tools/javac/T8071847/T8071847.java
langtools/test/tools/javac/TestPkgInfo.java
langtools/test/tools/javac/TryWithResources/InterruptedExceptionTest.java
langtools/test/tools/javac/TryWithResources/UnusedResourcesTest.java
langtools/test/tools/javac/VersionOpt.java
langtools/test/tools/javac/annotations/6550655/T6550655.java
langtools/test/tools/javac/annotations/SyntheticParameters.java
langtools/test/tools/javac/annotations/TestAnnotationPackageInfo.java
langtools/test/tools/javac/annotations/neg/8022765/T8022765.java
langtools/test/tools/javac/annotations/neg/8022765/T8022765.out
langtools/test/tools/javac/annotations/neg/8022765/VerifyErroneousAnnotationsAttributed.java
langtools/test/tools/javac/annotations/repeatingAnnotations/combo/BasicSyntaxCombo.java
langtools/test/tools/javac/annotations/repeatingAnnotations/combo/DeprecatedAnnoCombo.java
langtools/test/tools/javac/annotations/repeatingAnnotations/combo/DocumentedAnnoCombo.java
langtools/test/tools/javac/annotations/repeatingAnnotations/combo/InheritedAnnoCombo.java
langtools/test/tools/javac/annotations/repeatingAnnotations/combo/ReflectionTest.java
langtools/test/tools/javac/annotations/repeatingAnnotations/combo/RetentionAnnoCombo.java
langtools/test/tools/javac/annotations/repeatingAnnotations/combo/TargetAnnoCombo.java
langtools/test/tools/javac/annotations/typeAnnotations/TypeProcOnly.java
langtools/test/tools/javac/annotations/typeAnnotations/api/AnnotatedArrayOrder.java
langtools/test/tools/javac/annotations/typeAnnotations/api/ArrayCreationTree.java
langtools/test/tools/javac/annotations/typeAnnotations/api/ArrayPositionConsistency.java
langtools/test/tools/javac/annotations/typeAnnotations/classfile/CombinationsTargetTest1.java
langtools/test/tools/javac/annotations/typeAnnotations/classfile/CombinationsTargetTest2.java
langtools/test/tools/javac/annotations/typeAnnotations/classfile/CombinationsTargetTest3.java
langtools/test/tools/javac/annotations/typeAnnotations/classfile/DeadCode.java
langtools/test/tools/javac/annotations/typeAnnotations/classfile/NewTypeArguments.java
langtools/test/tools/javac/annotations/typeAnnotations/classfile/NoTargetAnnotations.java
langtools/test/tools/javac/annotations/typeAnnotations/classfile/Scopes.java
langtools/test/tools/javac/annotations/typeAnnotations/classfile/SyntheticParameters.java
langtools/test/tools/javac/annotations/typeAnnotations/classfile/T8008762.java
langtools/test/tools/javac/annotations/typeAnnotations/classfile/T8008769.java
langtools/test/tools/javac/annotations/typeAnnotations/classfile/T8010015.java
langtools/test/tools/javac/annotations/typeAnnotations/classfile/TestAnonInnerClasses.java
langtools/test/tools/javac/annotations/typeAnnotations/classfile/TestNewCastArray.java
langtools/test/tools/javac/annotations/typeAnnotations/classfile/TypeCasts.java
langtools/test/tools/javac/annotations/typeAnnotations/classfile/Wildcards.java
langtools/test/tools/javac/annotations/typeAnnotations/failures/CheckErrorsForSource7.java
langtools/test/tools/javac/annotations/typeAnnotations/failures/TypeVariableMissingTA.java
langtools/test/tools/javac/annotations/typeAnnotations/failures/TypeVariableMissingTA.out
langtools/test/tools/javac/annotations/typeAnnotations/newlocations/AfterMethodTypeParams.java
langtools/test/tools/javac/annotations/typeAnnotations/packageanno/PackageProcessor.java
langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/ClassExtends.java
langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/ClassTypeParam.java
langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/ConstructorInvocationTypeArgument.java
langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/Constructors.java
langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/ExceptionParameters.java
langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/Fields.java
langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/FromSpecification.java
langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/Initializers.java
langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/Lambda.java
langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/MethodInvocationTypeArgument.java
langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/MethodParameters.java
langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/MethodReceivers.java
langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/MethodReturns.java
langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/MethodThrows.java
langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/MethodTypeParam.java
langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/MultiCatch.java
langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/NestedTypes.java
langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/NewObjects.java
langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/RepeatingTypeAnnotations.java
langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/ResourceVariable.java
langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/TypeCasts.java
langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/TypeTests.java
langtools/test/tools/javac/api/6400303/T6400303.java
langtools/test/tools/javac/api/6406133/T6406133.java
langtools/test/tools/javac/api/6410643/T6410643.java
langtools/test/tools/javac/api/6411310/T6411310.java
langtools/test/tools/javac/api/6411333/T6411333.java
langtools/test/tools/javac/api/6412656/T6412656.java
langtools/test/tools/javac/api/6415780/T6415780.java
langtools/test/tools/javac/api/6418694/T6418694.java
langtools/test/tools/javac/api/6420409/T6420409.java
langtools/test/tools/javac/api/6420464/T6420464.java
langtools/test/tools/javac/api/6421111/T6421111.java
langtools/test/tools/javac/api/6421756/T6421756.java
langtools/test/tools/javac/api/6422215/T6422215.java
langtools/test/tools/javac/api/6422327/T6422327.java
langtools/test/tools/javac/api/6423003/T6423003.java
langtools/test/tools/javac/api/6431257/T6431257.java
langtools/test/tools/javac/api/6431435/T6431435.java
langtools/test/tools/javac/api/6437349/T6437349.java
langtools/test/tools/javac/api/6437999/T6437999.java
langtools/test/tools/javac/api/6440333/T6440333.java
langtools/test/tools/javac/api/6440528/T6440528.java
langtools/test/tools/javac/api/6452876/T6452876.java
langtools/test/tools/javac/api/6468404/T6468404.java
langtools/test/tools/javac/api/6471599/Main.java
langtools/test/tools/javac/api/6557752/T6557752.java
langtools/test/tools/javac/api/6598108/T6598108.java
langtools/test/tools/javac/api/6608214/T6608214.java
langtools/test/tools/javac/api/6731573/T6731573.java
langtools/test/tools/javac/api/6733837/T6733837.java
langtools/test/tools/javac/api/6852595/T6852595.java
langtools/test/tools/javac/api/7086261/T7086261.java
langtools/test/tools/javac/api/8007344/Test.java
langtools/test/tools/javac/api/EndPositions.java
langtools/test/tools/javac/api/Sibling.java
langtools/test/tools/javac/api/T6257235.java
langtools/test/tools/javac/api/T6258271.java
langtools/test/tools/javac/api/T6265137.java
langtools/test/tools/javac/api/T6306137.java
langtools/test/tools/javac/api/T6345974.java
langtools/test/tools/javac/api/T6357331.java
langtools/test/tools/javac/api/T6358786.java
langtools/test/tools/javac/api/T6358955.java
langtools/test/tools/javac/api/T6392782.java
langtools/test/tools/javac/api/T6395981.java
langtools/test/tools/javac/api/T6397104.java
langtools/test/tools/javac/api/T6400205.java
langtools/test/tools/javac/api/T6400207.java
langtools/test/tools/javac/api/T6407011.java
langtools/test/tools/javac/api/T6412669.java
langtools/test/tools/javac/api/T6419926.java
langtools/test/tools/javac/api/T6430241.java
langtools/test/tools/javac/api/T6431879.java
langtools/test/tools/javac/api/T6437138.java
langtools/test/tools/javac/api/T6483788.java
langtools/test/tools/javac/api/T6501502.java
langtools/test/tools/javac/api/T6838467.java
langtools/test/tools/javac/api/T6877206.java
langtools/test/tools/javac/api/TestClientCodeWrapper.java
langtools/test/tools/javac/api/TestContainTypes.java
langtools/test/tools/javac/api/TestDocComments.java
langtools/test/tools/javac/api/TestEvalExpression.java
langtools/test/tools/javac/api/TestGetElement.java
langtools/test/tools/javac/api/TestGetElementReference.java
langtools/test/tools/javac/api/TestGetScope.java
langtools/test/tools/javac/api/TestGetTree.java
langtools/test/tools/javac/api/TestJavacTask.java
langtools/test/tools/javac/api/TestJavacTaskScanner.java
langtools/test/tools/javac/api/TestJavacTask_Lock.java
langtools/test/tools/javac/api/TestJavacTask_Multiple.java
langtools/test/tools/javac/api/TestJavacTask_ParseAttrGen.java
langtools/test/tools/javac/api/TestOperators.java
langtools/test/tools/javac/api/TestResolveError.java
langtools/test/tools/javac/api/TestResolveIdent.java
langtools/test/tools/javac/api/TestSearchPaths.java
langtools/test/tools/javac/api/TestTreePath.java
langtools/test/tools/javac/api/TestTrees.java
langtools/test/tools/javac/api/ToolProvider/HelloWorldTest.java
langtools/test/tools/javac/api/ToolProvider/ToolProviderTest1.java
langtools/test/tools/javac/api/ToolProvider/ToolProviderTest2.java
langtools/test/tools/javac/api/file/SJFM_AsPath.java
langtools/test/tools/javac/api/file/SJFM_GetFileObjects.java
langtools/test/tools/javac/api/file/SJFM_IsSameFile.java
langtools/test/tools/javac/api/file/SJFM_Locations.java
langtools/test/tools/javac/api/guide/Test.java
langtools/test/tools/javac/api/taskListeners/CompileEvent.java
langtools/test/tools/javac/api/taskListeners/EventsBalancedTest.java
langtools/test/tools/javac/api/taskListeners/TestSimpleAddRemove.java
langtools/test/tools/javac/cast/intersection/IntersectionTypeCastTest.java
langtools/test/tools/javac/cast/intersection/IntersectionTypeParserTest.java
langtools/test/tools/javac/cast/intersection/model/Model01.java
langtools/test/tools/javac/classfiles/ClassVersionChecker.java
langtools/test/tools/javac/classfiles/InnerClasses/SyntheticClasses.java
langtools/test/tools/javac/classfiles/InnerClasses/T8068517.java
langtools/test/tools/javac/classfiles/attributes/AnnotationDefault/AnnotationDefaultTest.java
langtools/test/tools/javac/classfiles/attributes/EnclosingMethod/EnclosingMethodTest.java
langtools/test/tools/javac/classfiles/attributes/LineNumberTable/LineNumberTest.java
langtools/test/tools/javac/classfiles/attributes/LocalVariableTable/LocalVariableTableTest.java
langtools/test/tools/javac/classfiles/attributes/LocalVariableTable/LocalVariableTypeTableTest.java
langtools/test/tools/javac/classfiles/attributes/Signature/ConstructorTest.java
langtools/test/tools/javac/classfiles/attributes/Signature/EnumTest.java
langtools/test/tools/javac/classfiles/attributes/Signature/ExceptionTest.java
langtools/test/tools/javac/classfiles/attributes/Signature/FieldTest.java
langtools/test/tools/javac/classfiles/attributes/Signature/InnerClassTest.java
langtools/test/tools/javac/classfiles/attributes/Signature/MethodParameterTest.java
langtools/test/tools/javac/classfiles/attributes/Signature/MethodTypeBoundTest.java
langtools/test/tools/javac/classfiles/attributes/Signature/ReturnTypeTest.java
langtools/test/tools/javac/classfiles/attributes/SourceFile/AnonymousClassTest.java
langtools/test/tools/javac/classfiles/attributes/SourceFile/InnerClassTest.java
langtools/test/tools/javac/classfiles/attributes/SourceFile/LocalClassTest.java
langtools/test/tools/javac/classfiles/attributes/SourceFile/MixTest.java
langtools/test/tools/javac/classfiles/attributes/SourceFile/NoSourceFileAttribute.java
langtools/test/tools/javac/classfiles/attributes/SourceFile/SyntheticClassTest.java
langtools/test/tools/javac/classfiles/attributes/SourceFile/TopLevelClassesOneFileTest.java
langtools/test/tools/javac/classfiles/attributes/deprecated/DeprecatedPackageTest.java
langtools/test/tools/javac/classfiles/attributes/deprecated/DeprecatedTest.java
langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerAnnotationsInInnerAnnotationTest.java
langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerAnnotationsInInnerClassTest.java
langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerAnnotationsInInnerEnumTest.java
langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerAnnotationsInInnerInterfaceTest.java
langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerClassesHierarchyTest.java
langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerClassesInAnonymousClassTest.java
langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerClassesInInnerAnnotationTest.java
langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerClassesInInnerClassTest.java
langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerClassesInInnerEnumTest.java
langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerClassesInInnerInterfaceTest.java
langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerClassesInLocalClassTest.java
langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerClassesIndexTest.java
langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerClassesTest.java
langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerEnumInInnerAnnotationTest.java
langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerEnumInInnerEnumTest.java
langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerEnumInInnerInterfaceTest.java
langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerEnumsInInnerClassTest.java
langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerInterfacesInInnerAnnotationTest.java
langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerInterfacesInInnerClassTest.java
langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerInterfacesInInnerEnumTest.java
langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerInterfacesInInnerInterfaceTest.java
langtools/test/tools/javac/classfiles/attributes/innerclasses/NoInnerClassesTest.java
langtools/test/tools/javac/classreader/BadClass.java
langtools/test/tools/javac/classreader/T7031108.java
langtools/test/tools/javac/code/ArrayClone.java
langtools/test/tools/javac/constDebug/ConstDebugTest.java
langtools/test/tools/javac/defaultMethods/AssertionsTest.java
langtools/test/tools/javac/defaultMethods/BadClassfile.java
langtools/test/tools/javac/defaultMethods/CheckACC_STRICTFlagOnDefaultMethodTest.java
langtools/test/tools/javac/defaultMethods/DefaultMethodFlags.java
langtools/test/tools/javac/defaultMethods/TestDefaultBody.java
langtools/test/tools/javac/defaultMethods/TestNoBridgeOnDefaults.java
langtools/test/tools/javac/defaultMethods/static/hiding/InterfaceMethodHidingTest.java
langtools/test/tools/javac/defaultMethods/super/TestDefaultSuperCall.java
langtools/test/tools/javac/defaultMethods/super/TestDirectSuperInterfaceInvoke.java
langtools/test/tools/javac/defaultMethods/syntax/TestDefaultMethodsSyntax.java
langtools/test/tools/javac/defaultMethodsVisibility/DefaultMethodsNotVisibleForSourceLessThan8Test.java
langtools/test/tools/javac/diags/CheckExamples.java
langtools/test/tools/javac/diags/CheckResourceKeys.java
langtools/test/tools/javac/diags/MessageInfo.java
langtools/test/tools/javac/diags/RunExamples.java
langtools/test/tools/javac/doclint/DocLintTest.java
langtools/test/tools/javac/doclint/IncludePackagesTest.java
langtools/test/tools/javac/doctree/AttrTest.java
langtools/test/tools/javac/doctree/AuthorTest.java
langtools/test/tools/javac/doctree/BadTest.java
langtools/test/tools/javac/doctree/CodeTest.java
langtools/test/tools/javac/doctree/DeprecatedTest.java
langtools/test/tools/javac/doctree/DocRootTest.java
langtools/test/tools/javac/doctree/DocTreePathScannerTest.java
langtools/test/tools/javac/doctree/ElementTest.java
langtools/test/tools/javac/doctree/EntityTest.java
langtools/test/tools/javac/doctree/ExceptionTest.java
langtools/test/tools/javac/doctree/FirstSentenceTest.java
langtools/test/tools/javac/doctree/InheritDocTest.java
langtools/test/tools/javac/doctree/LinkPlainTest.java
langtools/test/tools/javac/doctree/LinkTest.java
langtools/test/tools/javac/doctree/LiteralTest.java
langtools/test/tools/javac/doctree/ParamTest.java
langtools/test/tools/javac/doctree/ReferenceTest.java
langtools/test/tools/javac/doctree/ReturnTest.java
langtools/test/tools/javac/doctree/SeeTest.java
langtools/test/tools/javac/doctree/SerialDataTest.java
langtools/test/tools/javac/doctree/SerialFieldTest.java
langtools/test/tools/javac/doctree/SerialTest.java
langtools/test/tools/javac/doctree/SimpleDocTreeVisitorTest.java
langtools/test/tools/javac/doctree/SinceTest.java
langtools/test/tools/javac/doctree/TagTest.java
langtools/test/tools/javac/doctree/ThrowableTest.java
langtools/test/tools/javac/doctree/ValueTest.java
langtools/test/tools/javac/doctree/VersionTest.java
langtools/test/tools/javac/doctree/positions/TestPosition.java
langtools/test/tools/javac/enum/6350057/T6350057.java
langtools/test/tools/javac/enum/6424358/T6424358.java
langtools/test/tools/javac/expression/_super/NonDirectSuper/NonDirectSuper.java
langtools/test/tools/javac/failover/CheckAttributedTree.java
langtools/test/tools/javac/fatalErrors/NoJavaLangTest.java
langtools/test/tools/javac/file/BootClassPathPrepend.java
langtools/test/tools/javac/file/ExplodedImage.java
langtools/test/tools/javac/file/T7018098.java
langtools/test/tools/javac/file/T7068437.java
langtools/test/tools/javac/file/T7068451.java
langtools/test/tools/javac/file/zip/8003512/LoadClassFromJava6CreatedJarTest.java
langtools/test/tools/javac/file/zip/T6836682.java
langtools/test/tools/javac/file/zip/T6865530.java
langtools/test/tools/javac/flow/LVTHarness.java
langtools/test/tools/javac/generics/6413682/TestPos.java
langtools/test/tools/javac/generics/bridges/BridgeHarness.java
langtools/test/tools/javac/generics/diamond/6996914/T6996914a.java
langtools/test/tools/javac/generics/diamond/7030150/GenericConstructorAndDiamondTest.java
langtools/test/tools/javac/generics/diamond/7030687/ParserTest.java
langtools/test/tools/javac/generics/diamond/7046778/DiamondAndInnerClassTest.java
langtools/test/tools/javac/generics/inference/7086601/T7086601b.java
langtools/test/tools/javac/generics/rawOverride/7062745/GenericOverrideTest.java
langtools/test/tools/javac/importscope/ImportDependenciesTest.java
langtools/test/tools/javac/importscope/ImportMembersTest.java
langtools/test/tools/javac/importscope/NegativeCyclicDependencyTest.java
langtools/test/tools/javac/importscope/TestDuplicateImport.java
langtools/test/tools/javac/importscope/TestLazyImportScope.java
langtools/test/tools/javac/importscope/dependencies/DependenciesTest.java
langtools/test/tools/javac/innerClassFile/InnerClassFileTest.java
langtools/test/tools/javac/javazip/JavaZipTest.java
langtools/test/tools/javac/jvm/ClassRefDupInConstantPoolTest.java
langtools/test/tools/javac/lambda/BadLambdaExpr.java
langtools/test/tools/javac/lambda/ByteCodeTest.java
langtools/test/tools/javac/lambda/FunctionalInterfaceConversionTest.java
langtools/test/tools/javac/lambda/LambdaInnerTypeVarReflect.java
langtools/test/tools/javac/lambda/LambdaParserTest.java
langtools/test/tools/javac/lambda/LambdaTestStrictFPFlag.java
langtools/test/tools/javac/lambda/LocalVariableTable.java
langtools/test/tools/javac/lambda/MethodReferenceParserTest.java
langtools/test/tools/javac/lambda/T8031967.java
langtools/test/tools/javac/lambda/TestInvokeDynamic.java
langtools/test/tools/javac/lambda/TestLambdaToMethodStats.java
langtools/test/tools/javac/lambda/TestSelfRef.java
langtools/test/tools/javac/lambda/abort/Abort.java
langtools/test/tools/javac/lambda/abort/CompletionFailure.java
langtools/test/tools/javac/lambda/bridge/TestMetafactoryBridges.java
langtools/test/tools/javac/lambda/bytecode/TestLambdaBytecode.java
langtools/test/tools/javac/lambda/funcInterfaces/LambdaTest2_SAM1.java
langtools/test/tools/javac/lambda/funcInterfaces/LambdaTest2_SAM2.java
langtools/test/tools/javac/lambda/funcInterfaces/LambdaTest2_SAM3.java
langtools/test/tools/javac/lambda/intersection/IntersectionTargetTypeTest.java
langtools/test/tools/javac/lambda/lambdaExpression/SamConversionComboTest.java
langtools/test/tools/javac/lambda/lambdaNaming/TestNonSerializableLambdaNameStability.java
langtools/test/tools/javac/lambda/lambdaNaming/TestSerializedLambdaNameStability.java
langtools/test/tools/javac/lambda/methodReference/SamConversionComboTest.java
langtools/test/tools/javac/lambda/mostSpecific/StructuralMostSpecificTest.java
langtools/test/tools/javac/lambda/typeInference/combo/TypeInferenceComboTest.java
langtools/test/tools/javac/lib/DPrinter.java
langtools/test/tools/javac/limits/NestedClassConstructorArgs.java
langtools/test/tools/javac/limits/NestedClassMethodArgs.java
langtools/test/tools/javac/limits/StaticNestedClassConstructorArgs.java
langtools/test/tools/javac/limits/TopLevelClassConstructorArgs.java
langtools/test/tools/javac/limits/TopLevelClassMethodArgs.java
langtools/test/tools/javac/limits/TopLevelClassStaticMethodArgs.java
langtools/test/tools/javac/linenumbers/ConditionalLineNumberTest.java
langtools/test/tools/javac/linenumbers/NestedLineNumberTest.java
langtools/test/tools/javac/links/LinksTest.java
langtools/test/tools/javac/main/Option_J_At_Test.java
langtools/test/tools/javac/main/T8058445.java
langtools/test/tools/javac/meth/TestCP.java
langtools/test/tools/javac/multicatch/7005371/T7005371.java
langtools/test/tools/javac/multicatch/7030606/DisjunctiveTypeWellFormednessTest.java
langtools/test/tools/javac/multicatch/Pos05.java
langtools/test/tools/javac/multicatch/model/ModelChecker.java
langtools/test/tools/javac/nativeHeaders/NativeHeaderTest.java
langtools/test/tools/javac/nativeHeaders/javahComparison/CompareTest.java
langtools/test/tools/javac/newlines/NewLineTest.java
langtools/test/tools/javac/options/T6986895.java
langtools/test/tools/javac/options/T7022337.java
langtools/test/tools/javac/options/modes/AtFilesTest.java
langtools/test/tools/javac/options/modes/DocLintTest.java
langtools/test/tools/javac/options/modes/FSInfoTest.java
langtools/test/tools/javac/options/modes/InfoOptsTest.java
langtools/test/tools/javac/options/modes/NoOperandsTest.java
langtools/test/tools/javac/options/modes/OutputDirTest.java
langtools/test/tools/javac/options/modes/ProfileBootClassPathTest.java
langtools/test/tools/javac/options/modes/ProfileTargetTest.java
langtools/test/tools/javac/options/modes/SourceTargetTest.java
langtools/test/tools/javac/options/modes/StdOutTest.java
langtools/test/tools/javac/options/xprefer/XPreferTest.java
langtools/test/tools/javac/parser/ExtraSemiTest.java
langtools/test/tools/javac/parser/JavacParserTest.java
langtools/test/tools/javac/parser/StringFoldingTest.java
langtools/test/tools/javac/parser/T4910483.java
langtools/test/tools/javac/parser/extend/JavacExtensionTest.java
langtools/test/tools/javac/plugin/showtype/Test.java
langtools/test/tools/javac/policy/test1/Test1b.java
langtools/test/tools/javac/policy/test3/Test.java
langtools/test/tools/javac/positions/T6402077.java
langtools/test/tools/javac/positions/T6404194.java
langtools/test/tools/javac/positions/TreeEndPosTest.java
langtools/test/tools/javac/processing/6348193/T6348193.java
langtools/test/tools/javac/processing/6348499/T6348499.java
langtools/test/tools/javac/processing/6350124/T6350124.java
langtools/test/tools/javac/processing/6359313/T6359313.java
langtools/test/tools/javac/processing/6365040/T6365040.java
langtools/test/tools/javac/processing/6378728/T6378728.java
langtools/test/tools/javac/processing/6413690/T6413690.java
langtools/test/tools/javac/processing/6414633/T6414633.java
langtools/test/tools/javac/processing/6430209/T6430209.java
langtools/test/tools/javac/processing/6499119/ClassProcessor.java
langtools/test/tools/javac/processing/6511613/clss41701.java
langtools/test/tools/javac/processing/6511613/clss41701.out
langtools/test/tools/javac/processing/6512707/T6512707.java
langtools/test/tools/javac/processing/6634138/T6634138.java
langtools/test/tools/javac/processing/6994946/SemanticErrorTest.1.out
langtools/test/tools/javac/processing/6994946/SemanticErrorTest.2.out
langtools/test/tools/javac/processing/6994946/SemanticErrorTest.java
langtools/test/tools/javac/processing/6994946/SyntaxErrorTest.java
langtools/test/tools/javac/processing/6994946/SyntaxErrorTest.out
langtools/test/tools/javac/processing/T6439826.java
langtools/test/tools/javac/processing/T6920317.java
langtools/test/tools/javac/processing/T7196462.java
langtools/test/tools/javac/processing/TestMultipleErrors.java
langtools/test/tools/javac/processing/TestMultipleErrors.out
langtools/test/tools/javac/processing/TestWarnErrorCount.java
langtools/test/tools/javac/processing/completion/TestCompletions.java
langtools/test/tools/javac/processing/environment/ProcessingEnvAnnoDiscovery.java
langtools/test/tools/javac/processing/environment/TestSourceVersion.java
langtools/test/tools/javac/processing/environment/round/TestContext.java
langtools/test/tools/javac/processing/environment/round/TestElementsAnnotatedWith.java
langtools/test/tools/javac/processing/errors/CrashOnNonExistingAnnotation/Source.java
langtools/test/tools/javac/processing/errors/EnsureAnnotationTypeMismatchException/Source.java
langtools/test/tools/javac/processing/errors/EnsureMirroredTypeException/Source.java
langtools/test/tools/javac/processing/errors/EnsureMirroredTypeException/Source.out
langtools/test/tools/javac/processing/errors/StopOnInapplicableAnnotations/GenerateFunctionalInterface.java
langtools/test/tools/javac/processing/errors/StopOnInapplicableAnnotations/Source.java
langtools/test/tools/javac/processing/errors/TestBadProcessor.java
langtools/test/tools/javac/processing/errors/TestClassNames.java
langtools/test/tools/javac/processing/errors/TestErrorCount.java
langtools/test/tools/javac/processing/errors/TestFatalityOfParseErrors.java
langtools/test/tools/javac/processing/errors/TestOptionSyntaxErrors.java
langtools/test/tools/javac/processing/errors/TestParseErrors/TestParseErrors.java
langtools/test/tools/javac/processing/errors/TestReturnCode.java
langtools/test/tools/javac/processing/errors/TestSuppression.java
langtools/test/tools/javac/processing/filer/TestFilerConstraints.java
langtools/test/tools/javac/processing/filer/TestGetResource.java
langtools/test/tools/javac/processing/filer/TestGetResource2.java
langtools/test/tools/javac/processing/filer/TestInvalidRelativeNames.java
langtools/test/tools/javac/processing/filer/TestLastRound.java
langtools/test/tools/javac/processing/filer/TestPackageInfo.java
langtools/test/tools/javac/processing/filer/TestValidRelativeNames.java
langtools/test/tools/javac/processing/loader/testClose/TestClose.java
langtools/test/tools/javac/processing/loader/testClose/TestClose2.java
langtools/test/tools/javac/processing/messager/6362067/T6362067.java
langtools/test/tools/javac/processing/messager/6362067/T6362067.out
langtools/test/tools/javac/processing/messager/MessagerBasics.java
langtools/test/tools/javac/processing/messager/MessagerDiags.java
langtools/test/tools/javac/processing/model/6194785/T6194785.java
langtools/test/tools/javac/processing/model/6341534/T6341534.java
langtools/test/tools/javac/processing/model/TestExceptions.java
langtools/test/tools/javac/processing/model/TestSourceVersion.java
langtools/test/tools/javac/processing/model/TestSymtabItems.java
langtools/test/tools/javac/processing/model/element/8009367/TestQualifiedNameUsed.java
langtools/test/tools/javac/processing/model/element/TestAnonClassNames.java
langtools/test/tools/javac/processing/model/element/TestElement.java
langtools/test/tools/javac/processing/model/element/TestEmptyContainer.java
langtools/test/tools/javac/processing/model/element/TestExecutableElement.java
langtools/test/tools/javac/processing/model/element/TestMissingElement/TestMissingElement.java
langtools/test/tools/javac/processing/model/element/TestMissingElement2/TestMissingClass.java
langtools/test/tools/javac/processing/model/element/TestMissingElement2/TestMissingGenericClass1.java
langtools/test/tools/javac/processing/model/element/TestMissingElement2/TestMissingGenericClass2.java
langtools/test/tools/javac/processing/model/element/TestMissingElement2/TestMissingGenericInterface1.java
langtools/test/tools/javac/processing/model/element/TestMissingElement2/TestMissingGenericInterface2.java
langtools/test/tools/javac/processing/model/element/TestMissingElement2/TestMissingInterface.java
langtools/test/tools/javac/processing/model/element/TestNames.java
langtools/test/tools/javac/processing/model/element/TestNonInherited.java
langtools/test/tools/javac/processing/model/element/TestPackageElement.java
langtools/test/tools/javac/processing/model/element/TestResourceElement.java
langtools/test/tools/javac/processing/model/element/TestResourceVariable.java
langtools/test/tools/javac/processing/model/element/TestTypeElement.java
langtools/test/tools/javac/processing/model/element/TestTypeParameter.java
langtools/test/tools/javac/processing/model/element/TestTypeParameterAnnotations.java
langtools/test/tools/javac/processing/model/element/TypeParamBounds.java
langtools/test/tools/javac/processing/model/element/repeatingAnnotations/MixRepeatableAndOfficialContainerBasicTest.java
langtools/test/tools/javac/processing/model/element/repeatingAnnotations/MixRepeatableAndOfficialContainerInheritedA1Test.java
langtools/test/tools/javac/processing/model/element/repeatingAnnotations/MixRepeatableAndOfficialContainerInheritedA2Test.java
langtools/test/tools/javac/processing/model/element/repeatingAnnotations/MixRepeatableAndOfficialContainerInheritedB1Test.java
langtools/test/tools/javac/processing/model/element/repeatingAnnotations/MixRepeatableAndOfficialContainerInheritedB2Test.java
langtools/test/tools/javac/processing/model/element/repeatingAnnotations/MixSingularAndUnofficialContainerBasicTest.java
langtools/test/tools/javac/processing/model/element/repeatingAnnotations/MixSingularAndUnofficialContainerInheritedA1Test.java
langtools/test/tools/javac/processing/model/element/repeatingAnnotations/MixSingularAndUnofficialContainerInheritedA2Test.java
langtools/test/tools/javac/processing/model/element/repeatingAnnotations/MixSingularAndUnofficialContainerInheritedB1Test.java
langtools/test/tools/javac/processing/model/element/repeatingAnnotations/MixSingularAndUnofficialContainerInheritedB2Test.java
langtools/test/tools/javac/processing/model/element/repeatingAnnotations/OfficialContainerBasicTest.java
langtools/test/tools/javac/processing/model/element/repeatingAnnotations/OfficialContainerInheritedTest.java
langtools/test/tools/javac/processing/model/element/repeatingAnnotations/RepeatableBasicTest.java
langtools/test/tools/javac/processing/model/element/repeatingAnnotations/RepeatableInheritedTest.java
langtools/test/tools/javac/processing/model/element/repeatingAnnotations/RepeatableOfficialContainerBasicTest.java
langtools/test/tools/javac/processing/model/element/repeatingAnnotations/RepeatableOfficialContainerInheritedTest.java
langtools/test/tools/javac/processing/model/element/repeatingAnnotations/RepeatableOverrideATest.java
langtools/test/tools/javac/processing/model/element/repeatingAnnotations/RepeatableOverrideBTest.java
langtools/test/tools/javac/processing/model/element/repeatingAnnotations/SingularBasicTest.java
langtools/test/tools/javac/processing/model/element/repeatingAnnotations/SingularInheritedATest.java
langtools/test/tools/javac/processing/model/element/repeatingAnnotations/SingularInheritedBTest.java
langtools/test/tools/javac/processing/model/element/repeatingAnnotations/UnofficialContainerBasicTest.java
langtools/test/tools/javac/processing/model/element/repeatingAnnotations/UnofficialContainerInheritedTest.java
langtools/test/tools/javac/processing/model/inheritedByType/EnsureOrder.java
langtools/test/tools/javac/processing/model/testgetallmembers/Main.java
langtools/test/tools/javac/processing/model/trees/OnDemandAttribution.java
langtools/test/tools/javac/processing/model/type/BasicAnnoTests.java
langtools/test/tools/javac/processing/model/type/BoundsTest.java
langtools/test/tools/javac/processing/model/type/InheritedAP.java
langtools/test/tools/javac/processing/model/type/IntersectionPropertiesTest.java
langtools/test/tools/javac/processing/model/type/MirroredTypeEx/NpeTest.java
langtools/test/tools/javac/processing/model/type/MirroredTypeEx/OverEager.java
langtools/test/tools/javac/processing/model/type/MirroredTypeEx/Plurality.java
langtools/test/tools/javac/processing/model/type/NoTypes.java
langtools/test/tools/javac/processing/model/type/TestTypeKind.java
langtools/test/tools/javac/processing/model/type/TestUnionType.java
langtools/test/tools/javac/processing/model/util/BinaryName.java
langtools/test/tools/javac/processing/model/util/DirectSuperOfInt.java
langtools/test/tools/javac/processing/model/util/GetTypeElemBadArg.java
langtools/test/tools/javac/processing/model/util/NoSupers.java
langtools/test/tools/javac/processing/model/util/OverridesSpecEx.java
langtools/test/tools/javac/processing/model/util/TestIntersectionTypeVisitors.java
langtools/test/tools/javac/processing/model/util/TypesBadArg.java
langtools/test/tools/javac/processing/model/util/deprecation/TestDeprecation.java
langtools/test/tools/javac/processing/model/util/directSupersOfErr/DirectSupersOfErr.java
langtools/test/tools/javac/processing/model/util/elements/TestGetConstantExpression.java
langtools/test/tools/javac/processing/model/util/elements/TestGetPackageOf.java
langtools/test/tools/javac/processing/model/util/elements/TestIsFunctionalInterface.java
langtools/test/tools/javac/processing/model/util/elements/doccomments/TestDocComments.java
langtools/test/tools/javac/processing/model/util/elements/doccomments/TestPackageInfoComments.java
langtools/test/tools/javac/processing/model/util/filter/TestIterables.java
langtools/test/tools/javac/processing/options/TestImplicitNone.java
langtools/test/tools/javac/processing/options/Xprint.java
langtools/test/tools/javac/processing/options/testCommandLineClasses/Test.java
langtools/test/tools/javac/processing/options/testPrintProcessorInfo/Test.java
langtools/test/tools/javac/processing/options/testPrintProcessorInfo/TestWithXstdout.java
langtools/test/tools/javac/processing/rounds/BaseClassesNotReRead.java
langtools/test/tools/javac/processing/rounds/ClassDependingOnGenerated.java
langtools/test/tools/javac/processing/rounds/CompleteOnClosed.java
langtools/test/tools/javac/processing/rounds/MethodsDroppedBetweenRounds.java
langtools/test/tools/javac/processing/rounds/OverwriteBetweenCompilations.java
langtools/test/tools/javac/processing/rounds/TypesCachesCleared.java
langtools/test/tools/javac/processing/warnings/TestSourceVersionWarnings.java
langtools/test/tools/javac/processing/warnings/UseImplicit/TestProcUseImplicitWarning.java
langtools/test/tools/javac/processing/werror/WError1.java
langtools/test/tools/javac/processing/werror/WErrorGen.java
langtools/test/tools/javac/processing/werror/WErrorLast.java
langtools/test/tools/javac/profiles/ProfileOptionTest.java
langtools/test/tools/javac/profiles/ProfileTest.java
langtools/test/tools/javac/proprietary/WarnClass.java
langtools/test/tools/javac/proprietary/WarnMethod.java
langtools/test/tools/javac/proprietary/WarnVariable.java
langtools/test/tools/javac/proprietary/WarnWildcard.java
langtools/test/tools/javac/resolve/ResolveHarness.java
langtools/test/tools/javac/scope/7017664/CompoundScopeTest.java
langtools/test/tools/javac/scope/7017664/ImplementationCacheTest.java
langtools/test/tools/javac/scope/7046348/EagerInterfaceCompletionTest.java
langtools/test/tools/javac/scope/DupUnsharedTest.java
langtools/test/tools/javac/scope/HashCollisionTest.java
langtools/test/tools/javac/scope/StarImportTest.java
langtools/test/tools/javac/stackmap/StackMapTest.java
langtools/test/tools/javac/synthesize/Main.java
langtools/test/tools/javac/tree/8067914/NukeExtraCast.java
langtools/test/tools/javac/tree/ArrayTypeToString.java
langtools/test/tools/javac/tree/ClassTreeTest.java
langtools/test/tools/javac/tree/DocCommentToplevelTest.java
langtools/test/tools/javac/tree/JavacTreeScannerTest.java
langtools/test/tools/javac/tree/MakeLiteralTest.java
langtools/test/tools/javac/tree/MakeQualIdent.java
langtools/test/tools/javac/tree/MakeTypeTest.java
langtools/test/tools/javac/tree/MissingSemicolonTest.java
langtools/test/tools/javac/tree/NewArrayPretty.java
langtools/test/tools/javac/tree/NoPrivateTypesExported.java
langtools/test/tools/javac/tree/PrettySimpleStringTest.java
langtools/test/tools/javac/tree/ScopeTest.java
langtools/test/tools/javac/tree/SourceTreeScannerTest.java
langtools/test/tools/javac/tree/T6963934.java
langtools/test/tools/javac/tree/T6993305.java
langtools/test/tools/javac/tree/T8024415.java
langtools/test/tools/javac/tree/TestToString.java
langtools/test/tools/javac/tree/TreeKindTest.java
langtools/test/tools/javac/tree/TreePosRoundsTest.java
langtools/test/tools/javac/tree/TreePosTest.java
langtools/test/tools/javac/tree/TypeAnnotationsPretty.java
langtools/test/tools/javac/treeannotests/AnnoTreeTests.java
langtools/test/tools/javac/types/BoxingConversionTest.java
langtools/test/tools/javac/types/CastTest.java
langtools/test/tools/javac/types/GenericTypeWellFormednessTest.java
langtools/test/tools/javac/types/PrimitiveConversionTest.java
langtools/test/tools/javac/types/TestComparisons.java
langtools/test/tools/javac/unicode/SupplementaryJavaID6.java
langtools/test/tools/javac/unit/T6198196.java
langtools/test/tools/javac/unit/util/convert/EnclosingCandidates.java
langtools/test/tools/javac/unit/util/list/AbstractList.java
langtools/test/tools/javac/unit/util/list/FromArray.java
langtools/test/tools/javac/util/BitsTest.java
langtools/test/tools/javac/util/NewlineOnlyDiagnostic.java
langtools/test/tools/javac/util/StringUtilsTest.java
langtools/test/tools/javac/util/T6597678.java
langtools/test/tools/javac/util/context/T7021650.java
langtools/test/tools/javac/util/filemanager/TestName.java
langtools/test/tools/javac/util/list/ListBufferTest.java
langtools/test/tools/javac/util/list/TList.java
langtools/test/tools/javac/varargs/6199075/T6199075.java
langtools/test/tools/javac/varargs/7042566/T7042566.java
langtools/test/tools/javac/varargs/7043922/T7043922.java
langtools/test/tools/javac/varargs/warning/Warn4.java
langtools/test/tools/javac/varargs/warning/Warn5.java
langtools/test/tools/javac/versions/SourceTargetTest.java
langtools/test/tools/javac/versions/Versions.java
langtools/test/tools/javac/warnings/6594914/T6594914b.java
langtools/test/tools/javac/warnings/6594914/T6594914b.out
langtools/test/tools/javac/warnings/VerifyLintDescriptions.java
langtools/test/tools/javac/warnings/suppress/Overridden.java
langtools/test/tools/javac/warnings/suppress/Overridden.out
langtools/test/tools/javac/warnings/suppress/T6480588.java
langtools/test/tools/javac/warnings/suppress/T6480588.out
langtools/test/tools/javac/warnings/suppress/T6707032.java
langtools/test/tools/javac/warnings/suppress/T6707032.out
langtools/test/tools/javac/warnings/suppress/T8021112b.java
langtools/test/tools/javac/warnings/suppress/T8021112b.out
langtools/test/tools/javac/warnings/suppress/T8069094.java
langtools/test/tools/javac/warnings/suppress/T8069094.out
langtools/test/tools/javac/warnings/suppress/TypeAnnotations.java
langtools/test/tools/javadoc/6176978/T6176978.java
langtools/test/tools/javadoc/6227454/Test.java
langtools/test/tools/javadoc/6942366/T6942366.java
langtools/test/tools/javadoc/6958836/Test.java
langtools/test/tools/javadoc/6964914/Test.java
langtools/test/tools/javadoc/6964914/TestUserDoclet.java
langtools/test/tools/javadoc/8025693/Test.java
langtools/test/tools/javadoc/BooleanConst.java
langtools/test/tools/javadoc/BreakIteratorWarning.java
langtools/test/tools/javadoc/CheckResourceKeys.java
langtools/test/tools/javadoc/FlagsTooEarly.java
langtools/test/tools/javadoc/InlineTagsWithBraces.java
langtools/test/tools/javadoc/LangVers.java
langtools/test/tools/javadoc/MaxWarns.java
langtools/test/tools/javadoc/MethodLinks.java
langtools/test/tools/javadoc/NoStar.java
langtools/test/tools/javadoc/T4696488.java
langtools/test/tools/javadoc/T4994049/T4994049.java
langtools/test/tools/javadoc/T6551367.java
langtools/test/tools/javadoc/T6968833.java
langtools/test/tools/javadoc/XWerror.java
langtools/test/tools/javadoc/annotations/annotateMethodsFields/Main.java
langtools/test/tools/javadoc/annotations/annotatePackage/Main.java
langtools/test/tools/javadoc/annotations/annotateParams/Main.java
langtools/test/tools/javadoc/annotations/badVals/Main.java
langtools/test/tools/javadoc/annotations/defaults/Main.java
langtools/test/tools/javadoc/annotations/elementTypes/Main.java
langtools/test/tools/javadoc/annotations/missing/Main.java
langtools/test/tools/javadoc/annotations/shortcuts/Main.java
langtools/test/tools/javadoc/api/basic/DocletPathTest.java
langtools/test/tools/javadoc/api/basic/DocumentationToolLocationTest.java
langtools/test/tools/javadoc/api/basic/GetSourceVersionsTest.java
langtools/test/tools/javadoc/api/basic/GetTask_DiagListenerTest.java
langtools/test/tools/javadoc/api/basic/GetTask_DocletClassTest.java
langtools/test/tools/javadoc/api/basic/GetTask_FileManagerTest.java
langtools/test/tools/javadoc/api/basic/GetTask_FileObjectsTest.java
langtools/test/tools/javadoc/api/basic/GetTask_OptionsTest.java
langtools/test/tools/javadoc/api/basic/GetTask_WriterTest.java
langtools/test/tools/javadoc/api/basic/IsSupportedOptionTest.java
langtools/test/tools/javadoc/api/basic/JavadocTaskImplTest.java
langtools/test/tools/javadoc/api/basic/RunTest.java
langtools/test/tools/javadoc/api/basic/TagletPathTest.java
langtools/test/tools/javadoc/api/basic/Task_reuseTest.java
langtools/test/tools/javadoc/badSuper/BadSuper.java
langtools/test/tools/javadoc/completionFailure/CompletionFailure.java
langtools/test/tools/javadoc/doclint/DocLintTest.java
langtools/test/tools/javadoc/doclint/ImplicitHeadersTest.java
langtools/test/tools/javadoc/dupOk/DupOk.java
langtools/test/tools/javadoc/enum/docComments/Main.java
langtools/test/tools/javadoc/enum/enumType/Main.java
langtools/test/tools/javadoc/generics/genericClass/Main.java
langtools/test/tools/javadoc/generics/genericInnerAndOuter/Main.java
langtools/test/tools/javadoc/generics/genericInterface/Main.java
langtools/test/tools/javadoc/generics/genericMethod/Main.java
langtools/test/tools/javadoc/generics/genericSuper/Main.java
langtools/test/tools/javadoc/generics/supertypes/Main.java
langtools/test/tools/javadoc/generics/throwsGeneric/Main.java
langtools/test/tools/javadoc/generics/tparamCycle/Main.java
langtools/test/tools/javadoc/generics/tparamTagOnMethod/Main.java
langtools/test/tools/javadoc/generics/tparamTagOnType/Main.java
langtools/test/tools/javadoc/generics/wildcards/Main.java
langtools/test/tools/javadoc/imports/MissingImport.java
langtools/test/tools/javadoc/nestedClass/NestedClass.java
langtools/test/tools/javadoc/nonConstExprs/Test.java
langtools/test/tools/javadoc/outputRedirect/Test.java
langtools/test/tools/javadoc/parser/7091528/T7091528.java
langtools/test/tools/javadoc/sourceOnly/Test.java
langtools/test/tools/javadoc/sourceOption/SourceOption.java
langtools/test/tools/javadoc/subpackageIgnore/SubpackageIgnore.java
langtools/test/tools/javadoc/varArgs/Main.java
langtools/test/tools/javah/4942232/Test.java
langtools/test/tools/javah/6257087/T6257087.java
langtools/test/tools/javah/6572945/T6572945.java
langtools/test/tools/javah/T4942232/MissingParamClassTest.java
langtools/test/tools/javah/T5070898.java
langtools/test/tools/javah/T6893943.java
langtools/test/tools/javah/T6994608.java
langtools/test/tools/javah/T7126832/T7126832.java
langtools/test/tools/javah/T7185778.java
langtools/test/tools/javah/TestHelpOpts.java
langtools/test/tools/javah/VersionTest.java
langtools/test/tools/javah/constMacroTest/ConstMacroTest.java
langtools/test/tools/javap/4111861/T4111861.java
langtools/test/tools/javap/4798312/JavapShouldLoadClassesFromRTJarTest.java
langtools/test/tools/javap/4866831/PublicInterfaceTest.java
langtools/test/tools/javap/4870651/T4870651.java
langtools/test/tools/javap/6937244/T6937244.java
langtools/test/tools/javap/6937244/T6937244A.java
langtools/test/tools/javap/8006334/JavapTaskCtorFailWithNPE.java
langtools/test/tools/javap/8007907/JavapReturns0AfterClassNotFoundTest.java
langtools/test/tools/javap/AccessModifiers.java
langtools/test/tools/javap/BadAttributeLength.java
langtools/test/tools/javap/BoundsTypeVariableTest.java
langtools/test/tools/javap/DescriptorTest.java
langtools/test/tools/javap/ExtPath.java
langtools/test/tools/javap/InvalidOptions.java
langtools/test/tools/javap/MethodParameters.java
langtools/test/tools/javap/StackMapTableTest.java
langtools/test/tools/javap/T4075403.java
langtools/test/tools/javap/T4459541.java
langtools/test/tools/javap/T4501660.java
langtools/test/tools/javap/T4501661.java
langtools/test/tools/javap/T4777949.java
langtools/test/tools/javap/T4876942.java
langtools/test/tools/javap/T4880663.java
langtools/test/tools/javap/T4880672.java
langtools/test/tools/javap/T4884240.java
langtools/test/tools/javap/T4975569.java
langtools/test/tools/javap/T6271787.java
langtools/test/tools/javap/T6474890.java
langtools/test/tools/javap/T6587786.java
langtools/test/tools/javap/T6622216.java
langtools/test/tools/javap/T6622232.java
langtools/test/tools/javap/T6622260.java
langtools/test/tools/javap/T6715251.java
langtools/test/tools/javap/T6715753.java
langtools/test/tools/javap/T6715767.java
langtools/test/tools/javap/T6716452.java
langtools/test/tools/javap/T6729471.java
langtools/test/tools/javap/T6824493.java
langtools/test/tools/javap/T6863746.java
langtools/test/tools/javap/T6866657.java
langtools/test/tools/javap/T6868539.java
langtools/test/tools/javap/T6879371.java
langtools/test/tools/javap/T6980017.java
langtools/test/tools/javap/T7004698.java
langtools/test/tools/javap/T7186925.java
langtools/test/tools/javap/T7190862.java
langtools/test/tools/javap/T8032814.java
langtools/test/tools/javap/T8032819.java
langtools/test/tools/javap/T8033180.java
langtools/test/tools/javap/T8033711.java
langtools/test/tools/javap/T8035104.java
langtools/test/tools/javap/T8038414.java
langtools/test/tools/javap/TestSuperclass.java
langtools/test/tools/javap/WhitespaceTest.java
langtools/test/tools/javap/classfile/T6887895.java
langtools/test/tools/javap/classfile/deps/T6907575.java
langtools/test/tools/javap/stackmap/StackmapTest.java
langtools/test/tools/javap/typeAnnotations/JSR175Annotations.java
langtools/test/tools/javap/typeAnnotations/NewArray.java
langtools/test/tools/javap/typeAnnotations/Presence.java
langtools/test/tools/javap/typeAnnotations/PresenceInner.java
langtools/test/tools/javap/typeAnnotations/T6855990.java
langtools/test/tools/javap/typeAnnotations/TypeCasts.java
langtools/test/tools/javap/typeAnnotations/Visibility.java
langtools/test/tools/javap/typeAnnotations/Wildcards.java
langtools/test/tools/jdeps/APIDeps.java
langtools/test/tools/jdeps/Basic.java
langtools/test/tools/jdeps/DotFileTest.java
langtools/test/tools/sjavac/CompileCircularSources.java
langtools/test/tools/sjavac/CompileExcludingDependency.java
langtools/test/tools/sjavac/CompileWithAtFile.java
langtools/test/tools/sjavac/CompileWithInvisibleSources.java
langtools/test/tools/sjavac/CompileWithOverrideSources.java
langtools/test/tools/sjavac/DependencyCollection.java
langtools/test/tools/sjavac/ExclPattern.java
langtools/test/tools/sjavac/IdleShutdown.java
langtools/test/tools/sjavac/IgnoreSymbolFile.java
langtools/test/tools/sjavac/IncCompInheritance.java
langtools/test/tools/sjavac/IncCompileChangeNative.java
langtools/test/tools/sjavac/IncCompileDropClasses.java
langtools/test/tools/sjavac/IncCompileFullyQualifiedRef.java
langtools/test/tools/sjavac/IncCompileNoChanges.java
langtools/test/tools/sjavac/IncCompileUpdateNative.java
langtools/test/tools/sjavac/IncCompileWithChanges.java
langtools/test/tools/sjavac/JavacOptionPrep.java
langtools/test/tools/sjavac/OptionDecoding.java
langtools/test/tools/sjavac/PackagePathMismatch.java
langtools/test/tools/sjavac/ParallelCompilations.java
langtools/test/tools/sjavac/PermittedArtifact.java
langtools/test/tools/sjavac/PooledExecution.java
langtools/test/tools/sjavac/Serialization.java
langtools/test/tools/sjavac/StateDir.java
--- a/langtools/test/com/sun/javadoc/5093723/T5093723.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/com/sun/javadoc/5093723/T5093723.java	Thu May 21 11:41:04 2015 -0700
@@ -26,6 +26,7 @@
  * @bug      5093723
  * @summary  REGRESSION: ClassCastException in SingleIndexWriter
  * @library ../lib
+ * @modules jdk.javadoc
  * @build    JavadocTester
  * @run main T5093723
  */
--- a/langtools/test/com/sun/javadoc/AccessAsciiArt/AccessAsciiArt.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/com/sun/javadoc/AccessAsciiArt/AccessAsciiArt.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
  * @summary  Add text equivalent of class tree ASCII art for accessibility
  * @author dkramer
  * @library ../lib
+ * @modules jdk.javadoc
  * @build JavadocTester
  * @run main AccessAsciiArt
  */
--- a/langtools/test/com/sun/javadoc/AccessFrameTitle/AccessFrameTitle.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/com/sun/javadoc/AccessFrameTitle/AccessFrameTitle.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
  * @summary  Add title attribute to <FRAME> tags for accessibility
  * @author dkramer
  * @library ../lib
+ * @modules jdk.javadoc
  * @build JavadocTester
  * @run main AccessFrameTitle
  */
--- a/langtools/test/com/sun/javadoc/AccessH1/AccessH1.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/com/sun/javadoc/AccessH1/AccessH1.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
  * @summary  Use <H1, <H2>, and <H3> in proper sequence for accessibility
  * @author dkramer
  * @library ../lib
+ * @modules jdk.javadoc
  * @build JavadocTester
  * @run main AccessH1
  */
--- a/langtools/test/com/sun/javadoc/AccessSkipNav/AccessSkipNav.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/com/sun/javadoc/AccessSkipNav/AccessSkipNav.java	Thu May 21 11:41:04 2015 -0700
@@ -27,6 +27,7 @@
  * @summary  Add ability to skip over nav bar for accessibility
  * @author dkramer
  * @library ../lib
+ * @modules jdk.javadoc
  * @build JavadocTester
  * @run main AccessSkipNav
  */
--- a/langtools/test/com/sun/javadoc/AccessSummary/AccessSummary.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/com/sun/javadoc/AccessSummary/AccessSummary.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
  * @summary  Test the tables for summary attribute
  * @author   dkramer
  * @library ../lib
+ * @modules jdk.javadoc
  * @build    JavadocTester
  * @run main AccessSummary
  */
--- a/langtools/test/com/sun/javadoc/AuthorDD/AuthorDD.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/com/sun/javadoc/AuthorDD/AuthorDD.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
  * @summary Javadoc wrongly inserts </DD> tags when using multiple @author tags
  * @author dkramer
  * @library ../lib
+ * @modules jdk.javadoc
  * @build JavadocTester
  * @run main AuthorDD
  */
--- a/langtools/test/com/sun/javadoc/DocRootSlash/DocRootSlash.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/com/sun/javadoc/DocRootSlash/DocRootSlash.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
  * @summary stddoclet: {@docRoot} inserts an extra trailing "/"
  * @author dkramer
  * @library ../lib
+ * @modules jdk.javadoc
  * @build JavadocTester
  * @run main DocRootSlash
  */
--- a/langtools/test/com/sun/javadoc/InheritDocForUserTags/DocTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/com/sun/javadoc/InheritDocForUserTags/DocTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
  * @summary Using {@inheritDoc} in simple tag defined via -tag fails
  * @author Mike Duigou
  * @library ../lib
+ * @modules jdk.javadoc
  * @build JavadocTester
  * @run main DocTest
  */
--- a/langtools/test/com/sun/javadoc/JavascriptWinTitle/JavascriptWinTitle.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/com/sun/javadoc/JavascriptWinTitle/JavascriptWinTitle.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,7 @@
  *           Window title shouldn't change when loading left frames (javascript)
  * @author dkramer
  * @library ../lib
+ * @modules jdk.javadoc
  * @build JavadocTester
  * @run main JavascriptWinTitle
  */
--- a/langtools/test/com/sun/javadoc/MetaTag/MetaTag.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/com/sun/javadoc/MetaTag/MetaTag.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,7 @@
  *           class and member names to improve API search
  * @author   dkramer
  * @library ../lib
+ * @modules jdk.javadoc
  * @build    JavadocTester
  * @run main MetaTag
  */
--- a/langtools/test/com/sun/javadoc/PackagesHeader/PackagesHeader.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/com/sun/javadoc/PackagesHeader/PackagesHeader.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,6 +29,7 @@
  *           (2) -packagesheader, and (3) -header -packagesheader
  * @author   dkramer
  * @library  ../lib
+ * @modules jdk.javadoc
  * @build    JavadocTester
  * @run main PackagesHeader
  */
--- a/langtools/test/com/sun/javadoc/T6735320/T6735320.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/com/sun/javadoc/T6735320/T6735320.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
  * @bug 6735320
  * @summary javadoc throws exception if serialField value is missing
  * @library ../lib
+ * @modules jdk.javadoc
  * @build JavadocTester
  * @run main T6735320
  */
--- a/langtools/test/com/sun/javadoc/ValidHtml/ValidHtml.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/com/sun/javadoc/ValidHtml/ValidHtml.java	Thu May 21 11:41:04 2015 -0700
@@ -30,6 +30,7 @@
  *           HTML table tags inserted in wrong place in pakcage use page
  * @author dkramer
  * @library ../lib
+ * @modules jdk.javadoc
  * @build JavadocTester
  * @run main ValidHtml
  */
--- a/langtools/test/com/sun/javadoc/VersionNumber/VersionNumber.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/com/sun/javadoc/VersionNumber/VersionNumber.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
  * @summary  com.sun.tools.doclets.standard.Standard contains hard-coded version number
  * @author dkramer
  * @library ../lib
+ * @modules jdk.javadoc
  * @build JavadocTester
  * @run main VersionNumber
  */
--- a/langtools/test/com/sun/javadoc/WindowTitles/WindowTitles.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/com/sun/javadoc/WindowTitles/WindowTitles.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
  * @summary stddoclet: With frames off, window titles have "()" appended
  * @author dkramer
  * @library ../lib
+ * @modules jdk.javadoc
  * @build JavadocTester
  * @run main WindowTitles
  */
--- a/langtools/test/com/sun/javadoc/constantValues/TestConstantValuesDriver.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/com/sun/javadoc/constantValues/TestConstantValuesDriver.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
  * @summary Test the generation of constant-values.html.
  * @author jamieh
  * @library ../lib
+ * @modules jdk.javadoc
  * @build JavadocTester
  * @run main TestConstantValuesDriver
  */
--- a/langtools/test/com/sun/javadoc/dupThrowsTags/TestDupThrowsTags.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/com/sun/javadoc/dupThrowsTags/TestDupThrowsTags.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
  * @summary Determine if duplicate throws tags can be used.
  * @author jamieh
  * @library ../lib
+ * @modules jdk.javadoc
  * @build JavadocTester
  * @run main TestDupThrowsTags
  */
--- a/langtools/test/com/sun/javadoc/testAbsLinkPath/TestAbsLinkPath.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/com/sun/javadoc/testAbsLinkPath/TestAbsLinkPath.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
  * @summary This test verifys that the -link option handles absolute paths.
  * @author jamieh
  * @library ../lib
+ * @modules jdk.javadoc
  * @build JavadocTester
  * @run main TestAbsLinkPath
  */
--- a/langtools/test/com/sun/javadoc/testAbstractMethod/TestAbstractMethod.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/com/sun/javadoc/testAbstractMethod/TestAbstractMethod.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,7 @@
  *           if the abstract modifier is present explicitly or implicitly.
  * @author   bpatel
  * @library  ../lib
+ * @modules jdk.javadoc
  * @build    JavadocTester
  * @run main TestAbstractMethod
  */
--- a/langtools/test/com/sun/javadoc/testAnchorNames/TestAnchorNames.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/com/sun/javadoc/testAnchorNames/TestAnchorNames.java	Thu May 21 11:41:04 2015 -0700
@@ -27,6 +27,7 @@
  * @summary Test for valid name attribute in HTML anchors.
  * @author Bhavesh Patel
  * @library ../lib
+ * @modules jdk.javadoc
  * @build JavadocTester
  * @run main TestAnchorNames
  */
--- a/langtools/test/com/sun/javadoc/testAnnotationOptional/TestAnnotationOptional.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/com/sun/javadoc/testAnnotationOptional/TestAnnotationOptional.java	Thu May 21 11:41:04 2015 -0700
@@ -28,6 +28,7 @@
  *           element headers
  * @author   Mahmood Ali
  * @library  ../lib
+ * @modules jdk.javadoc
  * @build    JavadocTester
  * @run main TestAnnotationOptional
  */
--- a/langtools/test/com/sun/javadoc/testAnnotationTypes/TestAnnotationTypes.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/com/sun/javadoc/testAnnotationTypes/TestAnnotationTypes.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,7 @@
  *           extra HR tags.
  * @author   jamieh
  * @library  ../lib
+ * @modules jdk.javadoc
  * @build    JavadocTester
  * @run main TestAnnotationTypes
  */
--- a/langtools/test/com/sun/javadoc/testBackSlashInLink/TestBackSlashInLink.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/com/sun/javadoc/testBackSlashInLink/TestBackSlashInLink.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,7 @@
  * has a forward slash.  It would be wrong to use a back slash.
  * @author jamieh
  * @library ../lib
+ * @modules jdk.javadoc
  * @build JavadocTester
  * @run main TestBackSlashInLink
  */
--- a/langtools/test/com/sun/javadoc/testBadPackageFileInJar/TestBadPackageFileInJar.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/com/sun/javadoc/testBadPackageFileInJar/TestBadPackageFileInJar.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,7 @@
  * when a bad package.html file is in the JAR.
  * @author jamieh
  * @library ../lib
+ * @modules jdk.javadoc
  * @build JavadocTester
  * @run main TestBadPackageFileInJar
  */
--- a/langtools/test/com/sun/javadoc/testBadSourceFile/TestBadSourceFile.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/com/sun/javadoc/testBadSourceFile/TestBadSourceFile.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,7 @@
  *           file in the same directory as the file being documented.
  * @author   jamieh
  * @library ../lib
+ * @modules jdk.javadoc
  * @build    JavadocTester
  * @run main TestBadSourceFile
  */
--- a/langtools/test/com/sun/javadoc/testBaseClass/TestBaseClass.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/com/sun/javadoc/testBaseClass/TestBaseClass.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
  * @summary Javadoc does not process base class.
  * @author jamieh
  * @library ../lib
+ * @modules jdk.javadoc
  * @build BaseClass
  * @build JavadocTester
  * @run main TestBaseClass
--- a/langtools/test/com/sun/javadoc/testBreakIterator/TestBreakIterator.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/com/sun/javadoc/testBreakIterator/TestBreakIterator.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,6 +30,7 @@
  * Wrong Answer: "The class is empty (i.e."
  * @author jamieh
  * @library ../lib
+ * @modules jdk.javadoc
  * @build JavadocTester
  * @run main TestBreakIterator
  */
--- a/langtools/test/com/sun/javadoc/testCRLineSeparator/TestCRLineSeparator.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/com/sun/javadoc/testCRLineSeparator/TestCRLineSeparator.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
  * @summary  Make sure tool parses CR line separators properly.
  * @author   jamieh
  * @library  ../lib
+ * @modules jdk.javadoc
  * @build    JavadocTester
  * @run main TestCRLineSeparator
  */
--- a/langtools/test/com/sun/javadoc/testCharset/TestCharset.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/com/sun/javadoc/testCharset/TestCharset.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,7 @@
  *           part of the meta tag.
  * @author   Bhavesh Patel
  * @library  ../lib
+ * @modules jdk.javadoc
  * @build    JavadocTester
  * @run main TestCharset
  */
--- a/langtools/test/com/sun/javadoc/testClassCrossReferences/TestClassCrossReferences.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/com/sun/javadoc/testClassCrossReferences/TestClassCrossReferences.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
  * @summary This test verifies that class cross references work properly.
  * @author jamieh
  * @library ../lib
+ * @modules jdk.javadoc
  * @build JavadocTester
  * @build TestClassCrossReferences
  * @run main TestClassCrossReferences
--- a/langtools/test/com/sun/javadoc/testClassTree/TestClassTree.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/com/sun/javadoc/testClassTree/TestClassTree.java	Thu May 21 11:41:04 2015 -0700
@@ -30,6 +30,7 @@
  *           types.
  * @author   jamieh
  * @library  ../lib
+ * @modules jdk.javadoc
  * @build    JavadocTester
  * @run main TestClassTree
  */
--- a/langtools/test/com/sun/javadoc/testCmndLineClass/TestCmndLineClass.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/com/sun/javadoc/testCmndLineClass/TestCmndLineClass.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,6 +29,7 @@
  * classes.
  * @author jamieh
  * @library ../lib
+ * @modules jdk.javadoc
  * @build JavadocTester
  * @run main TestCmndLineClass
  */
--- a/langtools/test/com/sun/javadoc/testCompletionFailure/TestCompletionFailure.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/com/sun/javadoc/testCompletionFailure/TestCompletionFailure.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
  * @summary Test to verify javadoc executes without CompletionFailure exception.
  * @author Bhavesh Patel
  * @library ../lib
+ * @modules jdk.javadoc
  * @build JavadocTester
  * @run main TestCompletionFailure
  */
--- a/langtools/test/com/sun/javadoc/testConstantValuesPage/TestConstantValuesPage.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/com/sun/javadoc/testConstantValuesPage/TestConstantValuesPage.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,7 @@
  * generated when doclet has nothing to document.
  * @author jamieh
  * @library ../lib
+ * @modules jdk.javadoc
  * @build JavadocTester
  * @run main TestConstantValuesPage
  */
--- a/langtools/test/com/sun/javadoc/testConstructorIndent/TestConstructorIndent.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/com/sun/javadoc/testConstructorIndent/TestConstructorIndent.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,7 @@
  *           <dl></dl>.  Check for this in the output.
  * @author   jamieh
  * @library  ../lib
+ * @modules jdk.javadoc
  * @build    JavadocTester
  * @run main TestConstructorIndent
  */
--- a/langtools/test/com/sun/javadoc/testConstructors/TestConstructors.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/com/sun/javadoc/testConstructors/TestConstructors.java	Thu May 21 11:41:04 2015 -0700
@@ -27,6 +27,7 @@
  * @summary Test for constructor name which should be a non-qualified name.
  * @author Bhavesh Patel
  * @library ../lib
+ * @modules jdk.javadoc
  * @build JavadocTester
  * @run main TestConstructors
  */
--- a/langtools/test/com/sun/javadoc/testCustomTag/TestCustomTag.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/com/sun/javadoc/testCustomTag/TestCustomTag.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,9 @@
  * @summary  Test custom tag. Verify that an unknown tag generates appropriate warnings.
  * @author   Bhavesh Patel
  * @library  ../lib
+ * @modules jdk.javadoc/com.sun.tools.doclets.internal.toolkit
+ *          jdk.javadoc/com.sun.tools.doclets.internal.toolkit.taglets
+ *          jdk.javadoc/com.sun.tools.doclets.internal.toolkit.util
  * @build    JavadocTester taglets.CustomTag
  * @run main TestCustomTag
  */
--- a/langtools/test/com/sun/javadoc/testDeprecatedDocs/TestDeprecatedDocs.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/com/sun/javadoc/testDeprecatedDocs/TestDeprecatedDocs.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
  * @summary  <DESC>
  * @author   jamieh
  * @library  ../lib
+ * @modules jdk.javadoc
  * @build    JavadocTester
  * @run main TestDeprecatedDocs
  */
--- a/langtools/test/com/sun/javadoc/testDocEncoding/TestDocEncoding.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/com/sun/javadoc/testDocEncoding/TestDocEncoding.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,6 +32,7 @@
              used for stylesheet as well.
  * @author   jayashree viswanathan
  * @library  ../lib
+ * @modules jdk.javadoc
  * @build    JavadocTester
  * @run main TestDocEncoding
  */
--- a/langtools/test/com/sun/javadoc/testDocErrorReporter/TestDocErrorReporter.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/com/sun/javadoc/testDocErrorReporter/TestDocErrorReporter.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,7 @@
  *           DocErrorReporter.
  * @author   jamieh
  * @library ../lib
+ * @modules jdk.javadoc
  * @build    JavadocTester
  * @run main TestDocErrorReporter
  */
--- a/langtools/test/com/sun/javadoc/testDocFileDir/TestDocFileDir.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/com/sun/javadoc/testDocFileDir/TestDocFileDir.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,6 +30,7 @@
  *          Also test that -docfilessubdirs and -excludedocfilessubdir both work.
  * @author jamieh
  * @library ../lib
+ * @modules jdk.javadoc
  * @build JavadocTester
  * @run main TestDocFileDir
  */
--- a/langtools/test/com/sun/javadoc/testDocFiles/TestDocFiles.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/com/sun/javadoc/testDocFiles/TestDocFiles.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
  * @bug 8008949
  * @summary verify that doc-files get copied
  * @library ../lib
+ * @modules jdk.javadoc
  * @build JavadocTester
  * @run main TestDocFiles
  */
--- a/langtools/test/com/sun/javadoc/testDocRootInlineTag/TestDocRootInlineTag.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/com/sun/javadoc/testDocRootInlineTag/TestDocRootInlineTag.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,6 +29,7 @@
  * Make sure that the docRoot tag works with the -bottom option.
  * @author jamieh
  * @library ../lib
+ * @modules jdk.javadoc
  * @build JavadocTester
  * @run main TestDocRootInlineTag
  */
--- a/langtools/test/com/sun/javadoc/testDocRootLink/TestDocRootLink.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/com/sun/javadoc/testDocRootLink/TestDocRootLink.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
  * @summary This test verifies the -Xdocrootparent option.
  * @author Bhavesh Patel
  * @library ../lib
+ * @modules jdk.javadoc
  * @build JavadocTester
  * @run main TestDocRootLink
  */
--- a/langtools/test/com/sun/javadoc/testDupParamWarn/TestDupParamWarn.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/com/sun/javadoc/testDupParamWarn/TestDupParamWarn.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,7 @@
  * warning messages about duplicate param tags.
  * @author jamieh
  * @library ../lib
+ * @modules jdk.javadoc
  * @build JavadocTester
  * @run main TestDupParamWarn
  */
--- a/langtools/test/com/sun/javadoc/testEmptyClass/TestEmptyClass.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/com/sun/javadoc/testEmptyClass/TestEmptyClass.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,7 @@
  * run on a completely empty class (no comments or members).
  * @author jamieh
  * @library ../lib
+ * @modules jdk.javadoc
  * @build JavadocTester
  * @run main TestEmptyClass
  */
--- a/langtools/test/com/sun/javadoc/testEnclosingClass/TestEnclosingClass.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/com/sun/javadoc/testEnclosingClass/TestEnclosingClass.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
  * @summary  Check the outer class when documenting enclosing class/interface.
  * @author   jamieh
  * @library  ../lib
+ * @modules jdk.javadoc
  * @build    JavadocTester
  * @run main TestEnclosingClass
  */
--- a/langtools/test/com/sun/javadoc/testEncoding/TestEncoding.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/com/sun/javadoc/testEncoding/TestEncoding.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,7 @@
  * properly passed from Javadoc to the source file parser.
  * @author jamieh
  * @library ../lib
+ * @modules jdk.javadoc
  * @build JavadocTester
  * @run main TestEncoding
  */
--- a/langtools/test/com/sun/javadoc/testExternalOverridenMethod/TestExternalOverridenMethod.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/com/sun/javadoc/testExternalOverridenMethod/TestExternalOverridenMethod.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,6 +29,7 @@
  * "overrides" documentation even though the method is external.
  * @author jamieh
  * @library ../lib
+ * @modules jdk.javadoc
  * @build JavadocTester TestExternalOverridenMethod
  * @run main TestExternalOverridenMethod
  */
--- a/langtools/test/com/sun/javadoc/testGeneratedBy/TestGeneratedBy.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/com/sun/javadoc/testGeneratedBy/TestGeneratedBy.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
  * @bug 8000418 8024288
  * @summary Verify that files use a common Generated By string
  * @library ../lib
+ * @modules jdk.javadoc
  * @build JavadocTester
  * @run main TestGeneratedBy
  */
--- a/langtools/test/com/sun/javadoc/testGroupOption/TestGroupOption.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/com/sun/javadoc/testGroupOption/TestGroupOption.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,7 @@
  *           to be printed.
  * @author   jamieh
  * @library  ../lib
+ * @modules jdk.javadoc
  * @build    JavadocTester
  * @run main TestGroupOption
  */
--- a/langtools/test/com/sun/javadoc/testHeadings/TestHeadings.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/com/sun/javadoc/testHeadings/TestHeadings.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
  * @summary  Make sure that headings use the TH tag instead of the TD tag.
  * @author   jamieh
  * @library ../lib
+ * @modules jdk.javadoc
  * @build    JavadocTester
  * @build    TestHeadings
  * @run main TestHeadings
--- a/langtools/test/com/sun/javadoc/testHelpFile/TestHelpFile.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/com/sun/javadoc/testHelpFile/TestHelpFile.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
  * @summary  Make sure that the help file is generated correctly.
  * @author   Bhavesh Patel
  * @library  ../lib
+ * @modules jdk.javadoc
  * @build    JavadocTester
  * @run main TestHelpFile
  */
--- a/langtools/test/com/sun/javadoc/testHelpOption/TestHelpOption.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/com/sun/javadoc/testHelpOption/TestHelpOption.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,7 @@
  *           the help link appears in the documentation.
  * @author   jamieh
  * @library ../lib
+ * @modules jdk.javadoc
  * @build    JavadocTester TestHelpOption
  * @run main TestHelpOption
  */
--- a/langtools/test/com/sun/javadoc/testHiddenMembers/TestHiddenMembers.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/com/sun/javadoc/testHiddenMembers/TestHiddenMembers.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,7 @@
  * documented as inherited.
  * @author jamieh
  * @library ../lib
+ * @modules jdk.javadoc
  * @build JavadocTester
  * @run main TestHiddenMembers
  */
--- a/langtools/test/com/sun/javadoc/testHref/TestHref.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/com/sun/javadoc/testHref/TestHref.java	Thu May 21 11:41:04 2015 -0700
@@ -27,6 +27,7 @@
  * @summary  Verify that spaces do not appear in hrefs and anchors.
  * @author   jamieh
  * @library  ../lib
+ * @modules jdk.javadoc
  * @build    JavadocTester
  * @run main TestHref
  */
--- a/langtools/test/com/sun/javadoc/testHrefInDocComment/TestHrefInDocComment.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/com/sun/javadoc/testHrefInDocComment/TestHrefInDocComment.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,7 @@
  * appear in doc comments.
  * @author jamieh
  * @library ../lib
+ * @modules jdk.javadoc
  * @build JavadocTester
  * @run main TestHrefInDocComment
  */
--- a/langtools/test/com/sun/javadoc/testHtmlComments/TestHtmlComments.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/com/sun/javadoc/testHtmlComments/TestHtmlComments.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,7 @@
  *           are no fields to document.
  * @author   jamieh
  * @library  ../lib
+ * @modules jdk.javadoc
  * @build    JavadocTester
  * @run main TestHtmlComments
  */
--- a/langtools/test/com/sun/javadoc/testHtmlDefinitionListTag/TestHtmlDefinitionListTag.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/com/sun/javadoc/testHtmlDefinitionListTag/TestHtmlDefinitionListTag.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,6 +29,7 @@
  * @summary This test verifies the nesting of definition list tags.
  * @author Bhavesh Patel
  * @library ../lib
+ * @modules jdk.javadoc
  * @build JavadocTester
  * @run main TestHtmlDefinitionListTag
  */
--- a/langtools/test/com/sun/javadoc/testHtmlDocument/TestHtmlDocument.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/com/sun/javadoc/testHtmlDocument/TestHtmlDocument.java	Thu May 21 11:41:04 2015 -0700
@@ -28,6 +28,8 @@
  * @bug 6851834
  * @summary This test verifies the HTML document generation for javadoc output.
  * @library ../lib
+ * @modules jdk.javadoc/com.sun.tools.doclets.formats.html.markup
+ *          jdk.javadoc/com.sun.tools.doclets.internal.toolkit
  * @build JavadocTester
  * @author Bhavesh Patel
  * @run main TestHtmlDocument
--- a/langtools/test/com/sun/javadoc/testHtmlStrongTag/TestHtmlStrongTag.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/com/sun/javadoc/testHtmlStrongTag/TestHtmlStrongTag.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,6 +29,7 @@
  * @summary This test verifies the use of <strong> HTML tag instead of <B> by Javadoc std doclet.
  * @author Bhavesh Patel
  * @library ../lib
+ * @modules jdk.javadoc
  * @build JavadocTester
  * @run main TestHtmlStrongTag
  */
--- a/langtools/test/com/sun/javadoc/testHtmlTableStyles/TestHtmlTableStyles.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/com/sun/javadoc/testHtmlTableStyles/TestHtmlTableStyles.java	Thu May 21 11:41:04 2015 -0700
@@ -27,6 +27,7 @@
  * @summary Test styles on HTML tables generated by javadoc.
  * @author Bhavesh Patel
  * @library ../lib
+ * @modules jdk.javadoc
  * @build JavadocTester
  * @run main TestHtmlTableStyles
  */
--- a/langtools/test/com/sun/javadoc/testHtmlTableTags/TestHtmlTableTags.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/com/sun/javadoc/testHtmlTableTags/TestHtmlTableTags.java	Thu May 21 11:41:04 2015 -0700
@@ -27,6 +27,7 @@
  * @summary  HTML tables should have table summary, caption and table headers.
  * @author   Bhavesh Patel
  * @library  ../lib
+ * @modules jdk.javadoc
  * @build    JavadocTester
  * @run main TestHtmlTableTags
  */
--- a/langtools/test/com/sun/javadoc/testHtmlTag/TestHtmlTag.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/com/sun/javadoc/testHtmlTag/TestHtmlTag.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,6 +29,7 @@
  * @summary This test verifies the use of lang attribute by <HTML>.
  * @author Bhavesh Patel
  * @library ../lib
+ * @modules jdk.javadoc
  * @build JavadocTester
  * @run main TestHtmlTag
  */
--- a/langtools/test/com/sun/javadoc/testHtmlVersion/TestHtmlVersion.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/com/sun/javadoc/testHtmlVersion/TestHtmlVersion.java	Thu May 21 11:41:04 2015 -0700
@@ -27,6 +27,7 @@
  * @summary Test the version of HTML generated by the javadoc tool.
  * @author bpatel
  * @library ../lib
+ * @modules jdk.javadoc
  * @build JavadocTester
  * @run main TestHtmlVersion
  */
--- a/langtools/test/com/sun/javadoc/testIndentation/TestIndentation.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/com/sun/javadoc/testIndentation/TestIndentation.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
  * @bug      8011288
  * @summary  Erratic/inconsistent indentation of signatures
  * @library  ../lib
+ * @modules jdk.javadoc
  * @build    JavadocTester
  * @run main TestIndentation
  */
--- a/langtools/test/com/sun/javadoc/testIndex/TestIndex.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/com/sun/javadoc/testIndex/TestIndex.java	Thu May 21 11:41:04 2015 -0700
@@ -29,6 +29,7 @@
  *           Test for unnamed package in index.
  * @author   jamieh
  * @library  ../lib
+ * @modules jdk.javadoc
  * @build    JavadocTester
  * @run main TestIndex
  */
--- a/langtools/test/com/sun/javadoc/testInlineLinkLabel/TestInlineLinkLabel.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/com/sun/javadoc/testInlineLinkLabel/TestInlineLinkLabel.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
  * @summary Test to make sure label is used for inline links.
  * @author jamieh
  * @library ../lib
+ * @modules jdk.javadoc
  * @build JavadocTester
  * @run main TestInlineLinkLabel
  */
--- a/langtools/test/com/sun/javadoc/testInterface/TestInterface.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/com/sun/javadoc/testInterface/TestInterface.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,6 +30,7 @@
  *           implementing classes in the documentation for I.
  * @author   jamieh
  * @library  ../lib
+ * @modules jdk.javadoc
  * @build    JavadocTester
  * @run main TestInterface
  */
--- a/langtools/test/com/sun/javadoc/testJavaFX/TestJavaFX.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/com/sun/javadoc/testJavaFX/TestJavaFX.java	Thu May 21 11:41:04 2015 -0700
@@ -27,6 +27,7 @@
  * @summary Test of the JavaFX doclet features.
  * @author jvalenta
  * @library ../lib
+ * @modules jdk.javadoc
  * @build JavadocTester
  * @run main TestJavaFX
  */
--- a/langtools/test/com/sun/javadoc/testJavascript/TestJavascript.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/com/sun/javadoc/testJavascript/TestJavascript.java	Thu May 21 11:41:04 2015 -0700
@@ -27,6 +27,7 @@
  * @summary  Verify that the output has the right javascript.
  * @author   jamieh
  * @library  ../lib
+ * @modules jdk.javadoc
  * @build    JavadocTester
  * @run main TestJavascript
  */
--- a/langtools/test/com/sun/javadoc/testLambdaFeature/TestLambdaFeature.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/com/sun/javadoc/testLambdaFeature/TestLambdaFeature.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,7 @@
  *           javadoc.
  * @author   bpatel
  * @library  ../lib/
+ * @modules jdk.javadoc
  * @build    JavadocTester TestLambdaFeature
  * @run main TestLambdaFeature
  */
--- a/langtools/test/com/sun/javadoc/testLeadingSpaces/LeadingSpaces.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/com/sun/javadoc/testLeadingSpaces/LeadingSpaces.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,6 +30,7 @@
  *    spaces stripped
  * @author jamieh
  * @library ../lib
+ * @modules jdk.javadoc
  * @build JavadocTester
  * @run main LeadingSpaces
  */
--- a/langtools/test/com/sun/javadoc/testLegacyTaglet/TestLegacyTaglet.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/com/sun/javadoc/testLegacyTaglet/TestLegacyTaglet.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,7 @@
  * doclet still works with Taglets that implement the 1.4.0 interface.
  * @author jamieh
  * @library ../lib
+ * @modules jdk.javadoc
  * @build JavadocTester ToDoTaglet UnderlineTaglet Check
  * @run main TestLegacyTaglet
  */
--- a/langtools/test/com/sun/javadoc/testLinkOption/TestBadLinkOption.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/com/sun/javadoc/testLinkOption/TestBadLinkOption.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
  * @summary Make sure that bad -link arguments trigger warnings.
  * @author jamieh
  * @library ../lib
+ * @modules jdk.javadoc
  * @build JavadocTester
  * @run main TestBadLinkOption
  */
--- a/langtools/test/com/sun/javadoc/testLinkOption/TestLinkOption.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/com/sun/javadoc/testLinkOption/TestLinkOption.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,7 @@
  * right files, and URLs with and without trailing slash are accepted.
  * @author jamieh
  * @library ../lib
+ * @modules jdk.javadoc
  * @build JavadocTester
  * @run main TestLinkOption
  */
--- a/langtools/test/com/sun/javadoc/testLinkOption/TestNewLineInLink.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/com/sun/javadoc/testLinkOption/TestNewLineInLink.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,7 @@
  * link and label.
  * @author jamieh
  * @library ../lib
+ * @modules jdk.javadoc
  * @build JavadocTester
  * @run main TestNewLineInLink
  */
--- a/langtools/test/com/sun/javadoc/testLinkTaglet/TestLinkTaglet.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/com/sun/javadoc/testLinkTaglet/TestLinkTaglet.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,7 @@
  *           non-qualified name, furthermore, ensure the right one is linked.
  * @author   jamieh
  * @library  ../lib
+ * @modules jdk.javadoc
  * @build    JavadocTester
  * @run main TestLinkTaglet
  */
--- a/langtools/test/com/sun/javadoc/testLinkToSerialForm/TestLinkToSerialForm.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/com/sun/javadoc/testLinkToSerialForm/TestLinkToSerialForm.java	Thu May 21 11:41:04 2015 -0700
@@ -28,6 +28,7 @@
  * from a serializable class to serialized-form.html.
  * @author jamieh
  * @library ../lib
+ * @modules jdk.javadoc
  * @build JavadocTester
  * @run main TestLinkToSerialForm
  */
--- a/langtools/test/com/sun/javadoc/testLiteralCodeInPre/TestLiteralCodeInPre.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/com/sun/javadoc/testLiteralCodeInPre/TestLiteralCodeInPre.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
  * @bug      8002387 8014636
  * @summary  Improve rendered HTML formatting for {@code}
  * @library  ../lib
+ * @modules jdk.javadoc
  * @build    JavadocTester
  * @run main TestLiteralCodeInPre
  */
--- a/langtools/test/com/sun/javadoc/testMemberInheritence/TestMemberInheritence.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/com/sun/javadoc/testMemberInheritence/TestMemberInheritence.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,7 @@
  *          Verify that inheritence labels are correct.
  * @author jamieh
  * @library ../lib
+ * @modules jdk.javadoc
  * @build JavadocTester
  * @run main TestMemberInheritence
  */
--- a/langtools/test/com/sun/javadoc/testMemberSummary/TestMemberSummary.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/com/sun/javadoc/testMemberSummary/TestMemberSummary.java	Thu May 21 11:41:04 2015 -0700
@@ -29,6 +29,7 @@
  *           documentation is inherited but the return type isn't.
  * @author   jamieh
  * @library  ../lib
+ * @modules jdk.javadoc
  * @build    JavadocTester
  * @run main TestMemberSummary
  */
--- a/langtools/test/com/sun/javadoc/testMethodTypes/TestMethodTypes.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/com/sun/javadoc/testMethodTypes/TestMethodTypes.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
  * @summary  Test for various method types in the method summary table
  * @author   Bhavesh Patel
  * @library  ../lib
+ * @modules jdk.javadoc
  * @build    JavadocTester
  * @run main TestMethodTypes
  */
--- a/langtools/test/com/sun/javadoc/testModifier/TestModifier.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/com/sun/javadoc/testModifier/TestModifier.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
  * @summary Javadoc declares interfaces to be "abstract".
  * @author jamieh
  * @library ../lib
+ * @modules jdk.javadoc
  * @build ModifierAbstract
  * @build JavadocTester
  * @run main TestModifier
--- a/langtools/test/com/sun/javadoc/testNavigation/TestNavigation.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/com/sun/javadoc/testNavigation/TestNavigation.java	Thu May 21 11:41:04 2015 -0700
@@ -28,6 +28,7 @@
  *           Make sure the navagation is 2 columns, not 3.
  * @author   jamieh
  * @library  ../lib
+ * @modules jdk.javadoc
  * @build    JavadocTester
  * @run main TestNavigation
  */
--- a/langtools/test/com/sun/javadoc/testNestedGenerics/TestNestedGenerics.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/com/sun/javadoc/testNestedGenerics/TestNestedGenerics.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
  * @summary  Test HTML output for nested generic types.
  * @author   bpatel
  * @library  ../lib
+ * @modules jdk.javadoc
  * @build    JavadocTester
  * @run main TestNestedGenerics
  */
--- a/langtools/test/com/sun/javadoc/testNestedInlineTag/TestNestedInlineTag.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/com/sun/javadoc/testNestedInlineTag/TestNestedInlineTag.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,9 @@
  * @summary Test for nested inline tags. *
  * @author jamieh
  * @library ../lib
+ * @modules jdk.javadoc/com.sun.tools.doclets.internal.toolkit
+ *          jdk.javadoc/com.sun.tools.doclets.internal.toolkit.taglets
+ *          jdk.javadoc/com.sun.tools.doclets.internal.toolkit.util
  * @build JavadocTester
  * @build testtaglets.UnderlineTaglet
  * @build testtaglets.BoldTaglet
--- a/langtools/test/com/sun/javadoc/testNewLanguageFeatures/TestNewLanguageFeatures.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/com/sun/javadoc/testNewLanguageFeatures/TestNewLanguageFeatures.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,6 +29,7 @@
  *           language features are properly documented.
  * @author   jamieh
  * @library  ../lib
+ * @modules jdk.javadoc
  * @build    JavadocTester
  * @run main TestNewLanguageFeatures
  */
--- a/langtools/test/com/sun/javadoc/testNoPackagesFile/TestNoPackagesFile.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/com/sun/javadoc/testNoPackagesFile/TestNoPackagesFile.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,7 @@
  *           longer used.
  * @author   jamieh
  * @library  ../lib
+ * @modules jdk.javadoc
  * @build    JavadocTester
  * @run main TestNoPackagesFile
  */
--- a/langtools/test/com/sun/javadoc/testNotifications/TestNotifications.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/com/sun/javadoc/testNotifications/TestNotifications.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,6 +29,7 @@
  *           Make sure classname is not include in javadoc usage message.
  * @author   jamieh
  * @library ../lib
+ * @modules jdk.javadoc
  * @build    JavadocTester
  * @run main TestNotifications
  */
--- a/langtools/test/com/sun/javadoc/testOptions/TestOptions.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/com/sun/javadoc/testOptions/TestOptions.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
  * @summary  Test the output for -header and -footer options.
  * @author   Bhavesh Patel
  * @library  ../lib
+ * @modules jdk.javadoc
  * @build    JavadocTester
  * @run main TestOptions
  */
--- a/langtools/test/com/sun/javadoc/testOrdering/TestOrdering.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/com/sun/javadoc/testOrdering/TestOrdering.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
  * @summary test to determine if members are ordered correctly
  * @author ksrini
  * @library ../lib/
+ * @modules jdk.javadoc
  * @build JavadocTester
  * @run main TestOrdering
  */
--- a/langtools/test/com/sun/javadoc/testOverridenMethods/TestMultiInheritence.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/com/sun/javadoc/testOverridenMethods/TestMultiInheritence.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,7 @@
  *           interfaces are documented
  * @author   jamieh
  * @library  ../lib
+ * @modules jdk.javadoc
  * @build    JavadocTester
  * @run main TestMultiInheritence
  */
--- a/langtools/test/com/sun/javadoc/testOverridenMethods/TestOverridenMethodDocCopy.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/com/sun/javadoc/testOverridenMethods/TestOverridenMethodDocCopy.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,7 @@
  *           class
  * @author   jamieh
  * @library  ../lib
+ * @modules jdk.javadoc
  * @build    JavadocTester
  * @run main TestOverridenMethodDocCopy
  */
--- a/langtools/test/com/sun/javadoc/testOverridenMethods/TestOverridenPrivateMethods.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/com/sun/javadoc/testOverridenMethods/TestOverridenPrivateMethods.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,7 @@
  * -protected (default) visibility flag is used.
  * @author jamieh
  * @library ../lib
+ * @modules jdk.javadoc
  * @build JavadocTester
  * @run main TestOverridenPrivateMethods
  */
--- a/langtools/test/com/sun/javadoc/testOverridenMethods/TestOverridenPrivateMethodsWithPackageFlag.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/com/sun/javadoc/testOverridenMethods/TestOverridenPrivateMethodsWithPackageFlag.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,7 @@
  * -protected (default) visibility flag is used.
  * @author jamieh
  * @library ../lib
+ * @modules jdk.javadoc
  * @build JavadocTester
  * @run main TestOverridenPrivateMethodsWithPackageFlag
  */
--- a/langtools/test/com/sun/javadoc/testOverridenMethods/TestOverridenPrivateMethodsWithPrivateFlag.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/com/sun/javadoc/testOverridenMethods/TestOverridenPrivateMethodsWithPrivateFlag.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,7 @@
  * -protected (default) visibility flag is used.
  * @author jamieh
  * @library ../lib
+ * @modules jdk.javadoc
  * @build JavadocTester
  * @run main TestOverridenPrivateMethodsWithPrivateFlag
  */
--- a/langtools/test/com/sun/javadoc/testPackageDeprecation/TestPackageDeprecation.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/com/sun/javadoc/testPackageDeprecation/TestPackageDeprecation.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
  * @summary  Test package deprecation.
  * @author   bpatel
  * @library  ../lib/
+ * @modules jdk.javadoc
  * @build    JavadocTester TestPackageDeprecation
  * @run main TestPackageDeprecation
  */
--- a/langtools/test/com/sun/javadoc/testPackagePage/TestPackagePage.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/com/sun/javadoc/testPackagePage/TestPackagePage.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,6 +29,7 @@
  * when single or multiple packages are documented.
  * @author jamieh
  * @library ../lib
+ * @modules jdk.javadoc
  * @build JavadocTester
  * @run main TestPackagePage
  */
--- a/langtools/test/com/sun/javadoc/testParamTaglet/TestParamTaglet.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/com/sun/javadoc/testParamTaglet/TestParamTaglet.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,6 +29,7 @@
  *           Make sure inheritDoc cannot be used in an invalid param tag.
  * @author   jamieh
  * @library  ../lib
+ * @modules jdk.javadoc
  * @build    JavadocTester
  * @run main TestParamTaglet
  */
--- a/langtools/test/com/sun/javadoc/testPrivateClasses/TestPrivateClasses.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/com/sun/javadoc/testPrivateClasses/TestPrivateClasses.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -38,6 +38,7 @@
  *           signature is displayed correctly without extra space at the beginning.
  * @author   jamieh
  * @library  ../lib
+ * @modules jdk.javadoc
  * @build    JavadocTester
  * @run main TestPrivateClasses
  */
--- a/langtools/test/com/sun/javadoc/testProfiles/TestProfiles.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/com/sun/javadoc/testProfiles/TestProfiles.java	Thu May 21 11:41:04 2015 -0700
@@ -27,6 +27,7 @@
  * @summary  Test javadoc support for profiles.
  * @author   Bhavesh Patel, Evgeniya Stepanova
  * @library ../lib
+ * @modules jdk.javadoc
  * @build    JavadocTester
  * @run main TestProfiles
  */
--- a/langtools/test/com/sun/javadoc/testProfiles/TestProfilesConfiguration.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/com/sun/javadoc/testProfiles/TestProfilesConfiguration.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
  * @summary  Test javadoc options support for profiles.
  * @author   Evgeniya Stepanova
  * @library  ../lib
+ * @modules jdk.javadoc
  * @build    JavadocTester
  * @run main TestProfilesConfiguration
  */
--- a/langtools/test/com/sun/javadoc/testRecurseSubPackages/TestRecurseSubPackages.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/com/sun/javadoc/testRecurseSubPackages/TestRecurseSubPackages.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
  * @summary Make Javadoc capable of traversing/recursing all of given subpackages.
  * @author jamieh
  * @library ../lib
+ * @modules jdk.javadoc
  * @build JavadocTester
  * @run main TestRecurseSubPackages
  */
--- a/langtools/test/com/sun/javadoc/testRelativeLinks/TestRelativeLinks.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/com/sun/javadoc/testRelativeLinks/TestRelativeLinks.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,7 @@
  *           output so that they are not broken.
  * @author   jamieh
  * @library  ../lib
+ * @modules jdk.javadoc
  * @build    JavadocTester
  * @run main TestRelativeLinks
  */
--- a/langtools/test/com/sun/javadoc/testRepeatedAnnotations/TestRepeatedAnnotations.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/com/sun/javadoc/testRepeatedAnnotations/TestRepeatedAnnotations.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
  * @summary  Test repeated annotations output.
  * @author   bpatel
  * @library  ../lib
+ * @modules jdk.javadoc
  * @build    JavadocTester
  * @run main TestRepeatedAnnotations
  */
--- a/langtools/test/com/sun/javadoc/testReturnTag/TestReturnTag.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/com/sun/javadoc/testReturnTag/TestReturnTag.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
  * @summary  Warn when a return tag is used on a method without a return type.
  * @author   jamieh
  * @library  ../lib
+ * @modules jdk.javadoc
  * @build    JavadocTester
  * @run main TestReturnTag
  */
--- a/langtools/test/com/sun/javadoc/testSeeTag/TestSeeTag.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/com/sun/javadoc/testSeeTag/TestSeeTag.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
  * @summary  Javadoc is confused by at-link to imported classes outside of the set of generated packages
  * @author   jjg
  * @library  ../lib
+ * @modules jdk.javadoc
  * @build    JavadocTester
  * @run main TestSeeTag
  */
--- a/langtools/test/com/sun/javadoc/testSerialVersionUID/TestSerialVersionUID.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/com/sun/javadoc/testSerialVersionUID/TestSerialVersionUID.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,7 @@
  * documented in the serialized form.
  * @author   jamieh
  * @library  ../lib
+ * @modules jdk.javadoc
  * @build    JavadocTester
  * @run main TestSerialVersionUID
  */
--- a/langtools/test/com/sun/javadoc/testSerializedForm/TestSerializedForm.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/com/sun/javadoc/testSerializedForm/TestSerializedForm.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -33,6 +33,7 @@
  * Make sure see tags work in serialized form.
  * @author jamieh
  * @library ../lib/
+ * @modules jdk.javadoc
  * @build JavadocTester
  * @build TestSerializedForm
  * @run main TestSerializedForm
--- a/langtools/test/com/sun/javadoc/testSerializedFormDeprecationInfo/TestSerializedFormDeprecationInfo.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/com/sun/javadoc/testSerializedFormDeprecationInfo/TestSerializedFormDeprecationInfo.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,6 +29,7 @@
  * @summary This test verifies deprecation info in serialized-form.html.
  * @author Bhavesh Patel
  * @library ../lib
+ * @modules jdk.javadoc
  * @build JavadocTester
  * @run main TestSerializedFormDeprecationInfo
  */
--- a/langtools/test/com/sun/javadoc/testSimpleTag/TestSimpleTag.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/com/sun/javadoc/testSimpleTag/TestSimpleTag.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,6 +30,7 @@
  * considered a separator when parsing the simple tag argument.
  * @author jamieh
  * @library ../lib
+ * @modules jdk.javadoc
  * @build JavadocTester
  * @run main TestSimpleTag
  */
--- a/langtools/test/com/sun/javadoc/testSimpleTagExclude/TestSimpleTagExclude.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/com/sun/javadoc/testSimpleTagExclude/TestSimpleTagExclude.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,7 @@
  * exclude a simple tag by using -tag tagname:X
  * @author jamieh
  * @library ../lib
+ * @modules jdk.javadoc
  * @build JavadocTester
  * @run main TestSimpleTagExclude
  */
--- a/langtools/test/com/sun/javadoc/testSimpleTagInherit/TestSimpleTagInherit.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/com/sun/javadoc/testSimpleTagInherit/TestSimpleTagInherit.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
  * @bug      8008768 8026567
  * @summary  Using {@inheritDoc} in simple tag defined via -tag fails
  * @library  ../lib
+ * @modules jdk.javadoc
  * @build    JavadocTester
  * @run main TestSimpleTagInherit
  */
--- a/langtools/test/com/sun/javadoc/testSinceTag/TestSinceTag.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/com/sun/javadoc/testSinceTag/TestSinceTag.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
  * @summary  Test to make sure that the since tag works correctly
  * @author   Bhavesh Patel
  * @library  ../lib
+ * @modules jdk.javadoc
  * @build    JavadocTester
  * @run main TestSinceTag
  */
--- a/langtools/test/com/sun/javadoc/testSingleQuotedLink/TestSingleQuotedLink.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/com/sun/javadoc/testSingleQuotedLink/TestSingleQuotedLink.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
  * @summary Verify that a link in single quotes copied to the class-use page as is.
  * @author Yuri Nesterenko
  * @library ../lib
+ * @modules jdk.javadoc
  * @build JavadocTester
  * @run main TestSingleQuotedLink
  */
--- a/langtools/test/com/sun/javadoc/testSourceTab/TestSourceTab.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/com/sun/javadoc/testSourceTab/TestSourceTab.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,7 @@
  * when -linksourcetab is used.
  * @author jamieh
  * @library ../lib
+ * @modules jdk.javadoc
  * @build JavadocTester
  * @run main TestSourceTab
  */
--- a/langtools/test/com/sun/javadoc/testStylesheet/TestStylesheet.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/com/sun/javadoc/testStylesheet/TestStylesheet.java	Thu May 21 11:41:04 2015 -0700
@@ -27,6 +27,7 @@
  * @summary  Run tests on doclet stylesheet.
  * @author   jamieh
  * @library  ../lib
+ * @modules jdk.javadoc
  * @build    JavadocTester
  * @run main TestStylesheet
  */
--- a/langtools/test/com/sun/javadoc/testSubTitle/TestSubTitle.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/com/sun/javadoc/testSubTitle/TestSubTitle.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
  * @summary Test for correct sub title generation.
  * @author Bhavesh Patel
  * @library ../lib
+ * @modules jdk.javadoc
  * @build JavadocTester
  * @run main TestSubTitle
  */
--- a/langtools/test/com/sun/javadoc/testSummaryHeading/TestSummaryHeading.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/com/sun/javadoc/testSummaryHeading/TestSummaryHeading.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,6 +29,7 @@
  *           inherits methods.
  * @author   jamieh
  * @library  ../lib
+ * @modules jdk.javadoc
  * @build    JavadocTester
  * @run main TestSummaryHeading
  */
--- a/langtools/test/com/sun/javadoc/testSuperclassInSerialForm/TestSuperClassInSerialForm.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/com/sun/javadoc/testSuperclassInSerialForm/TestSuperClassInSerialForm.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,7 @@
  * each class in serialized form page.
  * @author jamieh
  * @library ../lib
+ * @modules jdk.javadoc
  * @build JavadocTester
  * @run main TestSuperClassInSerialForm
  */
--- a/langtools/test/com/sun/javadoc/testSupplementary/TestSupplementary.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/com/sun/javadoc/testSupplementary/TestSupplementary.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,7 @@
  *    characters correctly.  This test case needs to be run in en_US locale.
  * @author Naoto Sato
  * @library ../lib
+ * @modules jdk.javadoc
  * @build JavadocTester
  * @run main TestSupplementary
  */
--- a/langtools/test/com/sun/javadoc/testTagHolderMethod/TestTagHolderMethod.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/com/sun/javadoc/testTagHolderMethod/TestTagHolderMethod.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
  * @summary Determine if the new Tag.holder() method works properly.
  * @author jamieh
  * @library ../lib
+ * @modules jdk.javadoc
  * @build JavadocTester
  * @build TestTagHolderMethod
  * @run main TestTagHolderMethod
--- a/langtools/test/com/sun/javadoc/testTagInheritence/TestTagInheritence.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/com/sun/javadoc/testTagInheritence/TestTagInheritence.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
  * @summary <DESC>
  * @author  jamieh
  * @library ../lib
+ * @modules jdk.javadoc
  * @build JavadocTester
  * @run main TestTagInheritence
  */
--- a/langtools/test/com/sun/javadoc/testTagMisuse/TestTagMisuse.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/com/sun/javadoc/testTagMisuse/TestTagMisuse.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
  * @summary Determine if proper warning messages are printed when know.
  * @author jamieh
  * @library ../lib
+ * @modules jdk.javadoc
  * @build JavadocTester
  * @build TestTagMisuse
  * @run main TestTagMisuse
--- a/langtools/test/com/sun/javadoc/testTagOutput/TestTagOutput.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/com/sun/javadoc/testTagOutput/TestTagOutput.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,6 +29,7 @@
  * @summary This test checks the generated tag output.
  * @author Bhavesh Patel
  * @library ../lib
+ * @modules jdk.javadoc
  * @build JavadocTester
  * @run main TestTagOutput
  */
--- a/langtools/test/com/sun/javadoc/testTaglets/TestTaglets.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/com/sun/javadoc/testTaglets/TestTaglets.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,6 +30,9 @@
  *           sure that only the first sentence shows up in the summary table.
  * @author   jamieh
  * @library  ../lib
+ * @modules jdk.javadoc/com.sun.tools.doclets.internal.toolkit
+ *          jdk.javadoc/com.sun.tools.doclets.internal.toolkit.taglets
+ *          jdk.javadoc/com.sun.tools.doclets.internal.toolkit.util
  * @build    JavadocTester taglets.Foo
  * @run main TestTaglets
  */
--- a/langtools/test/com/sun/javadoc/testThrowsHead/TestThrowsHead.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/com/sun/javadoc/testThrowsHead/TestThrowsHead.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,6 +29,7 @@
  * throws section.  Make sure that the link is below a Throws heading.
  * @author jamieh
  * @library ../lib
+ * @modules jdk.javadoc
  * @build JavadocTester
  * @run main TestThrowsHead
  */
--- a/langtools/test/com/sun/javadoc/testThrowsInheritence/TestThrowsTagInheritence.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/com/sun/javadoc/testThrowsInheritence/TestThrowsTagInheritence.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,6 +29,7 @@
  * the case where the name of one exception is not fully qualified.
  * @author jamieh
  * @library ../lib
+ * @modules jdk.javadoc
  * @build JavadocTester
  * @run main TestThrowsTagInheritence
  */
--- a/langtools/test/com/sun/javadoc/testThrowsTag/TestThrowsTag.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/com/sun/javadoc/testThrowsTag/TestThrowsTag.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,7 @@
  *           correct order.
  * @author   jamieh
  * @library  ../lib
+ * @modules jdk.javadoc
  * @build    JavadocTester
  * @run main TestThrowsTag
  */
--- a/langtools/test/com/sun/javadoc/testTitleInHref/TestTitleInHref.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/com/sun/javadoc/testTitleInHref/TestTitleInHref.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
  * @summary Test to make sure that the title attribute shows up in links.
  * @author jamieh
  * @library ../lib
+ * @modules jdk.javadoc
  * @build JavadocTester
  * @run main TestTitleInHref
  */
--- a/langtools/test/com/sun/javadoc/testTopOption/TestTopOption.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/com/sun/javadoc/testTopOption/TestTopOption.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
  * @summary  Test the new -top option.
  * @author   jamieh
  * @library  ../lib
+ * @modules jdk.javadoc
  * @build    JavadocTester
  * @run main TestTopOption
  */
--- a/langtools/test/com/sun/javadoc/testTypeAnnotations/TestTypeAnnotations.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/com/sun/javadoc/testTypeAnnotations/TestTypeAnnotations.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
  * @summary  Make sure that type annotations are displayed correctly
  * @author   Bhavesh Patel
  * @library  ../lib
+ * @modules jdk.javadoc
  * @ignore 8006735 output type annotations in javadoc
  * @build    JavadocTester
  * @run main TestTypeAnnotations
--- a/langtools/test/com/sun/javadoc/testTypeParams/TestTypeParameters.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/com/sun/javadoc/testTypeParams/TestTypeParameters.java	Thu May 21 11:41:04 2015 -0700
@@ -31,6 +31,7 @@
  *           parameter links in the class/annotation signature section when -linksource is set.
  * @author   jamieh
  * @library  ../lib
+ * @modules jdk.javadoc
  * @build    JavadocTester
  * @run main TestTypeParameters
  */
--- a/langtools/test/com/sun/javadoc/testUnnamedPackage/TestUnnamedPackage.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/com/sun/javadoc/testUnnamedPackage/TestUnnamedPackage.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,7 @@
  *           Generate a package summary for the unnamed package.
  * @author   jamieh
  * @library  ../lib
+ * @modules jdk.javadoc
  * @build    JavadocTester
  * @run main TestUnnamedPackage
  */
--- a/langtools/test/com/sun/javadoc/testUseOption/TestUseOption.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/com/sun/javadoc/testUseOption/TestUseOption.java	Thu May 21 11:41:04 2015 -0700
@@ -27,6 +27,7 @@
  * @summary A simple test to ensure class-use files are correct.
  * @author jamieh
  * @library ../lib
+ * @modules jdk.javadoc
  * @build JavadocTester
  * @run main TestUseOption
  */
--- a/langtools/test/com/sun/javadoc/testValueTag/TestValueTag.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/com/sun/javadoc/testValueTag/TestValueTag.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,7 @@
  * use cases. The explainations for each test case are written below.
  * @author   jamieh
  * @library ../lib
+ * @modules jdk.javadoc
  * @build    JavadocTester
  * @run main TestValueTag
  */
--- a/langtools/test/com/sun/javadoc/testWarnBadParamNames/TestWarnBadParamNames.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/com/sun/javadoc/testWarnBadParamNames/TestWarnBadParamNames.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,7 @@
  * name is used with param.
  * @author jamieh
  * @library ../lib
+ * @modules jdk.javadoc
  * @build JavadocTester
  * @run main TestWarnBadParamNames
  */
--- a/langtools/test/com/sun/javadoc/testWarnings/TestWarnings.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/com/sun/javadoc/testWarnings/TestWarnings.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,6 +31,7 @@
  *           Make sure error message starts with "error -".
  * @author   jamieh
  * @library  ../lib
+ * @modules jdk.javadoc
  * @build    JavadocTester
  * @run main TestWarnings
  */
--- a/langtools/test/com/sun/javadoc/testWindowTitle/TestWindowTitle.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/com/sun/javadoc/testWindowTitle/TestWindowTitle.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
  * @summary Test for window title.
  * @author Bhavesh Patel
  * @library ../lib
+ * @modules jdk.javadoc
  * @build JavadocTester
  * @run main TestWindowTitle
  */
--- a/langtools/test/com/sun/javadoc/testXOption/TestXOption.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/com/sun/javadoc/testXOption/TestXOption.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
  * @bug      8007687
  * @summary  Make sure that the -X option works properly.
  * @library ../lib
+ * @modules jdk.javadoc
  * @build    JavadocTester
  * @run main TestXOption
  */
--- a/langtools/test/com/sun/javadoc/typeAnnotations/smoke/TestSmoke.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/com/sun/javadoc/typeAnnotations/smoke/TestSmoke.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,7 @@
  *
  * @author   Mahmood Ali <mali>
  * @library  ../../lib
+ * @modules jdk.javadoc
  * @ignore
  * @build    JavadocTester
  * @run main TestSmoke
--- a/langtools/test/tools/all/RunCodingRules.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/all/RunCodingRules.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,10 @@
  * @test
  * @bug 8043643
  * @summary Run the langtools coding rules over the langtools source code.
+ * @modules java.base/sun.reflect.annotation
+ *          java.logging
+ *          java.xml
+ *          jdk.compiler/com.sun.tools.javac.resources
  */
 
 
--- a/langtools/test/tools/doclint/AccessTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/doclint/AccessTest.java	Thu May 21 11:41:04 2015 -0700
@@ -2,6 +2,7 @@
  * @test /nodynamiccopyright/
  * @bug 8004832
  * @summary Add new doclint package
+ * @modules jdk.compiler/com.sun.tools.doclint
  * @build DocLintTester
  * @run main DocLintTester -ref AccessTest.protected.out AccessTest.java
  * @run main DocLintTester -Xmsgs -ref AccessTest.private.out AccessTest.java
--- a/langtools/test/tools/doclint/AccessTest.package.out	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/doclint/AccessTest.package.out	Thu May 21 11:41:04 2015 -0700
@@ -1,19 +1,19 @@
-AccessTest.java:23: error: malformed HTML
+AccessTest.java:24: error: malformed HTML
      * public a < b
                 ^
-AccessTest.java:28: error: malformed HTML
+AccessTest.java:29: error: malformed HTML
      * protected a < b
                    ^
-AccessTest.java:33: error: malformed HTML
+AccessTest.java:34: error: malformed HTML
      * package-private a < b
                          ^
-AccessTest.java:46: error: malformed HTML
+AccessTest.java:47: error: malformed HTML
      * public a < b
                 ^
-AccessTest.java:51: error: malformed HTML
+AccessTest.java:52: error: malformed HTML
      * protected a < b
                    ^
-AccessTest.java:56: error: malformed HTML
+AccessTest.java:57: error: malformed HTML
      * package-private a < b
                          ^
 6 errors
--- a/langtools/test/tools/doclint/AccessTest.private.out	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/doclint/AccessTest.private.out	Thu May 21 11:41:04 2015 -0700
@@ -1,25 +1,25 @@
-AccessTest.java:23: error: malformed HTML
+AccessTest.java:24: error: malformed HTML
      * public a < b
                 ^
-AccessTest.java:28: error: malformed HTML
+AccessTest.java:29: error: malformed HTML
      * protected a < b
                    ^
-AccessTest.java:33: error: malformed HTML
+AccessTest.java:34: error: malformed HTML
      * package-private a < b
                          ^
-AccessTest.java:38: error: malformed HTML
+AccessTest.java:39: error: malformed HTML
      * private a < b
                  ^
-AccessTest.java:46: error: malformed HTML
+AccessTest.java:47: error: malformed HTML
      * public a < b
                 ^
-AccessTest.java:51: error: malformed HTML
+AccessTest.java:52: error: malformed HTML
      * protected a < b
                    ^
-AccessTest.java:56: error: malformed HTML
+AccessTest.java:57: error: malformed HTML
      * package-private a < b
                          ^
-AccessTest.java:61: error: malformed HTML
+AccessTest.java:62: error: malformed HTML
      * private a < b
                  ^
 8 errors
--- a/langtools/test/tools/doclint/AccessTest.protected.out	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/doclint/AccessTest.protected.out	Thu May 21 11:41:04 2015 -0700
@@ -1,7 +1,7 @@
-AccessTest.java:23: error: malformed HTML
+AccessTest.java:24: error: malformed HTML
      * public a < b
                 ^
-AccessTest.java:28: error: malformed HTML
+AccessTest.java:29: error: malformed HTML
      * protected a < b
                    ^
 2 errors
--- a/langtools/test/tools/doclint/AccessTest.public.out	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/doclint/AccessTest.public.out	Thu May 21 11:41:04 2015 -0700
@@ -1,4 +1,4 @@
-AccessTest.java:23: error: malformed HTML
+AccessTest.java:24: error: malformed HTML
      * public a < b
                 ^
 1 error
--- a/langtools/test/tools/doclint/AccessibilityTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/doclint/AccessibilityTest.java	Thu May 21 11:41:04 2015 -0700
@@ -2,6 +2,7 @@
  * @test /nodynamiccopyright/
  * @bug 8004832
  * @summary Add new doclint package
+ * @modules jdk.compiler/com.sun.tools.doclint
  * @build DocLintTester
  * @run main DocLintTester -Xmsgs:-accessibility AccessibilityTest.java
  * @run main DocLintTester -ref AccessibilityTest.out AccessibilityTest.java
--- a/langtools/test/tools/doclint/AccessibilityTest.out	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/doclint/AccessibilityTest.out	Thu May 21 11:41:04 2015 -0700
@@ -1,13 +1,13 @@
-AccessibilityTest.java:14: error: header used out of sequence: <H2>
+AccessibilityTest.java:15: error: header used out of sequence: <H2>
      * <h2> ... </h2>
        ^
-AccessibilityTest.java:20: error: header used out of sequence: <H3>
+AccessibilityTest.java:21: error: header used out of sequence: <H3>
      * <h3> ... </h3>
        ^
-AccessibilityTest.java:25: error: no "alt" attribute for image
+AccessibilityTest.java:26: error: no "alt" attribute for image
      * <img src="x.jpg">
        ^
-AccessibilityTest.java:40: error: no summary or caption for table
+AccessibilityTest.java:41: error: no summary or caption for table
      * <table><tr><th>head<tr><td>data</table>
                                       ^
 4 errors
--- a/langtools/test/tools/doclint/AnchorTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/doclint/AnchorTest.java	Thu May 21 11:41:04 2015 -0700
@@ -2,6 +2,7 @@
  * @test /nodynamiccopyright/
  * @bug 8004832
  * @summary Add new doclint package
+ * @modules jdk.compiler/com.sun.tools.doclint
  * @build DocLintTester
  * @run main DocLintTester -ref AnchorTest.out AnchorTest.java
  */
--- a/langtools/test/tools/doclint/AnchorTest.out	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/doclint/AnchorTest.out	Thu May 21 11:41:04 2015 -0700
@@ -1,49 +1,49 @@
-AnchorTest.java:19: error: anchor already defined: "foo"
+AnchorTest.java:20: error: anchor already defined: "foo"
      * <a name=foo></a>
           ^
-AnchorTest.java:24: error: invalid name for anchor: ""
+AnchorTest.java:25: error: invalid name for anchor: ""
      * <a name=></a>
           ^
-AnchorTest.java:29: error: invalid name for anchor: "123"
+AnchorTest.java:30: error: invalid name for anchor: "123"
      * <a name=123 ></a>
           ^
-AnchorTest.java:34: error: no value given for anchor
+AnchorTest.java:35: error: no value given for anchor
      * <a name ></a>
           ^
-AnchorTest.java:46: error: anchor already defined: "foo"
+AnchorTest.java:47: error: anchor already defined: "foo"
      * <a id=foo></a>
           ^
-AnchorTest.java:51: error: invalid name for anchor: ""
+AnchorTest.java:52: error: invalid name for anchor: ""
      * <a id=></a>
           ^
-AnchorTest.java:51: error: anchor already defined: ""
+AnchorTest.java:52: error: anchor already defined: ""
      * <a id=></a>
           ^
-AnchorTest.java:56: error: invalid name for anchor: "123"
+AnchorTest.java:57: error: invalid name for anchor: "123"
      * <a id=123 ></a>
           ^
-AnchorTest.java:56: error: anchor already defined: "123"
+AnchorTest.java:57: error: anchor already defined: "123"
      * <a id=123 ></a>
           ^
-AnchorTest.java:61: error: no value given for anchor
+AnchorTest.java:62: error: no value given for anchor
      * <a id ></a>
           ^
-AnchorTest.java:73: error: anchor already defined: "foo"
+AnchorTest.java:74: error: anchor already defined: "foo"
      * <p id=foo>text</p>
           ^
-AnchorTest.java:78: error: invalid name for anchor: ""
+AnchorTest.java:79: error: invalid name for anchor: ""
      * <p id=>text</p>
           ^
-AnchorTest.java:78: error: anchor already defined: ""
+AnchorTest.java:79: error: anchor already defined: ""
      * <p id=>text</p>
           ^
-AnchorTest.java:83: error: invalid name for anchor: "123"
+AnchorTest.java:84: error: invalid name for anchor: "123"
      * <p id=123 >text</p>
           ^
-AnchorTest.java:83: error: anchor already defined: "123"
+AnchorTest.java:84: error: anchor already defined: "123"
      * <p id=123 >text</p>
           ^
-AnchorTest.java:88: error: no value given for anchor
+AnchorTest.java:89: error: no value given for anchor
      * <p id >text</p>
           ^
 16 errors
--- a/langtools/test/tools/doclint/AnchorTest2.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/doclint/AnchorTest2.java	Thu May 21 11:41:04 2015 -0700
@@ -2,6 +2,7 @@
  * @test /nodynamiccopyright/
  * @bug 8020313
  * @summary doclint doesn't reset HTML anchors correctly
+ * @modules jdk.compiler/com.sun.tools.doclint
  * @build DocLintTester
  * @run main DocLintTester -ref AnchorTest2.out AnchorTest2.java AnchorTest2a.java
  * @run main DocLintTester -ref AnchorTest2.out AnchorTest2a.java AnchorTest2.java
--- a/langtools/test/tools/doclint/AnchorTest2.out	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/doclint/AnchorTest2.out	Thu May 21 11:41:04 2015 -0700
@@ -1,4 +1,4 @@
-AnchorTest2.java:15: error: anchor already defined: "AnchorTest2"
+AnchorTest2.java:16: error: anchor already defined: "AnchorTest2"
     /** <a name="AnchorTest2"> </a> */
            ^
 1 error
--- a/langtools/test/tools/doclint/BadPackageCommentTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/doclint/BadPackageCommentTest.java	Thu May 21 11:41:04 2015 -0700
@@ -2,6 +2,7 @@
  * @test /nodynamiccopyright/
  * @bug 8020278
  * @summary NPE in javadoc (bad handling of bad tag in package-info.java)
+ * @modules jdk.compiler/com.sun.tools.doclint
  * @build DocLintTester
  * @run main DocLintTester -ref BadPackageCommentTest.out BadPackageCommentTest.java
  */
--- a/langtools/test/tools/doclint/BadPackageCommentTest.out	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/doclint/BadPackageCommentTest.out	Thu May 21 11:41:04 2015 -0700
@@ -1,13 +1,13 @@
-BadPackageCommentTest.java:13: warning: documentation comment not expected here
+BadPackageCommentTest.java:14: warning: documentation comment not expected here
 package p;
 ^
-BadPackageCommentTest.java:11: error: no tag name after @
+BadPackageCommentTest.java:12: error: no tag name after @
  * @@@
    ^
-BadPackageCommentTest.java:11: error: no tag name after @
+BadPackageCommentTest.java:12: error: no tag name after @
  * @@@
     ^
-BadPackageCommentTest.java:11: error: no tag name after @
+BadPackageCommentTest.java:12: error: no tag name after @
  * @@@
      ^
 3 errors
--- a/langtools/test/tools/doclint/CoverageExtras.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/doclint/CoverageExtras.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test
  * @bug 8006263
  * @summary Supplementary test cases needed for doclint
+ * @modules jdk.compiler/com.sun.tools.doclint
  */
 
 import com.sun.tools.doclint.Checker;
--- a/langtools/test/tools/doclint/CustomTagTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/doclint/CustomTagTest.java	Thu May 21 11:41:04 2015 -0700
@@ -2,6 +2,7 @@
  * @test /nodynamiccopyright/
  * @bug 8006248 8028318
  * @summary DocLint should report unknown tags
+ * @modules jdk.compiler/com.sun.tools.doclint
  * @build DocLintTester
  * @run main DocLintTester CustomTagTest.java
  * @run main DocLintTester -XcustomTags: -ref CustomTagTest.out CustomTagTest.java
--- a/langtools/test/tools/doclint/CustomTagTest.out	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/doclint/CustomTagTest.out	Thu May 21 11:41:04 2015 -0700
@@ -1,10 +1,10 @@
-CustomTagTest.java:14: error: unknown tag: customTag
+CustomTagTest.java:15: error: unknown tag: customTag
  * @customTag Text for a custom tag.
    ^
-CustomTagTest.java:15: error: unknown tag: custom.tag
+CustomTagTest.java:16: error: unknown tag: custom.tag
  * @custom.tag Text for another custom tag.
    ^
-CustomTagTest.java:16: error: unknown tag: unknownTag
+CustomTagTest.java:17: error: unknown tag: unknownTag
  * @unknownTag Text for an unknown tag.
    ^
 3 errors
--- a/langtools/test/tools/doclint/CustomTagTestWithOption.out	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/doclint/CustomTagTestWithOption.out	Thu May 21 11:41:04 2015 -0700
@@ -1,4 +1,4 @@
-CustomTagTest.java:16: error: unknown tag: unknownTag
+CustomTagTest.java:17: error: unknown tag: unknownTag
  * @unknownTag Text for an unknown tag.
    ^
 1 error
--- a/langtools/test/tools/doclint/EmptyAuthorTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/doclint/EmptyAuthorTest.java	Thu May 21 11:41:04 2015 -0700
@@ -2,6 +2,7 @@
  * @test /nodynamiccopyright/
  * @bug 8004832
  * @summary Add new doclint package
+ * @modules jdk.compiler/com.sun.tools.doclint
  * @build DocLintTester
  * @run main DocLintTester -Xmsgs:-syntax EmptyAuthorTest.java
  * @run main DocLintTester -Xmsgs:syntax -ref EmptyAuthorTest.out EmptyAuthorTest.java
--- a/langtools/test/tools/doclint/EmptyAuthorTest.out	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/doclint/EmptyAuthorTest.out	Thu May 21 11:41:04 2015 -0700
@@ -1,4 +1,4 @@
-EmptyAuthorTest.java:10: warning: no description for @author
+EmptyAuthorTest.java:11: warning: no description for @author
 /** @author */
     ^
 1 warning
--- a/langtools/test/tools/doclint/EmptyExceptionTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/doclint/EmptyExceptionTest.java	Thu May 21 11:41:04 2015 -0700
@@ -2,6 +2,7 @@
  * @test /nodynamiccopyright/
  * @bug 8004832
  * @summary Add new doclint package
+ * @modules jdk.compiler/com.sun.tools.doclint
  * @build DocLintTester
  * @run main DocLintTester -Xmsgs:-syntax EmptyExceptionTest.java
  * @run main DocLintTester -Xmsgs:syntax -ref EmptyExceptionTest.out EmptyExceptionTest.java
--- a/langtools/test/tools/doclint/EmptyExceptionTest.out	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/doclint/EmptyExceptionTest.out	Thu May 21 11:41:04 2015 -0700
@@ -1,4 +1,4 @@
-EmptyExceptionTest.java:12: warning: no description for @exception
+EmptyExceptionTest.java:13: warning: no description for @exception
     /** @exception NullPointerException */
         ^
 1 warning
--- a/langtools/test/tools/doclint/EmptyParamTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/doclint/EmptyParamTest.java	Thu May 21 11:41:04 2015 -0700
@@ -2,6 +2,7 @@
  * @test /nodynamiccopyright/
  * @bug 8004832
  * @summary Add new doclint package
+ * @modules jdk.compiler/com.sun.tools.doclint
  * @build DocLintTester
  * @run main DocLintTester -Xmsgs:-syntax EmptyParamTest.java
  * @run main DocLintTester -Xmsgs:syntax -ref EmptyParamTest.out EmptyParamTest.java
--- a/langtools/test/tools/doclint/EmptyParamTest.out	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/doclint/EmptyParamTest.out	Thu May 21 11:41:04 2015 -0700
@@ -1,4 +1,4 @@
-EmptyParamTest.java:12: warning: no description for @param
+EmptyParamTest.java:13: warning: no description for @param
     /** @param i */
         ^
 1 warning
--- a/langtools/test/tools/doclint/EmptyPreTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/doclint/EmptyPreTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test
  * @bug 8010317
  * @summary DocLint incorrectly reports some <pre> tags as empty
+ * @modules jdk.compiler/com.sun.tools.doclint
  * @build DocLintTester
  * @run main DocLintTester -Xmsgs:html EmptyPreTest.java
  */
--- a/langtools/test/tools/doclint/EmptyReturnTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/doclint/EmptyReturnTest.java	Thu May 21 11:41:04 2015 -0700
@@ -2,6 +2,7 @@
  * @test /nodynamiccopyright/
  * @bug 8004832
  * @summary Add new doclint package
+ * @modules jdk.compiler/com.sun.tools.doclint
  * @build DocLintTester
  * @run main DocLintTester -Xmsgs:-syntax EmptyReturnTest.java
  * @run main DocLintTester -Xmsgs:syntax -ref EmptyReturnTest.out EmptyReturnTest.java
--- a/langtools/test/tools/doclint/EmptyReturnTest.out	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/doclint/EmptyReturnTest.out	Thu May 21 11:41:04 2015 -0700
@@ -1,4 +1,4 @@
-EmptyReturnTest.java:12: warning: no description for @return
+EmptyReturnTest.java:13: warning: no description for @return
     /** @return */
         ^
 1 warning
--- a/langtools/test/tools/doclint/EmptySerialDataTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/doclint/EmptySerialDataTest.java	Thu May 21 11:41:04 2015 -0700
@@ -2,6 +2,7 @@
  * @test /nodynamiccopyright/
  * @bug 8004832
  * @summary Add new doclint package
+ * @modules jdk.compiler/com.sun.tools.doclint
  * @build DocLintTester
  * @run main DocLintTester -Xmsgs:-syntax EmptySerialDataTest.java
  * @run main DocLintTester -Xmsgs:syntax -ref EmptySerialDataTest.out EmptySerialDataTest.java
--- a/langtools/test/tools/doclint/EmptySerialDataTest.out	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/doclint/EmptySerialDataTest.out	Thu May 21 11:41:04 2015 -0700
@@ -1,4 +1,4 @@
-EmptySerialDataTest.java:15: warning: no description for @serialData
+EmptySerialDataTest.java:16: warning: no description for @serialData
     /** @serialData */
         ^
 1 warning
--- a/langtools/test/tools/doclint/EmptySerialFieldTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/doclint/EmptySerialFieldTest.java	Thu May 21 11:41:04 2015 -0700
@@ -2,6 +2,7 @@
  * @test /nodynamiccopyright/
  * @bug 8004832
  * @summary Add new doclint package
+ * @modules jdk.compiler/com.sun.tools.doclint
  * @build DocLintTester
  * @run main DocLintTester -Xmsgs:-syntax EmptySerialFieldTest.java
  * @run main DocLintTester -Xmsgs:syntax -ref EmptySerialFieldTest.out EmptySerialFieldTest.java
--- a/langtools/test/tools/doclint/EmptySerialFieldTest.out	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/doclint/EmptySerialFieldTest.out	Thu May 21 11:41:04 2015 -0700
@@ -1,4 +1,4 @@
-EmptySerialFieldTest.java:17: warning: no description for @serialField
+EmptySerialFieldTest.java:18: warning: no description for @serialField
      * @serialField empty    String
        ^
 1 warning
--- a/langtools/test/tools/doclint/EmptySinceTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/doclint/EmptySinceTest.java	Thu May 21 11:41:04 2015 -0700
@@ -2,6 +2,7 @@
  * @test /nodynamiccopyright/
  * @bug 8004832
  * @summary Add new doclint package
+ * @modules jdk.compiler/com.sun.tools.doclint
  * @build DocLintTester
  * @run main DocLintTester -Xmsgs:-syntax EmptySinceTest.java
  * @run main DocLintTester -Xmsgs:syntax -ref EmptySinceTest.out EmptySinceTest.java
--- a/langtools/test/tools/doclint/EmptySinceTest.out	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/doclint/EmptySinceTest.out	Thu May 21 11:41:04 2015 -0700
@@ -1,4 +1,4 @@
-EmptySinceTest.java:12: warning: no description for @since
+EmptySinceTest.java:13: warning: no description for @since
     /** @since */
         ^
 1 warning
--- a/langtools/test/tools/doclint/EmptyVersionTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/doclint/EmptyVersionTest.java	Thu May 21 11:41:04 2015 -0700
@@ -2,6 +2,7 @@
  * @test /nodynamiccopyright/
  * @bug 8004832
  * @summary Add new doclint package
+ * @modules jdk.compiler/com.sun.tools.doclint
  * @build DocLintTester
  * @run main DocLintTester -Xmsgs:-syntax EmptyVersionTest.java
  * @run main DocLintTester -Xmsgs:syntax -ref EmptyVersionTest.out EmptyVersionTest.java
--- a/langtools/test/tools/doclint/EmptyVersionTest.out	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/doclint/EmptyVersionTest.out	Thu May 21 11:41:04 2015 -0700
@@ -1,4 +1,4 @@
-EmptyVersionTest.java:12: warning: no description for @version
+EmptyVersionTest.java:13: warning: no description for @version
     /** @version */
         ^
 1 warning
--- a/langtools/test/tools/doclint/EndTagsTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/doclint/EndTagsTest.java	Thu May 21 11:41:04 2015 -0700
@@ -2,6 +2,7 @@
  * @test /nodynamiccopyright/
  * @bug 8006236
  * @summary doclint: structural issue hidden
+ * @modules jdk.compiler/com.sun.tools.doclint
  * @build DocLintTester
  * @run main DocLintTester -Xmsgs:-html EndTagsTest.java
  * @run main DocLintTester -ref EndTagsTest.out EndTagsTest.java
--- a/langtools/test/tools/doclint/EndTagsTest.out	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/doclint/EndTagsTest.out	Thu May 21 11:41:04 2015 -0700
@@ -1,25 +1,25 @@
-EndTagsTest.java:18: error: unexpected end tag: </a>
+EndTagsTest.java:19: error: unexpected end tag: </a>
     /** </a> */
         ^
-EndTagsTest.java:21: error: unexpected end tag: </a>
+EndTagsTest.java:22: error: unexpected end tag: </a>
     /** <p> </a> */
             ^
-EndTagsTest.java:24: error: unexpected end tag: </a>
+EndTagsTest.java:25: error: unexpected end tag: </a>
     /** <p> text </p> </a> */
                       ^
-EndTagsTest.java:27: error: invalid end tag: </img>
+EndTagsTest.java:28: error: invalid end tag: </img>
     /** <img alt="image" src="image.png"> </img> */
                                           ^
-EndTagsTest.java:30: error: unknown tag: invalid
+EndTagsTest.java:31: error: unknown tag: invalid
     /** <invalid> </invalid> */
         ^
-EndTagsTest.java:30: error: unknown tag: invalid
+EndTagsTest.java:31: error: unknown tag: invalid
     /** <invalid> </invalid> */
                   ^
-EndTagsTest.java:33: error: unknown tag: invalid
+EndTagsTest.java:34: error: unknown tag: invalid
     /** <invalid> */
         ^
-EndTagsTest.java:36: error: unknown tag: invalid
+EndTagsTest.java:37: error: unknown tag: invalid
     /** </invalid> */
         ^
 8 errors
--- a/langtools/test/tools/doclint/EndWithIdentifierTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/doclint/EndWithIdentifierTest.java	Thu May 21 11:41:04 2015 -0700
@@ -2,6 +2,7 @@
  * @test /nodynamiccopyright/
  * @bug 8007096
  * @summary DocLint parsing problems with some comments
+ * @modules jdk.compiler/com.sun.tools.doclint
  * @build DocLintTester
  * @run main DocLintTester -Xmsgs:-html EndWithIdentifierTest.java
  * @run main DocLintTester -Xmsgs -ref EndWithIdentifierTest.out EndWithIdentifierTest.java
--- a/langtools/test/tools/doclint/EndWithIdentifierTest.out	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/doclint/EndWithIdentifierTest.out	Thu May 21 11:41:04 2015 -0700
@@ -1,19 +1,19 @@
-EndWithIdentifierTest.java:14: error: syntax error in reference
+EndWithIdentifierTest.java:15: error: syntax error in reference
     /**{@link*/
        ^
-EndWithIdentifierTest.java:17: error: reference not found
+EndWithIdentifierTest.java:18: error: reference not found
     /**@see List*/
             ^
-EndWithIdentifierTest.java:20: error: semicolon missing
+EndWithIdentifierTest.java:21: error: semicolon missing
     /**&amp*/
        ^
-EndWithIdentifierTest.java:23: error: malformed HTML
+EndWithIdentifierTest.java:24: error: malformed HTML
     /**<a*/
        ^
-EndWithIdentifierTest.java:26: error: malformed HTML
+EndWithIdentifierTest.java:27: error: malformed HTML
     /**</a*/
        ^
-EndWithIdentifierTest.java:29: error: malformed HTML
+EndWithIdentifierTest.java:30: error: malformed HTML
     /**<a name*/
        ^
 6 errors
--- a/langtools/test/tools/doclint/HtmlAttrsTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/doclint/HtmlAttrsTest.java	Thu May 21 11:41:04 2015 -0700
@@ -2,6 +2,7 @@
  * @test /nodynamiccopyright/
  * @bug 8004832
  * @summary Add new doclint package
+ * @modules jdk.compiler/com.sun.tools.doclint
  * @build DocLintTester
  * @run main DocLintTester -Xmsgs:-html HtmlAttrsTest.java
  * @run main DocLintTester -ref HtmlAttrsTest.out HtmlAttrsTest.java
--- a/langtools/test/tools/doclint/HtmlAttrsTest.out	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/doclint/HtmlAttrsTest.out	Thu May 21 11:41:04 2015 -0700
@@ -1,10 +1,10 @@
-HtmlAttrsTest.java:13: error: unknown attribute: xyz
+HtmlAttrsTest.java:14: error: unknown attribute: xyz
      * <p xyz> text </p>
           ^
-HtmlAttrsTest.java:18: warning: attribute obsolete: name
+HtmlAttrsTest.java:19: warning: attribute obsolete: name
      * <img name="x" alt="alt">
             ^
-HtmlAttrsTest.java:23: warning: attribute obsolete, use CSS instead: size
+HtmlAttrsTest.java:24: warning: attribute obsolete, use CSS instead: size
      * <font size="3"> text </font>
              ^
 1 error
--- a/langtools/test/tools/doclint/HtmlTagsTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/doclint/HtmlTagsTest.java	Thu May 21 11:41:04 2015 -0700
@@ -2,6 +2,7 @@
  * @test /nodynamiccopyright/
  * @bug 8004832
  * @summary Add new doclint package
+ * @modules jdk.compiler/com.sun.tools.doclint
  * @build DocLintTester
  * @run main DocLintTester -Xmsgs:-html HtmlTagsTest.java
  * @run main DocLintTester -ref HtmlTagsTest.out HtmlTagsTest.java
--- a/langtools/test/tools/doclint/HtmlTagsTest.out	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/doclint/HtmlTagsTest.out	Thu May 21 11:41:04 2015 -0700
@@ -1,47 +1,47 @@
-HtmlTagsTest.java:13: error: unknown tag: xyz
+HtmlTagsTest.java:14: error: unknown tag: xyz
      * <xyz> ... </xyz>
        ^
-HtmlTagsTest.java:13: error: unknown tag: xyz
+HtmlTagsTest.java:14: error: unknown tag: xyz
      * <xyz> ... </xyz>
                  ^
-HtmlTagsTest.java:18: error: unknown tag: xyz
+HtmlTagsTest.java:19: error: unknown tag: xyz
      * <div> <xyz> </div>
              ^
-HtmlTagsTest.java:23: error: self-closing element not allowed
+HtmlTagsTest.java:24: error: self-closing element not allowed
      * <br/>
        ^
-HtmlTagsTest.java:28: error: element not allowed in documentation comments: <html>
-     * <html>
-       ^
-HtmlTagsTest.java:28: error: element not closed: html
+HtmlTagsTest.java:29: error: element not allowed in documentation comments: <html>
      * <html>
        ^
-HtmlTagsTest.java:33: error: block element not allowed within inline element <span>: p
+HtmlTagsTest.java:29: error: element not closed: html
+     * <html>
+       ^
+HtmlTagsTest.java:34: error: block element not allowed within inline element <span>: p
      * <span> <p> </span>
               ^
-HtmlTagsTest.java:38: error: block element not allowed within @link: p
-     * {@link java.lang.String <p> }
-                               ^
 HtmlTagsTest.java:39: error: block element not allowed within @link: p
      * {@link java.lang.String <p> }
                                ^
-HtmlTagsTest.java:44: error: invalid end tag: </img>
+HtmlTagsTest.java:40: error: block element not allowed within @link: p
+     * {@link java.lang.String <p> }
+                               ^
+HtmlTagsTest.java:45: error: invalid end tag: </img>
      * <img src="any.jpg" alt="alt"> </img>
                                      ^
-HtmlTagsTest.java:49: error: end tag missing: </b>
+HtmlTagsTest.java:50: error: end tag missing: </b>
      * <i> <b> </i>
            ^
-HtmlTagsTest.java:54: error: unexpected end tag: </b>
+HtmlTagsTest.java:55: error: unexpected end tag: </b>
      * <i> </b> </i>
            ^
-HtmlTagsTest.java:54: warning: empty <i> tag
+HtmlTagsTest.java:55: warning: empty <i> tag
      * <i> </b> </i>
                 ^
-HtmlTagsTest.java:59: error: text not allowed in <ul> element
+HtmlTagsTest.java:60: error: text not allowed in <ul> element
      * <ul> text <li> ... </li> </ul>
            ^
-HtmlTagsTest.java:64: error: tag not allowed here: <b>
+HtmlTagsTest.java:65: error: tag not allowed here: <b>
      * <ul> <b>text</b> <li> ... </li> </ul>
             ^
 14 errors
-1 warning
\ No newline at end of file
+1 warning
--- a/langtools/test/tools/doclint/HtmlVersionTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/doclint/HtmlVersionTest.java	Thu May 21 11:41:04 2015 -0700
@@ -26,6 +26,7 @@
  * @bug 8072945
  * @summary test HTML version
  * @library ..
+ * @modules jdk.compiler/com.sun.tools.doclint
  * @build DocLintTester
  * @run main DocLintTester -XhtmlVersion:html5 HtmlVersionTest.java
  * @run main DocLintTester -XhtmlVersion:html4 HtmlVersionTest.java
--- a/langtools/test/tools/doclint/LiteralTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/doclint/LiteralTest.java	Thu May 21 11:41:04 2015 -0700
@@ -2,6 +2,7 @@
  * @test /nodynamiccopyright/
  * @bug 8006228
  * @summary Doclint doesn't detect <code> {@code nested inline} </code>
+ * @modules jdk.compiler/com.sun.tools.doclint
  * @build DocLintTester
  * @run main DocLintTester -ref LiteralTest.out LiteralTest.java
  */
--- a/langtools/test/tools/doclint/LiteralTest.out	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/doclint/LiteralTest.out	Thu May 21 11:41:04 2015 -0700
@@ -1,4 +1,4 @@
-LiteralTest.java:14: warning: {@code} within <code>
+LiteralTest.java:15: warning: {@code} within <code>
     /** <code> abc {@code < & > } def </code> */
                    ^
 1 warning
--- a/langtools/test/tools/doclint/MissingCommentTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/doclint/MissingCommentTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,6 @@
 /*
  * @test /nodynamiccopyright/
+ * @modules jdk.compiler/com.sun.tools.doclint
  * @build DocLintTester
  * @run main DocLintTester -Xmsgs:-missing MissingCommentTest.java
  * @run main DocLintTester -Xmsgs:missing -ref MissingCommentTest.out MissingCommentTest.java
--- a/langtools/test/tools/doclint/MissingCommentTest.out	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/doclint/MissingCommentTest.out	Thu May 21 11:41:04 2015 -0700
@@ -1,13 +1,13 @@
-MissingCommentTest.java:8: warning: no comment
+MissingCommentTest.java:9: warning: no comment
 public class MissingCommentTest {
        ^
-MissingCommentTest.java:9: warning: no comment
+MissingCommentTest.java:10: warning: no comment
     MissingCommentTest() { }
     ^
-MissingCommentTest.java:11: warning: no comment
+MissingCommentTest.java:12: warning: no comment
     int missingComment;
         ^
-MissingCommentTest.java:13: warning: no comment
+MissingCommentTest.java:14: warning: no comment
     void missingComment() { }
          ^
 4 warnings
--- a/langtools/test/tools/doclint/MissingParamsTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/doclint/MissingParamsTest.java	Thu May 21 11:41:04 2015 -0700
@@ -2,6 +2,7 @@
  * @test /nodynamiccopyright/
  * @bug 8004832
  * @summary Add new doclint package
+ * @modules jdk.compiler/com.sun.tools.doclint
  * @build DocLintTester
  * @run main DocLintTester -Xmsgs:-missing MissingParamsTest.java
  * @run main DocLintTester -Xmsgs:missing -ref MissingParamsTest.out MissingParamsTest.java
--- a/langtools/test/tools/doclint/MissingParamsTest.out	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/doclint/MissingParamsTest.out	Thu May 21 11:41:04 2015 -0700
@@ -1,13 +1,13 @@
-MissingParamsTest.java:13: warning: no @param for param
+MissingParamsTest.java:14: warning: no @param for param
     MissingParamsTest(int param) { }
     ^
-MissingParamsTest.java:16: warning: no @param for <T>
+MissingParamsTest.java:17: warning: no @param for <T>
     <T> MissingParamsTest() { }
         ^
-MissingParamsTest.java:19: warning: no @param for param
+MissingParamsTest.java:20: warning: no @param for param
     void missingParam(int param) { }
          ^
-MissingParamsTest.java:22: warning: no @param for <T>
+MissingParamsTest.java:23: warning: no @param for <T>
     <T> void missingTyparam() { }
              ^
 4 warnings
--- a/langtools/test/tools/doclint/MissingReturnTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/doclint/MissingReturnTest.java	Thu May 21 11:41:04 2015 -0700
@@ -2,6 +2,7 @@
  * @test /nodynamiccopyright/
  * @bug 8004832
  * @summary Add new doclint package
+ * @modules jdk.compiler/com.sun.tools.doclint
  * @build DocLintTester
  * @run main DocLintTester -Xmsgs:-missing MissingReturnTest.java
  * @run main DocLintTester -Xmsgs:missing -ref MissingReturnTest.out MissingReturnTest.java
--- a/langtools/test/tools/doclint/MissingReturnTest.out	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/doclint/MissingReturnTest.out	Thu May 21 11:41:04 2015 -0700
@@ -1,4 +1,4 @@
-MissingReturnTest.java:22: warning: no @return
+MissingReturnTest.java:23: warning: no @return
     int missingReturn() { }
         ^
 1 warning
--- a/langtools/test/tools/doclint/MissingThrowsTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/doclint/MissingThrowsTest.java	Thu May 21 11:41:04 2015 -0700
@@ -2,6 +2,7 @@
  * @test /nodynamiccopyright/
  * @bug 8004832
  * @summary Add new doclint package
+ * @modules jdk.compiler/com.sun.tools.doclint
  * @build DocLintTester
  * @run main DocLintTester -Xmsgs:-missing MissingThrowsTest.java
  * @run main DocLintTester -Xmsgs:missing -ref MissingThrowsTest.out MissingThrowsTest.java
--- a/langtools/test/tools/doclint/MissingThrowsTest.out	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/doclint/MissingThrowsTest.out	Thu May 21 11:41:04 2015 -0700
@@ -1,4 +1,4 @@
-MissingThrowsTest.java:13: warning: no @throws for java.lang.Exception
+MissingThrowsTest.java:14: warning: no @throws for java.lang.Exception
     void missingThrows() throws Exception { }
          ^
 1 warning
--- a/langtools/test/tools/doclint/OptionTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/doclint/OptionTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test
  * @bug 8004832
  * @summary Add new doclint package
+ * @modules jdk.compiler/com.sun.tools.doclint
  */
 
 import com.sun.tools.doclint.DocLint;
--- a/langtools/test/tools/doclint/OverridesTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/doclint/OverridesTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test
  * @bug 8004832
  * @summary Add new doclint package
+ * @modules jdk.compiler/com.sun.tools.doclint
  * @build DocLintTester
  * @run main DocLintTester -Xmsgs:all OverridesTest.java
  */
--- a/langtools/test/tools/doclint/ParaTagTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/doclint/ParaTagTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test
  * @bug 8007566
  * @summary DocLint too aggressive with not allowed here: <p>
+ * @modules jdk.compiler/com.sun.tools.doclint
  * @build DocLintTester
  * @run main DocLintTester -Xmsgs ParaTagTest.java
  */
--- a/langtools/test/tools/doclint/ReferenceTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/doclint/ReferenceTest.java	Thu May 21 11:41:04 2015 -0700
@@ -2,6 +2,7 @@
  * @test /nodynamiccopyright/
  * @bug 8004832 8020556 8002154
  * @summary Add new doclint package
+ * @modules jdk.compiler/com.sun.tools.doclint
  * @build DocLintTester
  * @run main DocLintTester -Xmsgs:-reference ReferenceTest.java
  * @run main DocLintTester -ref ReferenceTest.out ReferenceTest.java
--- a/langtools/test/tools/doclint/ReferenceTest.out	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/doclint/ReferenceTest.out	Thu May 21 11:41:04 2015 -0700
@@ -1,40 +1,40 @@
-ReferenceTest.java:13: error: invalid use of @param
+ReferenceTest.java:14: error: invalid use of @param
      * @param x description
        ^
-ReferenceTest.java:18: error: invalid use of @param
+ReferenceTest.java:19: error: invalid use of @param
      * @param x description
        ^
-ReferenceTest.java:23: error: @param name not found
+ReferenceTest.java:24: error: @param name not found
      * @param x description
               ^
-ReferenceTest.java:25: warning: no @param for a
+ReferenceTest.java:26: warning: no @param for a
     public void param_name_not_found(int a) { }
                 ^
-ReferenceTest.java:28: error: @param name not found
+ReferenceTest.java:29: error: @param name not found
      * @param <X> description
                ^
-ReferenceTest.java:33: error: reference not found
+ReferenceTest.java:34: error: reference not found
      * @see Object#tooStrong()
             ^
-ReferenceTest.java:38: error: invalid use of @return
+ReferenceTest.java:39: error: invalid use of @return
      * @return x description
        ^
-ReferenceTest.java:43: error: invalid use of @return
+ReferenceTest.java:44: error: invalid use of @return
      * @return x description
        ^
-ReferenceTest.java:48: error: exception not thrown: java.lang.Exception
+ReferenceTest.java:49: error: exception not thrown: java.lang.Exception
      * @throws Exception description
                ^
-ReferenceTest.java:59: error: type arguments not allowed here
+ReferenceTest.java:60: error: type arguments not allowed here
      * {@link java.util.List<String>}
               ^
-ReferenceTest.java:60: error: type arguments not allowed here
+ReferenceTest.java:61: error: type arguments not allowed here
      * {@link java.util.List<String>#equals}
               ^
-ReferenceTest.java:61: error: type arguments not allowed here
+ReferenceTest.java:62: error: type arguments not allowed here
      * @see java.util.List<String>
             ^
-ReferenceTest.java:62: error: type arguments not allowed here
+ReferenceTest.java:63: error: type arguments not allowed here
      * @see java.util.List<String>#equals
             ^
 12 errors
--- a/langtools/test/tools/doclint/ResourceTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/doclint/ResourceTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test
  * @bug 8006615
  * @summary move remaining messages into resource bundle
+ * @modules jdk.compiler/com.sun.tools.doclint
  */
 
 import java.io.IOException;
--- a/langtools/test/tools/doclint/RunTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/doclint/RunTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @bug 8004832 8000103
  * @summary Add new doclint package
  * @summary Create doclint utility
+ * @modules jdk.compiler/com.sun.tools.doclint
  */
 
 import java.io.File;
--- a/langtools/test/tools/doclint/SyntaxTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/doclint/SyntaxTest.java	Thu May 21 11:41:04 2015 -0700
@@ -2,6 +2,7 @@
  * @test /nodynamiccopyright/
  * @bug 8004832
  * @summary Add new doclint package
+ * @modules jdk.compiler/com.sun.tools.doclint
  * @build DocLintTester
  * @run main DocLintTester -Xmsgs:-syntax SyntaxTest.java
  * @run main DocLintTester -ref SyntaxTest.out SyntaxTest.java
--- a/langtools/test/tools/doclint/SyntaxTest.out	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/doclint/SyntaxTest.out	Thu May 21 11:41:04 2015 -0700
@@ -1,4 +1,4 @@
-SyntaxTest.java:13: error: malformed HTML
+SyntaxTest.java:14: error: malformed HTML
      * a < b
          ^
 1 error
--- a/langtools/test/tools/doclint/SyntheticTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/doclint/SyntheticTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test
  * @bug 8004832
  * @summary Add new doclint package
+ * @modules jdk.compiler/com.sun.tools.doclint
  * @build DocLintTester
  * @run main DocLintTester -Xmsgs:all SyntheticTest.java
  */
--- a/langtools/test/tools/doclint/UnfinishedInlineTagTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/doclint/UnfinishedInlineTagTest.java	Thu May 21 11:41:04 2015 -0700
@@ -2,6 +2,7 @@
  * @test /nodynamiccopyright/
  * @bug 8007096
  * @summary DocLint parsing problems with some comments
+ * @modules jdk.compiler/com.sun.tools.doclint
  * @build DocLintTester
  * @run main DocLintTester -Xmsgs:-html UnfinishedInlineTagTest.java
  * @run main DocLintTester -Xmsgs -ref UnfinishedInlineTagTest.out UnfinishedInlineTagTest.java
--- a/langtools/test/tools/doclint/UnfinishedInlineTagTest.out	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/doclint/UnfinishedInlineTagTest.out	Thu May 21 11:41:04 2015 -0700
@@ -1,4 +1,4 @@
-UnfinishedInlineTagTest.java:14: error: unterminated inline tag
+UnfinishedInlineTagTest.java:15: error: unterminated inline tag
  */
 ^
 1 error
--- a/langtools/test/tools/doclint/ValidTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/doclint/ValidTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test
  * @bug 8004832 8048806
  * @summary Add new doclint package
+ * @modules jdk.compiler/com.sun.tools.doclint
  * @build DocLintTester
  * @run main DocLintTester ValidTest.java
  */
--- a/langtools/test/tools/doclint/ValueTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/doclint/ValueTest.java	Thu May 21 11:41:04 2015 -0700
@@ -2,6 +2,7 @@
  * @test /nodynamiccopyright/
  * @bug 8025272
  * @summary doclint needs to check for valid usage of at-value tag
+ * @modules jdk.compiler/com.sun.tools.doclint
  * @build DocLintTester
  * @run main DocLintTester -ref ValueTest.out ValueTest.java
  */
--- a/langtools/test/tools/doclint/ValueTest.out	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/doclint/ValueTest.out	Thu May 21 11:41:04 2015 -0700
@@ -1,22 +1,22 @@
-ValueTest.java:39: error: {@value} not allowed here
+ValueTest.java:40: error: {@value} not allowed here
     /** invalid class C: {@value} */
                          ^
-ValueTest.java:42: error: {@value} not allowed here
+ValueTest.java:43: error: {@value} not allowed here
     /** invalid enum E: {@value} */
                         ^
-ValueTest.java:44: error: {@value} not allowed here
+ValueTest.java:45: error: {@value} not allowed here
         /** invalid enum constant E1: {@value} */
                                       ^
-ValueTest.java:48: error: {@value} not allowed here
+ValueTest.java:49: error: {@value} not allowed here
     /** invalid field 1: {@value} */
                          ^
-ValueTest.java:51: error: {@value} not allowed here
+ValueTest.java:52: error: {@value} not allowed here
     /** invalid field 2: {@value} */
                          ^
-ValueTest.java:62: error: value does not refer to a constant
+ValueTest.java:63: error: value does not refer to a constant
     /** invalid method: {@value Object#toString} */
                         ^
-ValueTest.java:65: error: value does not refer to a constant
+ValueTest.java:66: error: value does not refer to a constant
     /** invalid enum constant: {@value Thread.State#NEW} */
                                ^
 7 errors
--- a/langtools/test/tools/doclint/anchorTests/p/Test.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/doclint/anchorTests/p/Test.java	Thu May 21 11:41:04 2015 -0700
@@ -2,6 +2,7 @@
  * @bug 8025246
  * @summary doclint is showing error on anchor already defined when it's not
  * @library ../..
+ * @modules jdk.compiler/com.sun.tools.doclint
  * @build DocLintTester
  * @run main DocLintTester -ref Test.out Test.java
  * @compile/fail/ref=Test.javac.out -XDrawDiagnostics -Werror -Xdoclint:all Test.java
--- a/langtools/test/tools/doclint/anchorTests/p/Test.javac.out	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/doclint/anchorTests/p/Test.javac.out	Thu May 21 11:41:04 2015 -0700
@@ -1,7 +1,7 @@
-Test.java:14:7: compiler.err.proc.messager: anchor already defined: "dupTest"
-Test.java:24:12: compiler.err.proc.messager: anchor already defined: "dupTestField"
-Test.java:27:12: compiler.err.proc.messager: anchor already defined: "dupTestMethod"
-Test.java:32:11: compiler.err.proc.messager: anchor already defined: "dupNested"
-Test.java:40:15: compiler.err.proc.messager: anchor already defined: "dupNestedField"
-Test.java:47:15: compiler.err.proc.messager: anchor already defined: "dupNestedMethod"
+Test.java:15:7: compiler.err.proc.messager: anchor already defined: "dupTest"
+Test.java:25:12: compiler.err.proc.messager: anchor already defined: "dupTestField"
+Test.java:28:12: compiler.err.proc.messager: anchor already defined: "dupTestMethod"
+Test.java:33:11: compiler.err.proc.messager: anchor already defined: "dupNested"
+Test.java:41:15: compiler.err.proc.messager: anchor already defined: "dupNestedField"
+Test.java:48:15: compiler.err.proc.messager: anchor already defined: "dupNestedMethod"
 6 errors
--- a/langtools/test/tools/doclint/anchorTests/p/Test.out	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/doclint/anchorTests/p/Test.out	Thu May 21 11:41:04 2015 -0700
@@ -1,19 +1,19 @@
-Test.java:14: error: anchor already defined: "dupTest"
+Test.java:15: error: anchor already defined: "dupTest"
  * <a name="dupTest">dupTest again</a>
       ^
-Test.java:24: error: anchor already defined: "dupTestField"
+Test.java:25: error: anchor already defined: "dupTestField"
     /** <a name="dupTestField">dupTestField again</a> */
            ^
-Test.java:27: error: anchor already defined: "dupTestMethod"
+Test.java:28: error: anchor already defined: "dupTestMethod"
     /** <a name="dupTestMethod">dupTestMethod again</a> */
            ^
-Test.java:32: error: anchor already defined: "dupNested"
+Test.java:33: error: anchor already defined: "dupNested"
      * <a name="dupNested">dupNested again</a>
           ^
-Test.java:40: error: anchor already defined: "dupNestedField"
+Test.java:41: error: anchor already defined: "dupNestedField"
          * <a name="dupNestedField">dupNestedField</a>
               ^
-Test.java:47: error: anchor already defined: "dupNestedMethod"
+Test.java:48: error: anchor already defined: "dupNestedMethod"
          * <a name="dupNestedMethod">dupNestedMethod</a>
               ^
 6 errors
--- a/langtools/test/tools/doclint/anchorTests/p/package-info.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/doclint/anchorTests/p/package-info.java	Thu May 21 11:41:04 2015 -0700
@@ -2,6 +2,7 @@
  * @bug 8025246
  * @summary doclint is showing error on anchor already defined when it's not
  * @library ../..
+ * @modules jdk.compiler/com.sun.tools.doclint
  * @build DocLintTester
  * @run main DocLintTester -ref package-info.out package-info.java
  * @compile/fail/ref=package-info.javac.out -XDrawDiagnostics -Werror -Xdoclint:all package-info.java
--- a/langtools/test/tools/doclint/anchorTests/p/package-info.javac.out	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/doclint/anchorTests/p/package-info.javac.out	Thu May 21 11:41:04 2015 -0700
@@ -1,2 +1,2 @@
-package-info.java:12:7: compiler.err.proc.messager: anchor already defined: "here"
+package-info.java:13:7: compiler.err.proc.messager: anchor already defined: "here"
 1 error
--- a/langtools/test/tools/doclint/anchorTests/p/package-info.out	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/doclint/anchorTests/p/package-info.out	Thu May 21 11:41:04 2015 -0700
@@ -1,4 +1,4 @@
-package-info.java:12: error: anchor already defined: "here"
+package-info.java:13: error: anchor already defined: "here"
  * <a name=here>here again</a>
       ^
 1 error
--- a/langtools/test/tools/doclint/html/BlockTagsTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/doclint/html/BlockTagsTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
  * @bug 8006251
  * @summary test block tags
  * @library ..
+ * @modules jdk.compiler/com.sun.tools.doclint
  * @build DocLintTester
  * @run main DocLintTester -Xmsgs BlockTagsTest.java
  */
--- a/langtools/test/tools/doclint/html/EntitiesTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/doclint/html/EntitiesTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
  * @bug 8006263
  * @summary Supplementary test cases needed for doclint
  * @library ..
+ * @modules jdk.compiler/com.sun.tools.doclint
  * @build DocLintTester
  * @run main DocLintTester -Xmsgs:-html EntitiesTest.java
  * @run main DocLintTester -Xmsgs:html -ref EntitiesTest.out EntitiesTest.java
--- a/langtools/test/tools/doclint/html/EntitiesTest.out	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/doclint/html/EntitiesTest.out	Thu May 21 11:41:04 2015 -0700
@@ -1,19 +1,19 @@
-EntitiesTest.java:300: error: invalid entity &bad;
+EntitiesTest.java:301: error: invalid entity &bad;
      * &bad;
        ^
-EntitiesTest.java:305: error: invalid entity &#31;
+EntitiesTest.java:306: error: invalid entity &#31;
      * &#31;
        ^
-EntitiesTest.java:306: error: invalid entity &#2127;
+EntitiesTest.java:307: error: invalid entity &#2127;
      * &#2127;
        ^
-EntitiesTest.java:311: error: invalid entity &#8213;
+EntitiesTest.java:312: error: invalid entity &#8213;
      * &#8213;
        ^
-EntitiesTest.java:312: error: invalid entity &#9003;
+EntitiesTest.java:313: error: invalid entity &#9003;
      * &#9003;
        ^
-EntitiesTest.java:313: error: invalid entity &#xffff;
+EntitiesTest.java:314: error: invalid entity &#xffff;
      * &#xffff;
        ^
 6 errors
--- a/langtools/test/tools/doclint/html/HtmlVersionTagsAttrsTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/doclint/html/HtmlVersionTagsAttrsTest.java	Thu May 21 11:41:04 2015 -0700
@@ -3,6 +3,7 @@
  * @bug 8072945
  * @summary test tags and attributes specific to the output HTML version
  * @library ..
+ * @modules jdk.compiler/com.sun.tools.doclint
  * @build DocLintTester
  * @run main DocLintTester -XhtmlVersion:html5 -ref HtmlVersionTagsAttrsTestHtml5.out HtmlVersionTagsAttrsTest.java
  * @run main DocLintTester -XhtmlVersion:html4 -ref HtmlVersionTagsAttrsTestHtml4.out HtmlVersionTagsAttrsTest.java
--- a/langtools/test/tools/doclint/html/HtmlVersionTagsAttrsTestHtml4.out	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/doclint/html/HtmlVersionTagsAttrsTestHtml4.out	Thu May 21 11:41:04 2015 -0700
@@ -1,211 +1,211 @@
-HtmlVersionTagsAttrsTest.java:21: warning: attribute obsolete: name
+HtmlVersionTagsAttrsTest.java:22: warning: attribute obsolete: name
      * <img name="name_test" alt="alt">
             ^
-HtmlVersionTagsAttrsTest.java:25: error: no summary or caption for table
+HtmlVersionTagsAttrsTest.java:26: error: no summary or caption for table
      * </table>
        ^
-HtmlVersionTagsAttrsTest.java:28: warning: attribute obsolete, use CSS instead: align
+HtmlVersionTagsAttrsTest.java:29: warning: attribute obsolete, use CSS instead: align
      * <table align="left" bgcolor="#EAEAEA" cellpadding="10" cellspacing="2" frame="box" rules="rows" width="200">
               ^
-HtmlVersionTagsAttrsTest.java:28: warning: attribute obsolete, use CSS instead: bgcolor
+HtmlVersionTagsAttrsTest.java:29: warning: attribute obsolete, use CSS instead: bgcolor
      * <table align="left" bgcolor="#EAEAEA" cellpadding="10" cellspacing="2" frame="box" rules="rows" width="200">
                            ^
-HtmlVersionTagsAttrsTest.java:29: warning: attribute obsolete, use CSS instead: align
+HtmlVersionTagsAttrsTest.java:30: warning: attribute obsolete, use CSS instead: align
      * <caption align="center">Test table, caption, col, colgroup, tbody,
                 ^
-HtmlVersionTagsAttrsTest.java:36: warning: attribute obsolete, use CSS instead: bgcolor
+HtmlVersionTagsAttrsTest.java:37: warning: attribute obsolete, use CSS instead: bgcolor
      * <tr align="char" char="." charoff="2" bgcolor="#EAEAEA" valign="top">
                                              ^
-HtmlVersionTagsAttrsTest.java:37: warning: attribute obsolete, use CSS instead: bgcolor
+HtmlVersionTagsAttrsTest.java:38: warning: attribute obsolete, use CSS instead: bgcolor
      * <th align="char" char="." charoff="2" bgcolor="#EAEAEA" height="200" valign="top" width="200" nowrap>HeadCol1</th>
                                              ^
-HtmlVersionTagsAttrsTest.java:37: warning: attribute obsolete, use CSS instead: height
+HtmlVersionTagsAttrsTest.java:38: warning: attribute obsolete, use CSS instead: height
      * <th align="char" char="." charoff="2" bgcolor="#EAEAEA" height="200" valign="top" width="200" nowrap>HeadCol1</th>
                                                                ^
-HtmlVersionTagsAttrsTest.java:37: warning: attribute obsolete, use CSS instead: width
+HtmlVersionTagsAttrsTest.java:38: warning: attribute obsolete, use CSS instead: width
      * <th align="char" char="." charoff="2" bgcolor="#EAEAEA" height="200" valign="top" width="200" nowrap>HeadCol1</th>
                                                                                          ^
-HtmlVersionTagsAttrsTest.java:37: warning: attribute obsolete, use CSS instead: nowrap
+HtmlVersionTagsAttrsTest.java:38: warning: attribute obsolete, use CSS instead: nowrap
      * <th align="char" char="." charoff="2" bgcolor="#EAEAEA" height="200" valign="top" width="200" nowrap>HeadCol1</th>
                                                                                                      ^
-HtmlVersionTagsAttrsTest.java:49: warning: attribute obsolete, use CSS instead: bgcolor
+HtmlVersionTagsAttrsTest.java:50: warning: attribute obsolete, use CSS instead: bgcolor
      * <td align="char" char="." charoff="2" bgcolor="#EAEAEA" height="200" valign="top" width="200" nowrap>BodyCol1</td>
                                              ^
-HtmlVersionTagsAttrsTest.java:49: warning: attribute obsolete, use CSS instead: height
+HtmlVersionTagsAttrsTest.java:50: warning: attribute obsolete, use CSS instead: height
      * <td align="char" char="." charoff="2" bgcolor="#EAEAEA" height="200" valign="top" width="200" nowrap>BodyCol1</td>
                                                                ^
-HtmlVersionTagsAttrsTest.java:49: warning: attribute obsolete, use CSS instead: width
+HtmlVersionTagsAttrsTest.java:50: warning: attribute obsolete, use CSS instead: width
      * <td align="char" char="." charoff="2" bgcolor="#EAEAEA" height="200" valign="top" width="200" nowrap>BodyCol1</td>
                                                                                          ^
-HtmlVersionTagsAttrsTest.java:49: warning: attribute obsolete, use CSS instead: nowrap
+HtmlVersionTagsAttrsTest.java:50: warning: attribute obsolete, use CSS instead: nowrap
      * <td align="char" char="." charoff="2" bgcolor="#EAEAEA" height="200" valign="top" width="200" nowrap>BodyCol1</td>
                                                                                                      ^
-HtmlVersionTagsAttrsTest.java:54: warning: attribute obsolete, use CSS instead: clear
+HtmlVersionTagsAttrsTest.java:55: warning: attribute obsolete, use CSS instead: clear
      * <br clear="left">
            ^
-HtmlVersionTagsAttrsTest.java:55: warning: attribute obsolete, use CSS instead: compact
+HtmlVersionTagsAttrsTest.java:56: warning: attribute obsolete, use CSS instead: compact
      * <ol compact>
            ^
-HtmlVersionTagsAttrsTest.java:60: warning: attribute obsolete, use CSS instead: type
+HtmlVersionTagsAttrsTest.java:61: warning: attribute obsolete, use CSS instead: type
      * <li type="square">Test list</li>
            ^
-HtmlVersionTagsAttrsTest.java:63: warning: attribute obsolete, use CSS instead: compact
+HtmlVersionTagsAttrsTest.java:64: warning: attribute obsolete, use CSS instead: compact
      * <dl compact>
            ^
-HtmlVersionTagsAttrsTest.java:67: warning: attribute obsolete, use CSS instead: hspace
+HtmlVersionTagsAttrsTest.java:68: warning: attribute obsolete, use CSS instead: hspace
      * <img src="testImg.jpg" alt="imgTest" hspace="10" vspace="10" border="0">
                                             ^
-HtmlVersionTagsAttrsTest.java:67: warning: attribute obsolete, use CSS instead: vspace
+HtmlVersionTagsAttrsTest.java:68: warning: attribute obsolete, use CSS instead: vspace
      * <img src="testImg.jpg" alt="imgTest" hspace="10" vspace="10" border="0">
                                                         ^
-HtmlVersionTagsAttrsTest.java:67: warning: attribute obsolete, use CSS instead: border
+HtmlVersionTagsAttrsTest.java:68: warning: attribute obsolete, use CSS instead: border
      * <img src="testImg.jpg" alt="imgTest" hspace="10" vspace="10" border="0">
                                                                     ^
-HtmlVersionTagsAttrsTest.java:68: warning: attribute obsolete, use CSS instead: size
+HtmlVersionTagsAttrsTest.java:69: warning: attribute obsolete, use CSS instead: size
      * <hr size="20" noshade>
            ^
-HtmlVersionTagsAttrsTest.java:68: warning: attribute obsolete, use CSS instead: noshade
+HtmlVersionTagsAttrsTest.java:69: warning: attribute obsolete, use CSS instead: noshade
      * <hr size="20" noshade>
                      ^
-HtmlVersionTagsAttrsTest.java:69: warning: attribute obsolete, use CSS instead: width
+HtmlVersionTagsAttrsTest.java:70: warning: attribute obsolete, use CSS instead: width
      * <pre width="25">Test Pre</pre>
             ^
-HtmlVersionTagsAttrsTest.java:73: error: no summary or caption for table
+HtmlVersionTagsAttrsTest.java:74: error: no summary or caption for table
      * </table>
        ^
-HtmlVersionTagsAttrsTest.java:78: error: attribute not supported in HTML4: reversed
+HtmlVersionTagsAttrsTest.java:79: error: attribute not supported in HTML4: reversed
      * <ol reversed="reversed">
            ^
-HtmlVersionTagsAttrsTest.java:83: error: attribute not supported in HTML4: crossorigin
+HtmlVersionTagsAttrsTest.java:84: error: attribute not supported in HTML4: crossorigin
      * <img src="testImg.jpg" alt="imgTest" crossorigin="anonymous">
                                             ^
-HtmlVersionTagsAttrsTest.java:84: error: attribute not supported in HTML4: aria-labelledby
+HtmlVersionTagsAttrsTest.java:85: error: attribute not supported in HTML4: aria-labelledby
      * <div aria-labelledby="Topics" aria-describedby="t1">
             ^
-HtmlVersionTagsAttrsTest.java:84: error: attribute not supported in HTML4: aria-describedby
+HtmlVersionTagsAttrsTest.java:85: error: attribute not supported in HTML4: aria-describedby
      * <div aria-labelledby="Topics" aria-describedby="t1">
                                      ^
-HtmlVersionTagsAttrsTest.java:87: error: attribute not supported in HTML4: aria-label
+HtmlVersionTagsAttrsTest.java:88: error: attribute not supported in HTML4: aria-label
      * <p id="t2" aria-label="Label">Label test</p>
                   ^
-HtmlVersionTagsAttrsTest.java:95: warning: attribute obsolete, use CSS instead: size
+HtmlVersionTagsAttrsTest.java:96: warning: attribute obsolete, use CSS instead: size
      * <font size="3">Font test</font>
              ^
-HtmlVersionTagsAttrsTest.java:98: error: tag not supported in the generated HTML version: section
+HtmlVersionTagsAttrsTest.java:99: error: tag not supported in the generated HTML version: section
      * <section>
        ^
-HtmlVersionTagsAttrsTest.java:99: error: unknown tag: hgroup
+HtmlVersionTagsAttrsTest.java:100: error: unknown tag: hgroup
      * <hgroup>
        ^
-HtmlVersionTagsAttrsTest.java:102: error: unknown tag: hgroup
+HtmlVersionTagsAttrsTest.java:103: error: unknown tag: hgroup
      * </hgroup>
        ^
-HtmlVersionTagsAttrsTest.java:105: error: unknown tag: details
+HtmlVersionTagsAttrsTest.java:106: error: unknown tag: details
      * <details>
        ^
-HtmlVersionTagsAttrsTest.java:106: error: unknown tag: summary
+HtmlVersionTagsAttrsTest.java:107: error: unknown tag: summary
      * <summary>Summary</summary>
        ^
-HtmlVersionTagsAttrsTest.java:106: error: unknown tag: summary
+HtmlVersionTagsAttrsTest.java:107: error: unknown tag: summary
      * <summary>Summary</summary>
                        ^
-HtmlVersionTagsAttrsTest.java:108: error: unknown tag: details
+HtmlVersionTagsAttrsTest.java:109: error: unknown tag: details
      * </details>
        ^
-HtmlVersionTagsAttrsTest.java:113: error: tag not supported in the generated HTML version: section
+HtmlVersionTagsAttrsTest.java:114: error: tag not supported in the generated HTML version: section
      * <section>
        ^
-HtmlVersionTagsAttrsTest.java:118: error: tag not supported in the generated HTML version: article
+HtmlVersionTagsAttrsTest.java:119: error: tag not supported in the generated HTML version: article
      * <article>
        ^
-HtmlVersionTagsAttrsTest.java:123: error: tag not supported in the generated HTML version: header
+HtmlVersionTagsAttrsTest.java:124: error: tag not supported in the generated HTML version: header
      * <header>
        ^
-HtmlVersionTagsAttrsTest.java:124: error: tag not supported in the generated HTML version: nav
+HtmlVersionTagsAttrsTest.java:125: error: tag not supported in the generated HTML version: nav
      * <nav>Navigation</nav>
        ^
-HtmlVersionTagsAttrsTest.java:127: error: tag not supported in the generated HTML version: footer
+HtmlVersionTagsAttrsTest.java:128: error: tag not supported in the generated HTML version: footer
      * <footer>
        ^
-HtmlVersionTagsAttrsTest.java:128: error: tag not supported in the generated HTML version: nav
+HtmlVersionTagsAttrsTest.java:129: error: tag not supported in the generated HTML version: nav
      * <nav>Navigation</nav>
        ^
-HtmlVersionTagsAttrsTest.java:131: error: tag not supported in the generated HTML version: main
+HtmlVersionTagsAttrsTest.java:132: error: tag not supported in the generated HTML version: main
      * <main>
        ^
-HtmlVersionTagsAttrsTest.java:134: error: tag not supported in the generated HTML version: aside
+HtmlVersionTagsAttrsTest.java:135: error: tag not supported in the generated HTML version: aside
      * <aside>
        ^
-HtmlVersionTagsAttrsTest.java:139: error: tag not supported in the generated HTML version: bdi
+HtmlVersionTagsAttrsTest.java:140: error: tag not supported in the generated HTML version: bdi
      * <li>Testing<bdi>BDI</bdi></li>
                   ^
-HtmlVersionTagsAttrsTest.java:141: error: tag not supported in the generated HTML version: figure
+HtmlVersionTagsAttrsTest.java:142: error: tag not supported in the generated HTML version: figure
      * <figure>
        ^
-HtmlVersionTagsAttrsTest.java:143: error: tag not supported in the generated HTML version: figcaption
+HtmlVersionTagsAttrsTest.java:144: error: tag not supported in the generated HTML version: figcaption
      * <figcaption>Fig. 1</figcaption>
        ^
-HtmlVersionTagsAttrsTest.java:145: error: tag not supported in the generated HTML version: mark
+HtmlVersionTagsAttrsTest.java:146: error: tag not supported in the generated HTML version: mark
      * <p><mark>Marked</mark> text test</p>
           ^
-HtmlVersionTagsAttrsTest.java:146: error: tag not supported in the generated HTML version: nav
+HtmlVersionTagsAttrsTest.java:147: error: tag not supported in the generated HTML version: nav
      * <nav>
        ^
-HtmlVersionTagsAttrsTest.java:152: error: tag not supported in the generated HTML version: template
+HtmlVersionTagsAttrsTest.java:153: error: tag not supported in the generated HTML version: template
      * <template id="testTemplate">
        ^
-HtmlVersionTagsAttrsTest.java:155: error: tag not supported in the generated HTML version: time
+HtmlVersionTagsAttrsTest.java:156: error: tag not supported in the generated HTML version: time
      * <p>Test current time is <time>10:00</time> at night</p>
                                ^
-HtmlVersionTagsAttrsTest.java:156: error: tag not supported in the generated HTML version: wbr
+HtmlVersionTagsAttrsTest.java:157: error: tag not supported in the generated HTML version: wbr
      * <p>Test <wbr>WBR</wbr> text</p>
                ^
-HtmlVersionTagsAttrsTest.java:161: error: tag not supported in the generated HTML version: section
+HtmlVersionTagsAttrsTest.java:162: error: tag not supported in the generated HTML version: section
      * <section>
        ^
-HtmlVersionTagsAttrsTest.java:164: error: tag not supported in the generated HTML version: article
+HtmlVersionTagsAttrsTest.java:165: error: tag not supported in the generated HTML version: article
      * <article>
        ^
-HtmlVersionTagsAttrsTest.java:167: error: tag not supported in the generated HTML version: header
-     * <header>
-       ^
 HtmlVersionTagsAttrsTest.java:168: error: tag not supported in the generated HTML version: header
      * <header>
        ^
-HtmlVersionTagsAttrsTest.java:171: error: tag not supported in the generated HTML version: footer
+HtmlVersionTagsAttrsTest.java:169: error: tag not supported in the generated HTML version: header
+     * <header>
+       ^
+HtmlVersionTagsAttrsTest.java:172: error: tag not supported in the generated HTML version: footer
      * <footer>
        ^
-HtmlVersionTagsAttrsTest.java:174: error: tag not supported in the generated HTML version: main
+HtmlVersionTagsAttrsTest.java:175: error: tag not supported in the generated HTML version: main
      * <main>
        ^
-HtmlVersionTagsAttrsTest.java:179: error: tag not supported in the generated HTML version: footer
+HtmlVersionTagsAttrsTest.java:180: error: tag not supported in the generated HTML version: footer
      * <footer>
        ^
-HtmlVersionTagsAttrsTest.java:180: error: tag not supported in the generated HTML version: header
+HtmlVersionTagsAttrsTest.java:181: error: tag not supported in the generated HTML version: header
      * <header>
        ^
-HtmlVersionTagsAttrsTest.java:183: error: tag not supported in the generated HTML version: footer
+HtmlVersionTagsAttrsTest.java:184: error: tag not supported in the generated HTML version: footer
      * <footer>
        ^
-HtmlVersionTagsAttrsTest.java:186: error: tag not supported in the generated HTML version: main
+HtmlVersionTagsAttrsTest.java:187: error: tag not supported in the generated HTML version: main
      * <main>
        ^
-HtmlVersionTagsAttrsTest.java:193: error: no summary or caption for table
+HtmlVersionTagsAttrsTest.java:194: error: no summary or caption for table
      * </table>
        ^
-HtmlVersionTagsAttrsTest.java:198: error: tag not supported in the generated HTML version: header
+HtmlVersionTagsAttrsTest.java:199: error: tag not supported in the generated HTML version: header
      * <header role="banner">Main text</header>
        ^
-HtmlVersionTagsAttrsTest.java:198: error: attribute not supported in HTML4: role
+HtmlVersionTagsAttrsTest.java:199: error: attribute not supported in HTML4: role
      * <header role="banner">Main text</header>
                ^
-HtmlVersionTagsAttrsTest.java:199: error: attribute not supported in HTML4: role
+HtmlVersionTagsAttrsTest.java:200: error: attribute not supported in HTML4: role
      * <div role="navigation">
             ^
-HtmlVersionTagsAttrsTest.java:204: error: no summary or caption for table
+HtmlVersionTagsAttrsTest.java:205: error: no summary or caption for table
      * </table>
        ^
-HtmlVersionTagsAttrsTest.java:207: error: no summary or caption for table
+HtmlVersionTagsAttrsTest.java:208: error: no summary or caption for table
      * </table>
        ^
 46 errors
--- a/langtools/test/tools/doclint/html/HtmlVersionTagsAttrsTestHtml5.out	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/doclint/html/HtmlVersionTagsAttrsTestHtml5.out	Thu May 21 11:41:04 2015 -0700
@@ -1,298 +1,298 @@
-HtmlVersionTagsAttrsTest.java:18: error: attribute not supported in HTML5: rev
+HtmlVersionTagsAttrsTest.java:19: error: attribute not supported in HTML5: rev
      * <a rev="help" href="rev_test.html">Help Page</a>
           ^
-HtmlVersionTagsAttrsTest.java:19: error: attribute not supported in HTML5: charset
+HtmlVersionTagsAttrsTest.java:20: error: attribute not supported in HTML5: charset
      * <a charset="UTF-8" href="charset_test.html">Test page</a>
           ^
-HtmlVersionTagsAttrsTest.java:20: error: attribute not supported in HTML5: shape
+HtmlVersionTagsAttrsTest.java:21: error: attribute not supported in HTML5: shape
      * <a href="shape_test.html" shape="poly" coords="10,30,56,142">Location</a>
                                  ^
-HtmlVersionTagsAttrsTest.java:20: error: attribute not supported in HTML5: coords
+HtmlVersionTagsAttrsTest.java:21: error: attribute not supported in HTML5: coords
      * <a href="shape_test.html" shape="poly" coords="10,30,56,142">Location</a>
                                               ^
-HtmlVersionTagsAttrsTest.java:21: error: attribute not supported in HTML5: name
+HtmlVersionTagsAttrsTest.java:22: error: attribute not supported in HTML5: name
      * <img name="name_test" alt="alt">
             ^
-HtmlVersionTagsAttrsTest.java:23: error: attribute not supported in HTML5: axis
+HtmlVersionTagsAttrsTest.java:24: error: attribute not supported in HTML5: axis
      * <tr><th axis="desc">Description</th></tr>
                ^
-HtmlVersionTagsAttrsTest.java:24: error: attribute not supported in HTML5: axis
+HtmlVersionTagsAttrsTest.java:25: error: attribute not supported in HTML5: axis
      * <tr><td axis="desc" abbr="abbr_test" scope="row">Axis_Test</td></tr>
                ^
-HtmlVersionTagsAttrsTest.java:24: error: attribute not supported in HTML5: abbr
+HtmlVersionTagsAttrsTest.java:25: error: attribute not supported in HTML5: abbr
      * <tr><td axis="desc" abbr="abbr_test" scope="row">Axis_Test</td></tr>
                            ^
-HtmlVersionTagsAttrsTest.java:24: error: attribute not supported in HTML5: scope
+HtmlVersionTagsAttrsTest.java:25: error: attribute not supported in HTML5: scope
      * <tr><td axis="desc" abbr="abbr_test" scope="row">Axis_Test</td></tr>
                                             ^
-HtmlVersionTagsAttrsTest.java:25: error: no summary or caption for table
+HtmlVersionTagsAttrsTest.java:26: error: no summary or caption for table
      * </table>
        ^
-HtmlVersionTagsAttrsTest.java:26: error: attribute not supported in HTML5: summary
+HtmlVersionTagsAttrsTest.java:27: error: attribute not supported in HTML5: summary
      * <table summary="summary_test"><tr><td>Test Row</td></tr></table>
               ^
-HtmlVersionTagsAttrsTest.java:28: error: attribute not supported in HTML5: align
+HtmlVersionTagsAttrsTest.java:29: error: attribute not supported in HTML5: align
      * <table align="left" bgcolor="#EAEAEA" cellpadding="10" cellspacing="2" frame="box" rules="rows" width="200">
               ^
-HtmlVersionTagsAttrsTest.java:28: error: attribute not supported in HTML5: bgcolor
+HtmlVersionTagsAttrsTest.java:29: error: attribute not supported in HTML5: bgcolor
      * <table align="left" bgcolor="#EAEAEA" cellpadding="10" cellspacing="2" frame="box" rules="rows" width="200">
                            ^
-HtmlVersionTagsAttrsTest.java:28: error: attribute not supported in HTML5: cellpadding
+HtmlVersionTagsAttrsTest.java:29: error: attribute not supported in HTML5: cellpadding
      * <table align="left" bgcolor="#EAEAEA" cellpadding="10" cellspacing="2" frame="box" rules="rows" width="200">
                                              ^
-HtmlVersionTagsAttrsTest.java:28: error: attribute not supported in HTML5: cellspacing
+HtmlVersionTagsAttrsTest.java:29: error: attribute not supported in HTML5: cellspacing
      * <table align="left" bgcolor="#EAEAEA" cellpadding="10" cellspacing="2" frame="box" rules="rows" width="200">
                                                               ^
-HtmlVersionTagsAttrsTest.java:28: error: attribute not supported in HTML5: frame
+HtmlVersionTagsAttrsTest.java:29: error: attribute not supported in HTML5: frame
      * <table align="left" bgcolor="#EAEAEA" cellpadding="10" cellspacing="2" frame="box" rules="rows" width="200">
                                                                               ^
-HtmlVersionTagsAttrsTest.java:28: error: attribute not supported in HTML5: rules
+HtmlVersionTagsAttrsTest.java:29: error: attribute not supported in HTML5: rules
      * <table align="left" bgcolor="#EAEAEA" cellpadding="10" cellspacing="2" frame="box" rules="rows" width="200">
                                                                                           ^
-HtmlVersionTagsAttrsTest.java:28: error: attribute not supported in HTML5: width
+HtmlVersionTagsAttrsTest.java:29: error: attribute not supported in HTML5: width
      * <table align="left" bgcolor="#EAEAEA" cellpadding="10" cellspacing="2" frame="box" rules="rows" width="200">
                                                                                                        ^
-HtmlVersionTagsAttrsTest.java:29: error: attribute not supported in HTML5: align
+HtmlVersionTagsAttrsTest.java:30: error: attribute not supported in HTML5: align
      * <caption align="center">Test table, caption, col, colgroup, tbody,
                 ^
-HtmlVersionTagsAttrsTest.java:31: error: attribute not supported in HTML5: align
+HtmlVersionTagsAttrsTest.java:32: error: attribute not supported in HTML5: align
      * <colgroup align="char" char="." charoff="2" valign="top" width="200">
                  ^
-HtmlVersionTagsAttrsTest.java:31: error: attribute not supported in HTML5: char
+HtmlVersionTagsAttrsTest.java:32: error: attribute not supported in HTML5: char
      * <colgroup align="char" char="." charoff="2" valign="top" width="200">
                               ^
-HtmlVersionTagsAttrsTest.java:31: error: attribute not supported in HTML5: charoff
+HtmlVersionTagsAttrsTest.java:32: error: attribute not supported in HTML5: charoff
      * <colgroup align="char" char="." charoff="2" valign="top" width="200">
                                        ^
-HtmlVersionTagsAttrsTest.java:31: error: attribute not supported in HTML5: valign
+HtmlVersionTagsAttrsTest.java:32: error: attribute not supported in HTML5: valign
      * <colgroup align="char" char="." charoff="2" valign="top" width="200">
                                                    ^
-HtmlVersionTagsAttrsTest.java:31: error: attribute not supported in HTML5: width
+HtmlVersionTagsAttrsTest.java:32: error: attribute not supported in HTML5: width
      * <colgroup align="char" char="." charoff="2" valign="top" width="200">
                                                                 ^
-HtmlVersionTagsAttrsTest.java:32: error: attribute not supported in HTML5: align
+HtmlVersionTagsAttrsTest.java:33: error: attribute not supported in HTML5: align
      * <col align="center" valign="top" width="200">
             ^
-HtmlVersionTagsAttrsTest.java:32: error: attribute not supported in HTML5: valign
+HtmlVersionTagsAttrsTest.java:33: error: attribute not supported in HTML5: valign
      * <col align="center" valign="top" width="200">
                            ^
-HtmlVersionTagsAttrsTest.java:32: error: attribute not supported in HTML5: width
+HtmlVersionTagsAttrsTest.java:33: error: attribute not supported in HTML5: width
      * <col align="center" valign="top" width="200">
                                         ^
-HtmlVersionTagsAttrsTest.java:33: error: attribute not supported in HTML5: align
+HtmlVersionTagsAttrsTest.java:34: error: attribute not supported in HTML5: align
      * <col align="char" char="." charoff="2">
             ^
-HtmlVersionTagsAttrsTest.java:33: error: attribute not supported in HTML5: char
+HtmlVersionTagsAttrsTest.java:34: error: attribute not supported in HTML5: char
      * <col align="char" char="." charoff="2">
                          ^
-HtmlVersionTagsAttrsTest.java:33: error: attribute not supported in HTML5: charoff
+HtmlVersionTagsAttrsTest.java:34: error: attribute not supported in HTML5: charoff
      * <col align="char" char="." charoff="2">
                                   ^
-HtmlVersionTagsAttrsTest.java:35: error: attribute not supported in HTML5: align
+HtmlVersionTagsAttrsTest.java:36: error: attribute not supported in HTML5: align
      * <thead align="char" char="." charoff="2" valign="top">
               ^
-HtmlVersionTagsAttrsTest.java:35: error: attribute not supported in HTML5: char
+HtmlVersionTagsAttrsTest.java:36: error: attribute not supported in HTML5: char
      * <thead align="char" char="." charoff="2" valign="top">
                            ^
-HtmlVersionTagsAttrsTest.java:35: error: attribute not supported in HTML5: charoff
+HtmlVersionTagsAttrsTest.java:36: error: attribute not supported in HTML5: charoff
      * <thead align="char" char="." charoff="2" valign="top">
                                     ^
-HtmlVersionTagsAttrsTest.java:36: error: attribute not supported in HTML5: align
+HtmlVersionTagsAttrsTest.java:37: error: attribute not supported in HTML5: align
      * <tr align="char" char="." charoff="2" bgcolor="#EAEAEA" valign="top">
            ^
-HtmlVersionTagsAttrsTest.java:36: error: attribute not supported in HTML5: char
+HtmlVersionTagsAttrsTest.java:37: error: attribute not supported in HTML5: char
      * <tr align="char" char="." charoff="2" bgcolor="#EAEAEA" valign="top">
                         ^
-HtmlVersionTagsAttrsTest.java:36: error: attribute not supported in HTML5: charoff
+HtmlVersionTagsAttrsTest.java:37: error: attribute not supported in HTML5: charoff
      * <tr align="char" char="." charoff="2" bgcolor="#EAEAEA" valign="top">
                                  ^
-HtmlVersionTagsAttrsTest.java:36: error: attribute not supported in HTML5: bgcolor
+HtmlVersionTagsAttrsTest.java:37: error: attribute not supported in HTML5: bgcolor
      * <tr align="char" char="." charoff="2" bgcolor="#EAEAEA" valign="top">
                                              ^
-HtmlVersionTagsAttrsTest.java:37: error: attribute not supported in HTML5: align
+HtmlVersionTagsAttrsTest.java:38: error: attribute not supported in HTML5: align
      * <th align="char" char="." charoff="2" bgcolor="#EAEAEA" height="200" valign="top" width="200" nowrap>HeadCol1</th>
            ^
-HtmlVersionTagsAttrsTest.java:37: error: attribute not supported in HTML5: char
+HtmlVersionTagsAttrsTest.java:38: error: attribute not supported in HTML5: char
      * <th align="char" char="." charoff="2" bgcolor="#EAEAEA" height="200" valign="top" width="200" nowrap>HeadCol1</th>
                         ^
-HtmlVersionTagsAttrsTest.java:37: error: attribute not supported in HTML5: charoff
+HtmlVersionTagsAttrsTest.java:38: error: attribute not supported in HTML5: charoff
      * <th align="char" char="." charoff="2" bgcolor="#EAEAEA" height="200" valign="top" width="200" nowrap>HeadCol1</th>
                                  ^
-HtmlVersionTagsAttrsTest.java:37: error: attribute not supported in HTML5: bgcolor
+HtmlVersionTagsAttrsTest.java:38: error: attribute not supported in HTML5: bgcolor
      * <th align="char" char="." charoff="2" bgcolor="#EAEAEA" height="200" valign="top" width="200" nowrap>HeadCol1</th>
                                              ^
-HtmlVersionTagsAttrsTest.java:37: error: attribute not supported in HTML5: height
+HtmlVersionTagsAttrsTest.java:38: error: attribute not supported in HTML5: height
      * <th align="char" char="." charoff="2" bgcolor="#EAEAEA" height="200" valign="top" width="200" nowrap>HeadCol1</th>
                                                                ^
-HtmlVersionTagsAttrsTest.java:37: error: attribute not supported in HTML5: width
+HtmlVersionTagsAttrsTest.java:38: error: attribute not supported in HTML5: width
      * <th align="char" char="." charoff="2" bgcolor="#EAEAEA" height="200" valign="top" width="200" nowrap>HeadCol1</th>
                                                                                          ^
-HtmlVersionTagsAttrsTest.java:37: error: attribute not supported in HTML5: nowrap
+HtmlVersionTagsAttrsTest.java:38: error: attribute not supported in HTML5: nowrap
      * <th align="char" char="." charoff="2" bgcolor="#EAEAEA" height="200" valign="top" width="200" nowrap>HeadCol1</th>
                                                                                                      ^
-HtmlVersionTagsAttrsTest.java:41: error: attribute not supported in HTML5: align
+HtmlVersionTagsAttrsTest.java:42: error: attribute not supported in HTML5: align
      * <tfoot align="char" char="." charoff="2" valign="top">
               ^
-HtmlVersionTagsAttrsTest.java:41: error: attribute not supported in HTML5: char
+HtmlVersionTagsAttrsTest.java:42: error: attribute not supported in HTML5: char
      * <tfoot align="char" char="." charoff="2" valign="top">
                            ^
-HtmlVersionTagsAttrsTest.java:41: error: attribute not supported in HTML5: charoff
+HtmlVersionTagsAttrsTest.java:42: error: attribute not supported in HTML5: charoff
      * <tfoot align="char" char="." charoff="2" valign="top">
                                     ^
-HtmlVersionTagsAttrsTest.java:47: error: attribute not supported in HTML5: align
+HtmlVersionTagsAttrsTest.java:48: error: attribute not supported in HTML5: align
      * <tbody align="char" char="." charoff="2" valign="top">
               ^
-HtmlVersionTagsAttrsTest.java:47: error: attribute not supported in HTML5: char
+HtmlVersionTagsAttrsTest.java:48: error: attribute not supported in HTML5: char
      * <tbody align="char" char="." charoff="2" valign="top">
                            ^
-HtmlVersionTagsAttrsTest.java:47: error: attribute not supported in HTML5: charoff
+HtmlVersionTagsAttrsTest.java:48: error: attribute not supported in HTML5: charoff
      * <tbody align="char" char="." charoff="2" valign="top">
                                     ^
-HtmlVersionTagsAttrsTest.java:49: error: attribute not supported in HTML5: align
+HtmlVersionTagsAttrsTest.java:50: error: attribute not supported in HTML5: align
      * <td align="char" char="." charoff="2" bgcolor="#EAEAEA" height="200" valign="top" width="200" nowrap>BodyCol1</td>
            ^
-HtmlVersionTagsAttrsTest.java:49: error: attribute not supported in HTML5: char
+HtmlVersionTagsAttrsTest.java:50: error: attribute not supported in HTML5: char
      * <td align="char" char="." charoff="2" bgcolor="#EAEAEA" height="200" valign="top" width="200" nowrap>BodyCol1</td>
                         ^
-HtmlVersionTagsAttrsTest.java:49: error: attribute not supported in HTML5: charoff
+HtmlVersionTagsAttrsTest.java:50: error: attribute not supported in HTML5: charoff
      * <td align="char" char="." charoff="2" bgcolor="#EAEAEA" height="200" valign="top" width="200" nowrap>BodyCol1</td>
                                  ^
-HtmlVersionTagsAttrsTest.java:49: error: attribute not supported in HTML5: bgcolor
+HtmlVersionTagsAttrsTest.java:50: error: attribute not supported in HTML5: bgcolor
      * <td align="char" char="." charoff="2" bgcolor="#EAEAEA" height="200" valign="top" width="200" nowrap>BodyCol1</td>
                                              ^
-HtmlVersionTagsAttrsTest.java:49: error: attribute not supported in HTML5: height
+HtmlVersionTagsAttrsTest.java:50: error: attribute not supported in HTML5: height
      * <td align="char" char="." charoff="2" bgcolor="#EAEAEA" height="200" valign="top" width="200" nowrap>BodyCol1</td>
                                                                ^
-HtmlVersionTagsAttrsTest.java:49: error: attribute not supported in HTML5: width
+HtmlVersionTagsAttrsTest.java:50: error: attribute not supported in HTML5: width
      * <td align="char" char="." charoff="2" bgcolor="#EAEAEA" height="200" valign="top" width="200" nowrap>BodyCol1</td>
                                                                                          ^
-HtmlVersionTagsAttrsTest.java:49: error: attribute not supported in HTML5: nowrap
+HtmlVersionTagsAttrsTest.java:50: error: attribute not supported in HTML5: nowrap
      * <td align="char" char="." charoff="2" bgcolor="#EAEAEA" height="200" valign="top" width="200" nowrap>BodyCol1</td>
                                                                                                      ^
-HtmlVersionTagsAttrsTest.java:54: error: attribute not supported in HTML5: clear
+HtmlVersionTagsAttrsTest.java:55: error: attribute not supported in HTML5: clear
      * <br clear="left">
            ^
-HtmlVersionTagsAttrsTest.java:55: error: attribute not supported in HTML5: compact
+HtmlVersionTagsAttrsTest.java:56: error: attribute not supported in HTML5: compact
      * <ol compact>
            ^
-HtmlVersionTagsAttrsTest.java:59: error: attribute not supported in HTML5: type
+HtmlVersionTagsAttrsTest.java:60: error: attribute not supported in HTML5: type
      * <ul type="circle" compact>
            ^
-HtmlVersionTagsAttrsTest.java:59: error: attribute not supported in HTML5: compact
+HtmlVersionTagsAttrsTest.java:60: error: attribute not supported in HTML5: compact
      * <ul type="circle" compact>
                          ^
-HtmlVersionTagsAttrsTest.java:60: error: attribute not supported in HTML5: type
+HtmlVersionTagsAttrsTest.java:61: error: attribute not supported in HTML5: type
      * <li type="square">Test list</li>
            ^
-HtmlVersionTagsAttrsTest.java:63: error: attribute not supported in HTML5: compact
+HtmlVersionTagsAttrsTest.java:64: error: attribute not supported in HTML5: compact
      * <dl compact>
            ^
-HtmlVersionTagsAttrsTest.java:67: error: attribute not supported in HTML5: hspace
+HtmlVersionTagsAttrsTest.java:68: error: attribute not supported in HTML5: hspace
      * <img src="testImg.jpg" alt="imgTest" hspace="10" vspace="10" border="0">
                                             ^
-HtmlVersionTagsAttrsTest.java:67: error: attribute not supported in HTML5: vspace
+HtmlVersionTagsAttrsTest.java:68: error: attribute not supported in HTML5: vspace
      * <img src="testImg.jpg" alt="imgTest" hspace="10" vspace="10" border="0">
                                                         ^
-HtmlVersionTagsAttrsTest.java:67: error: attribute not supported in HTML5: border
+HtmlVersionTagsAttrsTest.java:68: error: attribute not supported in HTML5: border
      * <img src="testImg.jpg" alt="imgTest" hspace="10" vspace="10" border="0">
                                                                     ^
-HtmlVersionTagsAttrsTest.java:68: error: attribute not supported in HTML5: size
+HtmlVersionTagsAttrsTest.java:69: error: attribute not supported in HTML5: size
      * <hr size="20" noshade>
            ^
-HtmlVersionTagsAttrsTest.java:68: error: attribute not supported in HTML5: noshade
+HtmlVersionTagsAttrsTest.java:69: error: attribute not supported in HTML5: noshade
      * <hr size="20" noshade>
                      ^
-HtmlVersionTagsAttrsTest.java:69: error: attribute not supported in HTML5: width
+HtmlVersionTagsAttrsTest.java:70: error: attribute not supported in HTML5: width
      * <pre width="25">Test Pre</pre>
             ^
-HtmlVersionTagsAttrsTest.java:70: error: attribute not supported in HTML5: name
+HtmlVersionTagsAttrsTest.java:71: error: attribute not supported in HTML5: name
      * <a name="AnchorTest">Anchor Test</a>
           ^
-HtmlVersionTagsAttrsTest.java:71: error: attribute border for table only accepts "" or "1", use CSS instead: BORDER
+HtmlVersionTagsAttrsTest.java:72: error: attribute border for table only accepts "" or "1", use CSS instead: BORDER
      * <table border="0">
               ^
-HtmlVersionTagsAttrsTest.java:73: error: no summary or caption for table
+HtmlVersionTagsAttrsTest.java:74: error: no summary or caption for table
      * </table>
        ^
-HtmlVersionTagsAttrsTest.java:93: error: tag not supported in the generated HTML version: big
+HtmlVersionTagsAttrsTest.java:94: error: tag not supported in the generated HTML version: big
      * <p><big>Bigger text test</big></p>
           ^
-HtmlVersionTagsAttrsTest.java:93: warning: empty <p> tag
+HtmlVersionTagsAttrsTest.java:94: warning: empty <p> tag
      * <p><big>Bigger text test</big></p>
                                      ^
-HtmlVersionTagsAttrsTest.java:94: error: tag not supported in the generated HTML version: center
+HtmlVersionTagsAttrsTest.java:95: error: tag not supported in the generated HTML version: center
      * <center>Center text test</center>
        ^
-HtmlVersionTagsAttrsTest.java:95: error: tag not supported in the generated HTML version: font
+HtmlVersionTagsAttrsTest.java:96: error: tag not supported in the generated HTML version: font
      * <font size="3">Font test</font>
        ^
-HtmlVersionTagsAttrsTest.java:95: error: attribute not supported in HTML5: size
+HtmlVersionTagsAttrsTest.java:96: error: attribute not supported in HTML5: size
      * <font size="3">Font test</font>
              ^
-HtmlVersionTagsAttrsTest.java:96: error: tag not supported in the generated HTML version: strike
+HtmlVersionTagsAttrsTest.java:97: error: tag not supported in the generated HTML version: strike
      * <p>Text <strike>strike</strike></p>
                ^
-HtmlVersionTagsAttrsTest.java:97: error: tag not supported in the generated HTML version: tt
+HtmlVersionTagsAttrsTest.java:98: error: tag not supported in the generated HTML version: tt
      * <p><tt>Teletype text</tt></p>
           ^
-HtmlVersionTagsAttrsTest.java:97: warning: empty <p> tag
+HtmlVersionTagsAttrsTest.java:98: warning: empty <p> tag
      * <p><tt>Teletype text</tt></p>
                                 ^
-HtmlVersionTagsAttrsTest.java:99: error: unknown tag: hgroup
+HtmlVersionTagsAttrsTest.java:100: error: unknown tag: hgroup
      * <hgroup>
        ^
-HtmlVersionTagsAttrsTest.java:102: error: unknown tag: hgroup
+HtmlVersionTagsAttrsTest.java:103: error: unknown tag: hgroup
      * </hgroup>
        ^
-HtmlVersionTagsAttrsTest.java:105: error: unknown tag: details
+HtmlVersionTagsAttrsTest.java:106: error: unknown tag: details
      * <details>
        ^
-HtmlVersionTagsAttrsTest.java:106: error: unknown tag: summary
+HtmlVersionTagsAttrsTest.java:107: error: unknown tag: summary
      * <summary>Summary</summary>
        ^
-HtmlVersionTagsAttrsTest.java:106: error: unknown tag: summary
+HtmlVersionTagsAttrsTest.java:107: error: unknown tag: summary
      * <summary>Summary</summary>
                        ^
-HtmlVersionTagsAttrsTest.java:108: error: unknown tag: details
+HtmlVersionTagsAttrsTest.java:109: error: unknown tag: details
      * </details>
        ^
-HtmlVersionTagsAttrsTest.java:131: error: element not allowed in documentation comments: <main>
+HtmlVersionTagsAttrsTest.java:132: error: element not allowed in documentation comments: <main>
      * <main>
        ^
-HtmlVersionTagsAttrsTest.java:163: error: heading not found for </section>
+HtmlVersionTagsAttrsTest.java:164: error: heading not found for </section>
      * </section>
        ^
-HtmlVersionTagsAttrsTest.java:166: error: heading not found for </article>
+HtmlVersionTagsAttrsTest.java:167: error: heading not found for </article>
      * </article>
        ^
-HtmlVersionTagsAttrsTest.java:168: error: tag not allowed here: <header>
+HtmlVersionTagsAttrsTest.java:169: error: tag not allowed here: <header>
      * <header>
        ^
-HtmlVersionTagsAttrsTest.java:171: error: tag not allowed here: <footer>
+HtmlVersionTagsAttrsTest.java:172: error: tag not allowed here: <footer>
      * <footer>
        ^
-HtmlVersionTagsAttrsTest.java:174: error: element not allowed in documentation comments: <main>
+HtmlVersionTagsAttrsTest.java:175: error: element not allowed in documentation comments: <main>
      * <main>
        ^
-HtmlVersionTagsAttrsTest.java:180: error: tag not allowed here: <header>
+HtmlVersionTagsAttrsTest.java:181: error: tag not allowed here: <header>
      * <header>
        ^
-HtmlVersionTagsAttrsTest.java:183: error: tag not allowed here: <footer>
+HtmlVersionTagsAttrsTest.java:184: error: tag not allowed here: <footer>
      * <footer>
        ^
-HtmlVersionTagsAttrsTest.java:186: error: element not allowed in documentation comments: <main>
+HtmlVersionTagsAttrsTest.java:187: error: element not allowed in documentation comments: <main>
      * <main>
        ^
-HtmlVersionTagsAttrsTest.java:191: error: attribute border for table only accepts "" or "1", use CSS instead: BORDER
+HtmlVersionTagsAttrsTest.java:192: error: attribute border for table only accepts "" or "1", use CSS instead: BORDER
      * <table border="2">
               ^
-HtmlVersionTagsAttrsTest.java:193: error: no summary or caption for table
+HtmlVersionTagsAttrsTest.java:194: error: no summary or caption for table
      * </table>
        ^
-HtmlVersionTagsAttrsTest.java:204: error: no summary or caption for table
+HtmlVersionTagsAttrsTest.java:205: error: no summary or caption for table
      * </table>
        ^
-HtmlVersionTagsAttrsTest.java:207: error: no summary or caption for table
+HtmlVersionTagsAttrsTest.java:208: error: no summary or caption for table
      * </table>
        ^
 97 errors
--- a/langtools/test/tools/doclint/html/InlineTagsTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/doclint/html/InlineTagsTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
  * @bug 8006251
  * @summary test inline tags
  * @library ..
+ * @modules jdk.compiler/com.sun.tools.doclint
  * @build DocLintTester
  * @run main DocLintTester -Xmsgs InlineTagsTest.java
  */
--- a/langtools/test/tools/doclint/html/ListTagsTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/doclint/html/ListTagsTest.java	Thu May 21 11:41:04 2015 -0700
@@ -3,6 +3,7 @@
  * @bug 8006251 8013405 8022173
  * @summary test list tags
  * @library ..
+ * @modules jdk.compiler/com.sun.tools.doclint
  * @build DocLintTester
  * @run main DocLintTester -Xmsgs -ref ListTagsTest.out ListTagsTest.java
  */
--- a/langtools/test/tools/doclint/html/ListTagsTest.out	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/doclint/html/ListTagsTest.out	Thu May 21 11:41:04 2015 -0700
@@ -1,7 +1,7 @@
-ListTagsTest.java:16: error: attribute lacks value
+ListTagsTest.java:17: error: attribute lacks value
      *  <ol> <li value> bad </ol>
                  ^
-ListTagsTest.java:17: error: attribute value is not a number
+ListTagsTest.java:18: error: attribute value is not a number
      *  <ol> <li value="a"> bad </ol>
                  ^
 2 errors
--- a/langtools/test/tools/doclint/html/OtherTagsTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/doclint/html/OtherTagsTest.java	Thu May 21 11:41:04 2015 -0700
@@ -3,6 +3,7 @@
  * @bug 8006251 8022173
  * @summary test other tags
  * @library ..
+ * @modules jdk.compiler/com.sun.tools.doclint
  * @build DocLintTester
  * @run main DocLintTester -Xmsgs -ref OtherTagsTest.out OtherTagsTest.java
  */
--- a/langtools/test/tools/doclint/html/OtherTagsTest.out	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/doclint/html/OtherTagsTest.out	Thu May 21 11:41:04 2015 -0700
@@ -1,28 +1,28 @@
-OtherTagsTest.java:13: error: element not allowed in documentation comments: <body>
+OtherTagsTest.java:14: error: element not allowed in documentation comments: <body>
      *  <body> <p> abc </body>
         ^
-OtherTagsTest.java:14: error: element not allowed in documentation comments: <frame>
+OtherTagsTest.java:15: error: element not allowed in documentation comments: <frame>
      *  <frame>
         ^
-OtherTagsTest.java:15: error: element not allowed in documentation comments: <frameset>
+OtherTagsTest.java:16: error: element not allowed in documentation comments: <frameset>
      *  <frameset> </frameset>
         ^
-OtherTagsTest.java:16: error: element not allowed in documentation comments: <head>
+OtherTagsTest.java:17: error: element not allowed in documentation comments: <head>
      *  <head> </head>
         ^
-OtherTagsTest.java:18: error: element not allowed in documentation comments: <link>
+OtherTagsTest.java:19: error: element not allowed in documentation comments: <link>
      *  <link>
         ^
-OtherTagsTest.java:19: error: element not allowed in documentation comments: <meta>
+OtherTagsTest.java:20: error: element not allowed in documentation comments: <meta>
      *  <meta>
         ^
-OtherTagsTest.java:20: error: element not allowed in documentation comments: <noframes>
+OtherTagsTest.java:21: error: element not allowed in documentation comments: <noframes>
      *  <noframes> </noframes>
         ^
-OtherTagsTest.java:21: error: element not allowed in documentation comments: <script>
+OtherTagsTest.java:22: error: element not allowed in documentation comments: <script>
      *  <script> </script>
         ^
-OtherTagsTest.java:22: error: element not allowed in documentation comments: <title>
+OtherTagsTest.java:23: error: element not allowed in documentation comments: <title>
      *  <title> </title>
         ^
 9 errors
--- a/langtools/test/tools/doclint/html/TableTagsTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/doclint/html/TableTagsTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
  * @bug 8006251 8022173
  * @summary test table tags
  * @library ..
+ * @modules jdk.compiler/com.sun.tools.doclint
  * @build DocLintTester
  * @run main DocLintTester -Xmsgs TableTagsTest.java
  */
--- a/langtools/test/tools/doclint/html/TagNotAllowed.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/doclint/html/TagNotAllowed.java	Thu May 21 11:41:04 2015 -0700
@@ -3,6 +3,7 @@
  * @bug 8004832
  * @summary Add new doclint package
  * @library ..
+ * @modules jdk.compiler/com.sun.tools.doclint
  * @build DocLintTester
  * @run main DocLintTester -ref TagNotAllowed.out TagNotAllowed.java
  */
--- a/langtools/test/tools/doclint/html/TagNotAllowed.out	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/doclint/html/TagNotAllowed.out	Thu May 21 11:41:04 2015 -0700
@@ -1,61 +1,61 @@
-TagNotAllowed.java:11: error: tag not allowed here: <b>
- * <dl> <b>abc</b> <dt> term </dt> <b>def</b> <dd> description </dd> <b>ghi</b> </dl>
-        ^
-TagNotAllowed.java:11: error: tag not allowed here: <b>
+TagNotAllowed.java:12: error: tag not allowed here: <b>
  * <dl> <b>abc</b> <dt> term </dt> <b>def</b> <dd> description </dd> <b>ghi</b> </dl>
-                                   ^
-TagNotAllowed.java:11: error: tag not allowed here: <b>
- * <dl> <b>abc</b> <dt> term </dt> <b>def</b> <dd> description </dd> <b>ghi</b> </dl>
-                                                                     ^
-TagNotAllowed.java:12: error: tag not allowed here: <b>
- * <ol> <b>abc</b> <li> item </li> <b>def</b> <li> item </li> <b>ghi</b> </ol>
         ^
 TagNotAllowed.java:12: error: tag not allowed here: <b>
+ * <dl> <b>abc</b> <dt> term </dt> <b>def</b> <dd> description </dd> <b>ghi</b> </dl>
+                                   ^
+TagNotAllowed.java:12: error: tag not allowed here: <b>
+ * <dl> <b>abc</b> <dt> term </dt> <b>def</b> <dd> description </dd> <b>ghi</b> </dl>
+                                                                     ^
+TagNotAllowed.java:13: error: tag not allowed here: <b>
+ * <ol> <b>abc</b> <li> item </li> <b>def</b> <li> item </li> <b>ghi</b> </ol>
+        ^
+TagNotAllowed.java:13: error: tag not allowed here: <b>
  * <ol> <b>abc</b> <li> item </li> <b>def</b> <li> item </li> <b>ghi</b> </ol>
                                    ^
-TagNotAllowed.java:12: error: tag not allowed here: <b>
+TagNotAllowed.java:13: error: tag not allowed here: <b>
  * <ol> <b>abc</b> <li> item </li> <b>def</b> <li> item </li> <b>ghi</b> </ol>
                                                               ^
-TagNotAllowed.java:13: error: tag not allowed here: <b>
+TagNotAllowed.java:14: error: tag not allowed here: <b>
  * <ul> <b>abc</b> <li> item </li> <b>def</b> <li> item </li> <b>ghi</b> </ul>
         ^
-TagNotAllowed.java:13: error: tag not allowed here: <b>
+TagNotAllowed.java:14: error: tag not allowed here: <b>
  * <ul> <b>abc</b> <li> item </li> <b>def</b> <li> item </li> <b>ghi</b> </ul>
                                    ^
-TagNotAllowed.java:13: error: tag not allowed here: <b>
+TagNotAllowed.java:14: error: tag not allowed here: <b>
  * <ul> <b>abc</b> <li> item </li> <b>def</b> <li> item </li> <b>ghi</b> </ul>
                                                               ^
-TagNotAllowed.java:15: error: tag not allowed here: <b>
+TagNotAllowed.java:16: error: tag not allowed here: <b>
  * <table summary=description> <b>abc</b> </table>
                                ^
-TagNotAllowed.java:16: error: tag not allowed here: <b>
+TagNotAllowed.java:17: error: tag not allowed here: <b>
  * <table summary=description> <thead> <b>abc</b> </thead> </table>
                                        ^
-TagNotAllowed.java:17: error: tag not allowed here: <b>
+TagNotAllowed.java:18: error: tag not allowed here: <b>
  * <table summary=description> <tbody> <b>abc</b> </tbody> </table>
                                        ^
-TagNotAllowed.java:18: error: tag not allowed here: <b>
+TagNotAllowed.java:19: error: tag not allowed here: <b>
  * <table summary=description> <tfoot> <b>abc</b> </tfoot> </table>
                                        ^
-TagNotAllowed.java:19: error: tag not allowed here: <b>
+TagNotAllowed.java:20: error: tag not allowed here: <b>
  * <table summary=description> <tr> <b>abc</b> </tr> </table>
                                     ^
-TagNotAllowed.java:22: error: tag not allowed here: <img>
+TagNotAllowed.java:23: error: tag not allowed here: <img>
  *   <img alt="image" src="image.png">
      ^
-TagNotAllowed.java:23: error: tag not allowed here: <p>
+TagNotAllowed.java:24: error: tag not allowed here: <p>
  *   <p> para </p>
      ^
-TagNotAllowed.java:24: error: tag not allowed here: <big>
+TagNotAllowed.java:25: error: tag not allowed here: <big>
  *   <big> text </big>
      ^
-TagNotAllowed.java:25: error: tag not allowed here: <small>
+TagNotAllowed.java:26: error: tag not allowed here: <small>
  *   <small> text </small>
      ^
-TagNotAllowed.java:26: error: tag not allowed here: <sub>
+TagNotAllowed.java:27: error: tag not allowed here: <sub>
  *   <sub> text </sub>
      ^
-TagNotAllowed.java:27: error: tag not allowed here: <sup>
+TagNotAllowed.java:28: error: tag not allowed here: <sup>
  *   <sup> text </sup>
      ^
 20 errors
--- a/langtools/test/tools/doclint/html/TextNotAllowed.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/doclint/html/TextNotAllowed.java	Thu May 21 11:41:04 2015 -0700
@@ -3,6 +3,7 @@
  * @bug 8004832
  * @summary Add new doclint package
  * @library ..
+ * @modules jdk.compiler/com.sun.tools.doclint
  * @build DocLintTester
  * @run main DocLintTester -ref TextNotAllowed.out TextNotAllowed.java
  */
--- a/langtools/test/tools/doclint/html/TextNotAllowed.out	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/doclint/html/TextNotAllowed.out	Thu May 21 11:41:04 2015 -0700
@@ -1,85 +1,85 @@
-TextNotAllowed.java:11: error: text not allowed in <dl> element
+TextNotAllowed.java:12: error: text not allowed in <dl> element
  * <dl> abc <dt> term </dt> def <dd> description </dd> ghi </dl>
        ^
-TextNotAllowed.java:11: error: text not allowed in <dl> element
+TextNotAllowed.java:12: error: text not allowed in <dl> element
  * <dl> abc <dt> term </dt> def <dd> description </dd> ghi </dl>
                            ^
-TextNotAllowed.java:11: error: text not allowed in <dl> element
+TextNotAllowed.java:12: error: text not allowed in <dl> element
  * <dl> abc <dt> term </dt> def <dd> description </dd> ghi </dl>
                                                       ^
-TextNotAllowed.java:12: error: text not allowed in <ol> element
+TextNotAllowed.java:13: error: text not allowed in <ol> element
  * <ol> abc <li> item </li> def <li> item </li> ghi </ol>
        ^
-TextNotAllowed.java:12: error: text not allowed in <ol> element
+TextNotAllowed.java:13: error: text not allowed in <ol> element
  * <ol> abc <li> item </li> def <li> item </li> ghi </ol>
                            ^
-TextNotAllowed.java:12: error: text not allowed in <ol> element
+TextNotAllowed.java:13: error: text not allowed in <ol> element
  * <ol> abc <li> item </li> def <li> item </li> ghi </ol>
                                                ^
-TextNotAllowed.java:13: error: text not allowed in <ul> element
+TextNotAllowed.java:14: error: text not allowed in <ul> element
  * <ul> abc <li> item </li> def <li> item </li> ghi </ul>
        ^
-TextNotAllowed.java:13: error: text not allowed in <ul> element
+TextNotAllowed.java:14: error: text not allowed in <ul> element
  * <ul> abc <li> item </li> def <li> item </li> ghi </ul>
                            ^
-TextNotAllowed.java:13: error: text not allowed in <ul> element
+TextNotAllowed.java:14: error: text not allowed in <ul> element
  * <ul> abc <li> item </li> def <li> item </li> ghi </ul>
                                                ^
-TextNotAllowed.java:15: error: text not allowed in <table> element
+TextNotAllowed.java:16: error: text not allowed in <table> element
  * <table summary=description> abc </table>
                               ^
-TextNotAllowed.java:16: error: text not allowed in <thead> element
+TextNotAllowed.java:17: error: text not allowed in <thead> element
  * <table summary=description> <thead> abc </thead> </table>
                                       ^
-TextNotAllowed.java:17: error: text not allowed in <tbody> element
+TextNotAllowed.java:18: error: text not allowed in <tbody> element
  * <table summary=description> <tbody> abc </tbody> </table>
                                       ^
-TextNotAllowed.java:18: error: text not allowed in <tfoot> element
+TextNotAllowed.java:19: error: text not allowed in <tfoot> element
  * <table summary=description> <tfoot> abc </tfoot> </table>
                                       ^
-TextNotAllowed.java:19: error: text not allowed in <tr> element
+TextNotAllowed.java:20: error: text not allowed in <tr> element
  * <table summary=description> <tr> abc </tr> </table>
                                    ^
-TextNotAllowed.java:21: error: text not allowed in <dl> element
+TextNotAllowed.java:22: error: text not allowed in <dl> element
  * <dl> &amp; <dt> term </dt> &lt; <dd> description </dd> &gt; </dl>
         ^
-TextNotAllowed.java:21: error: text not allowed in <dl> element
+TextNotAllowed.java:22: error: text not allowed in <dl> element
  * <dl> &amp; <dt> term </dt> &lt; <dd> description </dd> &gt; </dl>
                               ^
-TextNotAllowed.java:21: error: text not allowed in <dl> element
+TextNotAllowed.java:22: error: text not allowed in <dl> element
  * <dl> &amp; <dt> term </dt> &lt; <dd> description </dd> &gt; </dl>
                                                           ^
-TextNotAllowed.java:22: error: text not allowed in <ol> element
+TextNotAllowed.java:23: error: text not allowed in <ol> element
  * <ol> &amp; <li> item </li> &lt; <li> item </li> &gt; </ol>
         ^
-TextNotAllowed.java:22: error: text not allowed in <ol> element
+TextNotAllowed.java:23: error: text not allowed in <ol> element
  * <ol> &amp; <li> item </li> &lt; <li> item </li> &gt; </ol>
                               ^
-TextNotAllowed.java:22: error: text not allowed in <ol> element
+TextNotAllowed.java:23: error: text not allowed in <ol> element
  * <ol> &amp; <li> item </li> &lt; <li> item </li> &gt; </ol>
                                                    ^
-TextNotAllowed.java:23: error: text not allowed in <ul> element
+TextNotAllowed.java:24: error: text not allowed in <ul> element
  * <ul> &amp; <li> item </li> &lt; <li> item </li> &gt; </ul>
         ^
-TextNotAllowed.java:23: error: text not allowed in <ul> element
+TextNotAllowed.java:24: error: text not allowed in <ul> element
  * <ul> &amp; <li> item </li> &lt; <li> item </li> &gt; </ul>
                               ^
-TextNotAllowed.java:23: error: text not allowed in <ul> element
+TextNotAllowed.java:24: error: text not allowed in <ul> element
  * <ul> &amp; <li> item </li> &lt; <li> item </li> &gt; </ul>
                                                    ^
-TextNotAllowed.java:25: error: text not allowed in <table> element
+TextNotAllowed.java:26: error: text not allowed in <table> element
  * <table summary=description> &amp; </table>
                                ^
-TextNotAllowed.java:26: error: text not allowed in <thead> element
+TextNotAllowed.java:27: error: text not allowed in <thead> element
  * <table summary=description> <thead> &amp; </thead> </table>
                                        ^
-TextNotAllowed.java:27: error: text not allowed in <tbody> element
+TextNotAllowed.java:28: error: text not allowed in <tbody> element
  * <table summary=description> <tbody> &amp; </tbody> </table>
                                        ^
-TextNotAllowed.java:28: error: text not allowed in <tfoot> element
+TextNotAllowed.java:29: error: text not allowed in <tfoot> element
  * <table summary=description> <tfoot> &amp; </tfoot> </table>
                                        ^
-TextNotAllowed.java:29: error: text not allowed in <tr> element
+TextNotAllowed.java:30: error: text not allowed in <tr> element
  * <table summary=description> <tr> &amp; </tr> </table>
                                     ^
 28 errors
--- a/langtools/test/tools/doclint/packageTests/bad/Test.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/doclint/packageTests/bad/Test.java	Thu May 21 11:41:04 2015 -0700
@@ -3,6 +3,7 @@
  * @bug 8020664 8021215
  * @summary doclint gives incorrect warnings on normal package statements
  * @library ../..
+ * @modules jdk.compiler/com.sun.tools.doclint
  * @build DocLintTester
  * @run main DocLintTester -ref Test.out Test.java
  * @compile/fail/ref=Test.javac.out -XDrawDiagnostics -Werror -Xdoclint:all Test.java
--- a/langtools/test/tools/doclint/packageTests/bad/Test.javac.out	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/doclint/packageTests/bad/Test.javac.out	Thu May 21 11:41:04 2015 -0700
@@ -1,4 +1,4 @@
-Test.java:12:1: compiler.warn.proc.messager: documentation comment not expected here
+Test.java:13:1: compiler.warn.proc.messager: documentation comment not expected here
 - compiler.err.warnings.and.werror
 1 error
 1 warning
--- a/langtools/test/tools/doclint/packageTests/bad/Test.out	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/doclint/packageTests/bad/Test.out	Thu May 21 11:41:04 2015 -0700
@@ -1,4 +1,4 @@
-Test.java:12: warning: documentation comment not expected here
+Test.java:13: warning: documentation comment not expected here
 package bad;
 ^
 1 warning
--- a/langtools/test/tools/doclint/packageTests/bad/package-info.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/doclint/packageTests/bad/package-info.java	Thu May 21 11:41:04 2015 -0700
@@ -3,6 +3,7 @@
  * @bug 8020664 8021215
  * @summary doclint gives incorrect warnings on normal package statements
  * @library ../..
+ * @modules jdk.compiler/com.sun.tools.doclint
  * @build DocLintTester
  * @run main DocLintTester -ref package-info.out package-info.java
  * @compile/fail/ref=package-info.javac.out -XDrawDiagnostics -Werror -Xdoclint:all package-info.java
--- a/langtools/test/tools/doclint/packageTests/bad/package-info.javac.out	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/doclint/packageTests/bad/package-info.javac.out	Thu May 21 11:41:04 2015 -0700
@@ -1,4 +1,4 @@
-package-info.java:12:1: compiler.warn.proc.messager: no comment
+package-info.java:13:1: compiler.warn.proc.messager: no comment
 - compiler.err.warnings.and.werror
 1 error
 1 warning
--- a/langtools/test/tools/doclint/packageTests/bad/package-info.out	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/doclint/packageTests/bad/package-info.out	Thu May 21 11:41:04 2015 -0700
@@ -1,4 +1,4 @@
-package-info.java:12: warning: no comment
+package-info.java:13: warning: no comment
 package bad;
 ^
 1 warning
--- a/langtools/test/tools/doclint/packageTests/good/Test.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/doclint/packageTests/good/Test.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
  * @bug 8020664 8021215
  * @summary doclint gives incorrect warnings on normal package statements
  * @library ../..
+ * @modules jdk.compiler/com.sun.tools.doclint
  * @build DocLintTester
  * @run main DocLintTester Test.java
  * @compile -Xdoclint:all Test.java
--- a/langtools/test/tools/doclint/packageTests/good/package-info.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/doclint/packageTests/good/package-info.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
  * @bug 8020664 8021215
  * @summary doclint gives incorrect warnings on normal package statements
  * @library ../..
+ * @modules jdk.compiler/com.sun.tools.doclint
  * @build DocLintTester
  * @run main DocLintTester package-info.java
  * @compile -Xdoclint:all package-info.java
--- a/langtools/test/tools/doclint/tidy/AnchorAlreadyDefined.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/doclint/tidy/AnchorAlreadyDefined.java	Thu May 21 11:41:04 2015 -0700
@@ -3,6 +3,7 @@
  * @bug 8004832
  * @summary Add new doclint package
  * @library ..
+ * @modules jdk.compiler/com.sun.tools.doclint
  * @build DocLintTester
  * @run main DocLintTester -ref AnchorAlreadyDefined.out AnchorAlreadyDefined.java
  */
--- a/langtools/test/tools/doclint/tidy/AnchorAlreadyDefined.out	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/doclint/tidy/AnchorAlreadyDefined.out	Thu May 21 11:41:04 2015 -0700
@@ -1,7 +1,7 @@
-AnchorAlreadyDefined.java:14: error: anchor already defined: "here"
+AnchorAlreadyDefined.java:15: error: anchor already defined: "here"
  * <a name="here">duplicate</a>
       ^
-AnchorAlreadyDefined.java:15: error: anchor already defined: "here"
+AnchorAlreadyDefined.java:16: error: anchor already defined: "here"
  * <h1 id="here">duplicate</h1>
        ^
 2 errors
--- a/langtools/test/tools/doclint/tidy/BadEnd.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/doclint/tidy/BadEnd.java	Thu May 21 11:41:04 2015 -0700
@@ -3,6 +3,7 @@
  * @bug 8004832
  * @summary Add new doclint package
  * @library ..
+ * @modules jdk.compiler/com.sun.tools.doclint
  * @build DocLintTester
  * @run main DocLintTester -ref BadEnd.out BadEnd.java
  */
--- a/langtools/test/tools/doclint/tidy/BadEnd.out	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/doclint/tidy/BadEnd.out	Thu May 21 11:41:04 2015 -0700
@@ -1,19 +1,19 @@
-BadEnd.java:14: warning: nested tag not allowed: <code>
+BadEnd.java:15: warning: nested tag not allowed: <code>
  * <code> text <code>
                ^
-BadEnd.java:14: warning: empty <code> tag
+BadEnd.java:15: warning: empty <code> tag
  * <code> text <code>
                ^
-BadEnd.java:14: error: element not closed: code
+BadEnd.java:15: error: element not closed: code
  * <code> text <code>
                ^
-BadEnd.java:14: error: element not closed: code
+BadEnd.java:15: error: element not closed: code
  * <code> text <code>
    ^
-BadEnd.java:13: error: element not closed: a
+BadEnd.java:14: error: element not closed: a
  * <a name="here"> text <a>
                         ^
-BadEnd.java:13: error: element not closed: a
+BadEnd.java:14: error: element not closed: a
  * <a name="here"> text <a>
    ^
 4 errors
--- a/langtools/test/tools/doclint/tidy/InsertImplicit.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/doclint/tidy/InsertImplicit.java	Thu May 21 11:41:04 2015 -0700
@@ -3,6 +3,7 @@
  * @bug 8004832
  * @summary Add new doclint package
  * @library ..
+ * @modules jdk.compiler/com.sun.tools.doclint
  * @build DocLintTester
  * @run main DocLintTester -ref InsertImplicit.out InsertImplicit.java
  */
--- a/langtools/test/tools/doclint/tidy/InsertImplicit.out	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/doclint/tidy/InsertImplicit.out	Thu May 21 11:41:04 2015 -0700
@@ -1,7 +1,7 @@
-InsertImplicit.java:13: error: unexpected end tag: </p>
+InsertImplicit.java:14: error: unexpected end tag: </p>
  * </p>
    ^
-InsertImplicit.java:14: error: block element not allowed within inline element <i>: blockquote
+InsertImplicit.java:15: error: block element not allowed within inline element <i>: blockquote
  * <i> <blockquote> abc </blockquote> </i>
        ^
 2 errors
--- a/langtools/test/tools/doclint/tidy/InvalidEntity.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/doclint/tidy/InvalidEntity.java	Thu May 21 11:41:04 2015 -0700
@@ -3,6 +3,7 @@
  * @bug 8004832
  * @summary Add new doclint package
  * @library ..
+ * @modules jdk.compiler/com.sun.tools.doclint
  * @build DocLintTester
  * @run main DocLintTester -ref InvalidEntity.out InvalidEntity.java
  */
--- a/langtools/test/tools/doclint/tidy/InvalidEntity.out	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/doclint/tidy/InvalidEntity.out	Thu May 21 11:41:04 2015 -0700
@@ -1,10 +1,10 @@
-InvalidEntity.java:17: error: invalid entity &#01;
+InvalidEntity.java:18: error: invalid entity &#01;
  * &#01;
    ^
-InvalidEntity.java:18: error: invalid entity &#x01;
+InvalidEntity.java:19: error: invalid entity &#x01;
  * &#x01;
    ^
-InvalidEntity.java:19: error: invalid entity &splodge;
+InvalidEntity.java:20: error: invalid entity &splodge;
  * &splodge;
    ^
 3 errors
--- a/langtools/test/tools/doclint/tidy/InvalidName.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/doclint/tidy/InvalidName.java	Thu May 21 11:41:04 2015 -0700
@@ -3,6 +3,7 @@
  * @bug 8004832
  * @summary Add new doclint package
  * @library ..
+ * @modules jdk.compiler/com.sun.tools.doclint
  * @build DocLintTester
  * @run main DocLintTester -ref InvalidName.out InvalidName.java
  */
--- a/langtools/test/tools/doclint/tidy/InvalidName.out	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/doclint/tidy/InvalidName.out	Thu May 21 11:41:04 2015 -0700
@@ -1,4 +1,4 @@
-InvalidName.java:16: error: invalid name for anchor: "foo()"
+InvalidName.java:17: error: invalid name for anchor: "foo()"
  * <a name="foo()">invalid</a>
       ^
 1 error
--- a/langtools/test/tools/doclint/tidy/InvalidTag.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/doclint/tidy/InvalidTag.java	Thu May 21 11:41:04 2015 -0700
@@ -3,6 +3,7 @@
  * @bug 8004832
  * @summary Add new doclint package
  * @library ..
+ * @modules jdk.compiler/com.sun.tools.doclint
  * @build DocLintTester
  * @run main DocLintTester -ref InvalidTag.out InvalidTag.java
  */
--- a/langtools/test/tools/doclint/tidy/InvalidTag.out	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/doclint/tidy/InvalidTag.out	Thu May 21 11:41:04 2015 -0700
@@ -1,10 +1,10 @@
-InvalidTag.java:13: error: unknown tag: String
+InvalidTag.java:14: error: unknown tag: String
  * List<String> list = new ArrayList<>();
        ^
-InvalidTag.java:13: error: malformed HTML
+InvalidTag.java:14: error: malformed HTML
  * List<String> list = new ArrayList<>();
                                     ^
-InvalidTag.java:13: error: bad use of '>'
+InvalidTag.java:14: error: bad use of '>'
  * List<String> list = new ArrayList<>();
                                      ^
 3 errors
--- a/langtools/test/tools/doclint/tidy/InvalidURI.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/doclint/tidy/InvalidURI.java	Thu May 21 11:41:04 2015 -0700
@@ -3,6 +3,7 @@
  * @bug 8004832
  * @summary Add new doclint package
  * @library ..
+ * @modules jdk.compiler/com.sun.tools.doclint
  * @build DocLintTester
  * @run main DocLintTester -ref InvalidURI.out InvalidURI.java
  */
--- a/langtools/test/tools/doclint/tidy/InvalidURI.out	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/doclint/tidy/InvalidURI.out	Thu May 21 11:41:04 2015 -0700
@@ -1,13 +1,13 @@
-InvalidURI.java:16: error: invalid uri: "abc def"
+InvalidURI.java:17: error: invalid uri: "abc def"
  * <a href="abc def">invalid</a>
       ^
-InvalidURI.java:17: error: attribute lacks value
+InvalidURI.java:18: error: attribute lacks value
  * <a href>no value</a>
       ^
-InvalidURI.java:18: error: attribute lacks value
+InvalidURI.java:19: error: attribute lacks value
  * <a href= >no value</a>
       ^
-InvalidURI.java:19: error: attribute lacks value
+InvalidURI.java:20: error: attribute lacks value
  * <a href="" >no value</a>
       ^
 4 errors
--- a/langtools/test/tools/doclint/tidy/MissingGT.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/doclint/tidy/MissingGT.java	Thu May 21 11:41:04 2015 -0700
@@ -3,6 +3,7 @@
  * @bug 8004832
  * @summary Add new doclint package
  * @library ..
+ * @modules jdk.compiler/com.sun.tools.doclint
  * @build DocLintTester
  * @run main DocLintTester -ref MissingGT.out MissingGT.java
  */
--- a/langtools/test/tools/doclint/tidy/MissingGT.out	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/doclint/tidy/MissingGT.out	Thu May 21 11:41:04 2015 -0700
@@ -1,4 +1,4 @@
-MissingGT.java:13: error: malformed HTML
+MissingGT.java:14: error: malformed HTML
  * <img src="image.gif"
    ^
 1 error
--- a/langtools/test/tools/doclint/tidy/MissingTag.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/doclint/tidy/MissingTag.java	Thu May 21 11:41:04 2015 -0700
@@ -3,6 +3,7 @@
  * @bug 8004832
  * @summary Add new doclint package
  * @library ..
+ * @modules jdk.compiler/com.sun.tools.doclint
  * @build DocLintTester
  * @run main DocLintTester -ref MissingTag.out MissingTag.java
  */
--- a/langtools/test/tools/doclint/tidy/MissingTag.out	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/doclint/tidy/MissingTag.out	Thu May 21 11:41:04 2015 -0700
@@ -1,7 +1,7 @@
-MissingTag.java:14: error: unexpected end tag: </p>
+MissingTag.java:15: error: unexpected end tag: </p>
  * </p>
    ^
-MissingTag.java:15: error: end tag missing: </b>
+MissingTag.java:16: error: end tag missing: </b>
  * <h1> <b> text </h1>
         ^
 2 errors
--- a/langtools/test/tools/doclint/tidy/NestedTag.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/doclint/tidy/NestedTag.java	Thu May 21 11:41:04 2015 -0700
@@ -3,6 +3,7 @@
  * @bug 8004832
  * @summary Add new doclint package
  * @library ..
+ * @modules jdk.compiler/com.sun.tools.doclint
  * @build DocLintTester
  * @run main DocLintTester -ref NestedTag.out NestedTag.java
  */
--- a/langtools/test/tools/doclint/tidy/NestedTag.out	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/doclint/tidy/NestedTag.out	Thu May 21 11:41:04 2015 -0700
@@ -1,7 +1,7 @@
-NestedTag.java:13: warning: nested tag not allowed: <b>
+NestedTag.java:14: warning: nested tag not allowed: <b>
  * <b><b> text </b></b>
       ^
-NestedTag.java:14: warning: nested tag not allowed: <code>
+NestedTag.java:15: warning: nested tag not allowed: <code>
  * {@link java.lang.String <code>String</code>}
                            ^
 2 warnings
--- a/langtools/test/tools/doclint/tidy/ParaInPre.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/doclint/tidy/ParaInPre.java	Thu May 21 11:41:04 2015 -0700
@@ -3,6 +3,7 @@
  * @bug 8004832
  * @summary Add new doclint package
  * @library ..
+ * @modules jdk.compiler/com.sun.tools.doclint
  * @build DocLintTester
  * @run main DocLintTester -ref ParaInPre.out ParaInPre.java
  */
--- a/langtools/test/tools/doclint/tidy/ParaInPre.out	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/doclint/tidy/ParaInPre.out	Thu May 21 11:41:04 2015 -0700
@@ -1,4 +1,4 @@
-ParaInPre.java:16: error: tag not allowed here: <p>
+ParaInPre.java:17: error: tag not allowed here: <p>
  *     <p>
        ^
 1 error
--- a/langtools/test/tools/doclint/tidy/RepeatedAttr.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/doclint/tidy/RepeatedAttr.java	Thu May 21 11:41:04 2015 -0700
@@ -3,6 +3,7 @@
  * @bug 8004832
  * @summary Add new doclint package
  * @library ..
+ * @modules jdk.compiler/com.sun.tools.doclint
  * @build DocLintTester
  * @run main DocLintTester -ref RepeatedAttr.out RepeatedAttr.java
  */
--- a/langtools/test/tools/doclint/tidy/RepeatedAttr.out	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/doclint/tidy/RepeatedAttr.out	Thu May 21 11:41:04 2015 -0700
@@ -1,4 +1,4 @@
-RepeatedAttr.java:13: error: repeated attribute: alt
+RepeatedAttr.java:14: error: repeated attribute: alt
  * <img src="image.gif" alt alt="summary">
                             ^
 1 error
--- a/langtools/test/tools/doclint/tidy/TextNotAllowed.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/doclint/tidy/TextNotAllowed.java	Thu May 21 11:41:04 2015 -0700
@@ -3,6 +3,7 @@
  * @bug 8004832
  * @summary Add new doclint package
  * @library ..
+ * @modules jdk.compiler/com.sun.tools.doclint
  * @build DocLintTester
  * @run main DocLintTester -ref TextNotAllowed.out TextNotAllowed.java
  */
--- a/langtools/test/tools/doclint/tidy/TextNotAllowed.out	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/doclint/tidy/TextNotAllowed.out	Thu May 21 11:41:04 2015 -0700
@@ -1,19 +1,19 @@
-TextNotAllowed.java:13: error: text not allowed in <table> element
+TextNotAllowed.java:14: error: text not allowed in <table> element
  * <table summary=description> abc </table>
                               ^
-TextNotAllowed.java:14: error: text not allowed in <tbody> element
+TextNotAllowed.java:15: error: text not allowed in <tbody> element
  * <table summary=description> <tbody> abc </tbody> </table>
                                       ^
-TextNotAllowed.java:15: error: text not allowed in <tr> element
+TextNotAllowed.java:16: error: text not allowed in <tr> element
  * <table summary=description> <tr> abc </tr> </table>
                                    ^
-TextNotAllowed.java:17: error: text not allowed in <dl> element
+TextNotAllowed.java:18: error: text not allowed in <dl> element
  * <dl> abc </dl>
        ^
-TextNotAllowed.java:18: error: text not allowed in <ol> element
+TextNotAllowed.java:19: error: text not allowed in <ol> element
  * <ol> abc </ol>
        ^
-TextNotAllowed.java:19: error: text not allowed in <ul> element
+TextNotAllowed.java:20: error: text not allowed in <ul> element
  * <ul> abc </ul>
        ^
 6 errors
--- a/langtools/test/tools/doclint/tidy/TrimmingEmptyTag.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/doclint/tidy/TrimmingEmptyTag.java	Thu May 21 11:41:04 2015 -0700
@@ -3,6 +3,7 @@
  * @bug 8004832 8026368
  * @summary Add new doclint package
  * @library ..
+ * @modules jdk.compiler/com.sun.tools.doclint
  * @build DocLintTester
  * @run main DocLintTester -ref TrimmingEmptyTag.out TrimmingEmptyTag.java
  */
--- a/langtools/test/tools/doclint/tidy/TrimmingEmptyTag.out	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/doclint/tidy/TrimmingEmptyTag.out	Thu May 21 11:41:04 2015 -0700
@@ -1,52 +1,52 @@
-TrimmingEmptyTag.java:13: warning: empty <b> tag
+TrimmingEmptyTag.java:14: warning: empty <b> tag
  * <b></b>
       ^
-TrimmingEmptyTag.java:14: warning: empty <table> tag
+TrimmingEmptyTag.java:15: warning: empty <table> tag
  * <table summary=description></table>
                               ^
-TrimmingEmptyTag.java:15: warning: empty <caption> tag
+TrimmingEmptyTag.java:16: warning: empty <caption> tag
  * <table><caption></caption></table>
                    ^
-TrimmingEmptyTag.java:16: warning: empty <code> tag
+TrimmingEmptyTag.java:17: warning: empty <code> tag
  * <code></code>
          ^
-TrimmingEmptyTag.java:17: warning: empty <dl> tag
+TrimmingEmptyTag.java:18: warning: empty <dl> tag
  * <dl></dl>
        ^
-TrimmingEmptyTag.java:18: warning: empty <dt> tag
+TrimmingEmptyTag.java:19: warning: empty <dt> tag
  * <dl><dt></dt><dd></dd></dl>
            ^
-TrimmingEmptyTag.java:18: warning: empty <dd> tag
+TrimmingEmptyTag.java:19: warning: empty <dd> tag
  * <dl><dt></dt><dd></dd></dl>
                     ^
-TrimmingEmptyTag.java:19: warning: empty <font> tag
+TrimmingEmptyTag.java:20: warning: empty <font> tag
  * <font></font>
          ^
-TrimmingEmptyTag.java:20: warning: empty <i> tag
+TrimmingEmptyTag.java:21: warning: empty <i> tag
  * <i></i>
       ^
-TrimmingEmptyTag.java:21: warning: empty <ol> tag
+TrimmingEmptyTag.java:22: warning: empty <ol> tag
  * <ol></ol>
        ^
-TrimmingEmptyTag.java:22: warning: empty <p> tag
+TrimmingEmptyTag.java:23: warning: empty <p> tag
  * <p></p>
       ^
-TrimmingEmptyTag.java:23: warning: empty <pre> tag
+TrimmingEmptyTag.java:24: warning: empty <pre> tag
  * <pre></pre>
         ^
-TrimmingEmptyTag.java:24: warning: empty <span> tag
+TrimmingEmptyTag.java:25: warning: empty <span> tag
  * <span></span>
          ^
-TrimmingEmptyTag.java:25: warning: empty <tt> tag
+TrimmingEmptyTag.java:26: warning: empty <tt> tag
  * <tt></tt>
        ^
-TrimmingEmptyTag.java:26: warning: empty <ul> tag
+TrimmingEmptyTag.java:27: warning: empty <ul> tag
  * <ul></ul>
        ^
-TrimmingEmptyTag.java:30: warning: empty <p> tag
+TrimmingEmptyTag.java:31: warning: empty <p> tag
     /** <p> */
         ^
-TrimmingEmptyTag.java:32: warning: empty <p> tag
+TrimmingEmptyTag.java:33: warning: empty <p> tag
     /** <p> <ul><li>text</ul> */
         ^
 17 warnings
--- a/langtools/test/tools/doclint/tidy/UnescapedOrUnknownEntity.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/doclint/tidy/UnescapedOrUnknownEntity.java	Thu May 21 11:41:04 2015 -0700
@@ -3,6 +3,7 @@
  * @bug 8004832
  * @summary Add new doclint package
  * @library ..
+ * @modules jdk.compiler/com.sun.tools.doclint
  * @build DocLintTester
  * @run main DocLintTester -ref UnescapedOrUnknownEntity.out UnescapedOrUnknownEntity.java
  */
--- a/langtools/test/tools/doclint/tidy/UnescapedOrUnknownEntity.out	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/doclint/tidy/UnescapedOrUnknownEntity.out	Thu May 21 11:41:04 2015 -0700
@@ -1,10 +1,10 @@
-UnescapedOrUnknownEntity.java:15: error: semicolon missing
+UnescapedOrUnknownEntity.java:16: error: semicolon missing
  * L&F
     ^
-UnescapedOrUnknownEntity.java:16: error: semicolon missing
+UnescapedOrUnknownEntity.java:17: error: semicolon missing
  * Drag&Drop
        ^
-UnescapedOrUnknownEntity.java:17: error: bad HTML entity
+UnescapedOrUnknownEntity.java:18: error: bad HTML entity
  * if (a & b);
          ^
 3 errors
--- a/langtools/test/tools/doclint/tool/HelpTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/doclint/tool/HelpTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
  * @bug 8006263
  * @summary Supplementary test cases needed for doclint
  * @library ..
+ * @modules jdk.compiler/com.sun.tools.doclint
  * @build DocLintTester
  * @run main DocLintTester -ref HelpTest.out
  * @run main DocLintTester -ref HelpTest.out -h
--- a/langtools/test/tools/doclint/tool/MaxDiagsTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/doclint/tool/MaxDiagsTest.java	Thu May 21 11:41:04 2015 -0700
@@ -3,6 +3,7 @@
  * @bug 8006263
  * @summary Supplementary test cases needed for doclint
  * @library ..
+ * @modules jdk.compiler/com.sun.tools.doclint
  * @build DocLintTester
  * @run main DocLintTester -ref MaxDiagsTest.out -Xmaxerrs 2 -Xmaxwarns 2 MaxDiagsTest.java
  * @run main DocLintTester -badargs -Xmaxerrs
--- a/langtools/test/tools/doclint/tool/MaxDiagsTest.out	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/doclint/tool/MaxDiagsTest.out	Thu May 21 11:41:04 2015 -0700
@@ -1,13 +1,13 @@
-MaxDiagsTest.java:13: warning: no comment
+MaxDiagsTest.java:14: warning: no comment
 public class MaxDiagsTest {
        ^
-MaxDiagsTest.java:15: error: invalid entity &#0;
+MaxDiagsTest.java:16: error: invalid entity &#0;
      * &#0; &#0; &#0; &#0;
        ^
-MaxDiagsTest.java:15: error: invalid entity &#0;
+MaxDiagsTest.java:16: error: invalid entity &#0;
      * &#0; &#0; &#0; &#0;
             ^
-MaxDiagsTest.java:20: warning: no @param for a1
+MaxDiagsTest.java:21: warning: no @param for a1
     public int warnings(int a1, int a2) throws Exception { return 0; }
                ^
 2 errors
--- a/langtools/test/tools/doclint/tool/PathsTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/doclint/tool/PathsTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,11 @@
  * @bug 8006263
  * @summary Supplementary test cases needed for doclint
  * @library /tools/lib
+ * @modules jdk.compiler/com.sun.tools.doclint
+ *          jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.main
+ *          jdk.compiler/com.sun.tools.javac.util
  * @build ToolBox
  * @run main PathsTest
  */
--- a/langtools/test/tools/doclint/tool/RunTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/doclint/tool/RunTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,8 @@
  * @test
  * @bug 8006263
  * @summary Supplementary test cases needed for doclint
+ * @modules jdk.compiler/com.sun.tools.doclint
+ *          jdk.compiler/com.sun.tools.javac.api
  */
 
 import com.sun.source.util.JavacTask;
--- a/langtools/test/tools/doclint/tool/StatsTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/doclint/tool/StatsTest.java	Thu May 21 11:41:04 2015 -0700
@@ -3,6 +3,7 @@
  * @bug 8006263
  * @summary Supplementary test cases needed for doclint
  * @library ..
+ * @modules jdk.compiler/com.sun.tools.doclint
  * @build DocLintTester
  * @run main DocLintTester -ref StatsTest.out -stats -Xmsgs:all StatsTest.java
  */
--- a/langtools/test/tools/doclint/tool/StatsTest.out	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/doclint/tool/StatsTest.out	Thu May 21 11:41:04 2015 -0700
@@ -1,28 +1,28 @@
-StatsTest.java:11: warning: no comment
+StatsTest.java:12: warning: no comment
 public class StatsTest {
        ^
-StatsTest.java:13: error: invalid entity &#0;
+StatsTest.java:14: error: invalid entity &#0;
      * &#0; &#0; &#0; &#0;
        ^
-StatsTest.java:13: error: invalid entity &#0;
+StatsTest.java:14: error: invalid entity &#0;
      * &#0; &#0; &#0; &#0;
             ^
-StatsTest.java:13: error: invalid entity &#0;
+StatsTest.java:14: error: invalid entity &#0;
      * &#0; &#0; &#0; &#0;
                  ^
-StatsTest.java:13: error: invalid entity &#0;
+StatsTest.java:14: error: invalid entity &#0;
      * &#0; &#0; &#0; &#0;
                       ^
-StatsTest.java:18: warning: no @param for a1
+StatsTest.java:19: warning: no @param for a1
     public int warnings(int a1, int a2) throws Exception { return 0; }
                ^
-StatsTest.java:18: warning: no @param for a2
+StatsTest.java:19: warning: no @param for a2
     public int warnings(int a1, int a2) throws Exception { return 0; }
                ^
-StatsTest.java:18: warning: no @return
+StatsTest.java:19: warning: no @return
     public int warnings(int a1, int a2) throws Exception { return 0; }
                ^
-StatsTest.java:18: warning: no @throws for java.lang.Exception
+StatsTest.java:19: warning: no @throws for java.lang.Exception
     public int warnings(int a1, int a2) throws Exception { return 0; }
                ^
 By group...
--- a/langtools/test/tools/javac/4241573/T4241573.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/4241573/T4241573.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test
  * @bug 4241573
  * @summary SourceFile attribute includes full path
+ * @modules jdk.compiler/com.sun.tools.classfile
  */
 
 import com.sun.tools.classfile.Attribute;
--- a/langtools/test/tools/javac/4846262/CheckEBCDICLocaleTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/4846262/CheckEBCDICLocaleTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,9 @@
  * @bug 4846262
  * @summary check that javac operates correctly in EBCDIC locale
  * @library /tools/lib
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.main
  * @build ToolBox
  * @run main CheckEBCDICLocaleTest
  */
--- a/langtools/test/tools/javac/6302184/HiddenOptionsShouldUseGivenEncodingTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/6302184/HiddenOptionsShouldUseGivenEncodingTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,9 @@
  * @summary javac hidden options that generate source should use the given
  * encoding, if available
  * @library /tools/lib
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.main
  * @build ToolBox
  * @run compile -encoding iso-8859-1 -XD-printsource T6302184.java
  * @run main HiddenOptionsShouldUseGivenEncodingTest
--- a/langtools/test/tools/javac/6304921/TestLog.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/6304921/TestLog.java	Thu May 21 11:41:04 2015 -0700
@@ -25,6 +25,10 @@
  * @test
  * @bug 6304912
  * @summary unit test for Log
+ * @modules jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.parser
+ *          jdk.compiler/com.sun.tools.javac.tree
+ *          jdk.compiler/com.sun.tools.javac.util
  */
 import java.lang.reflect.Field;
 import java.io.InputStream;
--- a/langtools/test/tools/javac/6330997/T6330997.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/6330997/T6330997.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,10 @@
  * @bug     6330997 7025789 8000961
  * @summary javac should accept class files with major version of the next release
  * @author  Wei Tao
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.code
+ *          jdk.compiler/com.sun.tools.javac.main
+ *          jdk.compiler/com.sun.tools.javac.util
  * @clean T1 T2
  * @compile -source 8 -target 8 T1.java
  * @compile -source 8 -target 8 T2.java
--- a/langtools/test/tools/javac/6341866/T6341866.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/6341866/T6341866.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,8 @@
  * @test
  * @bug 6341866
  * @summary Source files loaded from source path are not subject to annotation processing
+ * @modules java.compiler
+ *          jdk.compiler
  * @build Anno T6341866
  * @run main T6341866
  */
--- a/langtools/test/tools/javac/6394683/T6394683.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/6394683/T6394683.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,8 @@
  * @test
  * @bug 6394683
  * @summary need to resolve different file-type precedence semantics for javac and 269
+ * @modules java.compiler
+ *          jdk.compiler
  */
 
 import java.io.*;
--- a/langtools/test/tools/javac/6400383/T6400383.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/6400383/T6400383.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test
  * @bug 6400383
  * @summary directory foo.java on javac command line causes javac to crash
+ * @modules jdk.compiler/com.sun.tools.javac.api
  */
 
 import java.io.*;
--- a/langtools/test/tools/javac/6400872/T6400872.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/6400872/T6400872.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,8 @@
  * @test
  * @bug 6400872
  * @summary REGRESSION:  Java Compiler cannot find jar files referenced by other
+ * @modules java.compiler
+ *          jdk.compiler
  * @run main T6400872
  */
 
--- a/langtools/test/tools/javac/6402516/CheckClass.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/6402516/CheckClass.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,11 @@
  * @test
  * @bug 6402516
  * @summary need Trees.getScope(TreePath)
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.comp
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.tree
+ *          jdk.compiler/com.sun.tools.javac.util
  * @build Checker CheckClass
  * @run main CheckClass
  */
--- a/langtools/test/tools/javac/6402516/CheckIsAccessible.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/6402516/CheckIsAccessible.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,11 @@
  * @test
  * @bug 6402516
  * @summary need Trees.getScope(TreePath)
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.comp
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.tree
+ *          jdk.compiler/com.sun.tools.javac.util
  * @build Checker CheckIsAccessible
  * @run main CheckIsAccessible
  */
--- a/langtools/test/tools/javac/6402516/CheckLocalElements.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/6402516/CheckLocalElements.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,11 @@
  * @test
  * @bug 6402516 8031569
  * @summary need Trees.getScope(TreePath)
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.comp
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.tree
+ *          jdk.compiler/com.sun.tools.javac.util
  * @build Checker CheckLocalElements
  * @run main CheckLocalElements
  */
--- a/langtools/test/tools/javac/6402516/CheckMethod.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/6402516/CheckMethod.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,11 @@
  * @test
  * @bug 6402516
  * @summary need Trees.getScope(TreePath)
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.comp
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.tree
+ *          jdk.compiler/com.sun.tools.javac.util
  * @build Checker CheckMethod
  * @run main CheckMethod
  */
--- a/langtools/test/tools/javac/6403424/T6403424.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/6403424/T6403424.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test
  * @bug 6403424
  * @summary JavacFileManager.inferBinaryName is not case-insensitive on Windows
+ * @modules jdk.compiler/com.sun.tools.javac.api
  */
 
 import java.io.*;
--- a/langtools/test/tools/javac/6410653/T6410653.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/6410653/T6410653.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,8 @@
  * @bug     6410653 6401277
  * @summary REGRESSION: javac crashes if -d or -s argument is a file
  * @author  Peter von der Ah\u00e9
+ * @modules java.compiler
+ *          jdk.compiler
  */
 
 import java.lang.reflect.Field;
--- a/langtools/test/tools/javac/6440583/T6440583.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/6440583/T6440583.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,10 @@
  * @test
  * @bug 6440583
  * @summary better error recovery
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.tree
+ *          jdk.compiler/com.sun.tools.javac.util
  */
 
 import java.io.*;
--- a/langtools/test/tools/javac/6457284/T6457284.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/6457284/T6457284.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,8 @@
  * @bug     6457284
  * @summary Internationalize "unnamed package" when the term is used in diagnostics
  * @author  Peter von der Ah\u00e9
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.util
  */
 
 import java.io.IOException;
--- a/langtools/test/tools/javac/6508981/TestInferBinaryName.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/6508981/TestInferBinaryName.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,10 @@
  * @summary cleanup file separator handling in JavacFileManager
  * (This test is specifically to test the new impl of inferBinaryName)
  * @library /tools/lib
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.main
+ *          jdk.compiler/com.sun.tools.javac.util
  * @build ToolBox p.A
  * @run main TestInferBinaryName
  */
--- a/langtools/test/tools/javac/6567415/T6567415.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/6567415/T6567415.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
  * @bug 6567415
  * @summary Test to ensure javac does not go into an infinite loop, while
  *               reading a classfile of a specific length.
+ * @modules jdk.compiler
  * @compile -XDignore.symbol.file T6567415.java
  * @run main T6567415
  * @author ksrini
--- a/langtools/test/tools/javac/6589361/T6589361.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/6589361/T6589361.java	Thu May 21 11:41:04 2015 -0700
@@ -2,6 +2,8 @@
  * @test
  * @bug     6589361
  * @summary 6589361:Failing building ct.sym file as part of the control build
+ * @modules jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.util
  */
 
 import com.sun.tools.javac.file.JavacFileManager;
--- a/langtools/test/tools/javac/6627362/T6627362.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/6627362/T6627362.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
  * @bug 6627362
  * @summary javac generates code that uses array.clone,
  *          which is not available on JavaCard
+ * @modules jdk.compiler
  */
 
 import java.io.*;
--- a/langtools/test/tools/javac/6668794/badClass/Test.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/6668794/badClass/Test.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,7 @@
  * @bug 6668794 6668796
  * @summary javac puts localized text in raw diagnostics
  *      bad diagnostic "bad class file" given for source files
+ * @modules jdk.compiler
  */
 
 import java.io.*;
--- a/langtools/test/tools/javac/6863465/TestCircularClassfile.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/6863465/TestCircularClassfile.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test
  * @bug 6863465
  * @summary  javac doesn't detect circular subclass dependencies via qualified names
+ * @modules jdk.compiler
  * @run main TestCircularClassfile
  */
 
--- a/langtools/test/tools/javac/6889255/T6889255.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/6889255/T6889255.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,10 @@
  * @test
  * @bug 6889255
  * @summary ClassReader does not read parameter names correctly
+ * @modules jdk.compiler/com.sun.tools.javac.code
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.jvm
+ *          jdk.compiler/com.sun.tools.javac.util
  */
 
 import java.io.*;
--- a/langtools/test/tools/javac/6902720/Test.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/6902720/Test.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -36,6 +36,9 @@
  * @test
  * @bug 6902720
  * @summary javac pretty printer does not handle enums correctly
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.tree
  */
 
 public class Test {
--- a/langtools/test/tools/javac/6917288/GraphicalInstallerTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/6917288/GraphicalInstallerTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
 /* @test
  * @bug 6917288
  * @summary Unnamed nested class is not generated
+ * @modules jdk.compiler
  */
 
 import java.io.*;
--- a/langtools/test/tools/javac/6917288/T6917288.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/6917288/T6917288.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,6 +24,7 @@
 /* @test
  * @bug 6917288
  * @summary Unnamed nested class is not generated
+ * @modules jdk.compiler
  */
 
 import java.io.*;
--- a/langtools/test/tools/javac/7003595/T7003595.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/7003595/T7003595.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,9 @@
  * @test
  * @bug 7003595
  * @summary IncompatibleClassChangeError with unreferenced local class with subclass
+ * @modules jdk.compiler/com.sun.tools.classfile
+ *          jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
  */
 
 import com.sun.source.util.JavacTask;
--- a/langtools/test/tools/javac/7079713/TestCircularClassfile.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/7079713/TestCircularClassfile.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test
  * @bug 7079713
  * @summary javac hangs when compiling a class that references a cyclically inherited class
+ * @modules jdk.compiler
  * @run main TestCircularClassfile
  */
 
--- a/langtools/test/tools/javac/7118412/ShadowingTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/7118412/ShadowingTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test
  * @bug 7118412
  * @summary Shadowing of type-variables vs. member types
+ * @modules jdk.compiler
  */
 import java.io.File;
 import java.io.FileWriter;
--- a/langtools/test/tools/javac/7129225/NegTest.out	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/7129225/NegTest.out	Thu May 21 11:41:04 2015 -0700
@@ -1,2 +1,2 @@
-TestImportStar.java:14:1: compiler.err.doesnt.exist: xxx
+TestImportStar.java:16:1: compiler.err.doesnt.exist: xxx
 1 error
--- a/langtools/test/tools/javac/7129225/TestImportStar.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/7129225/TestImportStar.java	Thu May 21 11:41:04 2015 -0700
@@ -2,6 +2,8 @@
  * @bug 7129225
  * @summary import xxx.* isn't handled correctly by annotation processing
  * @library /tools/javac/lib
+ * @modules java.compiler
+ *          jdk.compiler
  * @build JavacTestingAbstractProcessor
  * @compile/fail/ref=NegTest.out -XDrawDiagnostics TestImportStar.java
  * @compile Anno.java AnnoProcessor.java
--- a/langtools/test/tools/javac/7129225/TestImportStar.out	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/7129225/TestImportStar.out	Thu May 21 11:41:04 2015 -0700
@@ -1,4 +1,4 @@
 - compiler.note.proc.messager: RUNNING - lastRound = false
-TestImportStar.java:14:1: compiler.err.doesnt.exist: xxx
+TestImportStar.java:16:1: compiler.err.doesnt.exist: xxx
 - compiler.note.proc.messager: RUNNING - lastRound = true
 1 error
--- a/langtools/test/tools/javac/7142086/T7142086.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/7142086/T7142086.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test
  * @bug 7142086
  * @summary performance problem in Check.checkOverrideClashes(...)
+ * @modules jdk.compiler
  * @run main/timeout=10 T7142086
  */
 
--- a/langtools/test/tools/javac/7144981/IgnoreIgnorableCharactersInInput.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/7144981/IgnoreIgnorableCharactersInInput.java	Thu May 21 11:41:04 2015 -0700
@@ -3,6 +3,7 @@
  * @test  /nodynamiccopyright/
  * @bug 7144981
  * @summary javac should ignore ignorable characters in input
+ * @modules jdk.compiler
  * @run main IgnoreIgnorableCharactersInInput
  */
 
--- a/langtools/test/tools/javac/7153958/CPoolRefClassContainingInlinedCts.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/7153958/CPoolRefClassContainingInlinedCts.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
  * @test
  * @bug 7153958
  * @summary add constant pool reference to class containing inlined constants
+ * @modules jdk.compiler/com.sun.tools.classfile
  * @compile pkg/ClassToBeStaticallyImported.java CPoolRefClassContainingInlinedCts.java
  * @run main CPoolRefClassContainingInlinedCts
  */
--- a/langtools/test/tools/javac/7166455/CheckACC_STRICTFlagOnclinitTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/7166455/CheckACC_STRICTFlagOnclinitTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
  * @test
  * @bug 7166455
  * @summary javac doesn't set ACC_STRICT bit on <clinit> for strictfp class
+ * @modules jdk.compiler/com.sun.tools.classfile
  * @run main CheckACC_STRICTFlagOnclinitTest
  */
 
--- a/langtools/test/tools/javac/7199823/InnerClassCannotBeVerified.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/7199823/InnerClassCannotBeVerified.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test
  * @bug 7199823
  * @summary javac generates inner class that can't be verified
+ * @modules jdk.compiler/com.sun.tools.classfile
  * @run main InnerClassCannotBeVerified
  */
 
--- a/langtools/test/tools/javac/8000518/DuplicateConstantPoolEntry.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/8000518/DuplicateConstantPoolEntry.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
  * @bug 8000518
  * @summary Javac generates duplicate name_and_type constant pool entry for
  * class BinaryOpValueExp.java
+ * @modules jdk.compiler/com.sun.tools.classfile
  * @run main DuplicateConstantPoolEntry
  */
 
--- a/langtools/test/tools/javac/8005931/CheckACC_STRICTFlagOnPkgAccessClassTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/8005931/CheckACC_STRICTFlagOnPkgAccessClassTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
  * @test
  * @bug 8005931
  * @summary javac doesn't set ACC_STRICT for classes with package access
+ * @modules jdk.compiler/com.sun.tools.classfile
  * @run main CheckACC_STRICTFlagOnPkgAccessClassTest
  */
 
--- a/langtools/test/tools/javac/8009170/RedundantByteCodeInArrayTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/8009170/RedundantByteCodeInArrayTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
  * @bug 8009170
  * @summary Regression: javac generates redundant bytecode in assignop involving
  * arrays
+ * @modules jdk.compiler/com.sun.tools.classfile
  * @run main RedundantByteCodeInArrayTest
  */
 
--- a/langtools/test/tools/javac/AnonymousSubclassTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/AnonymousSubclassTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,9 @@
  * @bug 8023945
  * @summary javac wrongly allows a subclass of an anonymous class
  * @library /tools/lib
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.main
  * @build ToolBox
  * @run main AnonymousSubclassTest
  */
--- a/langtools/test/tools/javac/BadOptimization/DeadCode6.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/BadOptimization/DeadCode6.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,7 @@
  * longer removes live code.
  * @author dps
  *
+ * @modules java.desktop
  * @run clean DeadCode6
  * @run compile -O DeadCode6.java
  */
--- a/langtools/test/tools/javac/ClassPathTest/ClassPathTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/ClassPathTest/ClassPathTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,9 @@
  * @bug 4241229 4785453
  * @summary Test -classpath option and classpath defaults.
  * @library /tools/lib
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.main
  * @build ToolBox
  * @run main ClassPathTest
  */
--- a/langtools/test/tools/javac/ConstFoldTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/ConstFoldTest.java	Thu May 21 11:41:04 2015 -0700
@@ -26,6 +26,9 @@
  * @bug 8025505
  * @summary Constant folding deficiency
  * @library /tools/lib
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.main
  * @build ToolBox
  * @run main ConstFoldTest
  */
--- a/langtools/test/tools/javac/DefiniteAssignment/DefAssignNestedArg.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/DefiniteAssignment/DefAssignNestedArg.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
  * @summary Verify bug fix for 4306909
  * @author Neal Gafter (gafter)
  *
+ * @modules java.desktop
  * @run compile DefAssignNestedArg.java
  */
 
--- a/langtools/test/tools/javac/Diagnostics/6769027/T6769027.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/Diagnostics/6769027/T6769027.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,8 @@
  *  temporarily workaround combo tests are causing time out in several platforms
  * @author  Maurizio Cimadamore
  * @library ../../lib
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.util
  * @build JavacTestingAbstractThreadedTest
  * @run main/othervm T6769027
  */
--- a/langtools/test/tools/javac/Diagnostics/7010608/Test.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/Diagnostics/7010608/Test.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,8 @@
  * @test
  * @bug 7010608
  * @summary the string 'error' should appear in error messages
+ * @modules java.compiler
+ *          jdk.compiler
  */
 
 import java.io.*;
--- a/langtools/test/tools/javac/Diagnostics/7116676/T7116676.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/Diagnostics/7116676/T7116676.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,8 @@
  * @test
  * @bug 7116676
  * @summary RichDiagnosticFormatter throws NPE when formatMessage is called directly
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.util
  */
 
 import com.sun.source.util.JavacTask;
--- a/langtools/test/tools/javac/ExtDirs/ExtDirTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/ExtDirs/ExtDirTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,9 @@
  * @bug 4204897 4256097 4785453 4863609
  * @summary Test that '.jar' files in -extdirs are found.
  * @library /tools/lib
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.main
  * @build ToolBox
  * @run main ExtDirTest
  */
--- a/langtools/test/tools/javac/FinalInitializer.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/FinalInitializer.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
  * @summary Verify absence of bug in analysis of final initializers that caused crash.
  * @author maddox
  *
+ * @modules java.desktop
  * @run compile FinalInitializer.java
  */
 
--- a/langtools/test/tools/javac/IncorrectInheritance/IncorrectInheritanceTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/IncorrectInheritance/IncorrectInheritanceTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,9 @@
  * @bug 8034924
  * @summary Incorrect inheritance of inaccessible static method
  * @library /tools/lib
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.main
  * @build ToolBox
  * @run main IncorrectInheritanceTest
  */
--- a/langtools/test/tools/javac/InnerMethSig.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/InnerMethSig.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
  * @summary 1.5 beta-b15 java compiler throws NPE
  * @author gafter
  *
+ * @modules java.desktop
  * @compile InnerMethSig.java
  */
 
--- a/langtools/test/tools/javac/MethodParameters/AnnotationTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/MethodParameters/AnnotationTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test
  * @bug 8006582
  * @summary javac should generate method parameters correctly.
+ * @modules jdk.compiler/com.sun.tools.classfile
  * @build Tester
  * @compile -parameters AnnotationTest.java
  * @run main Tester AnnotationTest AnnotationTest.out
--- a/langtools/test/tools/javac/MethodParameters/AnonymousClass.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/MethodParameters/AnonymousClass.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test
  * @bug 8006582
  * @summary javac should generate method parameters correctly.
+ * @modules jdk.compiler/com.sun.tools.classfile
  * @build Tester
  * @compile -parameters AnonymousClass.java
  * @run main Tester AnonymousClass AnonymousClass.out
--- a/langtools/test/tools/javac/MethodParameters/Constructors.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/MethodParameters/Constructors.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test
  * @bug 8006582
  * @summary javac should generate method parameters correctly.
+ * @modules jdk.compiler/com.sun.tools.classfile
  * @build Tester
  * @compile -parameters Constructors.java
  * @run main Tester Constructors Constructors.out
--- a/langtools/test/tools/javac/MethodParameters/EnumTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/MethodParameters/EnumTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test
  * @bug 8006582 8008658
  * @summary javac should generate method parameters correctly.
+ * @modules jdk.compiler/com.sun.tools.classfile
  * @build Tester
  * @compile -parameters EnumTest.java
  * @run main Tester EnumTest EnumTest.out
--- a/langtools/test/tools/javac/MethodParameters/InstanceMethods.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/MethodParameters/InstanceMethods.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test
  * @bug 8006582
  * @summary javac should generate method parameters correctly.
+ * @modules jdk.compiler/com.sun.tools.classfile
  * @build Tester
  * @compile -parameters InstanceMethods.java
  * @run main Tester InstanceMethods InstanceMethods.out
--- a/langtools/test/tools/javac/MethodParameters/LambdaTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/MethodParameters/LambdaTest.java	Thu May 21 11:41:04 2015 -0700
@@ -25,6 +25,7 @@
  * @test
  * @bug 8006582 8037546
  * @summary javac should generate method parameters correctly.
+ * @modules jdk.compiler/com.sun.tools.classfile
  * @build Tester
  * @compile -parameters LambdaTest.java
  * @run main Tester LambdaTest LambdaTest.out
--- a/langtools/test/tools/javac/MethodParameters/LocalClassTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/MethodParameters/LocalClassTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test
  * @bug 8006582 8008658
  * @summary javac should generate method parameters correctly.
+ * @modules jdk.compiler/com.sun.tools.classfile
  * @build Tester
  * @compile -parameters LocalClassTest.java
  * @run main Tester LocalClassTest LocalClassTest.out
--- a/langtools/test/tools/javac/MethodParameters/MemberClassTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/MethodParameters/MemberClassTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test
  * @bug 8006582 8008658
  * @summary javac should generate method parameters correctly.
+ * @modules jdk.compiler/com.sun.tools.classfile
  * @build Tester
  * @compile -parameters MemberClassTest.java
  * @run main Tester MemberClassTest MemberClassTest.out
--- a/langtools/test/tools/javac/MethodParameters/StaticMethods.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/MethodParameters/StaticMethods.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test
  * @bug 8006582
  * @summary javac should generate method parameters correctly.
+ * @modules jdk.compiler/com.sun.tools.classfile
  * @build Tester
  * @compile -parameters StaticMethods.java
  * @run main Tester StaticMethods StaticMethods.out
--- a/langtools/test/tools/javac/MethodParameters/UncommonParamNames.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/MethodParameters/UncommonParamNames.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test
  * @bug 8006582
  * @summary javac should generate method parameters correctly.
+ * @modules jdk.compiler/com.sun.tools.classfile
  * @build Tester
  * @compile -parameters UncommonParamNames.java
  * @run main Tester UncommonParamNames UncommonParamNames.out
--- a/langtools/test/tools/javac/MethodParametersTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/MethodParametersTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,11 @@
  * @test
  * @bug 8004727
  * @summary javac should generate method parameters correctly.
+ * @modules jdk.compiler/com.sun.tools.classfile
+ *          jdk.compiler/com.sun.tools.javac.code
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.main
+ *          jdk.compiler/com.sun.tools.javac.util
  */
 // key: opt.arg.parameters
 import com.sun.tools.classfile.*;
--- a/langtools/test/tools/javac/MissingInclude/MissingIncludeTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/MissingInclude/MissingIncludeTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,9 @@
  * @summary javac <AT>sourcefiles should catch Exception, when sourcefiles
  * doesn't exist.
  * @library /tools/lib
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.main
  * @build ToolBox
  * @run main MissingIncludeTest
  */
--- a/langtools/test/tools/javac/NoStringToLower.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/NoStringToLower.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test
  * @bug 8029800
  * @summary String.toLowerCase()/toUpperCase is generally dangerous, check it is not used in langtools
+ * @modules jdk.compiler/com.sun.tools.classfile
  */
 
 import java.io.*;
--- a/langtools/test/tools/javac/Paths/6638501/JarFromManifestFailure.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/Paths/6638501/JarFromManifestFailure.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test
  * @bug 6638501
  * @summary REGRESSION:  Java Compiler cannot find jar files referenced by other
+ * @modules jdk.compiler
  * @run main JarFromManifestFailure
  */
 
--- a/langtools/test/tools/javac/Paths/AbsolutePathTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/Paths/AbsolutePathTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,9 @@
  * @summary javac incorrectly handles absolute paths in manifest classpath
  * @author govereau
  * @library /tools/lib
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.main
  * @ignore 8055768 ToolBox does not close opened files
  * @build ToolBox
  * @run main AbsolutePathTest
--- a/langtools/test/tools/javac/Paths/TestCompileJARInClassPath.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/Paths/TestCompileJARInClassPath.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,8 @@
  * @summary Test to make sure that java Compilation with JSR199 does not ignore
  * Class-Path in manifest
  * @author vicente.romero
+ * @modules jdk.compiler
+ *          jdk.jartool/sun.tools.jar
  * @build TestCompileJARInClassPath
  * @run main TestCompileJARInClassPath
  */
--- a/langtools/test/tools/javac/ProtectedInnerClass/ProtectedInnerClassesTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/ProtectedInnerClass/ProtectedInnerClassesTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,9 @@
  * @bug 4087314 4800342 4307565
  * @summary Verify allowed access to protected class from another package
  * @library /tools/lib
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.main
  * @build ToolBox
  * @run main ProtectedInnerClassesTest
  */
--- a/langtools/test/tools/javac/StdoutCloseTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/StdoutCloseTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,8 @@
  * @test
  * @bug 7118295
  * @summary javac does not explicitly close -Xstdout file
+ * @modules jdk.compiler/com.sun.tools.javac.main
+ *          jdk.compiler/com.sun.tools.javac.util
  * @run main StdoutCloseTest
  */
 
--- a/langtools/test/tools/javac/T4965689/ClassLiteralWastesByteTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/T4965689/ClassLiteralWastesByteTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test
  * @bug 4965689
  * @summary class literal code wastes a byte
+ * @modules jdk.compiler
  */
 
 import java.io.PrintWriter;
--- a/langtools/test/tools/javac/T5053846/MethodRefDupInConstantPoolTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/T5053846/MethodRefDupInConstantPoolTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
  * @bug 5053846 8011432
  * @summary javac: MethodRef entries are duplicated in the constant pool
  * @summary javac, compiler regression iterable + captured type
+ * @modules jdk.compiler
  */
 
 import java.io.PrintWriter;
--- a/langtools/test/tools/javac/T5090006/AssertionFailureTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/T5090006/AssertionFailureTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,9 @@
  * @bug 5090006
  * @summary javac fails with assertion error
  * @library /tools/lib
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.main
  * @build ToolBox
  * @run main AssertionFailureTest
  */
--- a/langtools/test/tools/javac/T6181889/EmptyFinallyTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/T6181889/EmptyFinallyTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test
  * @bug 6181889
  * @summary Empty try/finally results in bytecodes being generated
+ * @modules jdk.compiler
  */
 
 import java.io.PrintWriter;
--- a/langtools/test/tools/javac/T6238612.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/T6238612.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,6 +24,7 @@
 /*
  * @test
  * @summary com.sun.tools.util.List.toArray violates Collection spec
+ * @modules jdk.compiler/com.sun.tools.javac.util
  */
 
 import com.sun.tools.javac.util.List;
--- a/langtools/test/tools/javac/T6265400.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/T6265400.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,8 @@
  * @test
  * @bug 6265400
  * @summary  Javac should be shielded from client code errors in JSR 199
+ * @modules java.compiler
+ *          jdk.compiler
  * @run main T6265400
  */
 
--- a/langtools/test/tools/javac/T6340549.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/T6340549.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,6 +24,8 @@
 /*
  * @test 6403456
  * @summary javax.tools.JavaCompilerTool.getStandardFileManager().list() includes directories
+ * @modules java.compiler
+ *          jdk.compiler
  */
 
 import javax.tools.*;
--- a/langtools/test/tools/javac/T6351767.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/T6351767.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,8 @@
  * @test
  * @bug 6351767
  * @summary javax.tools.JavaCompilerTool.getStandardFileManager().list() treats directories as package
+ * @modules java.compiler
+ *          jdk.compiler
  */
 
 import java.io.File;
--- a/langtools/test/tools/javac/T6358024.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/T6358024.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,9 @@
  * @test
  * @bug 6358024
  * @summary TaskListener should be propogated between processing rounds
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.util
  */
 
 import java.io.*;
--- a/langtools/test/tools/javac/T6358166.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/T6358166.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,10 @@
  * @test
  * @bug 6358166
  * @summary -verbose reports absurd times when annotation processing involved
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.main
+ *          jdk.compiler/com.sun.tools.javac.util
  */
 
 import java.io.*;
--- a/langtools/test/tools/javac/T6358168.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/T6358168.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,10 @@
  * @test
  * @bug 6358168
  * @summary JavaCompiler.hasBeenUsed is not set in delegateCompiler
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.main
+ *          jdk.compiler/com.sun.tools.javac.util
  */
 
 import java.io.*;
--- a/langtools/test/tools/javac/T6361619.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/T6361619.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,8 @@
  * @test
  * @bug 6361619 6392118
  * @summary AssertionError from ClassReader; mismatch between JavacTaskImpl.context and JSR 269
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
  */
 
 import java.io.*;
--- a/langtools/test/tools/javac/T6366196.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/T6366196.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
  * @bug     6359661 6366196
  * @summary Unit test for corner cases of position encoding
  * @author  Wei Tao
+ * @modules jdk.compiler/com.sun.tools.javac.util
  * @run main T6366196
  */
 
--- a/langtools/test/tools/javac/T6395974.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/T6395974.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,8 @@
  * @test
  * @bug 6395974
  * @summary files are parsed even after failure to find annotation processor is reported
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
  */
 
 import java.io.*;
--- a/langtools/test/tools/javac/T6397044.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/T6397044.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,10 @@
  * @test
  * @bug 6397044
  * @summary JCModifiers.getModifiers() returns incorrect Modifiers set.
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.code
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.tree
  */
 
 import java.io.*;
--- a/langtools/test/tools/javac/T6397286.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/T6397286.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,8 @@
  * @test
  * @bug 6397286
  * @summary TaskListener calls are not protected agains user exceptions
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
  */
 
 import java.io.*;
--- a/langtools/test/tools/javac/T6403466.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/T6403466.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,8 @@
  * @test
  * @bug 6403466
  * @summary javac TaskListener should be informed when annotation processing occurs
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
  */
 
 import com.sun.source.util.*;
--- a/langtools/test/tools/javac/T6405099.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/T6405099.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test
  * @bug 6405099
  * @summary Compiler crashes when javac encounters /usr/jdk/packges/lib/ext with no 777 permissions
+ * @modules jdk.compiler
  */
 
 import java.io.*;
--- a/langtools/test/tools/javac/T6406771.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/T6406771.java	Thu May 21 11:41:04 2015 -0700
@@ -2,6 +2,9 @@
  * @test  /nodynamiccopyright/
  * @bug 6406771
  * @summary CompilationUnitTree needs access to a line map
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.tree
  */
 
 // WARNING: White-space and layout is important in this file, especially tab characters.
@@ -21,9 +24,9 @@
 @SupportedAnnotationTypes("*")
 public class T6406771 extends AbstractProcessor {
     String[] tests = {
-        "line:24",
-        "line:25",
-        "line:26", "line:26",
+        "line:27",
+        "line:28",
+        "line:29", "line:29",
 //       1         2         3         4         5         6
 //3456789012345678901234567890123456789012345678901234567890
       "col:7", "col:16", "col:26",                 // this line uses spaces
--- a/langtools/test/tools/javac/T6407066.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/T6407066.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,8 @@
  * @test
  * @bug 6407066
  * @summary Paths code should not discard non-existent directories
+ * @modules java.compiler
+ *          jdk.compiler
  */
 
 import java.io.File;
--- a/langtools/test/tools/javac/T6410706.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/T6410706.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,8 @@
  * @test
  * @bug 6410706
  * @summary CONFORMANCE Mandatory warnings in Tree API
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
  */
 
 import java.io.File;
--- a/langtools/test/tools/javac/T6411379.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/T6411379.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test
  * @bug 6411379
  * @summary NPE from JavacTrees.getPath
+ * @modules jdk.compiler
  * @build T6411379
  * @compile -processor T6411379 -proc:only T6411379 T6411379.java
  */
--- a/langtools/test/tools/javac/T6413876.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/T6413876.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,8 @@
  * @test
  * @bug 6413876
  * @summary REGRESSION javac -d /directory/ creates destination directories
+ * @modules java.compiler
+ *          jdk.compiler
  */
 
 import java.io.*;
--- a/langtools/test/tools/javac/T6423583.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/T6423583.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test
  * @bug 6423583
  * @summary LiteralTree.getValue() should return Boolean for Kind.BOOLEAN_LITERAL literals
+ * @modules jdk.compiler
  * @build T6423583
  * @compile -proc:only -processor T6423583 T6423583.java
  */
--- a/langtools/test/tools/javac/T6435291/T6435291.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/T6435291/T6435291.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,10 @@
  * @bug     6435291
  * @summary javac shouldn't throw NPE while compiling invalid RuntimeInvisibleParameterAnnotations
  * @author  Wei Tao
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.code
+ *          jdk.compiler/com.sun.tools.javac.main
+ *          jdk.compiler/com.sun.tools.javac.util
  * @run main/othervm T6435291
  */
 
--- a/langtools/test/tools/javac/T6458749.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/T6458749.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,8 @@
  * @test
  * @bug 6458749
  * @summary  TypeParameterElement.getEnclosedElements() throws NPE within javac
+ * @modules java.compiler
+ *          jdk.compiler
  * @build T6458749
  * @compile -processor T6458749 -proc:only T6458749.java
  */
--- a/langtools/test/tools/javac/T6458823/T6458823.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/T6458823/T6458823.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,8 @@
  * @bug 6458823
  * @summary Messager messages on TypeParamterElements to not include position information.
  *
+ * @modules java.compiler
+ *          jdk.compiler
  * @compile MyProcessor.java T6458823.java
  * @run main T6458823
  */
--- a/langtools/test/tools/javac/T6472751.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/T6472751.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
  * @bug 6472751
  * @summary SourcePositions.getStartPos returns incorrect value for enum constants
  * @author Peter Ahe
+ * @modules jdk.compiler/com.sun.tools.javac.util
  */
 
 import com.sun.source.tree.CompilationUnitTree;
--- a/langtools/test/tools/javac/T6534287.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/T6534287.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
  * @test
  * @bug 6534287
  * @summary empty arg caused a StringIndexOutOfBoundsException
+ * @modules jdk.compiler
  */
 public class T6534287 {
     public static void main(String... args) throws Exception {
--- a/langtools/test/tools/javac/T6558476.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/T6558476.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,9 @@
  * @bug 6558476 5071352
  * @summary com/sun/tools/javac/Main.compile don't release file handles on return
  * @library /tools/lib
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.main
  * @build ToolBox
  * @run main/othervm -Xmx512m -Xms512m  T6558476
  */
--- a/langtools/test/tools/javac/T6595666.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/T6595666.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test
  * @bug 6595666
  * @summary fix -Werror
+ * @modules jdk.compiler
  */
 
 import java.io.*;
--- a/langtools/test/tools/javac/T6625520.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/T6625520.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,6 +32,8 @@
  * @test
  * @bug 6625520
  * @summary javac handles missing entries on classpath badly
+ * @modules jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.util
  */
 public class T6625520 {
     public static void main(String[] args) throws Exception {
--- a/langtools/test/tools/javac/T6654037.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/T6654037.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,8 @@
  * @test
  * @bug 6654037
  * @summary JCTree.pos may be incorrect for BinaryTrees
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.tree
  */
 
 import com.sun.source.tree.BinaryTree;
--- a/langtools/test/tools/javac/T6665791.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/T6665791.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test
  * @bug 6665791
  * @summary com.sun.source.tree.MethodTree.toString() does not output default values
+ * @modules jdk.compiler
  */
 
 import java.io.File;
--- a/langtools/test/tools/javac/T6668802.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/T6668802.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
  * @test
  * @bug 6668802
  * @summary javac handles diagnostics for last line badly, if line not terminated by newline
+ * @modules jdk.compiler
  */
 
 import java.io.*;
--- a/langtools/test/tools/javac/T6695379/AnnotationsAreNotCopiedToBridgeMethodsTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/T6695379/AnnotationsAreNotCopiedToBridgeMethodsTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,8 @@
  * @bug 6695379
  * @summary Copy method annotations and parameter annotations to synthetic
  * bridge methods
+ * @modules jdk.compiler/com.sun.tools.classfile
+ *          jdk.compiler/com.sun.tools.javac.util
  * @run main AnnotationsAreNotCopiedToBridgeMethodsTest
  */
 
--- a/langtools/test/tools/javac/T6705935.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/T6705935.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test
  * @bug 6705935
  * @summary javac reports path name of entry in ZipFileIndex incorectly
+ * @modules jdk.compiler/com.sun.tools.javac.file
  */
 
 import java.io.*;
--- a/langtools/test/tools/javac/T6725036.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/T6725036.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,10 @@
  * @summary javac returns incorrect value for lastModifiedTime() when
  *          source is a zip file archive
  * @library /tools/lib
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.main
+ *          jdk.compiler/com.sun.tools.javac.util
  * @build ToolBox
  * @run main T6725036
  */
--- a/langtools/test/tools/javac/T6759996.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/T6759996.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test
  * @bug 6759996
  * @summary javac should ignore empty entries on paths
+ * @modules jdk.compiler
  */
 
 import java.io.File;
--- a/langtools/test/tools/javac/T6855236.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/T6855236.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test
  * @bug 6855236
  * @summary Compiler Tree API TreePath class generates NullPointerException from Iterator
+ * @modules jdk.compiler
  * @compile T6855236.java
  * @compile -processor T6855236 -proc:only T6855236.java
  */
--- a/langtools/test/tools/javac/T6873845.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/T6873845.java	Thu May 21 11:41:04 2015 -0700
@@ -2,6 +2,8 @@
  * @test /nodynamiccopyright/
  * @bug 6873845
  * @summary refine access to symbol file
+ * @modules java.base/sun.misc
+ *          jdk.compiler
  */
 
 import java.io.*;
@@ -19,8 +21,8 @@
         if (out.contains("sunapi"))
             throw new Exception("unexpected output for -X");
 
-        String warn1 = "T6873845.java:73:9: compiler.warn.sun.proprietary: sun.misc.Unsafe" + newline;
-        String warn2 = "T6873845.java:78:9: compiler.warn.sun.proprietary: sun.misc.Unsafe" + newline;
+        String warn1 = "T6873845.java:75:9: compiler.warn.sun.proprietary: sun.misc.Unsafe" + newline;
+        String warn2 = "T6873845.java:80:9: compiler.warn.sun.proprietary: sun.misc.Unsafe" + newline;
         String note1 = "- compiler.note.sunapi.filename: T6873845.java" + newline;
         String note2 = "- compiler.note.sunapi.recompile" + newline;
 
--- a/langtools/test/tools/javac/T6873849.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/T6873849.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,6 +31,7 @@
  * @test
  * @bug 6873849
  * @summary suppress notes generated by javac
+ * @modules jdk.compiler
  */
 
 public class T6873849 {
--- a/langtools/test/tools/javac/T6900149.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/T6900149.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,8 @@
  * @test
  * @bug 6900149
  * @summary IllegalStateException when compiling same files and DiagnosticListener is set
+ * @modules java.compiler
+ *          jdk.compiler
  */
 
 import java.io.*;
--- a/langtools/test/tools/javac/T6942649.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/T6942649.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
  * @test
  * @bug 6942649
  * @summary add hidden option to identify location and version of javac classes
+ * @modules jdk.compiler
  */
 
 import java.io.*;
--- a/langtools/test/tools/javac/T6956462/T6956462.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/T6956462/T6956462.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
  * @bug 6956462
  * @summary AssertionError exception throws in the Compiler Tree API in JDK 7.
  *
+ * @modules jdk.compiler
  * @build TestClass T6956462
  * @run main T6956462
  */
--- a/langtools/test/tools/javac/T6956638.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/T6956638.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -44,6 +44,7 @@
  * @test
  * @bug 6956638
  * @summary JavacTask.generate does not generate all required files
+ * @modules jdk.compiler
  */
 public class T6956638 {
     public static void main(String[] args) throws Exception {
--- a/langtools/test/tools/javac/T6970173/DebugPointerAtBadPositionTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/T6970173/DebugPointerAtBadPositionTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,11 @@
  * @bug 6970173
  * @summary Debug pointer at bad position
  * @library /tools/lib
+ * @modules jdk.compiler/com.sun.tools.classfile
+ *          jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.main
+ *          jdk.compiler/com.sun.tools.javac.util
  * @build ToolBox
  * @run main DebugPointerAtBadPositionTest
  */
--- a/langtools/test/tools/javac/T6972327.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/T6972327.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test
  * @bug 6972327
  * @summary JCTree.pos incorrect for annotations without modifiers and package
+ * @modules jdk.compiler/com.sun.tools.javac.api
  */
 
 import com.sun.source.tree.*;
--- a/langtools/test/tools/javac/T6985181.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/T6985181.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test
  * @bug 6985181
  * @summary Annotations lost from classfile
+ * @modules jdk.compiler
  */
 
 import java.io.*;
--- a/langtools/test/tools/javac/T6993301.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/T6993301.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -46,6 +46,7 @@
 /**
  *
  * @author Jan Lahoda
+ * @modules jdk.compiler/com.sun.tools.javac.api
  */
 public class T6993301 {
     public static void main(String... args) throws Exception {
--- a/langtools/test/tools/javac/T6999210.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/T6999210.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test
  * @bug 6999210
  * @summary javac should be able to warn of anomalous conditions in classfiles
+ * @modules jdk.compiler
  */
 
 import java.io.*;
--- a/langtools/test/tools/javac/T7008643/InlinedFinallyConfuseDebuggersTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/T7008643/InlinedFinallyConfuseDebuggersTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,11 @@
  * @bug 7008643
  * @summary inlined finally clauses confuse debuggers
  * @library /tools/lib
+ * @modules jdk.compiler/com.sun.tools.classfile
+ *          jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.main
+ *          jdk.compiler/com.sun.tools.javac.util
  * @build ToolBox
  * @run main InlinedFinallyConfuseDebuggersTest
  */
--- a/langtools/test/tools/javac/T7040592/CoerceNullToMoreSpecificTypeTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/T7040592/CoerceNullToMoreSpecificTypeTest.java	Thu May 21 11:41:04 2015 -0700
@@ -25,6 +25,7 @@
  * @test
  * @bug 7040592
  * @summary Test that the assertion in State.forceStackTop does not fail at compile time.
+ * @modules java.xml
  */
 
 import java.lang.reflect.Field;
--- a/langtools/test/tools/javac/T7040592/T7040592.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/T7040592/T7040592.java	Thu May 21 11:41:04 2015 -0700
@@ -25,6 +25,7 @@
  * @test
  * @bug 7040592
  * @summary Verify that null can be assigned freely to array types without a checkcast
+ * @modules jdk.compiler
  */
 
 import java.io.PrintWriter;
--- a/langtools/test/tools/javac/T7053059/DoubleCastTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/T7053059/DoubleCastTest.java	Thu May 21 11:41:04 2015 -0700
@@ -25,6 +25,8 @@
  * @test
  * @bug 8015499
  * @summary javac, Gen is generating extra checkcast instructions in some corner cases
+ * @modules jdk.compiler/com.sun.tools.classfile
+ *          jdk.compiler/com.sun.tools.javac.util
  * @run main DoubleCastTest
  */
 
--- a/langtools/test/tools/javac/T7093325.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/T7093325.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
  * @summary Redundant entry in bytecode exception table
  *  temporarily workaround combo tests are causing time out in several platforms
  * @library lib
+ * @modules jdk.compiler/com.sun.tools.classfile
  * @build JavacTestingAbstractThreadedTest
  * @run main/othervm T7093325
  */
--- a/langtools/test/tools/javac/T7142672/Bug.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/T7142672/Bug.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,8 @@
  * @bug 7142672
  * @summary Problems with the value passed to the 'classes' param of JavaCompiler.CompilationTask.getTask(...)
  * @author holmlund
+ * @modules java.compiler
+ *          jdk.compiler
  * @compile AnnoProcessor.java Bug.java Test3.java
  * @run main Bug Test2.java
  * @run main Bug Test2.foo
--- a/langtools/test/tools/javac/T7159016.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/T7159016.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,8 @@
  * @bug 7159016
  * @summary Static import of member in processor-generated class fails in JDK 7
  * @library lib
+ * @modules java.compiler
+ *          jdk.compiler
  * @build JavacTestingAbstractProcessor
  * @run main T7159016
  * @author Jessie Glick
--- a/langtools/test/tools/javac/T7165659/InnerClassAttrMustNotHaveStrictFPFlagTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/T7165659/InnerClassAttrMustNotHaveStrictFPFlagTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,8 @@
  * @test
  * @bug 7165659
  * @summary javac incorrectly sets strictfp access flag on inner-classes
+ * @modules jdk.compiler/com.sun.tools.classfile
+ *          jdk.compiler/com.sun.tools.javac.util
  */
 
 import java.io.File;
--- a/langtools/test/tools/javac/T8003967/DetectMutableStaticFields.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/T8003967/DetectMutableStaticFields.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,8 @@
  * @test
  * @bug 8003967
  * @summary detect and remove all mutable implicit static enum fields in langtools
+ * @modules jdk.compiler/com.sun.tools.classfile
+ *          jdk.compiler/com.sun.tools.javac.util
  * @run main DetectMutableStaticFields
  */
 
--- a/langtools/test/tools/javac/T8009640/CheckRejectProfileBCPOptionsIfUsedTogetherTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/T8009640/CheckRejectProfileBCPOptionsIfUsedTogetherTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,10 @@
  * @bug 8009640
  * @summary -profile <compact> does not work when -bootclasspath specified
  * @library /tools/lib
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.main
+ *          jdk.compiler/com.sun.tools.javac.util
  * @build ToolBox
  * @run main CheckRejectProfileBCPOptionsIfUsedTogetherTest
  */
--- a/langtools/test/tools/javac/T8010659/CompilerCrashWhenMixingBinariesAndSourcesTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/T8010659/CompilerCrashWhenMixingBinariesAndSourcesTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,9 @@
  * @bug 8010659
  * @summary Javac Crashes while building OpenJFX
  * @library /tools/lib
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.main
  * @build ToolBox
  * @run main CompilerCrashWhenMixingBinariesAndSourcesTest
  */
--- a/langtools/test/tools/javac/T8010737/ParameterNamesAreNotCopiedToAnonymousInitTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/T8010737/ParameterNamesAreNotCopiedToAnonymousInitTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,11 @@
  * @bug 8010737
  * @summary javac, known parameter's names should be copied to automatically
  * generated constructors for inner classes
+ * @modules jdk.compiler/com.sun.tools.classfile
+ *          jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.code
+ *          jdk.compiler/com.sun.tools.javac.tree
+ *          jdk.compiler/com.sun.tools.javac.util
  * @run main ParameterNamesAreNotCopiedToAnonymousInitTest check_class_file check_init_symbol
  */
 
--- a/langtools/test/tools/javac/T8011181/EmptyUTF8ForInnerClassNameTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/T8011181/EmptyUTF8ForInnerClassNameTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,8 @@
  * @test
  * @bug 8011181
  * @summary javac, empty UTF8 entry generated for inner class
+ * @modules jdk.compiler/com.sun.tools.classfile
+ *          jdk.compiler/com.sun.tools.javac.util
  */
 
 import java.io.BufferedInputStream;
--- a/langtools/test/tools/javac/T8013394/CompileErrorWithIteratorTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/T8013394/CompileErrorWithIteratorTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,9 @@
  * @bug 8013394
  * @summary compile of iterator use fails with error "defined in an inaccessible class or interface"
  * @library /tools/lib
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.main
  * @build ToolBox
  * @run main CompileErrorWithIteratorTest
  */
--- a/langtools/test/tools/javac/T8019486/WrongLNTForLambdaTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/T8019486/WrongLNTForLambdaTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,11 @@
  * @bug 8019486 8026861 8027142
  * @summary javac, generates erroneous LVT for a test case with lambda code
  * @library /tools/lib
+ * @modules jdk.compiler/com.sun.tools.classfile
+ *          jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.main
+ *          jdk.compiler/com.sun.tools.javac.util
  * @build ToolBox
  * @run main WrongLNTForLambdaTest
  */
--- a/langtools/test/tools/javac/T8022162/IncorrectSignatureDeterminationForInnerClassesTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/T8022162/IncorrectSignatureDeterminationForInnerClassesTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,9 @@
  * @bug 8022162
  * @summary Incorrect signature determination for certain inner class generics
  * @library /tools/lib
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.main
  * @build ToolBox
  * @run main IncorrectSignatureDeterminationForInnerClassesTest
  */
--- a/langtools/test/tools/javac/T8022186/DeadCodeGeneratedForEmptyTryTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/T8022186/DeadCodeGeneratedForEmptyTryTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,8 @@
  * @test
  * @bug 8022186
  * @summary javac generates dead code if a try with an empty body has a finalizer
+ * @modules jdk.compiler/com.sun.tools.classfile
+ *          jdk.compiler/com.sun.tools.javac.util
  */
 
 import com.sun.tools.classfile.Attribute;
--- a/langtools/test/tools/javac/T8024039/NoDeadCodeGenerationOnTrySmtTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/T8024039/NoDeadCodeGenerationOnTrySmtTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,11 @@
  * @bug 8024039
  * @summary javac, previous solution for JDK-8022186 was incorrect
  * @library /tools/lib
+ * @modules jdk.compiler/com.sun.tools.classfile
+ *          jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.main
+ *          jdk.compiler/com.sun.tools.javac.util
  * @build ToolBox
  * @run main NoDeadCodeGenerationOnTrySmtTest
  */
--- a/langtools/test/tools/javac/T8024437/ExceptionInferenceFromClassFileTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/T8024437/ExceptionInferenceFromClassFileTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,9 @@
  * @bug 8024437
  * @summary Inferring the exception thrown by a lambda: sometimes fails to compile
  * @library /tools/lib
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.main
  * @build ToolBox
  * @run main ExceptionInferenceFromClassFileTest
  */
--- a/langtools/test/tools/javac/T8028504/DontGenerateLVTForGNoneOpTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/T8028504/DontGenerateLVTForGNoneOpTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test
  * @bug 8028504
  * @summary javac generates LocalVariableTable even with -g:none
+ * @modules jdk.compiler/com.sun.tools.classfile
  * @compile -g:none DontGenerateLVTForGNoneOpTest.java
  * @run main DontGenerateLVTForGNoneOpTest
  */
--- a/langtools/test/tools/javac/T8071847/T8071847.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/T8071847/T8071847.java	Thu May 21 11:41:04 2015 -0700
@@ -25,6 +25,7 @@
  * @test
  * bug 8071847
  * @summary Verify proper termination when instance initialization method uses invalid flags
+ * @modules jdk.compiler
  * @compile  T8071847.java
  * @run main T8071847
 */
--- a/langtools/test/tools/javac/TestPkgInfo.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/TestPkgInfo.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
  * @summary new option -Xpkginfo for better control of when package-info.class
  *          is generated, also ensures no failures if package-info.java is
  *          not available.
+ * @modules jdk.compiler
  */
 
 import java.io.*;
--- a/langtools/test/tools/javac/TryWithResources/InterruptedExceptionTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/TryWithResources/InterruptedExceptionTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test
  * @bug 7027157
  * @summary Project Coin: javac warnings for AutoCloseable.close throwing InterruptedException
+ * @modules jdk.compiler
  */
 
 import com.sun.source.util.JavacTask;
--- a/langtools/test/tools/javac/TryWithResources/UnusedResourcesTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/TryWithResources/UnusedResourcesTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,9 @@
  * @test
  * @bug 7023233
  * @summary False positive for -Xlint:try with nested try with resources blocks
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.util
  */
 
 import com.sun.source.util.JavacTask;
--- a/langtools/test/tools/javac/VersionOpt.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/VersionOpt.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
  * @summary tools/javac/versionOpt.sh fails on OpenJDK builds
  * Test checks the version strings displayed by javac, using
  * strings that come out of the Java runtime.
+ * @modules jdk.compiler
  */
 
 import java.io.File;
--- a/langtools/test/tools/javac/annotations/6550655/T6550655.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/annotations/6550655/T6550655.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,8 @@
  * @test
  * @bug     6550655
  * @summary javac crashes when compiling against an annotated class
+ * @modules java.compiler
+ *          jdk.compiler
  */
 
 import java.io.File;
--- a/langtools/test/tools/javac/annotations/SyntheticParameters.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/annotations/SyntheticParameters.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
  * @bug 8065132
  * @summary Test generation of annotations on inner class parameters.
  * @library /lib/annotations/
+ * @modules jdk.compiler/com.sun.tools.classfile
  * @run main SyntheticParameters
  */
 
--- a/langtools/test/tools/javac/annotations/TestAnnotationPackageInfo.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/annotations/TestAnnotationPackageInfo.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test
  * @bug 6993311
  * @summary annotations on packages are not validated
+ * @modules jdk.compiler
  */
 
 import java.io.*;
--- a/langtools/test/tools/javac/annotations/neg/8022765/T8022765.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/annotations/neg/8022765/T8022765.java	Thu May 21 11:41:04 2015 -0700
@@ -2,6 +2,8 @@
  * @test /nodynamiccopyright/
  * @bug 8022765
  * @summary javac should not crash for incorrect attribute values
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
  * @build VerifyAnnotationsAttributed
  * @run main VerifyAnnotationsAttributed T8022765.java
  * @compile/fail/ref=T8022765.out -XDrawDiagnostics T8022765.java
--- a/langtools/test/tools/javac/annotations/neg/8022765/T8022765.out	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/annotations/neg/8022765/T8022765.out	Thu May 21 11:41:04 2015 -0700
@@ -1,53 +1,53 @@
-T8022765.java:10:12: compiler.err.annotation.not.valid.for.type: int
-T8022765.java:11:6: compiler.err.annotation.not.valid.for.type: java.lang.String
-T8022765.java:12:5: compiler.err.annotation.not.valid.for.type: E
-T8022765.java:14:15: compiler.err.annotation.not.valid.for.type: int
-T8022765.java:15:9: compiler.err.annotation.not.valid.for.type: java.lang.String
-T8022765.java:16:8: compiler.err.annotation.not.valid.for.type: E
-T8022765.java:21:10: compiler.err.annotation.value.must.be.annotation
-T8022765.java:23:10: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: int, java.lang.String)
-T8022765.java:24:9: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: int, E)
-T8022765.java:25:13: compiler.err.annotation.value.must.be.annotation
-T8022765.java:27:13: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: int, java.lang.String)
-T8022765.java:28:12: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: int, E)
-T8022765.java:37:10: compiler.err.annotation.value.must.be.annotation
-T8022765.java:38:16: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: java.lang.String, int)
-T8022765.java:40:9: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: java.lang.String, E)
-T8022765.java:41:13: compiler.err.annotation.value.must.be.annotation
-T8022765.java:42:19: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: java.lang.String, int)
-T8022765.java:44:12: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: java.lang.String, E)
-T8022765.java:49:7: compiler.err.annotation.value.must.be.annotation
-T8022765.java:50:13: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: E, int)
-T8022765.java:51:7: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: E, java.lang.String)
-T8022765.java:53:10: compiler.err.annotation.value.must.be.annotation
-T8022765.java:54:16: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: E, int)
-T8022765.java:55:10: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: E, java.lang.String)
-T8022765.java:59:6: compiler.err.annotation.value.not.allowable.type
-T8022765.java:60:12: compiler.err.annotation.value.not.allowable.type
+T8022765.java:12:12: compiler.err.annotation.not.valid.for.type: int
+T8022765.java:13:6: compiler.err.annotation.not.valid.for.type: java.lang.String
+T8022765.java:14:5: compiler.err.annotation.not.valid.for.type: E
+T8022765.java:16:15: compiler.err.annotation.not.valid.for.type: int
+T8022765.java:17:9: compiler.err.annotation.not.valid.for.type: java.lang.String
+T8022765.java:18:8: compiler.err.annotation.not.valid.for.type: E
+T8022765.java:23:10: compiler.err.annotation.value.must.be.annotation
+T8022765.java:25:10: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: int, java.lang.String)
+T8022765.java:26:9: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: int, E)
+T8022765.java:27:13: compiler.err.annotation.value.must.be.annotation
+T8022765.java:29:13: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: int, java.lang.String)
+T8022765.java:30:12: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: int, E)
+T8022765.java:39:10: compiler.err.annotation.value.must.be.annotation
+T8022765.java:40:16: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: java.lang.String, int)
+T8022765.java:42:9: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: java.lang.String, E)
+T8022765.java:43:13: compiler.err.annotation.value.must.be.annotation
+T8022765.java:44:19: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: java.lang.String, int)
+T8022765.java:46:12: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: java.lang.String, E)
+T8022765.java:51:7: compiler.err.annotation.value.must.be.annotation
+T8022765.java:52:13: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: E, int)
+T8022765.java:53:7: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: E, java.lang.String)
+T8022765.java:55:10: compiler.err.annotation.value.must.be.annotation
+T8022765.java:56:16: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: E, int)
+T8022765.java:57:10: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: E, java.lang.String)
 T8022765.java:61:6: compiler.err.annotation.value.not.allowable.type
-T8022765.java:62:5: compiler.err.annotation.value.not.allowable.type
-T8022765.java:64:16: compiler.err.annotation.not.valid.for.type: int
-T8022765.java:65:10: compiler.err.annotation.not.valid.for.type: java.lang.String
-T8022765.java:66:9: compiler.err.annotation.not.valid.for.type: E
-T8022765.java:71:10: compiler.err.annotation.value.not.allowable.type
-T8022765.java:72:16: compiler.err.annotation.value.not.allowable.type
+T8022765.java:62:12: compiler.err.annotation.value.not.allowable.type
+T8022765.java:63:6: compiler.err.annotation.value.not.allowable.type
+T8022765.java:64:5: compiler.err.annotation.value.not.allowable.type
+T8022765.java:66:16: compiler.err.annotation.not.valid.for.type: int
+T8022765.java:67:10: compiler.err.annotation.not.valid.for.type: java.lang.String
+T8022765.java:68:9: compiler.err.annotation.not.valid.for.type: E
 T8022765.java:73:10: compiler.err.annotation.value.not.allowable.type
-T8022765.java:74:9: compiler.err.annotation.value.not.allowable.type
-T8022765.java:75:14: compiler.err.annotation.value.must.be.annotation
-T8022765.java:77:14: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: int, java.lang.String)
-T8022765.java:78:13: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: int, E)
-T8022765.java:85:10: compiler.err.annotation.value.not.allowable.type
-T8022765.java:86:16: compiler.err.annotation.value.not.allowable.type
+T8022765.java:74:16: compiler.err.annotation.value.not.allowable.type
+T8022765.java:75:10: compiler.err.annotation.value.not.allowable.type
+T8022765.java:76:9: compiler.err.annotation.value.not.allowable.type
+T8022765.java:77:14: compiler.err.annotation.value.must.be.annotation
+T8022765.java:79:14: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: int, java.lang.String)
+T8022765.java:80:13: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: int, E)
 T8022765.java:87:10: compiler.err.annotation.value.not.allowable.type
-T8022765.java:88:9: compiler.err.annotation.value.not.allowable.type
-T8022765.java:89:14: compiler.err.annotation.value.must.be.annotation
-T8022765.java:90:20: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: java.lang.String, int)
-T8022765.java:92:13: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: java.lang.String, E)
-T8022765.java:97:6: compiler.err.annotation.value.not.allowable.type
-T8022765.java:98:12: compiler.err.annotation.value.not.allowable.type
+T8022765.java:88:16: compiler.err.annotation.value.not.allowable.type
+T8022765.java:89:10: compiler.err.annotation.value.not.allowable.type
+T8022765.java:90:9: compiler.err.annotation.value.not.allowable.type
+T8022765.java:91:14: compiler.err.annotation.value.must.be.annotation
+T8022765.java:92:20: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: java.lang.String, int)
+T8022765.java:94:13: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: java.lang.String, E)
 T8022765.java:99:6: compiler.err.annotation.value.not.allowable.type
-T8022765.java:100:5: compiler.err.annotation.value.not.allowable.type
-T8022765.java:101:11: compiler.err.annotation.value.must.be.annotation
-T8022765.java:102:17: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: E, int)
-T8022765.java:103:11: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: E, java.lang.String)
+T8022765.java:100:12: compiler.err.annotation.value.not.allowable.type
+T8022765.java:101:6: compiler.err.annotation.value.not.allowable.type
+T8022765.java:102:5: compiler.err.annotation.value.not.allowable.type
+T8022765.java:103:11: compiler.err.annotation.value.must.be.annotation
+T8022765.java:104:17: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: E, int)
+T8022765.java:105:11: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: E, java.lang.String)
 52 errors
--- a/langtools/test/tools/javac/annotations/neg/8022765/VerifyErroneousAnnotationsAttributed.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/annotations/neg/8022765/VerifyErroneousAnnotationsAttributed.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,6 +24,8 @@
 /*
  * @test
  * @bug 8029161 8029376
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
  */
 
 import com.sun.source.tree.CompilationUnitTree;
--- a/langtools/test/tools/javac/annotations/repeatingAnnotations/combo/BasicSyntaxCombo.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/annotations/repeatingAnnotations/combo/BasicSyntaxCombo.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
  * @bug      8002157
  * @author   sogoel
  * @summary  Basic Syntax test for repeating annotations on all elements
+ * @modules jdk.compiler
  * @build    Helper
  * @compile  BasicSyntaxCombo.java
  * @run main BasicSyntaxCombo
--- a/langtools/test/tools/javac/annotations/repeatingAnnotations/combo/DeprecatedAnnoCombo.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/annotations/repeatingAnnotations/combo/DeprecatedAnnoCombo.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
  * @bug      8002157
  * @author   sogoel
  * @summary  Combo test to check for usage of Deprecated
+ * @modules jdk.compiler
  * @build    Helper
  * @compile  DeprecatedAnnoCombo.java
  * @run main DeprecatedAnnoCombo
--- a/langtools/test/tools/javac/annotations/repeatingAnnotations/combo/DocumentedAnnoCombo.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/annotations/repeatingAnnotations/combo/DocumentedAnnoCombo.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
  * @bug      8002157
  * @author   sogoel
  * @summary  Positive combo test for use of Documented on baseAnno/containerAnno
+ * @modules jdk.compiler
  * @build    Helper
  * @compile  DocumentedAnnoCombo.java
  * @run main DocumentedAnnoCombo
--- a/langtools/test/tools/javac/annotations/repeatingAnnotations/combo/InheritedAnnoCombo.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/annotations/repeatingAnnotations/combo/InheritedAnnoCombo.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
  * @bug      8002157
  * @author   sogoel
  * @summary  Positive combo test for use of Inherited on baseAnno/containerAnno
+ * @modules jdk.compiler
  * @build    Helper
  * @compile  InheritedAnnoCombo.java
  * @run main InheritedAnnoCombo
--- a/langtools/test/tools/javac/annotations/repeatingAnnotations/combo/ReflectionTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/annotations/repeatingAnnotations/combo/ReflectionTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
  * @bug      8001457 8027477
  * @author   sogoel
  * @summary  Reflection api tests
+ * @modules jdk.compiler
  * @build    Helper
  * @compile  expectedFiles/ExpectedBase.java expectedFiles/ExpectedContainer.java
  * @run main ReflectionTest
--- a/langtools/test/tools/javac/annotations/repeatingAnnotations/combo/RetentionAnnoCombo.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/annotations/repeatingAnnotations/combo/RetentionAnnoCombo.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
  * @bug      8002157
  * @author   sogoel
  * @summary  Combo test for all possible combinations for Retention Values
+ * @modules jdk.compiler
  * @build    Helper
  * @compile  RetentionAnnoCombo.java
  * @run main RetentionAnnoCombo
--- a/langtools/test/tools/javac/annotations/repeatingAnnotations/combo/TargetAnnoCombo.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/annotations/repeatingAnnotations/combo/TargetAnnoCombo.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test
  * @bug      7151010 8006547 8007766 8029017
  * @summary  Default test cases for running combinations for Target values
+ * @modules jdk.compiler
  * @build    Helper
  * @run main TargetAnnoCombo
  */
--- a/langtools/test/tools/javac/annotations/typeAnnotations/TypeProcOnly.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/TypeProcOnly.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -46,6 +46,10 @@
  *
  * @author Mahmood Ali
  * @author Werner Dietl
+ * @modules jdk.compiler/com.sun.tools.javac.comp
+ *          jdk.compiler/com.sun.tools.javac.main
+ *          jdk.compiler/com.sun.tools.javac.processing
+ *          jdk.compiler/com.sun.tools.javac.util
  */
 @SupportedAnnotationTypes("*")
 public class TypeProcOnly extends AbstractProcessor {
--- a/langtools/test/tools/javac/annotations/typeAnnotations/api/AnnotatedArrayOrder.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/api/AnnotatedArrayOrder.java	Thu May 21 11:41:04 2015 -0700
@@ -25,6 +25,8 @@
  * @test
  * @bug 8031744
  * @summary Checks the annotation types targeting array types
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
  */
 
 import com.sun.tools.javac.api.JavacTool;
--- a/langtools/test/tools/javac/annotations/typeAnnotations/api/ArrayCreationTree.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/api/ArrayCreationTree.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,10 @@
  * @test
  * @summary Checks that the interaction between annotated and unannotated
   *         array levels in array creation trees
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.tree
+ *          jdk.compiler/com.sun.tools.javac.util
  */
 
 import com.sun.tools.javac.api.JavacTool;
--- a/langtools/test/tools/javac/annotations/typeAnnotations/api/ArrayPositionConsistency.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/api/ArrayPositionConsistency.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,8 @@
  * @test
  * @summary Checks that the interaction between annotated and unannotated
   *         array levels
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
  */
 
 import com.sun.tools.javac.api.JavacTool;
--- a/langtools/test/tools/javac/annotations/typeAnnotations/classfile/CombinationsTargetTest1.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/classfile/CombinationsTargetTest1.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test
  * @bug 8005085 8005877 8004829 8005681 8006734 8006775
  * @summary Combinations of Target ElementTypes on (repeated)type annotations.
+ * @modules jdk.compiler/com.sun.tools.classfile
  */
 
 import com.sun.tools.classfile.*;
--- a/langtools/test/tools/javac/annotations/typeAnnotations/classfile/CombinationsTargetTest2.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/classfile/CombinationsTargetTest2.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test
  * @bug 8005085 8005877 8004829 8005681 8006734 8006775 8006507
  * @summary Combinations of Target ElementTypes on (repeated)type annotations.
+ * @modules jdk.compiler/com.sun.tools.classfile
  */
 
 import com.sun.tools.classfile.*;
--- a/langtools/test/tools/javac/annotations/typeAnnotations/classfile/CombinationsTargetTest3.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/classfile/CombinationsTargetTest3.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test
  * @bug 8005085 8005681 8008769 8010015
  * @summary Check (repeating)type annotations on lambda usage.
+ * @modules jdk.compiler/com.sun.tools.classfile
  * @run main CombinationsTargetTest3
  */
 
--- a/langtools/test/tools/javac/annotations/typeAnnotations/classfile/DeadCode.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/classfile/DeadCode.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,6 +32,7 @@
  * @test
  * @bug 6917130 8006775
  * @summary test that optimized away annotations are not emited to classfile
+ * @modules jdk.compiler/com.sun.tools.classfile
  */
 
 public class DeadCode extends ClassfileTestHelper {
--- a/langtools/test/tools/javac/annotations/typeAnnotations/classfile/NewTypeArguments.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/classfile/NewTypeArguments.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,6 +31,7 @@
 /*
  * @test ClassLiterals
  * @summary test that new type arguments are emitted to classfile
+ * @modules jdk.compiler/com.sun.tools.classfile
  */
 
 public class NewTypeArguments extends ClassfileTestHelper{
--- a/langtools/test/tools/javac/annotations/typeAnnotations/classfile/NoTargetAnnotations.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/classfile/NoTargetAnnotations.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -33,6 +33,7 @@
  * @test NoTargetAnnotations
  * @summary test that annotations with no Target meta type is emitted
  *          only once as declaration annotation
+ * @modules jdk.compiler/com.sun.tools.classfile
  */
 public class NoTargetAnnotations {
 
--- a/langtools/test/tools/javac/annotations/typeAnnotations/classfile/Scopes.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/classfile/Scopes.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,6 +32,7 @@
  * @test
  * @bug 6843077 8006775
  * @summary Qualified inner type annotation accessible to the class.
+ * @modules jdk.compiler/com.sun.tools.classfile
  */
 
 @Scopes.UniqueInner
--- a/langtools/test/tools/javac/annotations/typeAnnotations/classfile/SyntheticParameters.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/classfile/SyntheticParameters.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test SyntheticParameters
  * @summary Test generation of annotations on inner class parameters.
  * @library /lib/annotations/
+ * @modules jdk.compiler/com.sun.tools.classfile
  * @run main SyntheticParameters
  */
 
--- a/langtools/test/tools/javac/annotations/typeAnnotations/classfile/T8008762.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/classfile/T8008762.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
  * @bug 8008762
  * @summary Type annotation on inner class in anonymous class
  *          shows up as regular annotation
+ * @modules jdk.compiler/com.sun.tools.classfile
  */
 import java.lang.annotation.*;
 import static java.lang.annotation.RetentionPolicy.*;
--- a/langtools/test/tools/javac/annotations/typeAnnotations/classfile/T8008769.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/classfile/T8008769.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @summary Repeated type-annotations on type parm of local variable
  *          are not written to classfile.
  * @bug 8008769
+ * @modules jdk.compiler/com.sun.tools.classfile
  */
 import java.lang.annotation.*;
 import static java.lang.annotation.RetentionPolicy.*;
--- a/langtools/test/tools/javac/annotations/typeAnnotations/classfile/T8010015.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/classfile/T8010015.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test
  * @summary Wrong classfile attribution in inner class of lambda expression.
  * @bug 8010015
+ * @modules jdk.compiler/com.sun.tools.classfile
  */
 
 import java.lang.annotation.*;
--- a/langtools/test/tools/javac/annotations/typeAnnotations/classfile/TestAnonInnerClasses.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/classfile/TestAnonInnerClasses.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -33,6 +33,7 @@
  *  results in 2). Elements with no annotations expect 0.
  *  Source template is read in from testanoninner.template
  *
+ * @modules jdk.compiler/com.sun.tools.classfile
  */
 import java.lang.annotation.*;
 import java.io.*;
--- a/langtools/test/tools/javac/annotations/typeAnnotations/classfile/TestNewCastArray.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/classfile/TestNewCastArray.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test
  * @bug 8005681
  * @summary Repeated annotations on new,array,cast.
+ * @modules jdk.compiler/com.sun.tools.classfile
  */
 import java.lang.annotation.*;
 import java.io.*;
--- a/langtools/test/tools/javac/annotations/typeAnnotations/classfile/TypeCasts.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/classfile/TypeCasts.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -33,6 +33,7 @@
  * @bug 6843077 8006775
  * @summary test that typecasts annotation are emitted if only the cast
  *          expression is optimized away
+ * @modules jdk.compiler/com.sun.tools.classfile
  */
 
 public class TypeCasts extends ClassfileTestHelper{
--- a/langtools/test/tools/javac/annotations/typeAnnotations/classfile/Wildcards.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/classfile/Wildcards.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,6 +32,7 @@
  * @test Wildcards
  * @bug 6843077 8006775
  * @summary test that annotations target wildcards get emitted to classfile
+ * @modules jdk.compiler/com.sun.tools.classfile
  */
 public class Wildcards extends ClassfileTestHelper {
     public static void main(String[] args) throws Exception {
--- a/langtools/test/tools/javac/annotations/typeAnnotations/failures/CheckErrorsForSource7.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/failures/CheckErrorsForSource7.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,8 @@
  * @bug 8035890
  * @summary Verify that the parser correctly checks for source level 8 on the new places where
  *          annotations can appear in 8.
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
  * @run main CheckErrorsForSource7 CheckErrorsForSource7.java
  */
 import java.io.File;
--- a/langtools/test/tools/javac/annotations/typeAnnotations/failures/TypeVariableMissingTA.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/failures/TypeVariableMissingTA.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,6 +29,8 @@
  *     annotation processor.
  * @author Werner Dietl
  *
+ * @modules java.compiler
+ *          jdk.compiler
  * @compile DummyProcessor.java
  * @compile/fail/ref=TypeVariableMissingTA.out -XDrawDiagnostics TypeVariableMissingTA.java
  * @compile/fail/ref=TypeVariableMissingTA.out -XDrawDiagnostics -cp . -processor DummyProcessor TypeVariableMissingTA.java
--- a/langtools/test/tools/javac/annotations/typeAnnotations/failures/TypeVariableMissingTA.out	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/failures/TypeVariableMissingTA.out	Thu May 21 11:41:04 2015 -0700
@@ -1,2 +1,2 @@
-TypeVariableMissingTA.java:39:40: compiler.err.cant.resolve: kindname.class, MISSING, , 
-1 error
\ No newline at end of file
+TypeVariableMissingTA.java:41:40: compiler.err.cant.resolve: kindname.class, MISSING, , 
+1 error
--- a/langtools/test/tools/javac/annotations/typeAnnotations/newlocations/AfterMethodTypeParams.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/newlocations/AfterMethodTypeParams.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test
  * @bug 8038788
  * @summary Verify proper handling of annotations after method's type parameters.
+ * @modules jdk.compiler
  * @build AfterMethodTypeParams
  * @run main AfterMethodTypeParams
  */
--- a/langtools/test/tools/javac/annotations/typeAnnotations/packageanno/PackageProcessor.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/packageanno/PackageProcessor.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -46,6 +46,10 @@
  * @author Mahmood Ali
  * @author Werner Dietl
  *
+ * @modules jdk.compiler/com.sun.tools.javac.comp
+ *          jdk.compiler/com.sun.tools.javac.main
+ *          jdk.compiler/com.sun.tools.javac.processing
+ *          jdk.compiler/com.sun.tools.javac.util
  * @compile PackageProcessor.java
  * @compile -cp . -processor PackageProcessor mypackage/Anno.java mypackage/MyClass.java mypackage/package-info.java
  */
--- a/langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/ClassExtends.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/ClassExtends.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
  * @test
  * @bug 8042451
  * @summary Test population of reference info for class extends clauses
+ * @modules jdk.compiler/com.sun.tools.classfile
  * @compile -g Driver.java ReferenceInfoUtil.java ClassExtends.java
  * @run main Driver ClassExtends
  */
--- a/langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/ClassTypeParam.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/ClassTypeParam.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
  * @test
  * @bug 8042451
  * @summary Test population of reference info for class type parameters
+ * @modules jdk.compiler/com.sun.tools.classfile
  * @compile -g Driver.java ReferenceInfoUtil.java ClassTypeParam.java
  * @run main Driver ClassTypeParam
  */
--- a/langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/ConstructorInvocationTypeArgument.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/ConstructorInvocationTypeArgument.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test
  * @bug 8042451
  * @summary Test population of reference info for constructor invocation type argument
+ * @modules jdk.compiler/com.sun.tools.classfile
  * @compile -g Driver.java ReferenceInfoUtil.java ConstructorInvocationTypeArgument.java
  * @run main Driver ConstructorInvocationTypeArgument
  */
--- a/langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/Constructors.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/Constructors.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test
  * @bug 8026791 8042451
  * @summary Test population of reference info for constructor results
+ * @modules jdk.compiler/com.sun.tools.classfile
  * @compile -g Driver.java ReferenceInfoUtil.java Constructors.java
  * @run main Driver Constructors
  */
--- a/langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/ExceptionParameters.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/ExceptionParameters.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,7 @@
  * @bug 8028576 8042451
  * @summary Test population of reference info for exception parameters
  * @author Werner Dietl
+ * @modules jdk.compiler/com.sun.tools.classfile
  * @compile -g Driver.java ReferenceInfoUtil.java ExceptionParameters.java
  * @run main Driver ExceptionParameters
  */
--- a/langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/Fields.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/Fields.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
  * @test
  * @bug 8042451
  * @summary Test population of reference info for field
+ * @modules jdk.compiler/com.sun.tools.classfile
  * @compile -g Driver.java ReferenceInfoUtil.java Fields.java
  * @run main Driver Fields
  */
--- a/langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/FromSpecification.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/FromSpecification.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
  * @test
  * @bug 8042451
  * @summary Test that the examples from the manual are stored as expected
+ * @modules jdk.compiler/com.sun.tools.classfile
  * @compile -g Driver.java ReferenceInfoUtil.java FromSpecification.java
  * @run main Driver FromSpecification
  */
--- a/langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/Initializers.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/Initializers.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,7 @@
  * @bug 8013852 8042451
  * @summary Test population of reference info for instance and class initializers
  * @author Werner Dietl
+ * @modules jdk.compiler/com.sun.tools.classfile
  * @compile -g Driver.java ReferenceInfoUtil.java Initializers.java
  * @run main Driver Initializers
  */
--- a/langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/Lambda.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/Lambda.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
  * @bug 8008077 8029721 8042451 8043974
  * @summary Test population of reference info for lambda expressions
  *          javac crash for annotated parameter type of lambda in a field
+ * @modules jdk.compiler/com.sun.tools.classfile
  * @ignore 8057687 emit correct byte code an attributes for type annotations
  * @compile -g Driver.java ReferenceInfoUtil.java Lambda.java
  * @run main Driver Lambda
--- a/langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/MethodInvocationTypeArgument.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/MethodInvocationTypeArgument.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test
  * @bug 8042451
  * @summary Test population of reference info for method invocation type arguments
+ * @modules jdk.compiler/com.sun.tools.classfile
  * @compile -g Driver.java ReferenceInfoUtil.java MethodInvocationTypeArgument.java
  * @run main Driver MethodInvocationTypeArgument
  */
--- a/langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/MethodParameters.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/MethodParameters.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
  * @test
  * @bug 8042451
  * @summary Test population of reference info for method parameters
+ * @modules jdk.compiler/com.sun.tools.classfile
  * @compile -g Driver.java ReferenceInfoUtil.java MethodParameters.java
  * @run main Driver MethodParameters
  */
--- a/langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/MethodReceivers.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/MethodReceivers.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
  * @test
  * @bug 8042451
  * @summary Test population of reference info for method receivers
+ * @modules jdk.compiler/com.sun.tools.classfile
  * @compile -g Driver.java ReferenceInfoUtil.java MethodReceivers.java
  * @run main Driver MethodReceivers
  */
--- a/langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/MethodReturns.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/MethodReturns.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
  * @test
  * @bug 8042451
  * @summary Test population of reference info for method return
+ * @modules jdk.compiler/com.sun.tools.classfile
  * @compile -g Driver.java ReferenceInfoUtil.java MethodReturns.java
  * @run main Driver MethodReturns
  */
--- a/langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/MethodThrows.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/MethodThrows.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
  * @test
  * @bug 8042451
  * @summary Test population of reference info for method exception clauses
+ * @modules jdk.compiler/com.sun.tools.classfile
  * @compile -g Driver.java ReferenceInfoUtil.java MethodThrows.java
  * @run main Driver MethodThrows
  */
--- a/langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/MethodTypeParam.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/MethodTypeParam.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,7 @@
  * @test
  * @bug 8042451
  * @summary Test population of reference info for method type parameters
+ * @modules jdk.compiler/com.sun.tools.classfile
  * @compile -g Driver.java ReferenceInfoUtil.java MethodTypeParam.java
  * @run main Driver MethodTypeParam
  */
--- a/langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/MultiCatch.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/MultiCatch.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,7 @@
  * @bug 8006732 8006775 8042451
  * @summary Test population of reference info for multicatch exception parameters
  * @author Werner Dietl
+ * @modules jdk.compiler/com.sun.tools.classfile
  * @compile -g Driver.java ReferenceInfoUtil.java MultiCatch.java
  * @run main Driver MultiCatch
  */
--- a/langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/NestedTypes.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/NestedTypes.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
  * @test
  * @bug 8042451 8044009 8044010
  * @summary Test population of reference info for nested types
+ * @modules jdk.compiler/com.sun.tools.classfile
  * @ignore 8057687 emit correct byte code an attributes for type annotations
  * @compile -g Driver.java ReferenceInfoUtil.java NestedTypes.java
  * @run main Driver NestedTypes
--- a/langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/NewObjects.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/NewObjects.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
  * @test
  * @bug 8042451
  * @summary Test population of reference info for new object creations
+ * @modules jdk.compiler/com.sun.tools.classfile
  * @compile -g Driver.java ReferenceInfoUtil.java NewObjects.java
  * @run main Driver NewObjects
  */
--- a/langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/RepeatingTypeAnnotations.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/RepeatingTypeAnnotations.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
 /*
  * @test
  * @summary Test population of reference info for repeating type annotations
+ * @modules jdk.compiler/com.sun.tools.classfile
  * @compile -g Driver.java ReferenceInfoUtil.java RepeatingTypeAnnotations.java
  * @run main Driver RepeatingTypeAnnotations
  * @author Werner Dietl
--- a/langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/ResourceVariable.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/ResourceVariable.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test
  * @bug 8042451
  * @summary Test population of reference info for resource variable
+ * @modules jdk.compiler/com.sun.tools.classfile
  * @compile -g Driver.java ReferenceInfoUtil.java ResourceVariable.java
  * @run main Driver ResourceVariable
  */
--- a/langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/TypeCasts.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/TypeCasts.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
  * @test
  * @bug 8042451
  * @summary Test population of reference info for type casts
+ * @modules jdk.compiler/com.sun.tools.classfile
  * @compile -g Driver.java ReferenceInfoUtil.java TypeCasts.java
  * @run main Driver TypeCasts
  */
--- a/langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/TypeTests.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/annotations/typeAnnotations/referenceinfos/TypeTests.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
  * @test
  * @bug 8042451
  * @summary Test population of reference info for class literals
+ * @modules jdk.compiler/com.sun.tools.classfile
  * @compile -g Driver.java ReferenceInfoUtil.java TypeTests.java
  * @run main Driver TypeTests
  */
--- a/langtools/test/tools/javac/api/6400303/T6400303.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/api/6400303/T6400303.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,10 @@
  * @bug     6400303
  * @summary REGRESSION: javadoc crashes in b75
  * @author  Peter von der Ah\u00e9
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.code
+ *          jdk.compiler/com.sun.tools.javac.main
+ *          jdk.compiler/com.sun.tools.javac.util
  * @compile Test1.java
  * @compile Test2.java
  * @run main/othervm -esa T6400303
--- a/langtools/test/tools/javac/api/6406133/T6406133.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/api/6406133/T6406133.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,8 @@
  * @summary Compiler API ignores locale settings
  * @author  Maurizio Cimadamore
  * @library ../lib
+ * @modules java.compiler
+ *          jdk.compiler
  * @build ToolTester
  * @run main T6406133
  */
--- a/langtools/test/tools/javac/api/6410643/T6410643.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/api/6410643/T6410643.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,8 @@
  * @summary JSR 199: The method JavaCompilerTool.run fails to handle null arguments
  * @author  Peter von der Ah\u00e9
  * @library ../lib
+ * @modules java.compiler
+ *          jdk.compiler
  * @build ToolTester
  * @run main T6410643
  */
--- a/langtools/test/tools/javac/api/6411310/T6411310.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/api/6411310/T6411310.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,8 @@
  * @summary JSR 199: FileObject should support user-friendly names via getName()
  * @author  Peter von der Ah\u00e9
  * @library ../lib
+ * @modules java.compiler
+ *          jdk.compiler
  * @build ToolTester
  * @compile T6411310.java
  * @run main T6411310
--- a/langtools/test/tools/javac/api/6411333/T6411333.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/api/6411333/T6411333.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,8 @@
  * @summary Ensure 6400208, 6400225, and 6400267 are tested
  * @author  Peter von der Ah\u00e9
  * @library ../lib
+ * @modules java.compiler
+ *          jdk.compiler
  * @build ToolTester
  * @compile T6411333.java
  * @run main T6411333
--- a/langtools/test/tools/javac/api/6412656/T6412656.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/api/6412656/T6412656.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,8 @@
  * @summary JSR 199: pass annotation processor instances to compiler
  * @author  Peter von der Ah\u00e9
  * @library ../lib
+ * @modules java.compiler
+ *          jdk.compiler
  * @build ToolTester
  * @run main T6412656
  */
--- a/langtools/test/tools/javac/api/6415780/T6415780.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/api/6415780/T6415780.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,8 @@
  * @author  igor.tseytin@...
  * @author  Peter von der Ah\u00e9
  * @library ../lib
+ * @modules java.compiler
+ *          jdk.compiler
  * @build ToolTester
  * @run main T6415780
  */
--- a/langtools/test/tools/javac/api/6418694/T6418694.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/api/6418694/T6418694.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,8 @@
  * @summary JSR 199: JavaFileManager.hasLocation(Location)
  * @author  Peter von der Ah\u00e9
  * @library ../lib
+ * @modules java.compiler
+ *          jdk.compiler
  * @build ToolTester
  * @compile T6418694.java
  * @run main T6418694
--- a/langtools/test/tools/javac/api/6420409/T6420409.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/api/6420409/T6420409.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,8 @@
  * @bug     6420409
  * @summary JSR 199: StandardFileManager: cannot set CLASS_PATH location
  * @author  Peter von der Ah\u00e9
+ * @modules java.compiler
+ *          jdk.compiler
  */
 
 import java.io.File;
--- a/langtools/test/tools/javac/api/6420464/T6420464.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/api/6420464/T6420464.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,8 @@
  * @bug     6420464
  * @summary JSR 199: JavaFileObject.isNameCompatible throws unspecified exception (IllegalArgumentException)
  * @author  Igor Tseytin
+ * @modules java.compiler
+ *          jdk.compiler
  */
 
 import javax.tools.*;
--- a/langtools/test/tools/javac/api/6421111/T6421111.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/api/6421111/T6421111.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,8 @@
  * @summary NullPointerException thrown when retrieving bounds for the type parameter
  * @author  Peter von der Ah\u00e9
  * @library ../lib
+ * @modules java.compiler
+ *          jdk.compiler
  * @build ToolTester
  * @compile -Xlint:all T6421111.java
  * @run main T6421111
--- a/langtools/test/tools/javac/api/6421756/T6421756.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/api/6421756/T6421756.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,8 @@
  * @summary 6421756 JSR 199: In the method JavaCompilerTool.getTask 'options' can be supplied in the place of 'classes'
  * @author  Peter von der Ah\u00e9
  * @library ../lib
+ * @modules java.compiler
+ *          jdk.compiler
  * @build ToolTester
  * @compile T6421756.java
  * @run main T6421756
--- a/langtools/test/tools/javac/api/6422215/T6422215.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/api/6422215/T6422215.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,8 @@
  * @summary JSR 199: What happens if a directory is missing
  * @author  Peter von der Ah\u00e9
  * @library ../lib
+ * @modules java.compiler
+ *          jdk.compiler
  * @build ToolTester
  * @run main T6422215
  */
--- a/langtools/test/tools/javac/api/6422327/T6422327.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/api/6422327/T6422327.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,8 @@
  * @summary JSR 199: JavaCompilerTool can compile and generate '.class' of non '.java' files
  * @author  Peter von der Ah\u00e9
  * @library ../lib
+ * @modules java.compiler
+ *          jdk.compiler
  * @build ToolTester
  * @run main T6422327
  */
--- a/langtools/test/tools/javac/api/6423003/T6423003.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/api/6423003/T6423003.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,8 @@
  * @summary JSR 199: confusing help message with compiler API
  * @author  Peter von der Ah\u00e9
  * @library ../lib
+ * @modules java.compiler
+ *          jdk.compiler
  * @build ToolTester
  * @compile T6423003.java
  * @run main T6423003
--- a/langtools/test/tools/javac/api/6431257/T6431257.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/api/6431257/T6431257.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,8 @@
  * @summary JSR 199: Changes to JavaFileManager to support JSR 269 Filer API
  * @author  Peter von der Ah\u00e9
  * @library ../lib
+ * @modules java.compiler
+ *          jdk.compiler
  * @build ToolTester
  * @compile T6431257.java package-info.java
  * @run main T6431257 foo.bar.baz foo/bar/baz
--- a/langtools/test/tools/javac/api/6431435/T6431435.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/api/6431435/T6431435.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,8 @@
  * @test
  * @bug 6431435 6439406
  * @summary Tree API: source files loaded implicitly from source path
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
  * @run main T6431435
  */
 
--- a/langtools/test/tools/javac/api/6437349/T6437349.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/api/6437349/T6437349.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,8 @@
  * @bug     6437349
  * @summary JSR 199: JavaFileObject.isNameCompatible() will give true with some incompatible kinds
  * @library ../lib
+ * @modules java.compiler
+ *          jdk.compiler
  * @build ToolTester
  * @compile T6437349.java
  * @run main T6437349
--- a/langtools/test/tools/javac/api/6437999/T6437999.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/api/6437999/T6437999.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,8 @@
  * @summary Unit test for encoding argument to standard file manager
  * @author  Peter von der Ah\u00e9
  * @library ../lib
+ * @modules java.compiler
+ *          jdk.compiler
  * @build ToolTester
  * @compile T6437999.java
  * @run main T6437999
--- a/langtools/test/tools/javac/api/6440333/T6440333.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/api/6440333/T6440333.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,8 @@
  * @summary SimpleJavaFileObject.toString() generates URI with some extra message
  * @author  Peter von der Ah\u00e9
  * @library ../lib
+ * @modules java.compiler
+ *          jdk.compiler
  * @build ToolTester
  * @compile T6440333.java
  * @run main T6440333
--- a/langtools/test/tools/javac/api/6440528/T6440528.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/api/6440528/T6440528.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,8 @@
  * @summary javac deposits package-info.class in bogus directory
  * @author  Peter von der Ah\u00e9
  * @library ../lib
+ * @modules java.compiler
+ *          jdk.compiler
  * @build ToolTester
  * @compile T6440528.java
  * @run main T6440528
--- a/langtools/test/tools/javac/api/6452876/T6452876.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/api/6452876/T6452876.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,8 @@
  * @summary JSR 199: DiagnosticCollector.report(null) should throw NPE
  * @author  Peter von der Ah\u00e9
  * @library ../lib
+ * @modules java.compiler
+ *          jdk.compiler
  * @compile T6452876.java
  * @run main T6452876
  */
--- a/langtools/test/tools/javac/api/6468404/T6468404.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/api/6468404/T6468404.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,8 @@
  * @author  jesse.glick@...
  * @author  Peter von der Ah\u00e9
  * @library ../lib
+ * @modules java.compiler
+ *          jdk.compiler
  * @build ToolTester
  * @compile T6468404.java
  * @run main T6468404
--- a/langtools/test/tools/javac/api/6471599/Main.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/api/6471599/Main.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
  * @bug     6471599
  * @summary Type of rhs cannot be obtained when assigning to erroneous symbol
  * @author  Peter von der Ah\u00e9
+ * @modules jdk.compiler/com.sun.tools.javac.util
  * @compile Main.java
  * @run main Main
  */
--- a/langtools/test/tools/javac/api/6557752/T6557752.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/api/6557752/T6557752.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
  * @bug     6557752
  * @summary Test for wrapping the original type in ErrorType.
  * @library ../lib
+ * @modules jdk.compiler/com.sun.tools.javac.util
  * @compile T6557752.java
  * @run main T6557752
  */
--- a/langtools/test/tools/javac/api/6598108/T6598108.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/api/6598108/T6598108.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
  * @bug     6598108
  * @summary com.sun.source.util.Trees.isAccessible incorrect
  * @author  Jan Lahoda
+ * @modules jdk.compiler
  */
 
 import com.sun.source.tree.CompilationUnitTree;
--- a/langtools/test/tools/javac/api/6608214/T6608214.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/api/6608214/T6608214.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
  * @bug     6608214
  * @summary Exception throw while analysing a file with error
  * @author  Maurizio Cimadamore
+ * @modules jdk.compiler
  */
 
 import com.sun.source.util.JavacTask;
--- a/langtools/test/tools/javac/api/6731573/T6731573.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/api/6731573/T6731573.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,8 @@
  * @summary diagnostic output should optionally include source line
  * @author  Maurizio Cimadamore
  * @library ../lib
+ * @modules java.compiler
+ *          jdk.compiler
  * @build ToolTester
  * @run main T6731573
  */
--- a/langtools/test/tools/javac/api/6733837/T6733837.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/api/6733837/T6733837.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
  * @summary Compiler API ignores locale settings
  * @author  Maurizio Cimadamore
  * @library ../lib
+ * @modules jdk.compiler
  * @build ToolTester
  * @run main T6733837
  */
--- a/langtools/test/tools/javac/api/6852595/T6852595.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/api/6852595/T6852595.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
  * @bug     6852595
  * @summary Accessing scope using JSR199 API on erroneous tree causes Illegal Argument Exception
  * @author  mcimadamore
+ * @modules jdk.compiler/com.sun.tools.javac.tree
  */
 
 import java.io.IOException;
--- a/langtools/test/tools/javac/api/7086261/T7086261.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/api/7086261/T7086261.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,8 @@
  * @test
  * @bug 7086261
  * @summary javac doesn't report error as expected, it only reports ClientCodeWrapper$DiagnosticSourceUnwrapper
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.util
  */
 
 import javax.tools.*;
--- a/langtools/test/tools/javac/api/8007344/Test.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/api/8007344/Test.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,10 @@
  * @summary javac may not make tree end positions and/or doc comments
  *          available to processors and listeners
  * @library /tools/javac/lib
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.tree
+ *          jdk.compiler/com.sun.tools.javac.util
  * @build JavacTestingAbstractProcessor
  * @run main Test
  */
--- a/langtools/test/tools/javac/api/EndPositions.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/api/EndPositions.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
  * @bug 7196760
  * @summary javac doesn't report Diagnostic end positions properly when
  * an annotation processor is present
+ * @modules jdk.compiler
  */
 
 import com.sun.source.util.JavacTask;
--- a/langtools/test/tools/javac/api/Sibling.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/api/Sibling.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,8 @@
  * @bug     6399602
  * @summary Verify that files are created relative to sibling
  * @author  Peter von der Ah\u00e9
+ * @modules java.compiler
+ *          jdk.compiler
  */
 
 import java.io.File;
--- a/langtools/test/tools/javac/api/T6257235.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/api/T6257235.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,8 @@
  * @bug     6257235
  * @summary setOption() and setExtendedOption() of JavacTool throws NullPointerException for undefined options
  * @author  Peter von der Ah\u00e9
+ * @modules java.compiler
+ *          jdk.compiler
  */
 
 import java.util.Arrays;
--- a/langtools/test/tools/javac/api/T6258271.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/api/T6258271.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,8 @@
  * @bug     6258271
  * @summary DiagnosticMessage exposes internal name __input
  * @author  Peter von der Ah\u00e9
+ * @modules java.compiler
+ *          jdk.compiler
  */
 
 import java.io.*;
--- a/langtools/test/tools/javac/api/T6265137.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/api/T6265137.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,8 @@
  * @bug     6265137
  * @summary setOption() and setExtendedOption() of JavacTool will throw exception for some defined options
  * @author  Peter von der Ah\u00e9
+ * @modules java.compiler
+ *          jdk.compiler
  */
 
 import java.io.File;
--- a/langtools/test/tools/javac/api/T6306137.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/api/T6306137.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,8 @@
  * @test
  * @bug     6306137
  * @summary JSR 199: encoding option doesn't affect standard file manager
+ * @modules java.compiler
+ *          jdk.compiler
  * @compile -encoding utf-8 T6306137.java
  * @run main T6306137
  * @author  Peter von der Ah\u00e9
--- a/langtools/test/tools/javac/api/T6345974.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/api/T6345974.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,8 @@
  * @bug 6345974
  * @summary JCPrimitiveTypeTree.getPrimitiveTypeKind() inappropriately throws an
  *              AssertionError for "void"
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
  */
 
 import com.sun.tools.javac.api.JavacTool;
--- a/langtools/test/tools/javac/api/T6357331.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/api/T6357331.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test
  * @bug 6357331
  * @summary NPE from JavacTask.getElements() after calling CompilationTask.run
+ * @modules jdk.compiler
  */
 import java.io.*;
 import java.util.*;
--- a/langtools/test/tools/javac/api/T6358786.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/api/T6358786.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
  * @bug     6358786
  * @summary Doccomments are not returned from Tree API
  * @author  Peter von der Ah\u00e9
+ * @modules jdk.compiler/com.sun.tools.javac.api
  * @run main T6358786 T6358786.java
  */
 
--- a/langtools/test/tools/javac/api/T6358955.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/api/T6358955.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,8 @@
  * @test
  * @bug 6358955
  * @summary JavacFileManager.getFileForInput(dir) shuld throw IAE
+ * @modules java.compiler
+ *          jdk.compiler
  */
 
 import java.io.File;
--- a/langtools/test/tools/javac/api/T6392782.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/api/T6392782.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,8 @@
  * @test
  * @bug 6392782
  * @summary TreeScanner.visitImport returns null, not result of nested scan
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
  */
 
 import java.io.*;
--- a/langtools/test/tools/javac/api/T6395981.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/api/T6395981.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,8 @@
  * @bug     6395981 6458819 7025784 8028543
  * @summary JavaCompilerTool and Tool must specify version of JLS and JVMS
  * @author  Peter von der Ah\u00e9
+ * @modules java.compiler
+ *          jdk.compiler
  * @run main/fail T6395981
  * @run main/fail T6395981 RELEASE_3 RELEASE_5 RELEASE_6
  * @run main/fail T6395981 RELEASE_0 RELEASE_1 RELEASE_2 RELEASE_3 RELEASE_4 RELEASE_5 RELEASE_6
--- a/langtools/test/tools/javac/api/T6397104.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/api/T6397104.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,8 @@
  * @bug     6397104
  * @summary JSR 199: JavaFileManager.getFileForOutput should have sibling argument
  * @author  Peter von der Ah\u00e9
+ * @modules java.compiler
+ *          jdk.compiler
  */
 
 import java.io.File;
--- a/langtools/test/tools/javac/api/T6400205.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/api/T6400205.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,8 @@
  * @bug     6400205
  * @summary getClassLoader(location) returns null if getLocation(location) returns null
  * @author  Peter von der Ah\u00e9
+ * @modules java.compiler
+ *          jdk.compiler
  */
 
 import java.io.IOException;
--- a/langtools/test/tools/javac/api/T6400207.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/api/T6400207.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,8 @@
  * @bug     6400207
  * @summary JSR 199: JavaFileManager.list and unset location
  * @author  Peter von der Ah\u00e9
+ * @modules java.compiler
+ *          jdk.compiler
  */
 
 import java.util.*;
--- a/langtools/test/tools/javac/api/T6407011.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/api/T6407011.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,8 @@
  * @bug     6407011 6407066
  * @summary javac crashes in b78 with NPE in JavacFileManager:293
  * @author  Peter von der Ah\u00e9
+ * @modules java.compiler
+ *          jdk.compiler
  */
 
 import java.io.File;
--- a/langtools/test/tools/javac/api/T6412669.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/api/T6412669.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,8 @@
  * @test
  * @bug 6412669 6997958
  * @summary Should be able to get SourcePositions from 269 world
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
  */
 
 import java.io.*;
--- a/langtools/test/tools/javac/api/T6419926.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/api/T6419926.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,8 @@
  * @test
  * @bug     6419926
  * @summary JSR 199: FileObject.toUri() generates URI without schema (Solaris)
+ * @modules java.compiler
+ *          jdk.compiler
  */
 
 import java.io.*;
--- a/langtools/test/tools/javac/api/T6430241.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/api/T6430241.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,10 @@
  * @bug 6430241
  * @summary Hard to disable symbol file feature through API
  * @library /tools/lib
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.main
+ *          jdk.compiler/com.sun.tools.javac.util
  * @build ToolBox
  * @run main T6430241
  */
--- a/langtools/test/tools/javac/api/T6431879.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/api/T6431879.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,8 @@
  * @test
  * @bug 6431879
  * @summary TreePathSCanner(CompilationUnitTree tree, P p) overloading forces use of most specific type
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
  */
 
 import java.io.*;
--- a/langtools/test/tools/javac/api/T6437138.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/api/T6437138.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,8 @@
  * @test
  * @bug     6437138
  * @summary JSR 199: Compiler doesn't diagnose crash in user code
+ * @modules java.compiler
+ *          jdk.compiler
  */
 
 import java.net.URI;
--- a/langtools/test/tools/javac/api/T6483788.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/api/T6483788.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,8 @@
  * @test
  * @bug 6483788
  * @summary DefaultFileManager.ZipFileObject.toUri() fails to escape space characters
+ * @modules java.compiler
+ *          jdk.compiler
  */
 
 import java.io.*;
--- a/langtools/test/tools/javac/api/T6501502.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/api/T6501502.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,8 @@
  * @test
  * @bug 6501502 6877206 6483788
  * @summary JSR 199: FileObject.toUri should return file:///c:/ or file:/c:/ not file://c:/
+ * @modules java.compiler
+ *          jdk.compiler
  */
 
 import java.io.*;
--- a/langtools/test/tools/javac/api/T6838467.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/api/T6838467.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,8 @@
  * @test
  * @bug 6838467
  * @summary JSR199 FileObjects don't obey general contract of equals.
+ * @modules jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.util
  */
 
 import java.io.*;
--- a/langtools/test/tools/javac/api/T6877206.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/api/T6877206.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,8 @@
  * @test
  * @bug 6877206
  * @summary JavaFileObject.toUri returns bogus URI (win)
+ * @modules jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.util
  */
 
 import java.io.*;
--- a/langtools/test/tools/javac/api/TestClientCodeWrapper.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/api/TestClientCodeWrapper.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
  * @bug 6437138 6482554
  * @summary JSR 199: Compiler doesn't diagnose crash in user code
  * @library ../lib
+ * @modules jdk.compiler/com.sun.tools.javac.api
  * @build JavacTestingAbstractProcessor TestClientCodeWrapper
  * @run main TestClientCodeWrapper
  */
--- a/langtools/test/tools/javac/api/TestContainTypes.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/api/TestContainTypes.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test
  * @bug 6981185
  * @summary  com.sun.tools.model.JavacTypes.contains() calls Type.contains instead of Types.containsType
+ * @modules jdk.compiler
  * @run main TestContainTypes
  */
 
--- a/langtools/test/tools/javac/api/TestDocComments.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/api/TestDocComments.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,6 +24,8 @@
 /* @test
  * @bug 6985202
  * @summary no access to doc comments from Tree API
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
  */
 
 import java.io.*;
--- a/langtools/test/tools/javac/api/TestEvalExpression.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/api/TestEvalExpression.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,9 @@
  * @bug     4164450
  * @summary JSR 199: Standard interface for Java compilers
  * @author  Peter von der Ah\u00e9
+ * @modules java.compiler
+ *          java.desktop
+ *          jdk.compiler
  * @compile TestEvalExpression.java evalexpr/ByteArrayClassLoader.java  evalexpr/CompileFromString.java  evalexpr/MemoryFileManager.java
  * @run main TestEvalExpression
  */
--- a/langtools/test/tools/javac/api/TestGetElement.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/api/TestGetElement.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test
  * @bug 6930507
  * @summary Symbols for anonymous and local classes made too late for use by java tree API
+ * @modules jdk.compiler
  */
 
 import java.io.*;
--- a/langtools/test/tools/javac/api/TestGetElementReference.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/api/TestGetElementReference.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test
  * @bug 8012929
  * @summary Trees.getElement should work not only for declaration trees, but also for use-trees
+ * @modules jdk.compiler
  * @build TestGetElementReference
  * @run main TestGetElementReference
  */
--- a/langtools/test/tools/javac/api/TestGetScope.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/api/TestGetScope.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test
  * @bug 7090249
  * @summary IllegalStateException from Trees.getScope when called from JSR 199
+ * @modules jdk.compiler
  */
 
 import com.sun.source.tree.IdentifierTree;
--- a/langtools/test/tools/javac/api/TestGetTree.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/api/TestGetTree.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
  * @bug     6344177 6392177
  * @summary Can't get tree from a top level class
  * @author  Peter von der Ah\u00e9
+ * @modules jdk.compiler
  * @compile TestGetTree.java
  * @compile -processor TestGetTree -proc:only TestGetTree.java
  */
--- a/langtools/test/tools/javac/api/TestJavacTask.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/api/TestJavacTask.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
  * @bug     4813736 8015073
  * @summary Provide a basic test of access to the Java Model from javac, and error messages
  * @author  Peter von der Ah\u00e9
+ * @modules jdk.compiler/com.sun.tools.javac.api
  * @run main TestJavacTask TestJavacTask.java
  */
 
--- a/langtools/test/tools/javac/api/TestJavacTaskScanner.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/api/TestJavacTaskScanner.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,10 @@
  * @summary Additional functionality test of task and JSR 269
  * @author  Peter von der Ah\u00e9
  * @library ./lib
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.code
+ *          jdk.compiler/com.sun.tools.javac.parser
+ *          jdk.compiler/com.sun.tools.javac.util
  * @build ToolTester
  * @run main TestJavacTaskScanner TestJavacTaskScanner.java
  */
--- a/langtools/test/tools/javac/api/TestJavacTask_Lock.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/api/TestJavacTask_Lock.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test
  * @bug 7026509
  * @summary Cannot use JavaCompiler to create multiple CompilationTasks for partial compilations
+ * @modules jdk.compiler
  */
 
 import java.io.*;
--- a/langtools/test/tools/javac/api/TestJavacTask_Multiple.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/api/TestJavacTask_Multiple.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test
  * @bug 7026509
  * @summary Cannot use JavaCompiler to create multiple CompilationTasks for partial compilations
+ * @modules jdk.compiler
  */
 
 import java.io.*;
--- a/langtools/test/tools/javac/api/TestJavacTask_ParseAttrGen.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/api/TestJavacTask_ParseAttrGen.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test
  * @bug 7026509
  * @summary Cannot use JavaCompiler to create multiple CompilationTasks for partial compilations
+ * @modules jdk.compiler
  */
 
 import java.io.*;
--- a/langtools/test/tools/javac/api/TestOperators.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/api/TestOperators.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
  * @summary Tree API: can't determine kind of operator
  * @author  Peter von der Ah\u00e9
  * @library ../lib
+ * @modules jdk.compiler
  * @build JavacTestingAbstractProcessor TestOperators
  * @compile -processor TestOperators -proc:only TestOperators.java
  */
--- a/langtools/test/tools/javac/api/TestResolveError.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/api/TestResolveError.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,8 @@
  * @bug 6930108
  * @summary IllegalArgumentException in AbstractDiagnosticFormatter for tools/javac/api/TestJavacTaskScanner.java
  * @library ./lib
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.code
  * @build ToolTester
  * @run main TestResolveError
  */
--- a/langtools/test/tools/javac/api/TestResolveIdent.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/api/TestResolveIdent.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,10 @@
  * @bug     6374357 6308351
  * @summary PackageElement.getEnclosedElements() throws ClassReader$BadClassFileException
  * @author  Peter von der Ah\u00e9
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.code
+ *          jdk.compiler/com.sun.tools.javac.main
+ *          jdk.compiler/com.sun.tools.javac.util
  * @run main TestResolveIdent
  */
 
--- a/langtools/test/tools/javac/api/TestSearchPaths.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/api/TestSearchPaths.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,8 @@
  * @test
  * @bug 7026941
  * @summary path options ignored when reusing filemanager across tasks
+ * @modules java.compiler
+ *          jdk.compiler
  */
 
 import java.io.File;
--- a/langtools/test/tools/javac/api/TestTreePath.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/api/TestTreePath.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test
  * @bug 6473148
  * @summary TreePath.iterator() throws NPE
+ * @modules jdk.compiler
  */
 import java.io.*;
 import java.util.Arrays;
--- a/langtools/test/tools/javac/api/TestTrees.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/api/TestTrees.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,10 @@
  * @test
  * @bug 6346249 6392177 6411385
  * @summary new Trees API
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.code
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.tree
  */
 
 import com.sun.source.tree.*;
--- a/langtools/test/tools/javac/api/ToolProvider/HelloWorldTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/api/ToolProvider/HelloWorldTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,9 @@
  * @bug 6604599
  * @summary ToolProvider should be less compiler-specific
  * @library /tools/lib
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.main
  * @build ToolBox
  * @run main HelloWorldTest
  */
--- a/langtools/test/tools/javac/api/ToolProvider/ToolProviderTest1.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/api/ToolProvider/ToolProviderTest1.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,9 @@
  * @bug 6604599
  * @summary ToolProvider should be less compiler-specific
  * @library /tools/lib
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.main
  * @build ToolBox
  * @run main ToolProviderTest1
  */
--- a/langtools/test/tools/javac/api/ToolProvider/ToolProviderTest2.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/api/ToolProvider/ToolProviderTest2.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,9 @@
  * @bug 6604599
  * @summary ToolProvider should be less compiler-specific
  * @library /tools/lib
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.main
  * @build ToolBox
  * @run main ToolProviderTest2
  */
--- a/langtools/test/tools/javac/api/file/SJFM_AsPath.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/api/file/SJFM_AsPath.java	Thu May 21 11:41:04 2015 -0700
@@ -26,6 +26,8 @@
  * @bug 8059977
  * @summary StandardJavaFileManager should support java.nio.file.Path.
  *          Test asPath method.
+ * @modules java.compiler
+ *          jdk.compiler
  * @build SJFM_TestBase
  * @run main SJFM_AsPath
  */
--- a/langtools/test/tools/javac/api/file/SJFM_GetFileObjects.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/api/file/SJFM_GetFileObjects.java	Thu May 21 11:41:04 2015 -0700
@@ -26,6 +26,8 @@
  * @bug 8059977
  * @summary StandardJavaFileManager should support java.nio.file.Path.
  *          Test getFileObject methods.
+ * @modules java.compiler
+ *          jdk.compiler
  * @build SJFM_TestBase
  * @run main SJFM_GetFileObjects
  */
--- a/langtools/test/tools/javac/api/file/SJFM_IsSameFile.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/api/file/SJFM_IsSameFile.java	Thu May 21 11:41:04 2015 -0700
@@ -26,6 +26,8 @@
  * @bug 8059977
  * @summary StandardJavaFileManager should support java.nio.file.Path.
  *          Test isSameFile method.
+ * @modules java.compiler
+ *          jdk.compiler
  * @build SJFM_TestBase
  * @run main SJFM_IsSameFile
  */
--- a/langtools/test/tools/javac/api/file/SJFM_Locations.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/api/file/SJFM_Locations.java	Thu May 21 11:41:04 2015 -0700
@@ -26,6 +26,8 @@
  * @bug 8059977
  * @summary StandardJavaFileManager should support java.nio.file.Path.
  *          Test get/setLocation methods.
+ * @modules java.compiler
+ *          jdk.compiler
  * @build SJFM_TestBase
  * @run main SJFM_Locations
  */
--- a/langtools/test/tools/javac/api/guide/Test.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/api/guide/Test.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,8 @@
  * @summary Various bugs fixed while writing Compiler API Guide
  * @author  Peter von der Ah\u0081
  * @library ../lib
+ * @modules java.compiler
+ *          jdk.compiler
  * @build ToolTester
  * @compile Test.java
  * @run main Test
--- a/langtools/test/tools/javac/api/taskListeners/CompileEvent.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/api/taskListeners/CompileEvent.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,8 @@
  * @test
  * @bug 8033414
  * @summary Verify that the TaskEvent.COMPILATION is fired properly.
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.util
  * @run main CompileEvent
  */
 
--- a/langtools/test/tools/javac/api/taskListeners/EventsBalancedTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/api/taskListeners/EventsBalancedTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,9 @@
  * @test
  * @bug     8040822
  * @summary Check that all TaskEvents are balanced.
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.comp
+ *          jdk.compiler/com.sun.tools.javac.file
  */
 
 import java.io.*;
--- a/langtools/test/tools/javac/api/taskListeners/TestSimpleAddRemove.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/api/taskListeners/TestSimpleAddRemove.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,8 @@
  * @test
  * @bug     7093891
  * @summary support multiple task listeners
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
  */
 
 import java.io.File;
--- a/langtools/test/tools/javac/cast/intersection/IntersectionTypeCastTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/cast/intersection/IntersectionTypeCastTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
  * @summary Add support for intersection types in cast expression
  *  temporarily workaround combo tests are causing time out in several platforms
  * @library ../../lib
+ * @modules jdk.compiler/com.sun.tools.javac.util
  * @build JavacTestingAbstractThreadedTest
  * @run main/othervm/timeout=360 IntersectionTypeCastTest
  */
--- a/langtools/test/tools/javac/cast/intersection/IntersectionTypeParserTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/cast/intersection/IntersectionTypeParserTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test
  * @bug 8002099
  * @summary Add support for intersection types in cast expression
+ * @modules jdk.compiler
  */
 
 import com.sun.source.util.JavacTask;
--- a/langtools/test/tools/javac/cast/intersection/model/Model01.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/cast/intersection/model/Model01.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,8 @@
  * @bug 8002099 6499673
  * @summary Add support for intersection types in cast expression
  * @library /tools/javac/lib
+ * @modules jdk.compiler/com.sun.tools.javac.code
+ *          jdk.compiler/com.sun.tools.javac.tree
  * @build JavacTestingAbstractProcessor ModelChecker
  * @compile -processor ModelChecker Model01.java
  */
--- a/langtools/test/tools/javac/classfiles/ClassVersionChecker.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/classfiles/ClassVersionChecker.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
  * @summary Test major version for all legal combinations for -source and -target
  * @author sgoel
  *
+ * @modules jdk.compiler
  */
 
 import java.io.*;
--- a/langtools/test/tools/javac/classfiles/InnerClasses/SyntheticClasses.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/classfiles/InnerClasses/SyntheticClasses.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  *  @bug 8034854
  *  @summary Verify that the InnerClasses attribute has outer_class_info_index zero if it has
  *           inner_name_index zero (for synthetic classes)
+ *  @modules jdk.compiler/com.sun.tools.classfile
  *  @compile SyntheticClasses.java
  *  @run main SyntheticClasses
  */
--- a/langtools/test/tools/javac/classfiles/InnerClasses/T8068517.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/classfiles/InnerClasses/T8068517.java	Thu May 21 11:41:04 2015 -0700
@@ -25,6 +25,10 @@
  *  @bug 8034854
  *  @summary Verify that nested enums have correct abstract flag in the InnerClasses attribute.
  *  @library /tools/lib
+ *  @modules jdk.compiler/com.sun.tools.javac.api
+ *           jdk.compiler/com.sun.tools.javac.file
+ *           jdk.compiler/com.sun.tools.javac.main
+ *           jdk.compiler/com.sun.tools.javac.util
  *  @build ToolBox T8068517
  *  @run main T8068517
  */
--- a/langtools/test/tools/javac/classfiles/attributes/AnnotationDefault/AnnotationDefaultTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/classfiles/attributes/AnnotationDefault/AnnotationDefaultTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,10 @@
  * @bug 8042947
  * @summary Checking AnnotationDefault attribute.
  * @library /tools/lib /tools/javac/lib ../lib
+ * @modules jdk.compiler/com.sun.tools.classfile
+ *          jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.main
  * @build AnnotationDefaultTest TestBase TestResult InMemoryFileManager ToolBox AnnotationDefaultVerifier
  * @run main AnnotationDefaultTest
  */
--- a/langtools/test/tools/javac/classfiles/attributes/EnclosingMethod/EnclosingMethodTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/classfiles/attributes/EnclosingMethod/EnclosingMethodTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,10 @@
  * @bug 8042931
  * @summary Checking EnclosingMethod attribute of anonymous/local class.
  * @library /tools/lib /tools/javac/lib ../lib
+ * @modules jdk.compiler/com.sun.tools.classfile
+ *          jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.main
  * @build EnclosingMethodTest TestBase TestResult InMemoryFileManager ToolBox
  * @run main EnclosingMethodTest
  */
--- a/langtools/test/tools/javac/classfiles/attributes/LineNumberTable/LineNumberTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/classfiles/attributes/LineNumberTable/LineNumberTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,10 @@
  * @bug 8040131
  *
  * @library /tools/lib /tools/javac/lib ../lib
+ * @modules jdk.compiler/com.sun.tools.classfile
+ *          jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.main
  * @build ToolBox TestBase InMemoryFileManager LineNumberTestBase Container TestCase
  * @run main LineNumberTest
  */
--- a/langtools/test/tools/javac/classfiles/attributes/LocalVariableTable/LocalVariableTableTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/classfiles/attributes/LocalVariableTable/LocalVariableTableTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,10 @@
  * @summary local variable table attribute test.
  * @bug 8040097
  * @library /tools/lib /tools/javac/lib ../lib
+ * @modules jdk.compiler/com.sun.tools.classfile
+ *          jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.main
  * @build ToolBox LocalVariableTestBase TestBase InMemoryFileManager
  * @compile -g LocalVariableTableTest.java
  * @run main LocalVariableTableTest
--- a/langtools/test/tools/javac/classfiles/attributes/LocalVariableTable/LocalVariableTypeTableTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/classfiles/attributes/LocalVariableTable/LocalVariableTypeTableTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,10 @@
  * @summary local variable type table attribute test.
  * @bug 8040097
  * @library /tools/lib /tools/javac/lib ../lib
+ * @modules jdk.compiler/com.sun.tools.classfile
+ *          jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.main
  * @build ToolBox LocalVariableTestBase TestBase InMemoryFileManager
  * @compile -g LocalVariableTypeTableTest.java
  * @run main LocalVariableTypeTableTest
--- a/langtools/test/tools/javac/classfiles/attributes/Signature/ConstructorTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/classfiles/attributes/Signature/ConstructorTest.java	Thu May 21 11:41:04 2015 -0700
@@ -26,6 +26,10 @@
  * @bug 8049238
  * @summary Checks Signature attribute for constructors.
  * @library /tools/lib /tools/javac/lib ../lib
+ * @modules jdk.compiler/com.sun.tools.classfile
+ *          jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.main
  * @build TestBase TestResult InMemoryFileManager ToolBox
  * @build ConstructorTest Driver ExpectedSignature ExpectedSignatureContainer
  * @run main Driver ConstructorTest
--- a/langtools/test/tools/javac/classfiles/attributes/Signature/EnumTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/classfiles/attributes/Signature/EnumTest.java	Thu May 21 11:41:04 2015 -0700
@@ -26,6 +26,10 @@
  * @bug 8049238
  * @summary Checks Signature attribute for enum.
  * @library /tools/lib /tools/javac/lib ../lib
+ * @modules jdk.compiler/com.sun.tools.classfile
+ *          jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.main
  * @build TestBase TestResult InMemoryFileManager ToolBox
  * @build EnumTest Driver ExpectedSignature ExpectedSignatureContainer
  * @run main Driver EnumTest
@@ -36,4 +40,4 @@
     // see 8026480
     @ExpectedSignature(descriptor = "<init>(java.lang.String, int)", signature = "()V")
     private EnumTest() {}
-}
\ No newline at end of file
+}
--- a/langtools/test/tools/javac/classfiles/attributes/Signature/ExceptionTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/classfiles/attributes/Signature/ExceptionTest.java	Thu May 21 11:41:04 2015 -0700
@@ -26,6 +26,10 @@
  * @bug 8049238
  * @summary Checks Signature attribute for methods which throw exceptions.
  * @library /tools/lib /tools/javac/lib ../lib
+ * @modules jdk.compiler/com.sun.tools.classfile
+ *          jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.main
  * @build TestBase TestResult InMemoryFileManager ToolBox
  * @build ExceptionTest Driver ExpectedSignature ExpectedSignatureContainer
  * @run main Driver ExceptionTest
--- a/langtools/test/tools/javac/classfiles/attributes/Signature/FieldTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/classfiles/attributes/Signature/FieldTest.java	Thu May 21 11:41:04 2015 -0700
@@ -26,6 +26,10 @@
  * @bug 8049238
  * @summary Checks Signature attribute for fields.
  * @library /tools/lib /tools/javac/lib ../lib
+ * @modules jdk.compiler/com.sun.tools.classfile
+ *          jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.main
  * @build TestBase TestResult InMemoryFileManager ToolBox
  * @build FieldTest Driver ExpectedSignature ExpectedSignatureContainer
  * @run main Driver FieldTest
--- a/langtools/test/tools/javac/classfiles/attributes/Signature/InnerClassTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/classfiles/attributes/Signature/InnerClassTest.java	Thu May 21 11:41:04 2015 -0700
@@ -26,6 +26,10 @@
  * @bug 8049238
  * @summary Checks Signature attribute for inner classes.
  * @library /tools/lib /tools/javac/lib ../lib
+ * @modules jdk.compiler/com.sun.tools.classfile
+ *          jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.main
  * @build TestBase TestResult InMemoryFileManager ToolBox
  * @build InnerClassTest Driver ExpectedSignature ExpectedSignatureContainer
  * @run main Driver InnerClassTest
--- a/langtools/test/tools/javac/classfiles/attributes/Signature/MethodParameterTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/classfiles/attributes/Signature/MethodParameterTest.java	Thu May 21 11:41:04 2015 -0700
@@ -26,6 +26,10 @@
  * @bug 8049238
  * @summary Checks Signature attribute for method parameters.
  * @library /tools/lib /tools/javac/lib ../lib
+ * @modules jdk.compiler/com.sun.tools.classfile
+ *          jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.main
  * @build TestBase TestResult InMemoryFileManager ToolBox
  * @build MethodParameterTest Driver ExpectedSignature ExpectedSignatureContainer
  * @run main Driver MethodParameterTest
--- a/langtools/test/tools/javac/classfiles/attributes/Signature/MethodTypeBoundTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/classfiles/attributes/Signature/MethodTypeBoundTest.java	Thu May 21 11:41:04 2015 -0700
@@ -26,6 +26,10 @@
  * @bug 8049238
  * @summary Checks Signature attribute for type bounds.
  * @library /tools/lib /tools/javac/lib ../lib
+ * @modules jdk.compiler/com.sun.tools.classfile
+ *          jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.main
  * @build TestBase TestResult InMemoryFileManager ToolBox
  * @build MethodTypeBoundTest Driver ExpectedSignature ExpectedSignatureContainer
  * @run main Driver MethodTypeBoundTest
--- a/langtools/test/tools/javac/classfiles/attributes/Signature/ReturnTypeTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/classfiles/attributes/Signature/ReturnTypeTest.java	Thu May 21 11:41:04 2015 -0700
@@ -26,6 +26,11 @@
  * @bug 8049238
  * @summary Checks Signature attribute for array return type of method.
  * @library /tools/lib /tools/javac/lib ../lib
+ * @modules java.desktop
+ *          jdk.compiler/com.sun.tools.classfile
+ *          jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.main
  * @build TestBase TestResult InMemoryFileManager ToolBox
  * @build ReturnTypeTest Driver ExpectedSignature ExpectedSignatureContainer
  * @run main Driver ReturnTypeTest
--- a/langtools/test/tools/javac/classfiles/attributes/SourceFile/AnonymousClassTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/classfiles/attributes/SourceFile/AnonymousClassTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,10 @@
  * @summary sourcefile attribute test for anonymous class.
  * @bug 8040129
  * @library /tools/lib /tools/javac/lib ../lib
+ * @modules jdk.compiler/com.sun.tools.classfile
+ *          jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.main
  * @build ToolBox SourceFileTestBase TestBase InMemoryFileManager
  * @run main AnonymousClassTest
  */
--- a/langtools/test/tools/javac/classfiles/attributes/SourceFile/InnerClassTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/classfiles/attributes/SourceFile/InnerClassTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,10 @@
  * @summary sourcefile attribute test for inner class.
  * @bug 8040129
  * @library /tools/lib /tools/javac/lib ../lib
+ * @modules jdk.compiler/com.sun.tools.classfile
+ *          jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.main
  * @build ToolBox SourceFileTestBase TestBase InMemoryFileManager
  * @run main InnerClassTest
  */
--- a/langtools/test/tools/javac/classfiles/attributes/SourceFile/LocalClassTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/classfiles/attributes/SourceFile/LocalClassTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,10 @@
  * @summary sourcefile attribute test for local class.
  * @bug 8040129
  * @library /tools/lib /tools/javac/lib ../lib
+ * @modules jdk.compiler/com.sun.tools.classfile
+ *          jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.main
  * @build ToolBox SourceFileTestBase TestBase InMemoryFileManager
  * @run main LocalClassTest
  */
--- a/langtools/test/tools/javac/classfiles/attributes/SourceFile/MixTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/classfiles/attributes/SourceFile/MixTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,10 @@
  * @summary sourcefile attribute test for complex structure of nested classes and other types.
  * @bug 8040129
  * @library /tools/lib /tools/javac/lib ../lib
+ * @modules jdk.compiler/com.sun.tools.classfile
+ *          jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.main
  * @build ToolBox SourceFileTestBase TestBase InMemoryFileManager
  * @run main MixTest
  */
--- a/langtools/test/tools/javac/classfiles/attributes/SourceFile/NoSourceFileAttribute.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/classfiles/attributes/SourceFile/NoSourceFileAttribute.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,10 @@
  * @summary sourcefile attribute test for file compiled without debug information.
  * @bug 8040129
  * @library /tools/lib /tools/javac/lib ../lib
+ * @modules jdk.compiler/com.sun.tools.classfile
+ *          jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.main
  * @build ToolBox SourceFileTestBase TestBase InMemoryFileManager
  * @compile -g:none NoSourceFileAttribute.java
  * @run main NoSourceFileAttribute
--- a/langtools/test/tools/javac/classfiles/attributes/SourceFile/SyntheticClassTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/classfiles/attributes/SourceFile/SyntheticClassTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,10 @@
  * @summary sourcefile attribute test for synthetic class.
  * @bug 8040129
  * @library /tools/lib /tools/javac/lib ../lib
+ * @modules jdk.compiler/com.sun.tools.classfile
+ *          jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.main
  * @build ToolBox SourceFileTestBase TestBase InMemoryFileManager
  * @run main SyntheticClassTest
  */
--- a/langtools/test/tools/javac/classfiles/attributes/SourceFile/TopLevelClassesOneFileTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/classfiles/attributes/SourceFile/TopLevelClassesOneFileTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,10 @@
  * @summary sourcefile attribute test for two type in one file.
  * @bug 8040129
  * @library /tools/lib /tools/javac/lib ../lib
+ * @modules jdk.compiler/com.sun.tools.classfile
+ *          jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.main
  * @build ToolBox SourceFileTestBase TestBase InMemoryFileManager
  * @run main TopLevelClassesOneFileTest
  */
--- a/langtools/test/tools/javac/classfiles/attributes/deprecated/DeprecatedPackageTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/classfiles/attributes/deprecated/DeprecatedPackageTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,10 @@
  * @bug 8042261
  * @summary Checking that deprecated attribute does not apply to classes of deprecated package.
  * @library /tools/lib /tools/javac/lib ../lib
+ * @modules jdk.compiler/com.sun.tools.classfile
+ *          jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.main
  * @build  ToolBox TestBase TestResult InMemoryFileManager
  * @run main DeprecatedPackageTest
  */
--- a/langtools/test/tools/javac/classfiles/attributes/deprecated/DeprecatedTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/classfiles/attributes/deprecated/DeprecatedTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,10 @@
  * @summary Checking what attribute is generated by annotation Deprecated
  *          or javadoc deprecated for field, method, class(inner/local), interface.
  * @library /tools/lib /tools/javac/lib ../lib
+ * @modules jdk.compiler/com.sun.tools.classfile
+ *          jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.main
  * @build ToolBox TestBase TestResult InMemoryFileManager
  * @run main DeprecatedTest
  */
--- a/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerAnnotationsInInnerAnnotationTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerAnnotationsInInnerAnnotationTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,10 @@
  * @bug 8042251
  * @summary Testing InnerClasses_attribute of inner annotations in inner annotation.
  * @library /tools/lib /tools/javac/lib ../lib
+ * @modules jdk.compiler/com.sun.tools.classfile
+ *          jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.main
  * @build InnerClassesInInnerClassTestBase InnerClassesTestBase TestBase TestResult InMemoryFileManager ToolBox
  * @run main InnerAnnotationsInInnerAnnotationTest
  */
--- a/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerAnnotationsInInnerClassTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerAnnotationsInInnerClassTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,10 @@
  * @bug 8042251
  * @summary Testing InnerClasses_attribute of inner annotations in inner class.
  * @library /tools/lib /tools/javac/lib ../lib
+ * @modules jdk.compiler/com.sun.tools.classfile
+ *          jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.main
  * @build InnerClassesInInnerClassTestBase InnerClassesTestBase TestBase TestResult InMemoryFileManager ToolBox
  * @run main InnerAnnotationsInInnerClassTest
  */
--- a/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerAnnotationsInInnerEnumTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerAnnotationsInInnerEnumTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,10 @@
  * @bug 8042251
  * @summary Testing InnerClasses_attribute of inner annotations in inner enum.
  * @library /tools/lib /tools/javac/lib ../lib
+ * @modules jdk.compiler/com.sun.tools.classfile
+ *          jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.main
  * @build InnerClassesInInnerClassTestBase InnerClassesTestBase TestBase TestResult InMemoryFileManager ToolBox
  * @run main InnerAnnotationsInInnerEnumTest
  */
--- a/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerAnnotationsInInnerInterfaceTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerAnnotationsInInnerInterfaceTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,10 @@
  * @bug 8042251
  * @summary Testing InnerClasses_attribute of inner annotations in inner interface.
  * @library /tools/lib /tools/javac/lib ../lib
+ * @modules jdk.compiler/com.sun.tools.classfile
+ *          jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.main
  * @build InnerClassesInInnerClassTestBase InnerClassesTestBase TestBase TestResult InMemoryFileManager ToolBox
  * @run main InnerAnnotationsInInnerInterfaceTest
  */
--- a/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerClassesHierarchyTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerClassesHierarchyTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,10 @@
  * @bug 8042251
  * @summary Test that inner classes have in its inner classes attribute enclosing classes and its immediate members.
  * @library /tools/lib /tools/javac/lib ../lib
+ * @modules jdk.compiler/com.sun.tools.classfile
+ *          jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.main
  * @build TestResult TestBase InMemoryFileManager ToolBox
  * @run main InnerClassesHierarchyTest
  */
--- a/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerClassesInAnonymousClassTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerClassesInAnonymousClassTest.java	Thu May 21 11:41:04 2015 -0700
@@ -26,6 +26,10 @@
  * @bug 8042251 8062373
  * @summary Testing InnerClasses_attribute of inner classes in anonymous class.
  * @library /tools/lib /tools/javac/lib ../lib
+ * @modules jdk.compiler/com.sun.tools.classfile
+ *          jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.main
  * @build InnerClassesTestBase TestResult TestBase InMemoryFileManager ToolBox
  * @run main InnerClassesInAnonymousClassTest
  */
--- a/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerClassesInInnerAnnotationTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerClassesInInnerAnnotationTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,10 @@
  * @bug 8042251
  * @summary Testing InnerClasses_attribute of inner classes in inner annotation.
  * @library /tools/lib /tools/javac/lib ../lib
+ * @modules jdk.compiler/com.sun.tools.classfile
+ *          jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.main
  * @build InnerClassesInInnerClassTestBase InnerClassesTestBase TestResult TestBase InMemoryFileManager ToolBox
  * @run main InnerClassesInInnerAnnotationTest
  */
--- a/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerClassesInInnerClassTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerClassesInInnerClassTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,10 @@
  * @bug 8034854 8042251
  * @summary Testing InnerClasses_attribute of inner classes in inner class.
  * @library /tools/lib /tools/javac/lib ../lib
+ * @modules jdk.compiler/com.sun.tools.classfile
+ *          jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.main
  * @build InnerClassesInInnerClassTestBase InnerClassesTestBase TestResult TestBase InMemoryFileManager ToolBox
  * @run main InnerClassesInInnerClassTest
  */
--- a/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerClassesInInnerEnumTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerClassesInInnerEnumTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,10 @@
  * @bug 8034854 8042251
  * @summary Testing InnerClasses_attribute of inner classes in inner enum.
  * @library /tools/lib /tools/javac/lib ../lib
+ * @modules jdk.compiler/com.sun.tools.classfile
+ *          jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.main
  * @build InnerClassesInInnerClassTestBase InnerClassesTestBase TestResult TestBase InMemoryFileManager ToolBox
  * @run main InnerClassesInInnerEnumTest
  */
--- a/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerClassesInInnerInterfaceTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerClassesInInnerInterfaceTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,10 @@
  * @bug 8042251
  * @summary Testing InnerClasses_attribute of inner classes in inner interface.
  * @library /tools/lib /tools/javac/lib ../lib
+ * @modules jdk.compiler/com.sun.tools.classfile
+ *          jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.main
  * @build InnerClassesInInnerClassTestBase InnerClassesTestBase TestResult TestBase InMemoryFileManager ToolBox
  * @run main InnerClassesInInnerInterfaceTest
  */
--- a/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerClassesInLocalClassTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerClassesInLocalClassTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,10 @@
  * @bug 8042251
  * @summary Testing InnerClasses_attribute of inner classes in local class.
  * @library /tools/lib /tools/javac/lib ../lib
+ * @modules jdk.compiler/com.sun.tools.classfile
+ *          jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.main
  * @build InnerClassesTestBase TestResult TestBase InMemoryFileManager ToolBox
  * @run main InnerClassesInLocalClassTest
  */
--- a/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerClassesIndexTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerClassesIndexTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,10 @@
  * @bug 8042251
  * @summary Test that outer_class_info_index of local and anonymous class is zero.
  * @library /tools/lib /tools/javac/lib ../lib
+ * @modules jdk.compiler/com.sun.tools.classfile
+ *          jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.main
  * @build TestBase TestResult InMemoryFileManager ToolBox
  * @run main InnerClassesIndexTest
  */
--- a/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerClassesTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerClassesTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,10 @@
  * @bug 8034854 8042251
  * @summary Testing inner classes attributes.
  * @library /tools/lib /tools/javac/lib ../lib
+ * @modules jdk.compiler/com.sun.tools.classfile
+ *          jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.main
  * @build InnerClassesTestBase TestBase TestResult InMemoryFileManager ToolBox
  * @run main InnerClassesTest
  */
--- a/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerEnumInInnerAnnotationTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerEnumInInnerAnnotationTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,10 @@
  * @bug 8042251
  * @summary Testing InnerClasses_attribute of inner enums in inner annotation.
  * @library /tools/lib /tools/javac/lib ../lib
+ * @modules jdk.compiler/com.sun.tools.classfile
+ *          jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.main
  * @build InnerClassesInInnerClassTestBase InnerClassesTestBase TestBase TestResult InMemoryFileManager ToolBox
  * @run main InnerEnumInInnerAnnotationTest
  */
--- a/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerEnumInInnerEnumTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerEnumInInnerEnumTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,10 @@
  * @bug 8042251
  * @summary Testing InnerClasses_attribute of inner enums in inner enum.
  * @library /tools/lib /tools/javac/lib ../lib
+ * @modules jdk.compiler/com.sun.tools.classfile
+ *          jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.main
  * @build InnerClassesInInnerClassTestBase InnerClassesTestBase TestBase TestResult InMemoryFileManager ToolBox
  * @run main InnerEnumInInnerEnumTest
  */
--- a/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerEnumInInnerInterfaceTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerEnumInInnerInterfaceTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,10 @@
  * @bug 8042251
  * @summary Testing InnerClasses_attribute of inner enums in inner interface.
  * @library /tools/lib /tools/javac/lib ../lib
+ * @modules jdk.compiler/com.sun.tools.classfile
+ *          jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.main
  * @build InnerClassesInInnerClassTestBase InnerClassesTestBase TestBase TestResult InMemoryFileManager ToolBox
  * @run main InnerEnumInInnerInterfaceTest
  */
--- a/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerEnumsInInnerClassTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerEnumsInInnerClassTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,10 @@
  * @bug 8042251
  * @summary Testing InnerClasses_attribute of inner enums in inner class.
  * @library /tools/lib /tools/javac/lib ../lib
+ * @modules jdk.compiler/com.sun.tools.classfile
+ *          jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.main
  * @build InnerClassesInInnerClassTestBase InnerClassesTestBase TestBase TestResult InMemoryFileManager ToolBox
  * @run main InnerEnumsInInnerClassTest
  */
--- a/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerInterfacesInInnerAnnotationTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerInterfacesInInnerAnnotationTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,10 @@
  * @bug 8042251
  * @summary Testing InnerClasses_attribute of inner interfaces in inner annotation.
  * @library /tools/lib /tools/javac/lib ../lib
+ * @modules jdk.compiler/com.sun.tools.classfile
+ *          jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.main
  * @build InnerClassesInInnerClassTestBase InnerClassesTestBase TestBase TestResult InMemoryFileManager ToolBox
  * @run main InnerInterfacesInInnerAnnotationTest
  */
--- a/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerInterfacesInInnerClassTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerInterfacesInInnerClassTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,10 @@
  * @summary Testing InnerClasses_attribute of inner interfaces in inner class.
  * @author aeremeev
  * @library /tools/lib /tools/javac/lib ../lib
+ * @modules jdk.compiler/com.sun.tools.classfile
+ *          jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.main
  * @build InnerClassesInInnerClassTestBase InnerClassesTestBase TestBase TestResult InMemoryFileManager ToolBox
  * @run main InnerInterfacesInInnerClassTest
  */
--- a/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerInterfacesInInnerEnumTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerInterfacesInInnerEnumTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,10 @@
  * @bug 8042251
  * @summary Testing InnerClasses_attribute of inner interfaces in inner enum.
  * @library /tools/lib /tools/javac/lib ../lib
+ * @modules jdk.compiler/com.sun.tools.classfile
+ *          jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.main
  * @build InnerClassesInInnerClassTestBase InnerClassesTestBase TestBase TestResult InMemoryFileManager ToolBox
  * @run main InnerInterfacesInInnerEnumTest
  */
--- a/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerInterfacesInInnerInterfaceTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/classfiles/attributes/innerclasses/InnerInterfacesInInnerInterfaceTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,10 @@
  * @bug 8042251
  * @summary Testing InnerClasses_attribute of inner interfaces in inner interface.
  * @library /tools/lib /tools/javac/lib ../lib
+ * @modules jdk.compiler/com.sun.tools.classfile
+ *          jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.main
  * @build InnerClassesInInnerClassTestBase InnerClassesTestBase TestBase TestResult InMemoryFileManager ToolBox
  * @run main InnerInterfacesInInnerInterfaceTest
  */
--- a/langtools/test/tools/javac/classfiles/attributes/innerclasses/NoInnerClassesTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/classfiles/attributes/innerclasses/NoInnerClassesTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,10 @@
  * @bug 8042251
  * @summary Test that there are no inner classes attributes in case of there are no inner classes.
  * @library /tools/lib /tools/javac/lib ../lib
+ * @modules jdk.compiler/com.sun.tools.classfile
+ *          jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.main
  * @build TestBase InMemoryFileManager ToolBox
  * @run main NoInnerClassesTest
  */
--- a/langtools/test/tools/javac/classreader/BadClass.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/classreader/BadClass.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test
  * @bug 6898851
  * @summary Compiling against this corrupt class file causes a stacktrace from javac
+ * @modules jdk.compiler/com.sun.tools.classfile
  */
 
 import java.io.File;
--- a/langtools/test/tools/javac/classreader/T7031108.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/classreader/T7031108.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,8 @@
  * @bug 7031108
  * @summary NPE in javac.jvm.ClassReader.findMethod in PackageElement.enclosedElements from AP in incr build
  * @library /tools/javac/lib
+ * @modules java.compiler
+ *          jdk.compiler
  * @build JavacTestingAbstractProcessor T7031108
  * @run main T7031108
  */
--- a/langtools/test/tools/javac/code/ArrayClone.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/code/ArrayClone.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
  * @bug 4329886
  * @summary Clone() on arrays compiled incorrectly
  * @author gafter jjg
+ * @modules jdk.compiler
  */
 
 import java.io.*;
--- a/langtools/test/tools/javac/constDebug/ConstDebugTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/constDebug/ConstDebugTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test
  * @bug 4645152 4785453
  * @summary javac compiler incorrectly inserts <clinit> when -g is specified
+ * @modules jdk.compiler/com.sun.tools.classfile
  * @run compile -g ConstDebugTest.java
  * @run main ConstDebugTest
  */
--- a/langtools/test/tools/javac/defaultMethods/AssertionsTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/defaultMethods/AssertionsTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,9 @@
  * @summary Interfaces must not contain non-public fields, ensure $assertionsDisabled
  *          is not generated into an interface
  * @library /tools/lib
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.main
  * @build ToolBox Assertions AssertionsTest
  * @run main AssertionsTest -da
  * @run main AssertionsTest -ea:test.Assertions Inner
--- a/langtools/test/tools/javac/defaultMethods/BadClassfile.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/defaultMethods/BadClassfile.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,12 @@
  * @bug 8025087
  * @summary Verify that pre-JDK8 classfiles with default and/or static methods
  *          are refused correctly.
+ * @modules jdk.compiler/com.sun.tools.classfile
+ *          jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.code
+ *          jdk.compiler/com.sun.tools.javac.jvm
+ *          jdk.compiler/com.sun.tools.javac.main
+ *          jdk.compiler/com.sun.tools.javac.util
  * @build BadClassfile
  * @run main BadClassfile
  */
--- a/langtools/test/tools/javac/defaultMethods/CheckACC_STRICTFlagOnDefaultMethodTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/defaultMethods/CheckACC_STRICTFlagOnDefaultMethodTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
  * @test
  * @bug 8012723
  * @summary strictfp interface misses strictfp modifer on default method
+ * @modules jdk.compiler/com.sun.tools.classfile
  * @run main CheckACC_STRICTFlagOnDefaultMethodTest
  */
 
--- a/langtools/test/tools/javac/defaultMethods/DefaultMethodFlags.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/defaultMethods/DefaultMethodFlags.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test
  * @bug 8011383
  * @summary Symbol.getModifiers omits ACC_ABSTRACT from interface with default methods
+ * @modules jdk.compiler/com.sun.tools.javac.util
  */
 
 import java.io.File;
--- a/langtools/test/tools/javac/defaultMethods/TestDefaultBody.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/defaultMethods/TestDefaultBody.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test
  * @bug 7192246
  * @summary  check that code attributed for default methods is correctly generated
+ * @modules jdk.compiler/com.sun.tools.classfile
  */
 
 import com.sun.tools.classfile.AccessFlags;
--- a/langtools/test/tools/javac/defaultMethods/TestNoBridgeOnDefaults.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/defaultMethods/TestNoBridgeOnDefaults.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test
  * @bug 7192246
  * @summary  check that javac does not generate bridge methods for defaults
+ * @modules jdk.compiler/com.sun.tools.classfile
  */
 
 import com.sun.tools.classfile.ClassFile;
--- a/langtools/test/tools/javac/defaultMethods/static/hiding/InterfaceMethodHidingTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/defaultMethods/static/hiding/InterfaceMethodHidingTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
  * @bug 8005166
  * @summary Add support for static interface methods
  *          Smoke test for static interface method hiding
+ * @modules jdk.compiler
  * @run main/timeout=600 InterfaceMethodHidingTest
  */
 
--- a/langtools/test/tools/javac/defaultMethods/super/TestDefaultSuperCall.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/defaultMethods/super/TestDefaultSuperCall.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
  * @summary Automatic test for checking correctness of default super/this resolution
  *  temporarily workaround combo tests are causing time out in several platforms
  * @library ../../lib
+ * @modules jdk.compiler
  * @build JavacTestingAbstractThreadedTest
  * @run main/othervm TestDefaultSuperCall
  */
--- a/langtools/test/tools/javac/defaultMethods/super/TestDirectSuperInterfaceInvoke.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/defaultMethods/super/TestDirectSuperInterfaceInvoke.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test
  * @bug 8027281
  * @summary As per JVMS 4.9.2, invokespecial can only refer to direct superinterfaces
+ * @modules jdk.compiler/com.sun.tools.classfile
  * @compile TestDirectSuperInterfaceInvoke.java
  * @run main TestDirectSuperInterfaceInvoke
  */
--- a/langtools/test/tools/javac/defaultMethods/syntax/TestDefaultMethodsSyntax.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/defaultMethods/syntax/TestDefaultMethodsSyntax.java	Thu May 21 11:41:04 2015 -0700
@@ -25,6 +25,7 @@
  * @test
  * @bug 7192245 8005851 8005166 8071453
  * @summary Automatic test for checking set of allowed modifiers on interface methods
+ * @modules jdk.compiler
  */
 
 import com.sun.source.util.JavacTask;
--- a/langtools/test/tools/javac/defaultMethodsVisibility/DefaultMethodsNotVisibleForSourceLessThan8Test.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/defaultMethodsVisibility/DefaultMethodsNotVisibleForSourceLessThan8Test.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,9 @@
  * @summary Default methods not always visible under -source 7
  * Default methods should be visible under source previous to 8
  * @library /tools/lib
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.main
  * @build ToolBox
  * @run main DefaultMethodsNotVisibleForSourceLessThan8Test
  */
--- a/langtools/test/tools/javac/diags/CheckExamples.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/diags/CheckExamples.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,10 @@
  * @test
  * @bug 6968063 7127924
  * @summary provide examples of code that generate diagnostics
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.main
+ *          jdk.compiler/com.sun.tools.javac.util
  * @build Example CheckExamples DocCommentProcessor
  * @run main/othervm CheckExamples
  */
--- a/langtools/test/tools/javac/diags/CheckResourceKeys.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/diags/CheckResourceKeys.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,8 @@
  * @test
  * @bug 6964768 6964461 6964469 6964487 6964460 6964481 6980021
  * @summary need test program to validate javac resource bundles
+ * @modules jdk.compiler/com.sun.tools.classfile
+ *          jdk.compiler/com.sun.tools.javac.code
  */
 
 import java.io.*;
--- a/langtools/test/tools/javac/diags/MessageInfo.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/diags/MessageInfo.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,12 @@
  * @test
  * @bug 7013272 7127924
  * @summary Automatically generate info about how compiler resource keys are used
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.code
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.main
+ *          jdk.compiler/com.sun.tools.javac.parser
+ *          jdk.compiler/com.sun.tools.javac.util
  * @build Example ArgTypeCompilerFactory MessageFile MessageInfo
  * @run main/othervm MessageInfo
  */
--- a/langtools/test/tools/javac/diags/RunExamples.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/diags/RunExamples.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,12 @@
  * @test
  * @bug 6968063 7127924
  * @summary provide examples of code that generate diagnostics
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.code
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.main
+ *          jdk.compiler/com.sun.tools.javac.parser
+ *          jdk.compiler/com.sun.tools.javac.util
  * @build ArgTypeCompilerFactory Example HTMLWriter RunExamples DocCommentProcessor
  * @run main/othervm RunExamples
  */
--- a/langtools/test/tools/javac/doclint/DocLintTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/doclint/DocLintTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test
  * @bug 8004833
  * @summary Integrate doclint support into javac
+ * @modules jdk.compiler/com.sun.tools.javac.main
  */
 
 import java.io.File;
--- a/langtools/test/tools/javac/doclint/IncludePackagesTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/doclint/IncludePackagesTest.java	Thu May 21 11:41:04 2015 -0700
@@ -25,6 +25,7 @@
  * @test
  * @bug 8071851
  * @summary Test the -Xdoclint/package option
+ * @modules jdk.compiler/com.sun.tools.javac.main
  */
 
 import java.io.File;
--- a/langtools/test/tools/javac/doctree/AttrTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/doctree/AttrTest.java	Thu May 21 11:41:04 2015 -0700
@@ -25,6 +25,10 @@
  * @test
  * @bug 7021614 8076026
  * @summary extend com.sun.source API to support parsing javadoc comments
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.tree
+ *          jdk.compiler/com.sun.tools.javac.util
  * @build DocCommentTester
  * @run main DocCommentTester AttrTest.java
  */
--- a/langtools/test/tools/javac/doctree/AuthorTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/doctree/AuthorTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,10 @@
  * @test
  * @bug 7021614
  * @summary extend com.sun.source API to support parsing javadoc comments
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.tree
+ *          jdk.compiler/com.sun.tools.javac.util
  * @build DocCommentTester
  * @run main DocCommentTester AuthorTest.java
  */
--- a/langtools/test/tools/javac/doctree/BadTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/doctree/BadTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,10 @@
  * @test
  * @bug 7021614
  * @summary extend com.sun.source API to support parsing javadoc comments
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.tree
+ *          jdk.compiler/com.sun.tools.javac.util
  * @build DocCommentTester
  * @run main DocCommentTester Bad.java
  */
--- a/langtools/test/tools/javac/doctree/CodeTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/doctree/CodeTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,10 @@
  * @test
  * @bug 7021614
  * @summary extend com.sun.source API to support parsing javadoc comments
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.tree
+ *          jdk.compiler/com.sun.tools.javac.util
  * @build DocCommentTester
  * @run main DocCommentTester CodeTest.java
  */
--- a/langtools/test/tools/javac/doctree/DeprecatedTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/doctree/DeprecatedTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,10 @@
  * @test
  * @bug 7021614
  * @summary extend com.sun.source API to support parsing javadoc comments
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.tree
+ *          jdk.compiler/com.sun.tools.javac.util
  * @build DocCommentTester
  * @run main DocCommentTester DeprecatedTest.java
  */
--- a/langtools/test/tools/javac/doctree/DocRootTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/doctree/DocRootTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,10 @@
  * @test
  * @bug 7021614
  * @summary extend com.sun.source API to support parsing javadoc comments
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.tree
+ *          jdk.compiler/com.sun.tools.javac.util
  * @build DocCommentTester
  * @run main DocCommentTester DocRootTest.java
  */
--- a/langtools/test/tools/javac/doctree/DocTreePathScannerTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/doctree/DocTreePathScannerTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,8 @@
  * @test
  * @bug 8009724
  * @summary adding DocTreePath and DocTreePathScanner
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
  */
 
 import com.sun.source.doctree.DocCommentTree;
--- a/langtools/test/tools/javac/doctree/ElementTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/doctree/ElementTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,10 @@
  * @test
  * @bug 7021614
  * @summary extend com.sun.source API to support parsing javadoc comments
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.tree
+ *          jdk.compiler/com.sun.tools.javac.util
  * @build DocCommentTester
  * @run main DocCommentTester ElementTest.java
  */
--- a/langtools/test/tools/javac/doctree/EntityTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/doctree/EntityTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,10 @@
  * @test
  * @bug 7021614
  * @summary extend com.sun.source API to support parsing javadoc comments
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.tree
+ *          jdk.compiler/com.sun.tools.javac.util
  * @build DocCommentTester
  * @run main DocCommentTester EntityTest.java
  */
--- a/langtools/test/tools/javac/doctree/ExceptionTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/doctree/ExceptionTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,10 @@
  * @test
  * @bug 7021614
  * @summary extend com.sun.source API to support parsing javadoc comments
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.tree
+ *          jdk.compiler/com.sun.tools.javac.util
  * @build DocCommentTester
  * @run main DocCommentTester ExceptionTest.java
  */
--- a/langtools/test/tools/javac/doctree/FirstSentenceTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/doctree/FirstSentenceTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,10 @@
  * @test
  * @bug 7021614
  * @summary extend com.sun.source API to support parsing javadoc comments
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.tree
+ *          jdk.compiler/com.sun.tools.javac.util
  * @build DocCommentTester
  * @run main DocCommentTester FirstSentenceTest.java
  */
--- a/langtools/test/tools/javac/doctree/InheritDocTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/doctree/InheritDocTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,10 @@
  * @test
  * @bug 7021614
  * @summary extend com.sun.source API to support parsing javadoc comments
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.tree
+ *          jdk.compiler/com.sun.tools.javac.util
  * @build DocCommentTester
  * @run main DocCommentTester InheritDocTest.java
  */
--- a/langtools/test/tools/javac/doctree/LinkPlainTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/doctree/LinkPlainTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,10 @@
  * @test
  * @bug 7021614
  * @summary extend com.sun.source API to support parsing javadoc comments
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.tree
+ *          jdk.compiler/com.sun.tools.javac.util
  * @build DocCommentTester
  * @run main DocCommentTester LinkPlainTest.java
  */
--- a/langtools/test/tools/javac/doctree/LinkTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/doctree/LinkTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,10 @@
  * @test
  * @bug 7021614
  * @summary extend com.sun.source API to support parsing javadoc comments
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.tree
+ *          jdk.compiler/com.sun.tools.javac.util
  * @build DocCommentTester
  * @run main DocCommentTester LinkTest.java
  */
--- a/langtools/test/tools/javac/doctree/LiteralTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/doctree/LiteralTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,10 @@
  * @test
  * @bug 7021614
  * @summary extend com.sun.source API to support parsing javadoc comments
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.tree
+ *          jdk.compiler/com.sun.tools.javac.util
  * @build DocCommentTester
  * @run main DocCommentTester LiteralTest.java
  */
--- a/langtools/test/tools/javac/doctree/ParamTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/doctree/ParamTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,10 @@
  * @test
  * @bug 7021614
  * @summary extend com.sun.source API to support parsing javadoc comments
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.tree
+ *          jdk.compiler/com.sun.tools.javac.util
  * @build DocCommentTester
  * @run main DocCommentTester ParamTest.java
  */
--- a/langtools/test/tools/javac/doctree/ReferenceTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/doctree/ReferenceTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
  * @bug 7021614
  * @summary extend com.sun.source API to support parsing javadoc comments
  * @summary check references in at-see and {at-link} tags
+ * @modules jdk.compiler
  * @build ReferenceTest
  * @compile -processor ReferenceTest -proc:only ReferenceTest.java
  */
--- a/langtools/test/tools/javac/doctree/ReturnTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/doctree/ReturnTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,10 @@
  * @test
  * @bug 7021614
  * @summary extend com.sun.source API to support parsing javadoc comments
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.tree
+ *          jdk.compiler/com.sun.tools.javac.util
  * @build DocCommentTester
  * @run main DocCommentTester ReturnTest.java
  */
--- a/langtools/test/tools/javac/doctree/SeeTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/doctree/SeeTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,10 @@
  * @test
  * @bug 7021614 8031212
  * @summary extend com.sun.source API to support parsing javadoc comments
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.tree
+ *          jdk.compiler/com.sun.tools.javac.util
  * @build DocCommentTester
  * @run main DocCommentTester SeeTest.java
  */
--- a/langtools/test/tools/javac/doctree/SerialDataTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/doctree/SerialDataTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,10 @@
  * @test
  * @bug 7021614
  * @summary extend com.sun.source API to support parsing javadoc comments
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.tree
+ *          jdk.compiler/com.sun.tools.javac.util
  * @build DocCommentTester
  * @run main DocCommentTester SerialDataTest.java
  */
--- a/langtools/test/tools/javac/doctree/SerialFieldTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/doctree/SerialFieldTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,10 @@
  * @test
  * @bug 7021614
  * @summary extend com.sun.source API to support parsing javadoc comments
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.tree
+ *          jdk.compiler/com.sun.tools.javac.util
  * @build DocCommentTester
  * @run main DocCommentTester SerialFieldTest.java
  */
--- a/langtools/test/tools/javac/doctree/SerialTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/doctree/SerialTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,10 @@
  * @test
  * @bug 7021614
  * @summary extend com.sun.source API to support parsing javadoc comments
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.tree
+ *          jdk.compiler/com.sun.tools.javac.util
  * @build DocCommentTester
  * @run main DocCommentTester SerialTest.java
  */
--- a/langtools/test/tools/javac/doctree/SimpleDocTreeVisitorTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/doctree/SimpleDocTreeVisitorTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,8 @@
  * @test
  * @bug 7021614
  * @summary extend com.sun.source API to support parsing javadoc comments
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
  */
 
 import com.sun.source.doctree.DocCommentTree;
--- a/langtools/test/tools/javac/doctree/SinceTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/doctree/SinceTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,10 @@
  * @test
  * @bug 7021614
  * @summary extend com.sun.source API to support parsing javadoc comments
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.tree
+ *          jdk.compiler/com.sun.tools.javac.util
  * @build DocCommentTester
  * @run main DocCommentTester SinceTest.java
  */
--- a/langtools/test/tools/javac/doctree/TagTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/doctree/TagTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,10 @@
  * @test
  * @bug 7021614
  * @summary extend com.sun.source API to support parsing javadoc comments
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.tree
+ *          jdk.compiler/com.sun.tools.javac.util
  * @build DocCommentTester
  * @run main DocCommentTester TagTest.java
  */
--- a/langtools/test/tools/javac/doctree/ThrowableTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/doctree/ThrowableTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,10 @@
  * @test
  * @bug 7021614
  * @summary extend com.sun.source API to support parsing javadoc comments
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.tree
+ *          jdk.compiler/com.sun.tools.javac.util
  * @build DocCommentTester
  * @run main DocCommentTester ThrowableTest.java
  */
--- a/langtools/test/tools/javac/doctree/ValueTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/doctree/ValueTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,10 @@
  * @test
  * @bug 7021614
  * @summary extend com.sun.source API to support parsing javadoc comments
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.tree
+ *          jdk.compiler/com.sun.tools.javac.util
  * @build DocCommentTester
  * @run main DocCommentTester ValueTest.java
  */
--- a/langtools/test/tools/javac/doctree/VersionTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/doctree/VersionTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,10 @@
  * @test
  * @bug 7021614
  * @summary extend com.sun.source API to support parsing javadoc comments
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.tree
+ *          jdk.compiler/com.sun.tools.javac.util
  * @build DocCommentTester
  * @run main DocCommentTester VersionTest.java
  */
--- a/langtools/test/tools/javac/doctree/positions/TestPosition.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/doctree/positions/TestPosition.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test
  * @bug 8008174
  * @summary proper source positions for doc comments
+ * @modules jdk.compiler
  * @build TestPosition
  * @compile/ref=TestPosition.out -processor TestPosition -proc:only TestPositionSource.java
  */
--- a/langtools/test/tools/javac/enum/6350057/T6350057.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/enum/6350057/T6350057.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,8 @@
  * @summary Test that parameters on implicit enum methods have the right kind
  * @author  Joseph D. Darcy
  * @library /tools/javac/lib
+ * @modules java.compiler
+ *          jdk.compiler
  * @build   JavacTestingAbstractProcessor T6350057
  * @compile -processor T6350057 -proc:only TestEnum.java
  */
--- a/langtools/test/tools/javac/enum/6424358/T6424358.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/enum/6424358/T6424358.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,8 @@
  * @summary Synthesized static enum method values() is final
  * @author  Peter von der Ah\u00e9
  * @library /tools/javac/lib
+ * @modules java.compiler
+ *          jdk.compiler
  * @build   JavacTestingAbstractProcessor T6424358
  * @compile -processor T6424358 -proc:only T6424358.java
  */
--- a/langtools/test/tools/javac/expression/_super/NonDirectSuper/NonDirectSuper.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/expression/_super/NonDirectSuper/NonDirectSuper.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
  * @bug 8027789
  * @summary check that the direct superclass is used as the site when calling
  *          a superclass' method
+ * @modules jdk.compiler/com.sun.tools.classfile
  * @compile Base.java NonDirectSuper.java
  * @run main test.NonDirectSuper
  */
--- a/langtools/test/tools/javac/failover/CheckAttributedTree.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/failover/CheckAttributedTree.java	Thu May 21 11:41:04 2015 -0700
@@ -27,6 +27,10 @@
  * @summary assorted position errors in compiler syntax trees
  *  temporarily workaround combo tests are causing time out in several platforms
  * @library ../lib
+ * @modules java.desktop
+ *          jdk.compiler/com.sun.tools.javac.code
+ *          jdk.compiler/com.sun.tools.javac.tree
+ *          jdk.compiler/com.sun.tools.javac.util
  * @build JavacTestingAbstractThreadedTest
  * @run main/othervm CheckAttributedTree -q -r -et ERRONEOUS .
  */
--- a/langtools/test/tools/javac/fatalErrors/NoJavaLangTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/fatalErrors/NoJavaLangTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,9 @@
  * @bug 4263768 4785453
  * @summary Verify that the compiler does not crash when java.lang is not
  * @library /tools/lib
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.main
  * @build ToolBox
  * @run main NoJavaLangTest
  */
--- a/langtools/test/tools/javac/file/BootClassPathPrepend.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/file/BootClassPathPrepend.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,9 @@
  * @bug 8067445
  * @summary Verify that file.Locations analyze sun.boot.class.path for BCP prepends/appends
  * @library /tools/lib
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.main
  */
 
 import java.io.IOException;
@@ -73,4 +76,4 @@
             throw new AssertionError("Cannot find class that was prepended on BCP");
         }
     }
-}
\ No newline at end of file
+}
--- a/langtools/test/tools/javac/file/ExplodedImage.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/file/ExplodedImage.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -49,6 +49,10 @@
  * @summary Verify that compiling against the exploded JDK image works, and that Locations close
  *          the directory streams properly when working with exploded JDK image.
  * @library /tools/lib
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.code
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.main
  * @build ToolBox ExplodedImage
  * @run main ExplodedImage
  */
--- a/langtools/test/tools/javac/file/T7018098.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/file/T7018098.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,9 @@
  * @bug 7018098
  * @summary CacheFSInfo persists too long
  * @library /tools/javac/lib
+ * @modules jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.processing
+ *          jdk.compiler/com.sun.tools.javac.util
  * @build JavacTestingAbstractProcessor T7018098
  * @run main T7018098
  */
--- a/langtools/test/tools/javac/file/T7068437.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/file/T7068437.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,8 @@
  * @test
  * @bug 7068437
  * @summary Filer.getResource(SOURCE_OUTPUT, ...) no longer works in JDK 7 w/o -s
+ * @modules java.compiler
+ *          jdk.compiler
  */
 
 import java.io.FileNotFoundException;
--- a/langtools/test/tools/javac/file/T7068451.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/file/T7068451.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,8 @@
  * @bug 7068451
  * @summary Regression: javac compiles fixed sources against previous,
  *              not current, version of generated sources
+ * @modules java.compiler
+ *          jdk.compiler
  */
 
 import java.io.File;
--- a/langtools/test/tools/javac/file/zip/8003512/LoadClassFromJava6CreatedJarTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/file/zip/8003512/LoadClassFromJava6CreatedJarTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (c) 2002, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,8 @@
  * @test
  * @bug 8003512
  * @summary javac doesn't work with jar files with >64k entries
+ * @modules jdk.compiler
+ *          jdk.jartool/sun.tools.jar
  * @compile -target 6 -source 6 -XDignore.symbol.file LoadClassFromJava6CreatedJarTest.java ../Utils.java
  * @run main/timeout=360 LoadClassFromJava6CreatedJarTest
  */
--- a/langtools/test/tools/javac/file/zip/T6836682.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/file/zip/T6836682.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,8 @@
  * @test
  * @bug 6836682 7025988
  * @summary JavacFileManager handling of zip64 archives (Scenario A and B)
+ * @modules jdk.compiler
+ *          jdk.jartool/sun.tools.jar
  * @compile  -XDignore.symbol.file T6836682.java Utils.java
  * @run main T6836682
  */
--- a/langtools/test/tools/javac/file/zip/T6865530.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/file/zip/T6865530.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,8 @@
  * @test
  * @bug 6865530
  * @summary ensure JavacFileManager handles non-standard zipfiles.
+ * @modules jdk.compiler
+ *          jdk.jartool/sun.tools.jar
  * @compile  -XDignore.symbol.file T6865530.java
  * @run main T6865530
  */
--- a/langtools/test/tools/javac/flow/LVTHarness.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/flow/LVTHarness.java	Thu May 21 11:41:04 2015 -0700
@@ -28,6 +28,7 @@
  *          javac crash while creating LVT entry for a local variable defined in
  *          an inner block
  * @library /tools/javac/lib
+ * @modules jdk.compiler/com.sun.tools.classfile
  * @build JavacTestingAbstractProcessor LVTHarness
  * @run main LVTHarness
  */
--- a/langtools/test/tools/javac/generics/6413682/TestPos.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/generics/6413682/TestPos.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
  * @bug     6413682
  * @summary Compiler confused about implicit type args and arrays
  * @author  Peter von der Ah\u00e9
+ * @modules jdk.compiler
  */
 
 import com.sun.source.tree.CompilationUnitTree;
--- a/langtools/test/tools/javac/generics/bridges/BridgeHarness.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/generics/bridges/BridgeHarness.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,9 @@
  * @bug 8013789
  * @summary Compiler should emit bridges in interfaces
  * @library /tools/javac/lib
+ * @modules jdk.compiler/com.sun.tools.classfile
+ *          jdk.compiler/com.sun.tools.javac.code
+ *          jdk.compiler/com.sun.tools.javac.util
  * @build JavacTestingAbstractProcessor BridgeHarness
  * @run main BridgeHarness
  */
--- a/langtools/test/tools/javac/generics/diamond/6996914/T6996914a.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/generics/diamond/6996914/T6996914a.java	Thu May 21 11:41:04 2015 -0700
@@ -25,6 +25,7 @@
  * @test
  * @bug 6996914 7020044 8062373
  * @summary  Diamond inference: problem when accessing protected constructor
+ * @modules jdk.compiler
  * @run main T6996914a
  */
 
--- a/langtools/test/tools/javac/generics/diamond/7030150/GenericConstructorAndDiamondTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/generics/diamond/7030150/GenericConstructorAndDiamondTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test
  * @bug 7030150 7039931
  * @summary Type inference for generic instance creation failed for formal type parameter
+ * @modules jdk.compiler
  */
 
 import com.sun.source.util.JavacTask;
--- a/langtools/test/tools/javac/generics/diamond/7030687/ParserTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/generics/diamond/7030687/ParserTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test
  * @bug 7030687
  * @summary Diamond: compiler accepts erroneous code where diamond is used with non-generic inner class
+ * @modules jdk.compiler
  */
 
 import com.sun.source.util.JavacTask;
--- a/langtools/test/tools/javac/generics/diamond/7046778/DiamondAndInnerClassTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/generics/diamond/7046778/DiamondAndInnerClassTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
  * @summary Project Coin: problem with diamond and member inner classes
  *  temporarily workaround combo tests are causing time out in several platforms
  * @library ../../../lib
+ * @modules jdk.compiler
  * @build JavacTestingAbstractThreadedTest
  * @run main/othervm DiamondAndInnerClassTest
  */
--- a/langtools/test/tools/javac/generics/inference/7086601/T7086601b.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/generics/inference/7086601/T7086601b.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test
  * @bug 7086601
  * @summary Error message bug: cause for method mismatch is 'null'
+ * @modules jdk.compiler
  */
 
 import com.sun.source.util.JavacTask;
--- a/langtools/test/tools/javac/generics/rawOverride/7062745/GenericOverrideTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/generics/rawOverride/7062745/GenericOverrideTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,7 @@
  *  are maximally specific
  *  temporarily workaround combo tests are causing time out in several platforms
  * @library ../../../lib
+ * @modules jdk.compiler
  * @build JavacTestingAbstractThreadedTest
  * @run main/othervm GenericOverrideTest
  */
--- a/langtools/test/tools/javac/importscope/ImportDependenciesTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/importscope/ImportDependenciesTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,9 @@
  * @bug 8065360
  * @summary The test checks dependencies through type parameters and implements/extends statements.
  * @library /tools/lib
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.main
  * @build ToolBox ImportDependenciesTest
  * @run main ImportDependenciesTest
  */
--- a/langtools/test/tools/javac/importscope/ImportMembersTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/importscope/ImportMembersTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,9 @@
  * @bug 8065360
  * @summary The test checks possibility of class members to be imported.
  * @library /tools/lib
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.main
  * @build ToolBox ImportMembersTest
  * @run main ImportMembersTest
  */
--- a/langtools/test/tools/javac/importscope/NegativeCyclicDependencyTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/importscope/NegativeCyclicDependencyTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,9 @@
  * @bug 8064794
  * @summary The negative test against cyclic dependencies.
  * @library /tools/lib
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.main
  * @build ToolBox NegativeCyclicDependencyTest
  * @run main NegativeCyclicDependencyTest
  */
--- a/langtools/test/tools/javac/importscope/TestDuplicateImport.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/importscope/TestDuplicateImport.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011-2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test
  * @bug 7101822
  * @summary static import fails to resolve interfaces on nested enums via import statements
+ * @modules jdk.compiler
  */
 
 import com.sun.source.util.JavacTask;
--- a/langtools/test/tools/javac/importscope/TestLazyImportScope.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/importscope/TestLazyImportScope.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011-2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test
  * @bug 7101822
  * @summary static import fails to resolve interfaces on nested enums via import statements
+ * @modules jdk.compiler
  */
 
 import com.sun.source.util.JavacTask;
--- a/langtools/test/tools/javac/importscope/dependencies/DependenciesTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/importscope/dependencies/DependenciesTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,11 @@
  * @bug 7101822
  * @summary Verify that the processing of classes in TypeEnter runs in the correct order.
  * @library /tools/lib
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.code
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.tree
+ *          jdk.compiler/com.sun.tools.javac.util
  * @build annotations.TriggersComplete annotations.TriggersCompleteRepeat annotations.Phase
  * @build DependenciesTest
  * @run main DependenciesTest
--- a/langtools/test/tools/javac/innerClassFile/InnerClassFileTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/innerClassFile/InnerClassFileTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,9 @@
  * @bug 4491755 4785453
  * @summary Prob w/static inner class with same name as a regular class
  * @library /tools/lib
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.main
  * @build ToolBox
  * @run main InnerClassFileTest
  */
--- a/langtools/test/tools/javac/javazip/JavaZipTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/javazip/JavaZipTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,9 @@
  * @bug 4098712 6304984 6388453
  * @summary check that source files inside zip files on the class path are ignored
  * @library /tools/lib
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.main
  * @build ToolBox
  * @run main JavaZipTest
  */
--- a/langtools/test/tools/javac/jvm/ClassRefDupInConstantPoolTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/jvm/ClassRefDupInConstantPoolTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test
  * @bug 8015927
  * @summary Class reference duplicates in constant pool
+ * @modules jdk.compiler/com.sun.tools.classfile
  * @clean ClassRefDupInConstantPoolTest$Duplicates.class
  * @run main ClassRefDupInConstantPoolTest
  */
--- a/langtools/test/tools/javac/lambda/BadLambdaExpr.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/lambda/BadLambdaExpr.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
  * @bug 8003280
  * @summary Add lambda tests
  *  compile crashes on partial lambda expressions
+ * @modules jdk.compiler
  */
 
 import com.sun.source.util.JavacTask;
--- a/langtools/test/tools/javac/lambda/ByteCodeTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/lambda/ByteCodeTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
  * @bug     8011738
  * @author  sogoel
  * @summary Code translation test for Lambda expressions, method references
+ * @modules jdk.compiler/com.sun.tools.classfile
  * @run main ByteCodeTest
  */
 
--- a/langtools/test/tools/javac/lambda/FunctionalInterfaceConversionTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/lambda/FunctionalInterfaceConversionTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,6 +29,7 @@
  *  temporarily workaround combo tests are causing time out in several platforms
  * @author  Maurizio Cimadamore
  * @library ../lib
+ * @modules jdk.compiler
  * @build JavacTestingAbstractThreadedTest
  * @run main/timeout=600/othervm FunctionalInterfaceConversionTest
  */
--- a/langtools/test/tools/javac/lambda/LambdaInnerTypeVarReflect.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/lambda/LambdaInnerTypeVarReflect.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
  * @bug 8005653
  * @summary A lambda containing an inner class referencing an external type var
  * @author  Robert Field
+ * @modules jdk.compiler
  * @run main LambdaInnerTypeVarReflect
  */
 
--- a/langtools/test/tools/javac/lambda/LambdaParserTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/lambda/LambdaParserTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,7 @@
  *  Add parser support for lambda expressions
  *  temporarily workaround combo tests are causing time out in several platforms
  * @library ../lib
+ * @modules jdk.compiler
  * @build JavacTestingAbstractThreadedTest
  * @run main/othervm LambdaParserTest
  */
--- a/langtools/test/tools/javac/lambda/LambdaTestStrictFPFlag.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/lambda/LambdaTestStrictFPFlag.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test
  * @bug 8046060
  * @summary Different results of floating point multiplication for lambda code block
+ * @modules jdk.compiler/com.sun.tools.classfile
  */
 
 import java.io.*;
--- a/langtools/test/tools/javac/lambda/LocalVariableTable.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/lambda/LocalVariableTable.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test
  * @bug 8025998 8026749 8054220 8058227
  * @summary Missing LV table in lambda bodies
+ * @modules jdk.compiler/com.sun.tools.classfile
  * @compile -g LocalVariableTable.java
  * @run main LocalVariableTable
  */
--- a/langtools/test/tools/javac/lambda/MethodReferenceParserTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/lambda/MethodReferenceParserTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,7 @@
  *  Add parser support for method references
  *  temporarily workaround combo tests are causing time out in several platforms
  * @library ../lib
+ * @modules jdk.compiler
  * @build JavacTestingAbstractThreadedTest
  * @run main/othervm MethodReferenceParserTest
  */
--- a/langtools/test/tools/javac/lambda/T8031967.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/lambda/T8031967.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
  * @bug 8031967
  * @summary Ensure javac can handle very deeply nested chain of method invocations occurring as
  *          a parameter to other method invocations.
+ * @modules jdk.compiler
  * @run main T8031967
  */
 
--- a/langtools/test/tools/javac/lambda/TestInvokeDynamic.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/lambda/TestInvokeDynamic.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,12 @@
  *  Add back-end support for invokedynamic
  *  temporarily workaround combo tests are causing time out in several platforms
  * @library ../lib
+ * @modules jdk.compiler/com.sun.tools.classfile
+ *          jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.code
+ *          jdk.compiler/com.sun.tools.javac.jvm
+ *          jdk.compiler/com.sun.tools.javac.tree
+ *          jdk.compiler/com.sun.tools.javac.util
  * @build JavacTestingAbstractThreadedTest
  * @run main/othervm TestInvokeDynamic
  */
--- a/langtools/test/tools/javac/lambda/TestLambdaToMethodStats.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/lambda/TestLambdaToMethodStats.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,8 @@
  * @bug 8013576
  * @summary Add stat support to LambdaToMethod
  * @library ../lib
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.util
  * @build JavacTestingAbstractThreadedTest
  * @run main/othervm TestLambdaToMethodStats
  */
--- a/langtools/test/tools/javac/lambda/TestSelfRef.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/lambda/TestSelfRef.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
  * @summary Add lambda tests
  *  Check that self/forward references from lambda expressions behave
  *          consistently w.r.t. local inner classes
+ * @modules jdk.compiler
  */
 
 import java.net.URI;
--- a/langtools/test/tools/javac/lambda/abort/Abort.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/lambda/abort/Abort.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
  * @bug 8003280
  * @summary Add lambda tests
  *  check that all diagnostics are dumped to output when compiler exits abruptly
+ * @modules jdk.compiler
  */
 
 import com.sun.source.util.JavacTask;
--- a/langtools/test/tools/javac/lambda/abort/CompletionFailure.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/lambda/abort/CompletionFailure.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test
  * @bug 8009227
  * @summary Certain diagnostics should not be deferred
+ * @modules jdk.compiler
  */
 
 import com.sun.source.util.JavacTask;
--- a/langtools/test/tools/javac/lambda/bridge/TestMetafactoryBridges.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/lambda/bridge/TestMetafactoryBridges.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,8 @@
  * @test
  * @bug 8013789
  * @summary Compiler should emit bridges in interfaces
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.util
  */
 
 import com.sun.source.util.JavacTask;
--- a/langtools/test/tools/javac/lambda/bytecode/TestLambdaBytecode.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/lambda/bytecode/TestLambdaBytecode.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,8 @@
  * @bug 8009649
  * @summary Lambda back-end should generate invokespecial for method handles referring to private instance methods
  * @library ../../lib
+ * @modules jdk.compiler/com.sun.tools.classfile
+ *          jdk.compiler/com.sun.tools.javac.api
  * @build JavacTestingAbstractThreadedTest
  * @run main/othervm TestLambdaBytecode
  */
--- a/langtools/test/tools/javac/lambda/funcInterfaces/LambdaTest2_SAM1.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/lambda/funcInterfaces/LambdaTest2_SAM1.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
  * @bug 8003280
  * @summary Add lambda tests
  *   This test is for identifying SAM types 2 and 3, see Helper.java for SAM types
+ * @modules java.sql
  * @compile LambdaTest2_SAM1.java Helper.java
  * @run main LambdaTest2_SAM1
  */
--- a/langtools/test/tools/javac/lambda/funcInterfaces/LambdaTest2_SAM2.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/lambda/funcInterfaces/LambdaTest2_SAM2.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
  * @bug 8003280
  * @summary Add lambda tests
  *   This test is for identifying SAM types #4, see Helper.java for SAM types
+ * @modules java.sql
  * @compile LambdaTest2_SAM2.java Helper.java
  * @run main LambdaTest2_SAM2
  */
--- a/langtools/test/tools/javac/lambda/funcInterfaces/LambdaTest2_SAM3.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/lambda/funcInterfaces/LambdaTest2_SAM3.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
  * @summary Add lambda tests
  *   This test is for identifying SAM types #5 and instantiating non-SAM types #7 through inner class,
              see Helper.java for SAM types
+ * @modules java.sql
  * @compile LambdaTest2_SAM3.java Helper.java
  * @run main LambdaTest2_SAM3
  */
--- a/langtools/test/tools/javac/lambda/intersection/IntersectionTargetTypeTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/lambda/intersection/IntersectionTargetTypeTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test
  * @bug 8002099 8010822
  * @summary Add support for intersection types in cast expression
+ * @modules jdk.compiler/com.sun.tools.javac.util
  */
 
 import com.sun.source.util.JavacTask;
--- a/langtools/test/tools/javac/lambda/lambdaExpression/SamConversionComboTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/lambda/lambdaExpression/SamConversionComboTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,7 @@
  *   Test SAM conversion of lambda expressions in combinations of different contexts,
  *           lambda body types(statement/expression), explict/implicit target type etc, to verify
  *           SAM conversion being conducted successfully as expected.
+ * @modules jdk.compiler
  */
 
 import com.sun.source.util.JavacTask;
--- a/langtools/test/tools/javac/lambda/lambdaNaming/TestNonSerializableLambdaNameStability.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/lambda/lambdaNaming/TestNonSerializableLambdaNameStability.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,10 @@
  * @bug 8067422
  * @summary Check that the lambda names are not unnecessarily unstable
  * @library /tools/lib
+ * @modules jdk.compiler/com.sun.tools.classfile
+ *          jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.main
  * @build ToolBox
  * @run main TestNonSerializableLambdaNameStability
  */
--- a/langtools/test/tools/javac/lambda/lambdaNaming/TestSerializedLambdaNameStability.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/lambda/lambdaNaming/TestSerializedLambdaNameStability.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,9 @@
  * @bug 8023668
  * @summary Desugar serializable lambda bodies using more robust naming scheme
  * @library /tools/lib
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.main
  * @build ToolBox
  * @run main TestSerializedLambdaNameStability
  */
--- a/langtools/test/tools/javac/lambda/methodReference/SamConversionComboTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/lambda/methodReference/SamConversionComboTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,7 @@
  *   Test SAM conversion of method references in combinations of different contexts,
  *           lambda body types(statement/expression), boxing/unboxing etc, to verify
  *           SAM conversion being conducted successfully as expected.
+ * @modules jdk.compiler
  */
 
 import com.sun.source.util.JavacTask;
--- a/langtools/test/tools/javac/lambda/mostSpecific/StructuralMostSpecificTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/lambda/mostSpecific/StructuralMostSpecificTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,8 @@
  *  Automatic test for checking correctness of structural most specific test routine
  *  temporarily workaround combo tests are causing time out in several platforms
  * @library ../../lib
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.util
  * @build JavacTestingAbstractThreadedTest
  * @run main/othervm/timeout=600 StructuralMostSpecificTest
  */
--- a/langtools/test/tools/javac/lambda/typeInference/combo/TypeInferenceComboTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/lambda/typeInference/combo/TypeInferenceComboTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,6 +29,7 @@
  *  in different contexts
  *  temporarily workaround combo tests are causing time out in several platforms
  * @library ../../../lib
+ * @modules jdk.compiler
  * @build JavacTestingAbstractThreadedTest
  * @compile  TypeInferenceComboTest.java
  * @run main/othervm/timeout=360 TypeInferenceComboTest
--- a/langtools/test/tools/javac/lib/DPrinter.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/lib/DPrinter.java	Thu May 21 11:41:04 2015 -0700
@@ -24,6 +24,10 @@
 /* @test
  * @bug 8043484 8007307
  * @summary Make sure DPrinter.java compiles
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.code
+ *          jdk.compiler/com.sun.tools.javac.tree
+ *          jdk.compiler/com.sun.tools.javac.util
  * @compile DPrinter.java
  */
 
--- a/langtools/test/tools/javac/limits/NestedClassConstructorArgs.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/limits/NestedClassConstructorArgs.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,8 @@
  * @test
  * @bug 8014230
  * @summary Compiler silently generates bytecode that exceeds VM limits
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
  * @compile NumArgsTest.java
  * @run main NestedClassConstructorArgs
  */
--- a/langtools/test/tools/javac/limits/NestedClassMethodArgs.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/limits/NestedClassMethodArgs.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,8 @@
  * @test
  * @bug 8014230
  * @summary Compiler silently generates bytecode that exceeds VM limits
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
  * @compile NumArgsTest.java
  * @run main NestedClassMethodArgs
  */
--- a/langtools/test/tools/javac/limits/StaticNestedClassConstructorArgs.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/limits/StaticNestedClassConstructorArgs.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,8 @@
  * @test
  * @bug 8014230
  * @summary Compiler silently generates bytecode that exceeds VM limits
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
  * @compile NumArgsTest.java
  * @run main StaticNestedClassConstructorArgs
  */
--- a/langtools/test/tools/javac/limits/TopLevelClassConstructorArgs.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/limits/TopLevelClassConstructorArgs.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,8 @@
  * @test
  * @bug 4309152
  * @summary Compiler silently generates bytecode that exceeds VM limits
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
  * @compile NumArgsTest.java
  * @run main TopLevelClassConstructorArgs
  */
--- a/langtools/test/tools/javac/limits/TopLevelClassMethodArgs.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/limits/TopLevelClassMethodArgs.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,8 @@
  * @test
  * @bug 4309152
  * @summary Compiler silently generates bytecode that exceeds VM limits
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
  * @compile NumArgsTest.java
  * @run main TopLevelClassMethodArgs
  */
--- a/langtools/test/tools/javac/limits/TopLevelClassStaticMethodArgs.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/limits/TopLevelClassStaticMethodArgs.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,8 @@
  * @test
  * @bug 4309152
  * @summary Compiler silently generates bytecode that exceeds VM limits
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
  * @compile NumArgsTest.java
  * @run main TopLevelClassStaticMethodArgs
  */
--- a/langtools/test/tools/javac/linenumbers/ConditionalLineNumberTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/linenumbers/ConditionalLineNumberTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test
  * @bug 8034091
  * @summary Add LineNumberTable attributes for conditional operator (?:) split across several lines.
+ * @modules jdk.compiler/com.sun.tools.classfile
  */
 
 import com.sun.tools.classfile.ClassFile;
--- a/langtools/test/tools/javac/linenumbers/NestedLineNumberTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/linenumbers/NestedLineNumberTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
  * @test
  * @bug 8061778
  * @summary  Wrong LineNumberTable for default constructors
+ * @modules jdk.compiler/com.sun.tools.classfile
  */
 
 import com.sun.tools.classfile.ClassFile;
@@ -49,8 +50,8 @@
         }
 
         int line = lines[0].line_number;
-        if (line != 78) {
-            error(String.format("LineNumberTable contains wrong line number - expected %d, found %d", 78, line));
+        if (line != 79) {
+            error(String.format("LineNumberTable contains wrong line number - expected %d, found %d", 79, line));
         }
     }
 
--- a/langtools/test/tools/javac/links/LinksTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/links/LinksTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,9 @@
  * @bug 4266026
  * @summary javac no longer follows symlinks
  * @library /tools/lib
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.main
  * @build ToolBox
  * @run main LinksTest
  */
--- a/langtools/test/tools/javac/main/Option_J_At_Test.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/main/Option_J_At_Test.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test
  * @bug 8006037
  * @summary extra space in javac -help for -J and @ options
+ * @modules jdk.compiler
  */
 
 import java.io.PrintWriter;
--- a/langtools/test/tools/javac/main/T8058445.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/main/T8058445.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test
  * @bug 8058445
  * @summary javac throws exception when displaying info
+ * @modules jdk.compiler
  */
 
 public class T8058445 {
--- a/langtools/test/tools/javac/meth/TestCP.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/meth/TestCP.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test
  * @bug 6991980
  * @summary  polymorphic signature calls don't share the same CP entries
+ * @modules jdk.compiler/com.sun.tools.classfile
  * @run main TestCP
  */
 
--- a/langtools/test/tools/javac/multicatch/7005371/T7005371.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/multicatch/7005371/T7005371.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test
  * @bug 7005371
  * @summary  Multicatch: assertion error while generating LocalVariableTypeTable attribute
+ * @modules jdk.compiler/com.sun.tools.classfile
  * @compile -g SubTest.java
  * @run main T7005371
  */
--- a/langtools/test/tools/javac/multicatch/7030606/DisjunctiveTypeWellFormednessTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/multicatch/7030606/DisjunctiveTypeWellFormednessTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
  * @summary Project-coin: multi-catch types should be pairwise disjoint
  *  temporarily workaround combo tests are causing time out in several platforms
  * @library ../../lib
+ * @modules jdk.compiler
  * @build JavacTestingAbstractThreadedTest
  * @run main/othervm DisjunctiveTypeWellFormednessTest
  */
--- a/langtools/test/tools/javac/multicatch/Pos05.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/multicatch/Pos05.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test
  * @bug 6943289
  * @summary  Project Coin: Improved Exception Handling for Java (aka 'multicatch')
+ * @modules jdk.compiler/com.sun.tools.classfile
  * @run main Pos05
  */
 
--- a/langtools/test/tools/javac/multicatch/model/ModelChecker.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/multicatch/model/ModelChecker.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
  * @bug 6993963 7025809
  * @summary Project Coin: Use precise exception analysis for effectively final catch parameters
  * @library /tools/javac/lib
+ * @modules jdk.compiler
  * @build JavacTestingAbstractProcessor ModelChecker
  * @compile -processor ModelChecker Model01.java
  */
--- a/langtools/test/tools/javac/nativeHeaders/NativeHeaderTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/nativeHeaders/NativeHeaderTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,8 @@
  * @test
  * @bug 7150368 8003412 8000407
  * @summary javac should include basic ability to generate native headers
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
  */
 
 import java.io.File;
--- a/langtools/test/tools/javac/nativeHeaders/javahComparison/CompareTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/nativeHeaders/javahComparison/CompareTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test
  * @bug 7150368 8003412 8000407 8031545
  * @summary javac should include basic ability to generate native headers
+ * @modules jdk.compiler
  */
 
 import java.io.File;
--- a/langtools/test/tools/javac/newlines/NewLineTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/newlines/NewLineTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,9 @@
  * @bug 4110560 4785453
  * @summary portability : javac.properties
  * @library /tools/lib
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.main
  * @build ToolBox
  * @run main NewLineTest
  */
--- a/langtools/test/tools/javac/options/T6986895.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/options/T6986895.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test
  * @bug 6986895
  * @summary compiler gives misleading message for no input files
+ * @modules jdk.compiler
  */
 
 import java.io.*;
--- a/langtools/test/tools/javac/options/T7022337.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/options/T7022337.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
  * @bug 7022337
  * @summary repeated warnings about bootclasspath not set
  * @library /tools/javac/lib
+ * @modules jdk.compiler
  * @build JavacTestingAbstractProcessor T7022337
  * @run main T7022337
  */
--- a/langtools/test/tools/javac/options/modes/AtFilesTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/options/modes/AtFilesTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,10 @@
  * @test
  * @bug 8044859
  * @summary test support for at-files
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.main
+ *          jdk.compiler/com.sun.tools.javac.util
  * @build Tester
  * @run main AtFilesTest
  */
--- a/langtools/test/tools/javac/options/modes/DocLintTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/options/modes/DocLintTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,10 @@
  * @test
  * @bug 8044859
  * @summary test support for -Xdoclint
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.main
+ *          jdk.compiler/com.sun.tools.javac.util
  * @build Tester
  * @run main DocLintTest
  */
--- a/langtools/test/tools/javac/options/modes/FSInfoTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/options/modes/FSInfoTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,10 @@
  * @test
  * @bug 8044859
  * @summary test support for the internal file system cache
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.main
+ *          jdk.compiler/com.sun.tools.javac.util
  * @build Tester
  * @run main FSInfoTest
  */
--- a/langtools/test/tools/javac/options/modes/InfoOptsTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/options/modes/InfoOptsTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,10 @@
  * @test
  * @bug 8044859
  * @summary test support for info options -help -X -version -fullversion
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.main
+ *          jdk.compiler/com.sun.tools.javac.util
  * @build Tester
  * @run main InfoOptsTest
  */
--- a/langtools/test/tools/javac/options/modes/NoOperandsTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/options/modes/NoOperandsTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,10 @@
  * @test
  * @bug 8044859
  * @summary test support no operands being specified
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.main
+ *          jdk.compiler/com.sun.tools.javac.util
  * @build Tester
  * @run main NoOperandsTest
  */
--- a/langtools/test/tools/javac/options/modes/OutputDirTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/options/modes/OutputDirTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,10 @@
  * @test
  * @bug 8044859
  * @summary test support for output directory options  -d  and -s
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.main
+ *          jdk.compiler/com.sun.tools.javac.util
  * @build Tester
  * @run main OutputDirTest
  */
--- a/langtools/test/tools/javac/options/modes/ProfileBootClassPathTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/options/modes/ProfileBootClassPathTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,10 @@
  * @test
  * @bug 8044859
  * @summary test support for checking -profile and -bootclasspath
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.main
+ *          jdk.compiler/com.sun.tools.javac.util
  * @build Tester
  * @run main ProfileBootClassPathTest
  */
--- a/langtools/test/tools/javac/options/modes/ProfileTargetTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/options/modes/ProfileTargetTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,10 @@
  * @test
  * @bug 8044859
  * @summary test support for checking -profile and -target
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.main
+ *          jdk.compiler/com.sun.tools.javac.util
  * @build Tester
  * @run main ProfileTargetTest
  */
--- a/langtools/test/tools/javac/options/modes/SourceTargetTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/options/modes/SourceTargetTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,10 @@
  * @test
  * @bug 8044859
  * @summary test support for -source and -target checks
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.main
+ *          jdk.compiler/com.sun.tools.javac.util
  * @build Tester
  * @run main SourceTargetTest
  */
--- a/langtools/test/tools/javac/options/modes/StdOutTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/options/modes/StdOutTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,10 @@
  * @test
  * @bug 8044859
  * @summary test support for  -Xstdout file  and  -XDstdout
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.main
+ *          jdk.compiler/com.sun.tools.javac.util
  * @build Tester
  * @run main StdOutTest
  */
--- a/langtools/test/tools/javac/options/xprefer/XPreferTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/options/xprefer/XPreferTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
  * @summary Tests which path is used to represent an implicit type given
  * various xprefer arguments and multiple .class / .java files involved.
  * @bug 8028196
+ * @modules jdk.compiler
  */
 
 import java.io.File;
--- a/langtools/test/tools/javac/parser/ExtraSemiTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/parser/ExtraSemiTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test
  * @bug 6921495
  * @summary spurious semicolons in class def cause empty NOPOS blocks
+ * @modules jdk.compiler
  */
 
 import java.io.*;
--- a/langtools/test/tools/javac/parser/JavacParserTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/parser/JavacParserTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,9 @@
  * @bug 7073631 7159445 7156633 8028235 8065753
  * @summary tests error and diagnostics positions
  * @author  Jan Lahoda
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.main
+ *          jdk.compiler/com.sun.tools.javac.tree
  */
 
 import com.sun.source.tree.BinaryTree;
--- a/langtools/test/tools/javac/parser/StringFoldingTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/parser/StringFoldingTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test
  * @bug 7068902
  * @summary verify that string folding can be enabled or disabled
+ * @modules jdk.compiler
  */
 
 import com.sun.source.tree.CompilationUnitTree;
--- a/langtools/test/tools/javac/parser/T4910483.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/parser/T4910483.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,10 @@
  * @test
  * @bug     4910483
  * @summary Javadoc renders the string ".*\\.pdf" as ".\*\.pdf"
+ * @modules jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.main
+ *          jdk.compiler/com.sun.tools.javac.tree
+ *          jdk.compiler/com.sun.tools.javac.util
  * @run main T4910483
  */
 
--- a/langtools/test/tools/javac/parser/extend/JavacExtensionTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/parser/extend/JavacExtensionTest.java	Thu May 21 11:41:04 2015 -0700
@@ -51,6 +51,11 @@
  * @test
  * @bug 8067384 8068488
  * @summary Verify that JavacParser can be extended
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.code
+ *          jdk.compiler/com.sun.tools.javac.parser
+ *          jdk.compiler/com.sun.tools.javac.tree
+ *          jdk.compiler/com.sun.tools.javac.util
  */
 public class JavacExtensionTest {
 
--- a/langtools/test/tools/javac/plugin/showtype/Test.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/plugin/showtype/Test.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,9 @@
  *  @test
  *  @bug 8001098 8004961 8004082
  *  @library /tools/lib
+ *  @modules jdk.compiler/com.sun.tools.javac.api
+ *           jdk.compiler/com.sun.tools.javac.file
+ *           jdk.compiler/com.sun.tools.javac.main
  *  @build ToolBox
  *  @run main Test
  *  @summary Provide a simple light-weight "plug-in" mechanism for javac
--- a/langtools/test/tools/javac/policy/test1/Test1b.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/policy/test1/Test1b.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,6 +24,7 @@
 /*
  * @test 6420151
  * @summary Compile a group of files and validate the set of class files produced
+ * @modules jdk.compiler
  * @run main Test1b -XDcompilePolicy=byfile A.java B.java D.java
  */
 
--- a/langtools/test/tools/javac/policy/test3/Test.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/policy/test3/Test.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
 /* @test
  * @bug 6813059
  * @summary
+ * @modules jdk.compiler
  */
 
 import java.io.*;
--- a/langtools/test/tools/javac/positions/T6402077.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/positions/T6402077.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
  * @bug     6402077
  * @summary Start position is wrong for package private constructors
  * @author  Peter von der Ah\u00e9
+ * @modules jdk.compiler
  */
 
 import com.sun.source.tree.ClassTree;
--- a/langtools/test/tools/javac/positions/T6404194.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/positions/T6404194.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
  * @bug     6404194
  * @summary javac parser generates incorrect end position for annotations with parentheses.
  * @author  Peter von der Ah\u00e9
+ * @modules jdk.compiler
  */
 
 import com.sun.source.tree.ClassTree;
--- a/langtools/test/tools/javac/positions/TreeEndPosTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/positions/TreeEndPosTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,8 @@
  * @test
  * @bug 8017216 8019422 8019421 8054956
  * @summary verify start and end positions
+ * @modules java.compiler
+ *          jdk.compiler
  * @run main TreeEndPosTest
  */
 
--- a/langtools/test/tools/javac/processing/6348193/T6348193.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/processing/6348193/T6348193.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,8 @@
  * @test
  * @bug 6348193
  * @summary AS8.1 UR2 BAT test failure with "javac"
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
  * @compile -proc:none T6348193.java
  * @run main/othervm T6348193
  */
--- a/langtools/test/tools/javac/processing/6348499/T6348499.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/processing/6348499/T6348499.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,8 @@
  * @bug 6441871
  * @summary javac crashes at com.sun.tools.javac.jvm.ClassReader$BadClassFile
  * @library /tools/javac/lib
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
  * @build JavacTestingAbstractProcessor A
  * @run main T6348499
  */
--- a/langtools/test/tools/javac/processing/6350124/T6350124.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/processing/6350124/T6350124.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,6 +24,8 @@
 /*
  * @test
  * @bug 6350124 6410012
+ * @modules java.compiler
+ *          jdk.compiler
  * @summary javac -s does not have the generated source files
  */
 
--- a/langtools/test/tools/javac/processing/6359313/T6359313.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/processing/6359313/T6359313.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,8 @@
  * @summary error compiling annotated package
  * @author  Peter von der Ah\u00e9
  * @library /tools/javac/lib
+ * @modules java.compiler
+ *          jdk.compiler
  * @build   JavacTestingAbstractProcessor
  * @compile T6359313.java
  * @compile -processor T6359313 package-info.java Foo.java
--- a/langtools/test/tools/javac/processing/6365040/T6365040.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/processing/6365040/T6365040.java	Thu May 21 11:41:04 2015 -0700
@@ -4,6 +4,8 @@
  * @summary Test -processor foo,bar,baz
  * @author  Joseph D. Darcy
  * @library /tools/javac/lib
+ * @modules java.compiler
+ *          jdk.compiler
  * @build   JavacTestingAbstractProcessor
  * @compile ProcFoo.java
  * @compile ProcBar.java
--- a/langtools/test/tools/javac/processing/6378728/T6378728.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/processing/6378728/T6378728.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,8 @@
  * @bug     6378728
  * @summary Verify -proc:only doesn't produce class files
  * @author  Joseph D. Darcy
+ * @modules java.compiler
+ *          jdk.compiler
  * @compile T6378728.java
  * @run main T6378728
  */
--- a/langtools/test/tools/javac/processing/6413690/T6413690.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/processing/6413690/T6413690.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,8 @@
  * @summary JavacProcessingEnvironment does not enter trees from preceding rounds
  * @author  Peter von der Ah\u00e9
  * @library /tools/javac/lib
+ * @modules java.compiler
+ *          jdk.compiler
  * @build   JavacTestingAbstractProcessor
  * @compile T6413690.java
  * @compile -XDfatalEnterError -verbose -processor T6413690 src/Super.java TestMe.java
--- a/langtools/test/tools/javac/processing/6414633/T6414633.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/processing/6414633/T6414633.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,8 @@
  * @bug 6414633 6440109
  * @summary Only the first processor message at a source location is reported
  * @library /tools/javac/lib
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
  * @build    JavacTestingAbstractProcessor A T6414633
  * @run main T6414633
  */
--- a/langtools/test/tools/javac/processing/6430209/T6430209.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/processing/6430209/T6430209.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,8 @@
  * @bug 6441871
  * @summary spurious compiler error elicited by packageElement.getEnclosedElements()
  * @library /tools/javac/lib
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
  * @build JavacTestingAbstractProcessor b6341534
  * @run main T6430209
  */
--- a/langtools/test/tools/javac/processing/6499119/ClassProcessor.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/processing/6499119/ClassProcessor.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -33,6 +33,8 @@
  * @bug 6499119
  * @summary Created package-info class file modeled improperly
  * @library /tools/javac/lib
+ * @modules java.compiler
+ *          jdk.compiler
  * @build   JavacTestingAbstractProcessor
  * @compile ClassProcessor.java package-info.java
  * @compile/process -cp . -processor ClassProcessor -Akind=java  java.lang.Object
--- a/langtools/test/tools/javac/processing/6511613/clss41701.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/processing/6511613/clss41701.java	Thu May 21 11:41:04 2015 -0700
@@ -3,6 +3,8 @@
  * @bug 6511613
  * @summary javac unexpectedly doesn't fail in some cases if an annotation processor specified
  * @library /tools/javac/lib
+ * @modules java.compiler
+ *          jdk.compiler
  * @build JavacTestingAbstractProcessor DummyProcessor
  * @compile/fail/ref=clss41701.out -XDrawDiagnostics clss41701.java
  * @compile/fail/ref=clss41701.out -XDrawDiagnostics -processor DummyProcessor clss41701.java
--- a/langtools/test/tools/javac/processing/6511613/clss41701.out	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/processing/6511613/clss41701.out	Thu May 21 11:41:04 2015 -0700
@@ -1,2 +1,2 @@
-clss41701.java:19:30: compiler.err.type.var.may.not.be.followed.by.other.bounds
+clss41701.java:21:30: compiler.err.type.var.may.not.be.followed.by.other.bounds
 1 error
--- a/langtools/test/tools/javac/processing/6512707/T6512707.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/processing/6512707/T6512707.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,8 @@
  * @summary "incompatible types" after (unrelated) annotation processing
  * @author  Peter Runge
  * @library /tools/javac/lib
+ * @modules java.compiler
+ *          jdk.compiler
  * @build   JavacTestingAbstractProcessor
  * @compile T6512707.java
  * @compile -processor T6512707 TestAnnotation.java
--- a/langtools/test/tools/javac/processing/6634138/T6634138.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/processing/6634138/T6634138.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,8 @@
  * @author  Joseph D. Darcy
  * @summary Verify source files output after processing is over are compiled
  * @library /tools/javac/lib
+ * @modules java.compiler
+ *          jdk.compiler
  * @build   JavacTestingAbstractProcessor
  * @compile T6634138.java
  * @compile -processor T6634138 Dummy.java
--- a/langtools/test/tools/javac/processing/6994946/SemanticErrorTest.1.out	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/processing/6994946/SemanticErrorTest.1.out	Thu May 21 11:41:04 2015 -0700
@@ -1,2 +1,2 @@
-SemanticErrorTest.java:11:46: compiler.err.repeated.interface
+SemanticErrorTest.java:13:46: compiler.err.repeated.interface
 1 error
--- a/langtools/test/tools/javac/processing/6994946/SemanticErrorTest.2.out	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/processing/6994946/SemanticErrorTest.2.out	Thu May 21 11:41:04 2015 -0700
@@ -1,3 +1,3 @@
-SemanticErrorTest.java:11:46: compiler.err.repeated.interface
+SemanticErrorTest.java:13:46: compiler.err.repeated.interface
 - compiler.err.proc.messager: Deliberate Error
-2 errors
\ No newline at end of file
+2 errors
--- a/langtools/test/tools/javac/processing/6994946/SemanticErrorTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/processing/6994946/SemanticErrorTest.java	Thu May 21 11:41:04 2015 -0700
@@ -3,6 +3,8 @@
  * @bug 6994946
  * @summary option to specify only syntax errors as unrecoverable
  * @library /tools/javac/lib
+ * @modules java.compiler
+ *          jdk.compiler
  * @build JavacTestingAbstractProcessor TestProcessor
  * @compile/fail/ref=SemanticErrorTest.1.out -XDrawDiagnostics                                  -processor TestProcessor SemanticErrorTest.java
  * @compile/fail/ref=SemanticErrorTest.2.out -XDrawDiagnostics -XDonlySyntaxErrorsUnrecoverable -processor TestProcessor SemanticErrorTest.java
--- a/langtools/test/tools/javac/processing/6994946/SyntaxErrorTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/processing/6994946/SyntaxErrorTest.java	Thu May 21 11:41:04 2015 -0700
@@ -3,6 +3,8 @@
  * @bug 6994946
  * @summary option to specify only syntax errors as unrecoverable
  * @library /tools/javac/lib
+ * @modules java.compiler
+ *          jdk.compiler
  * @build JavacTestingAbstractProcessor TestProcessor
  * @compile/fail/ref=SyntaxErrorTest.out -XDrawDiagnostics                                  -processor TestProcessor SyntaxErrorTest.java
  * @compile/fail/ref=SyntaxErrorTest.out -XDrawDiagnostics -XDonlySyntaxErrorsUnrecoverable -processor TestProcessor SyntaxErrorTest.java
--- a/langtools/test/tools/javac/processing/6994946/SyntaxErrorTest.out	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/processing/6994946/SyntaxErrorTest.out	Thu May 21 11:41:04 2015 -0700
@@ -1,2 +1,2 @@
-SyntaxErrorTest.java:12:10: compiler.err.expected: ';'
+SyntaxErrorTest.java:14:10: compiler.err.expected: ';'
 1 error
--- a/langtools/test/tools/javac/processing/T6439826.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/processing/T6439826.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,8 @@
  * @test
  * @bug 6439826 6411930 6380018 6392177
  * @summary Exception issuing Diagnostic while processing generated errant code
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
  */
 
 import java.io.*;
--- a/langtools/test/tools/javac/processing/T6920317.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/processing/T6920317.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
  * @bug 6920317
  * @summary package-info.java file has to be specified on the javac cmdline, else it will not be avail
  * @library /tools/javac/lib
+ * @modules jdk.compiler
  */
 
 import java.io.*;
--- a/langtools/test/tools/javac/processing/T7196462.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/processing/T7196462.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
  * @bug 7196462
  * @summary JavacProcessingEnvironment should tolerate BasicJavacTask
  * @library /tools/javac/lib
+ * @modules jdk.compiler
  * @build JavacTestingAbstractProcessor T7196462
  * @compile/process -processor T7196462 T7196462.java
  */
--- a/langtools/test/tools/javac/processing/TestMultipleErrors.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/processing/TestMultipleErrors.java	Thu May 21 11:41:04 2015 -0700
@@ -27,6 +27,7 @@
  * @bug 8066843
  * @summary Annotation processors should be able to print multiple errors at the same location.
  * @library /tools/javac/lib
+ * @modules jdk.compiler
  * @build JavacTestingAbstractProcessor TestMultipleErrors
  * @compile/fail/ref=TestMultipleErrors.out -XDrawDiagnostics -processor TestMultipleErrors TestMultipleErrors.java
  */
--- a/langtools/test/tools/javac/processing/TestMultipleErrors.out	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/processing/TestMultipleErrors.out	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
-TestMultipleErrors.java:41:8: compiler.err.proc.messager: error1
-TestMultipleErrors.java:41:8: compiler.err.proc.messager: error2
-TestMultipleErrors.java:41:8: compiler.err.proc.messager: error3
-TestMultipleErrors.java:41:8: compiler.err.proc.messager: error4
+TestMultipleErrors.java:42:8: compiler.err.proc.messager: error1
+TestMultipleErrors.java:42:8: compiler.err.proc.messager: error2
+TestMultipleErrors.java:42:8: compiler.err.proc.messager: error3
+TestMultipleErrors.java:42:8: compiler.err.proc.messager: error4
 4 errors
--- a/langtools/test/tools/javac/processing/TestWarnErrorCount.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/processing/TestWarnErrorCount.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
  * @bug 7022337
  * @summary repeated warnings about bootclasspath not set
  * @library /tools/javac/lib
+ * @modules jdk.compiler
  * @build JavacTestingAbstractProcessor TestWarnErrorCount
  * @run main TestWarnErrorCount
  */
--- a/langtools/test/tools/javac/processing/completion/TestCompletions.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/processing/completion/TestCompletions.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,8 @@
  * @bug 6341177
  * @summary Some simple tests of the methods in Completions
  * @author Joseph D. Darcy
+ * @modules java.compiler
+ *          jdk.compiler
  */
 import javax.annotation.processing.Completion;
 import static javax.annotation.processing.Completions.*;
--- a/langtools/test/tools/javac/processing/environment/ProcessingEnvAnnoDiscovery.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/processing/environment/ProcessingEnvAnnoDiscovery.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
  * @summary make sure that all declaration annotations are discovered
  *          by the processing environment
  * @library /tools/javac/lib
+ * @modules jdk.compiler/com.sun.tools.javac.util
  * @build JavacTestingAbstractProcessor ProcessingEnvAnnoDiscovery
  * @compile/process -processor ProcessingEnvAnnoDiscovery ProcessingEnvAnnoDiscovery.java
  */
--- a/langtools/test/tools/javac/processing/environment/TestSourceVersion.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/processing/environment/TestSourceVersion.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,8 @@
  * @summary Test that getSourceVersion works properly
  * @author  Joseph D. Darcy
  * @library /tools/javac/lib
+ * @modules java.compiler
+ *          jdk.compiler
  * @build   JavacTestingAbstractProcessor
  * @compile TestSourceVersion.java
  * @compile -processor TestSourceVersion -proc:only -source 1.6 -AExpectedVersion=RELEASE_6 HelloWorld.java
--- a/langtools/test/tools/javac/processing/environment/round/TestContext.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/processing/environment/round/TestContext.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,10 @@
  * @bug 6988836
  * @summary A new JavacElements is created for each round of annotation processing
  * @library /tools/javac/lib
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.model
+ *          jdk.compiler/com.sun.tools.javac.processing
+ *          jdk.compiler/com.sun.tools.javac.util
  * @build JavacTestingAbstractProcessor TestContext
  * @compile/process -processor TestContext -XprintRounds TestContext
  */
--- a/langtools/test/tools/javac/processing/environment/round/TestElementsAnnotatedWith.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/processing/environment/round/TestElementsAnnotatedWith.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,8 @@
  * @summary Tests that getElementsAnnotatedWith works properly.
  * @author  Joseph D. Darcy
  * @library /tools/javac/lib
+ * @modules java.compiler
+ *          jdk.compiler
  * @build   JavacTestingAbstractProcessor
  * @compile TestElementsAnnotatedWith.java
  * @compile InheritedAnnotation.java
--- a/langtools/test/tools/javac/processing/errors/CrashOnNonExistingAnnotation/Source.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/processing/errors/CrashOnNonExistingAnnotation/Source.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,9 @@
  * @test /nodynamiccopyright/
  * @bug 8027310
  * @summary Ensure no exceptions on unresolvable annotations
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.util
  * @build Processor
  * @run main Processor Source.java
  */
--- a/langtools/test/tools/javac/processing/errors/EnsureAnnotationTypeMismatchException/Source.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/processing/errors/EnsureAnnotationTypeMismatchException/Source.java	Thu May 21 11:41:04 2015 -0700
@@ -4,6 +4,7 @@
  * @summary Ensure AnnotationTypeMismatchException is thrown when appropriate
  *          with reasonable foundType filled.
  * @library /tools/javac/lib
+ * @modules jdk.compiler/com.sun.tools.javac.util
  * @build JavacTestingAbstractProcessor Processor
  * @compile/fail/ref=Source.out -XDrawDiagnostics -processor Processor Source.java
  */
--- a/langtools/test/tools/javac/processing/errors/EnsureMirroredTypeException/Source.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/processing/errors/EnsureMirroredTypeException/Source.java	Thu May 21 11:41:04 2015 -0700
@@ -3,6 +3,8 @@
  * @bug 8019243
  * @summary AnnotationTypeMismatchException instead of MirroredTypeException
  * @library /tools/javac/lib
+ * @modules jdk.compiler/com.sun.tools.javac.code
+ *          jdk.compiler/com.sun.tools.javac.util
  * @build JavacTestingAbstractProcessor Processor
  * @compile/fail/ref=Source.out -XDrawDiagnostics -processor Processor Source.java
  */
--- a/langtools/test/tools/javac/processing/errors/EnsureMirroredTypeException/Source.out	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/processing/errors/EnsureMirroredTypeException/Source.out	Thu May 21 11:41:04 2015 -0700
@@ -1,4 +1,4 @@
-Source.java:10:28: compiler.err.doesnt.exist: some.path.to
-Source.java:13:16: compiler.err.cant.resolve: kindname.class, SomeUnknownClass, , 
-Source.java:16:16: compiler.err.cant.resolve: kindname.variable, SomeUnknownClass, , 
+Source.java:12:28: compiler.err.doesnt.exist: some.path.to
+Source.java:15:16: compiler.err.cant.resolve: kindname.class, SomeUnknownClass, , 
+Source.java:18:16: compiler.err.cant.resolve: kindname.variable, SomeUnknownClass, , 
 3 errors
--- a/langtools/test/tools/javac/processing/errors/StopOnInapplicableAnnotations/GenerateFunctionalInterface.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/processing/errors/StopOnInapplicableAnnotations/GenerateFunctionalInterface.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
  * @bug 8014016
  * @summary Ensure that an annotation processor can generate a super-interface
  *          which will make the current interface functional
+ * @modules jdk.compiler/com.sun.tools.javac.util
  * @build GenerateSuperInterfaceProcessor
  * @compile -processor GenerateSuperInterfaceProcessor GenerateFunctionalInterface.java
  */
--- a/langtools/test/tools/javac/processing/errors/StopOnInapplicableAnnotations/Source.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/processing/errors/StopOnInapplicableAnnotations/Source.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,9 @@
  * @test
  * @bug 8014016
  * @summary Verify that annotation processors do not get invalid annotations
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.util
  * @build Processor
  * @run main Processor Source.java
  */
--- a/langtools/test/tools/javac/processing/errors/TestBadProcessor.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/processing/errors/TestBadProcessor.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test
  * @bug 8022163
  * @summary javac exits with 0 status and no messages on error to construct an ann-procesor
+ * @modules jdk.compiler
  */
 
 import java.io.*;
--- a/langtools/test/tools/javac/processing/errors/TestClassNames.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/processing/errors/TestClassNames.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
  * @bug 7071377
  * @summary verify if erroneous class names are rejected
  * @library /tools/javac/lib
+ * @modules jdk.compiler/com.sun.tools.javac.main
  * @build TestClassNames JavacTestingAbstractProcessor CompileFail
  * @run main CompileFail ERROR  -processor TestClassNames TestClassNames.x.y
  * @run main CompileFail ERROR  -processor TestClassNames x.y.TestClassNames
--- a/langtools/test/tools/javac/processing/errors/TestErrorCount.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/processing/errors/TestErrorCount.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,8 @@
  * @bug 6988079
  * @summary Errors reported via Messager.printMessage(ERROR,"error message") are not tallied correctly
  * @library /tools/javac/lib
+ * @modules java.compiler
+ *          jdk.compiler
  * @build JavacTestingAbstractProcessor TestErrorCount
  * @compile/fail/ref=TestErrorCount.out -XDrawDiagnostics -processor TestErrorCount TestErrorCount.java
  */
--- a/langtools/test/tools/javac/processing/errors/TestFatalityOfParseErrors.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/processing/errors/TestFatalityOfParseErrors.java	Thu May 21 11:41:04 2015 -0700
@@ -4,6 +4,8 @@
  * @summary Test that generating programs with syntax errors is a fatal condition
  * @author  Joseph D. Darcy
  * @library /tools/javac/lib
+ * @modules java.compiler
+ *          jdk.compiler
  * @build JavacTestingAbstractProcessor
  * @compile TestReturnCode.java
  * @compile TestFatalityOfParseErrors.java
--- a/langtools/test/tools/javac/processing/errors/TestOptionSyntaxErrors.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/processing/errors/TestOptionSyntaxErrors.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
  * @summary Test that annotation processor options with illegal syntax are rejected
  * @author  Joseph D. Darcy
  * @library /tools/javac/lib
+ * @modules jdk.compiler/com.sun.tools.javac.main
  * @build JavacTestingAbstractProcessor CompileFail
  * @compile TestOptionSyntaxErrors.java
  * @run main CompileFail CMDERR -A TestOptionSyntaxErrors.java
--- a/langtools/test/tools/javac/processing/errors/TestParseErrors/TestParseErrors.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/processing/errors/TestParseErrors/TestParseErrors.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,8 @@
  * @bug 6988407
  * @summary javac crashes running processor on errant code; it used to print error message
  * @library /tools/javac/lib
+ * @modules java.compiler
+ *          jdk.compiler
  * @build JavacTestingAbstractProcessor TestParseErrors
  * @compile/fail/ref=TestParseErrors.out -XDrawDiagnostics -proc:only -processor TestParseErrors ParseErrors.java
  */
--- a/langtools/test/tools/javac/processing/errors/TestReturnCode.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/processing/errors/TestReturnCode.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
  * @summary Test that an erroneous return code results from raising an error.
  * @author  Joseph D. Darcy
  * @library /tools/javac/lib
+ * @modules jdk.compiler/com.sun.tools.javac.main
  * @build JavacTestingAbstractProcessor CompileFail
  * @compile TestReturnCode.java
  *
--- a/langtools/test/tools/javac/processing/errors/TestSuppression.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/processing/errors/TestSuppression.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,9 @@
  * @test
  * @bug 6403465
  * @summary javac should defer diagnostics until it can be determined they are persistent
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.util
  */
 
 import java.io.*;
--- a/langtools/test/tools/javac/processing/filer/TestFilerConstraints.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/processing/filer/TestFilerConstraints.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,8 @@
  * @summary Test that the constraints guaranteed by the Filer and maintained
  * @author  Joseph D. Darcy
  * @library /tools/javac/lib
+ * @modules java.compiler
+ *          jdk.compiler
  * @build TestFilerConstraints
  * @compile -encoding iso-8859-1 -processor TestFilerConstraints -proc:only TestFilerConstraints.java
  */
--- a/langtools/test/tools/javac/processing/filer/TestGetResource.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/processing/filer/TestGetResource.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,8 @@
  * @summary Test Filer.getResource
  * @author  Joseph D. Darcy
  * @library /tools/javac/lib
+ * @modules java.compiler
+ *          jdk.compiler
  * @build  JavacTestingAbstractProcessor TestGetResource
  * @compile -processor TestGetResource -proc:only -Aphase=write TestGetResource.java
  * @compile -processor TestGetResource -proc:only -Aphase=read  TestGetResource.java
--- a/langtools/test/tools/javac/processing/filer/TestGetResource2.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/processing/filer/TestGetResource2.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,8 @@
  * @bug 6929404
  * @summary Filer.getResource(SOURCE_PATH, ...) does not work when -sourcepath contains >1 entry
  * @library /tools/javac/lib
+ * @modules java.compiler
+ *          jdk.compiler
  */
 
 import java.io.*;
--- a/langtools/test/tools/javac/processing/filer/TestInvalidRelativeNames.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/processing/filer/TestInvalidRelativeNames.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,8 @@
  * @bug 6502392
  * @summary Invalid relative names for Filer.createResource and Filer.getResource
  * @library /tools/javac/lib
+ * @modules java.compiler
+ *          jdk.compiler
  * @build   JavacTestingAbstractProcessor
  * @compile TestInvalidRelativeNames.java
  * @compile/process -processor TestInvalidRelativeNames java.lang.Object
--- a/langtools/test/tools/javac/processing/filer/TestLastRound.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/processing/filer/TestLastRound.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,8 @@
  * @test 6966604
  * @summary JavacFiler not correctly notified of lastRound
  * @library /tools/javac/lib
+ * @modules java.compiler
+ *          jdk.compiler
  * @build   JavacTestingAbstractProcessor
  * @compile TestLastRound.java
  * @compile/fail/ref=TestLastRound.out -XDrawDiagnostics -Werror -proc:only -processor TestLastRound TestLastRound.java
--- a/langtools/test/tools/javac/processing/filer/TestPackageInfo.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/processing/filer/TestPackageInfo.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,8 @@
  * @summary Test the ability to create and process package-info.java files
  * @author  Joseph D. Darcy
  * @library /tools/javac/lib
+ * @modules java.compiler
+ *          jdk.compiler
  * @build   JavacTestingAbstractProcessor
  * @compile TestPackageInfo.java
  * @compile -processor TestPackageInfo -proc:only foo/bar/package-info.java TestPackageInfo.java
--- a/langtools/test/tools/javac/processing/filer/TestValidRelativeNames.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/processing/filer/TestValidRelativeNames.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,8 @@
  * @bug 6999891
  * @summary Test valid relative names for Filer.createResource and Filer.getResource
  * @library /tools/javac/lib
+ * @modules java.compiler
+ *          jdk.compiler
  * @build   JavacTestingAbstractProcessor
  * @compile TestValidRelativeNames.java
  * @compile/process -processor TestValidRelativeNames -Amode=create java.lang.Object
--- a/langtools/test/tools/javac/processing/loader/testClose/TestClose.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/processing/loader/testClose/TestClose.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,8 @@
  * @test
  * @bug 7092965
  * @summary javac should not close processorClassLoader before end of compilation
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
  */
 
 import com.sun.source.util.JavacTask;
--- a/langtools/test/tools/javac/processing/loader/testClose/TestClose2.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/processing/loader/testClose/TestClose2.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,9 @@
  * @test
  * @bug 7092965
  * @summary javac should not close processorClassLoader before end of compilation
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.util
  */
 
 import com.sun.source.util.JavacTask;
--- a/langtools/test/tools/javac/processing/messager/6362067/T6362067.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/processing/messager/6362067/T6362067.java	Thu May 21 11:41:04 2015 -0700
@@ -3,6 +3,8 @@
  * @bug     6362067
  * @summary Messager methods do not print out source position information
  * @library /tools/javac/lib
+ * @modules java.compiler
+ *          jdk.compiler
  * @build   JavacTestingAbstractProcessor T6362067
  * @compile -processor T6362067 -proc:only T6362067.java
  * @compile/ref=T6362067.out -XDrawDiagnostics -processor T6362067 -proc:only T6362067.java
--- a/langtools/test/tools/javac/processing/messager/6362067/T6362067.out	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/processing/messager/6362067/T6362067.out	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
-T6362067.java:17:8: compiler.note.proc.messager: note:elem
-T6362067.java:15:1: compiler.note.proc.messager: note:anno
-T6362067.java:16:1: compiler.note.proc.messager: note:anno
-T6362067.java:16:1: compiler.note.proc.messager: note:value
+T6362067.java:19:8: compiler.note.proc.messager: note:elem
+T6362067.java:17:1: compiler.note.proc.messager: note:anno
+T6362067.java:18:1: compiler.note.proc.messager: note:anno
+T6362067.java:18:1: compiler.note.proc.messager: note:value
 - compiler.note.proc.messager: note:nopos
--- a/langtools/test/tools/javac/processing/messager/MessagerBasics.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/processing/messager/MessagerBasics.java	Thu May 21 11:41:04 2015 -0700
@@ -4,6 +4,8 @@
  * @summary Test presence of Messager methods
  * @author  Joseph D. Darcy
  * @library /tools/javac/lib
+ * @modules java.compiler
+ *          jdk.compiler
  * @build   JavacTestingAbstractProcessor
  * @compile MessagerBasics.java
  * @compile -processor MessagerBasics -proc:only MessagerBasics.java
--- a/langtools/test/tools/javac/processing/messager/MessagerDiags.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/processing/messager/MessagerDiags.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
  * @test
  * @bug 7166010
  * @summary  warnings printed by annotation processors uses incorrect source
+ * @modules jdk.compiler
  */
 import com.sun.source.util.JavacTask;
 import java.io.IOException;
--- a/langtools/test/tools/javac/processing/model/6194785/T6194785.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/processing/model/6194785/T6194785.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,8 @@
  * @summary ParameterDeclaration.getSimpleName does not return actual name from class files
  * @author  Peter von der Ah\u00e9
  * @library /tools/javac/lib
+ * @modules java.compiler
+ *          jdk.compiler
  * @build   JavacTestingAbstractProcessor
  * @compile -g T6194785.java T6194785a.java
  * @compile -processor T6194785 foo.T6194785a T6194785.java
--- a/langtools/test/tools/javac/processing/model/6341534/T6341534.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/processing/model/6341534/T6341534.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,8 @@
  * @author  Steve Sides
  * @author  Peter von der Ahe
  * @library /tools/javac/lib
+ * @modules java.compiler
+ *          jdk.compiler
  * @build   JavacTestingAbstractProcessor
  * @compile T6341534.java
  * @compile -proc:only -processor T6341534 dir/package-info.java
--- a/langtools/test/tools/javac/processing/model/TestExceptions.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/processing/model/TestExceptions.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,8 @@
  * @bug 6794071
  * @summary Test that exceptions have a proper parent class
  * @author  Joseph D. Darcy
+ * @modules java.compiler
+ *          jdk.compiler
  */
 
 import javax.lang.model.UnknownEntityException;
--- a/langtools/test/tools/javac/processing/model/TestSourceVersion.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/processing/model/TestSourceVersion.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,8 @@
  * @bug 7025809 8028543
  * @summary Test latest and latestSupported
  * @author  Joseph D. Darcy
+ * @modules java.compiler
+ *          jdk.compiler
  */
 
 import javax.lang.model.SourceVersion;
--- a/langtools/test/tools/javac/processing/model/TestSymtabItems.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/processing/model/TestSymtabItems.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,11 @@
  * @test
  * @bug 7021183 7025809
  * @summary 269: assertion failure getting enclosing element of an undefined name
+ * @modules jdk.compiler/com.sun.tools.javac.code
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.main
+ *          jdk.compiler/com.sun.tools.javac.model
+ *          jdk.compiler/com.sun.tools.javac.util
  */
 
 import java.lang.reflect.Field;
--- a/langtools/test/tools/javac/processing/model/element/8009367/TestQualifiedNameUsed.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/processing/model/element/8009367/TestQualifiedNameUsed.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
  * @summary Test that the correct kind of names (binary) are used when comparing
  *          Class and Symbol for repeatable Classes.
  * @library /tools/javac/lib
+ * @modules jdk.compiler/com.sun.tools.javac.util
  * @build   JavacTestingAbstractProcessor TestQualifiedNameUsed p.Q p.QQ p.R p.RR
  * @run compile -processor TestQualifiedNameUsed -proc:only TestQualifiedNameUsed.java
  */
--- a/langtools/test/tools/javac/processing/model/element/TestAnonClassNames.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/processing/model/element/TestAnonClassNames.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
  * @summary Test that reported names of anonymous classes are non-null.
  * @author  Joseph D. Darcy
  * @library /tools/javac/lib
+ * @modules jdk.compiler
  * @build   JavacTestingAbstractProcessor TestAnonSourceNames
  * @compile -processor TestAnonSourceNames TestAnonClassNames.java
  * @run main TestAnonClassNames
--- a/langtools/test/tools/javac/processing/model/element/TestElement.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/processing/model/element/TestElement.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,8 @@
  * @summary Test basic properties of javax.lang.element.Element
  * @author  Joseph D. Darcy
  * @library /tools/javac/lib
+ * @modules java.compiler
+ *          jdk.compiler
  * @build   JavacTestingAbstractProcessor TestElement
  * @compile -processor TestElement -proc:only TestElement.java
  */
--- a/langtools/test/tools/javac/processing/model/element/TestEmptyContainer.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/processing/model/element/TestEmptyContainer.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
  * @summary Test that an empty container does not stop us from looking at
  *          supertypes for inherited repeated annotations.
  * @library /tools/javac/lib
+ * @modules jdk.compiler/com.sun.tools.javac.util
  * @build   JavacTestingAbstractProcessor TestEmptyContainer
  * @compile -processor TestEmptyContainer -proc:only TestEmptyContainer.java
  */
--- a/langtools/test/tools/javac/processing/model/element/TestExecutableElement.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/processing/model/element/TestExecutableElement.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,8 @@
  * @summary Test basic properties of javax.lang.element.ExecutableElement
  * @author  Joseph D. Darcy
  * @library /tools/javac/lib
+ * @modules java.compiler
+ *          jdk.compiler
  * @build   JavacTestingAbstractProcessor TestExecutableElement
  * @compile -processor TestExecutableElement -proc:only -AexpectedMethodCount=7 TestExecutableElement.java
  * @compile/process -processor TestExecutableElement -proc:only -AexpectedMethodCount=3 ProviderOfDefault
--- a/langtools/test/tools/javac/processing/model/element/TestMissingElement/TestMissingElement.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/processing/model/element/TestMissingElement/TestMissingElement.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,8 @@
  * @bug 6639645 7026414 7025809
  * @summary Modeling type implementing missing interfaces
  * @library /tools/javac/lib
+ * @modules jdk.compiler/com.sun.tools.javac.processing
+ *          jdk.compiler/com.sun.tools.javac.util
  * @build JavacTestingAbstractProcessor TestMissingElement
  * @compile/fail/ref=TestMissingElement.ref -proc:only -XprintRounds -XDrawDiagnostics -processor TestMissingElement InvalidSource.java
  */
--- a/langtools/test/tools/javac/processing/model/element/TestMissingElement2/TestMissingClass.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/processing/model/element/TestMissingElement2/TestMissingClass.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,8 @@
  * @bug 6639645
  * @summary Modeling type implementing missing interfaces
  * @library /tools/javac/lib
+ * @modules java.compiler
+ *          jdk.compiler
  * @build JavacTestingAbstractProcessor Generator
  * @compile -XprintRounds -processor Generator TestMissingClass.java
  * @run main TestMissingClass
--- a/langtools/test/tools/javac/processing/model/element/TestMissingElement2/TestMissingGenericClass1.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/processing/model/element/TestMissingElement2/TestMissingGenericClass1.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,8 @@
  * @bug 6639645
  * @summary Modeling type implementing missing interfaces
  * @library /tools/javac/lib
+ * @modules java.compiler
+ *          jdk.compiler
  * @clean MissingGenericClass1
  * @build JavacTestingAbstractProcessor Generator
  * @compile -XprintRounds -processor Generator TestMissingGenericClass1.java
--- a/langtools/test/tools/javac/processing/model/element/TestMissingElement2/TestMissingGenericClass2.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/processing/model/element/TestMissingElement2/TestMissingGenericClass2.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,8 @@
  * @bug 6639645
  * @summary Modeling type implementing missing interfaces
  * @library /tools/javac/lib
+ * @modules java.compiler
+ *          jdk.compiler
  * @clean MissingGenericClass2
  * @build JavacTestingAbstractProcessor Generator
  * @compile -XprintRounds -processor Generator TestMissingGenericClass2.java
--- a/langtools/test/tools/javac/processing/model/element/TestMissingElement2/TestMissingGenericInterface1.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/processing/model/element/TestMissingElement2/TestMissingGenericInterface1.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,8 @@
  * @bug 6639645
  * @summary Modeling type implementing missing interfaces
  * @library /tools/javac/lib
+ * @modules java.compiler
+ *          jdk.compiler
  * @clean MissingGenericInterface1
  * @build JavacTestingAbstractProcessor Generator
  * @compile -XprintRounds -processor Generator TestMissingGenericInterface1.java
--- a/langtools/test/tools/javac/processing/model/element/TestMissingElement2/TestMissingGenericInterface2.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/processing/model/element/TestMissingElement2/TestMissingGenericInterface2.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,8 @@
  * @bug 6639645
  * @summary Modeling type implementing missing interfaces
  * @library /tools/javac/lib
+ * @modules java.compiler
+ *          jdk.compiler
  * @clean MissingGenericInterface2
  * @build JavacTestingAbstractProcessor Generator
  * @compile -XprintRounds -processor Generator TestMissingGenericInterface2.java
--- a/langtools/test/tools/javac/processing/model/element/TestMissingElement2/TestMissingInterface.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/processing/model/element/TestMissingElement2/TestMissingInterface.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,8 @@
  * @bug 6639645
  * @summary Modeling type implementing missing interfaces
  * @library /tools/javac/lib
+ * @modules java.compiler
+ *          jdk.compiler
  * @build JavacTestingAbstractProcessor Generator
  * @compile -XprintRounds -processor Generator TestMissingInterface.java
  * @run main TestMissingInterface
--- a/langtools/test/tools/javac/processing/model/element/TestNames.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/processing/model/element/TestNames.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,8 @@
  * @summary Test that the constraints guaranteed by the Filer and maintained
  * @author  Joseph D. Darcy
  * @library /tools/javac/lib
+ * @modules java.compiler
+ *          jdk.compiler
  * @build   JavacTestingAbstractProcessor TestNames
  * @compile -processor TestNames -proc:only TestNames.java
  */
--- a/langtools/test/tools/javac/processing/model/element/TestNonInherited.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/processing/model/element/TestNonInherited.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
  * @summary Javac should only look on supertypes for repeatable annotations if
  *          both container and containee are inherited.
  * @library /tools/javac/lib
+ * @modules jdk.compiler/com.sun.tools.javac.util
  * @build   JavacTestingAbstractProcessor TestNonInherited
  * @compile -processor TestNonInherited -proc:only TestNonInherited.java
  */
--- a/langtools/test/tools/javac/processing/model/element/TestPackageElement.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/processing/model/element/TestPackageElement.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,8 @@
  * @summary Test basic workings of PackageElement
  * @author  Joseph D. Darcy
  * @library /tools/javac/lib
+ * @modules java.compiler
+ *          jdk.compiler
  * @build   JavacTestingAbstractProcessor TestPackageElement
  * @compile -processor TestPackageElement -proc:only TestPackageElement.java
  */
--- a/langtools/test/tools/javac/processing/model/element/TestResourceElement.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/processing/model/element/TestResourceElement.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
  * @summary Element not returned from tree API for ARM resource variables.
  * @author A. Sundararajan
  * @library /tools/javac/lib
+ * @modules jdk.compiler
  * @build   JavacTestingAbstractProcessor TestResourceElement
  * @compile -processor TestResourceElement -proc:only TestResourceElement.java
  */
--- a/langtools/test/tools/javac/processing/model/element/TestResourceVariable.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/processing/model/element/TestResourceVariable.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
  * @summary Test that the resource variable kind is appropriately set
  * @author  Joseph D. Darcy
  * @library /tools/javac/lib
+ * @modules jdk.compiler
  * @build   JavacTestingAbstractProcessor TestResourceVariable
  * @compile -processor TestResourceVariable -proc:only TestResourceVariable.java
  */
--- a/langtools/test/tools/javac/processing/model/element/TestTypeElement.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/processing/model/element/TestTypeElement.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,8 @@
  * @summary Verify that TypeElement for interfaces does not have
  *          Modifier.DEFAULT in getModifiers()
  * @library /tools/javac/lib
+ * @modules java.compiler
+ *          jdk.compiler
  * @build   JavacTestingAbstractProcessor TestTypeElement
  * @compile -processor TestTypeElement -proc:only TestTypeElement.java
  */
--- a/langtools/test/tools/javac/processing/model/element/TestTypeParameter.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/processing/model/element/TestTypeParameter.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,8 @@
  * @bug 6505047
  * @summary javax.lang.model.element.Element.getEnclosingElement() doesn't return null for type parameter
  * @library /tools/javac/lib
+ * @modules java.compiler
+ *          jdk.compiler
  * @build JavacTestingAbstractProcessor TestTypeParameter
  * @compile -processor TestTypeParameter -proc:only TestTypeParameter.java
  */
--- a/langtools/test/tools/javac/processing/model/element/TestTypeParameterAnnotations.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/processing/model/element/TestTypeParameterAnnotations.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,8 @@
  * @test
  * @bug 8011027 8046916
  * @library /tools/javac/lib
+ * @modules java.compiler
+ *          jdk.compiler
  * @build JavacTestingAbstractProcessor TestTypeParameterAnnotations
  * @compile -processor TestTypeParameterAnnotations -proc:only TestTypeParameterAnnotations.java
  */
--- a/langtools/test/tools/javac/processing/model/element/TypeParamBounds.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/processing/model/element/TypeParamBounds.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,8 @@
  * @summary Tests TypeParameter.getBounds.
  * @author  Scott Seligman
  * @library /tools/javac/lib
+ * @modules java.compiler
+ *          jdk.compiler
  * @build   JavacTestingAbstractProcessor TypeParamBounds
  * @compile -processor TypeParamBounds -proc:only TypeParamBounds.java
  */
--- a/langtools/test/tools/javac/processing/model/element/repeatingAnnotations/MixRepeatableAndOfficialContainerBasicTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/processing/model/element/repeatingAnnotations/MixRepeatableAndOfficialContainerBasicTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,8 @@
  * @summary Language model api test basics for repeating annotations
  * @library /tools/javac/lib
  * @library supportingAnnotations
+ * @modules java.compiler
+ *          jdk.compiler
  * @build   JavacTestingAbstractProcessor ElementRepAnnoTester
  * @compile -processor ElementRepAnnoTester -proc:only
  * MixRepeatableAndOfficialContainerBasicTest.java
--- a/langtools/test/tools/javac/processing/model/element/repeatingAnnotations/MixRepeatableAndOfficialContainerInheritedA1Test.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/processing/model/element/repeatingAnnotations/MixRepeatableAndOfficialContainerInheritedA1Test.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,8 @@
  * @summary Language model api test basics for repeating annotations
  * @library /tools/javac/lib
  * @library supportingAnnotations
+ * @modules java.compiler
+ *          jdk.compiler
  * @build   JavacTestingAbstractProcessor ElementRepAnnoTester
  * @compile -processor ElementRepAnnoTester -proc:only
  * MixRepeatableAndOfficialContainerInheritedA1Test.java
--- a/langtools/test/tools/javac/processing/model/element/repeatingAnnotations/MixRepeatableAndOfficialContainerInheritedA2Test.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/processing/model/element/repeatingAnnotations/MixRepeatableAndOfficialContainerInheritedA2Test.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,8 @@
  * @summary Language model api test basics for repeating annotations
  * @library /tools/javac/lib
  * @library supportingAnnotations
+ * @modules java.compiler
+ *          jdk.compiler
  * @build   JavacTestingAbstractProcessor ElementRepAnnoTester
  * @compile -processor ElementRepAnnoTester -proc:only
  * MixRepeatableAndOfficialContainerInheritedA2Test.java
--- a/langtools/test/tools/javac/processing/model/element/repeatingAnnotations/MixRepeatableAndOfficialContainerInheritedB1Test.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/processing/model/element/repeatingAnnotations/MixRepeatableAndOfficialContainerInheritedB1Test.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,8 @@
  * @summary Language model api test basics for repeating annotations
  * @library /tools/javac/lib
  * @library supportingAnnotations
+ * @modules java.compiler
+ *          jdk.compiler
  * @build   JavacTestingAbstractProcessor ElementRepAnnoTester
  * @compile -processor ElementRepAnnoTester -proc:only
  * MixRepeatableAndOfficialContainerInheritedB1Test.java
--- a/langtools/test/tools/javac/processing/model/element/repeatingAnnotations/MixRepeatableAndOfficialContainerInheritedB2Test.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/processing/model/element/repeatingAnnotations/MixRepeatableAndOfficialContainerInheritedB2Test.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,8 @@
  * @summary Language model api test basics for repeating annotations
  * @library /tools/javac/lib
  * @library supportingAnnotations
+ * @modules java.compiler
+ *          jdk.compiler
  * @build   JavacTestingAbstractProcessor ElementRepAnnoTester
  * @compile -processor ElementRepAnnoTester -proc:only
  * MixRepeatableAndOfficialContainerInheritedB2Test.java
--- a/langtools/test/tools/javac/processing/model/element/repeatingAnnotations/MixSingularAndUnofficialContainerBasicTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/processing/model/element/repeatingAnnotations/MixSingularAndUnofficialContainerBasicTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,8 @@
  * @summary Language model api test basics for repeating annotations
  * @library /tools/javac/lib
  * @library supportingAnnotations
+ * @modules java.compiler
+ *          jdk.compiler
  * @build   JavacTestingAbstractProcessor ElementRepAnnoTester
  * @compile -processor ElementRepAnnoTester -proc:only MixSingularAndUnofficialContainerBasicTest.java
  */
--- a/langtools/test/tools/javac/processing/model/element/repeatingAnnotations/MixSingularAndUnofficialContainerInheritedA1Test.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/processing/model/element/repeatingAnnotations/MixSingularAndUnofficialContainerInheritedA1Test.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,8 @@
  * @summary Language model api test basics for repeating annotations
  * @library /tools/javac/lib
  * @library supportingAnnotations
+ * @modules java.compiler
+ *          jdk.compiler
  * @build   JavacTestingAbstractProcessor ElementRepAnnoTester
  * @compile -processor ElementRepAnnoTester -proc:only
  * MixSingularAndUnofficialContainerInheritedA1Test.java
--- a/langtools/test/tools/javac/processing/model/element/repeatingAnnotations/MixSingularAndUnofficialContainerInheritedA2Test.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/processing/model/element/repeatingAnnotations/MixSingularAndUnofficialContainerInheritedA2Test.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,8 @@
  * @summary Language model api test basics for repeating annotations
  * @library /tools/javac/lib
  * @library supportingAnnotations
+ * @modules java.compiler
+ *          jdk.compiler
  * @build   JavacTestingAbstractProcessor ElementRepAnnoTester
  * @compile -processor ElementRepAnnoTester -proc:only
  * MixSingularAndUnofficialContainerInheritedA2Test.java
--- a/langtools/test/tools/javac/processing/model/element/repeatingAnnotations/MixSingularAndUnofficialContainerInheritedB1Test.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/processing/model/element/repeatingAnnotations/MixSingularAndUnofficialContainerInheritedB1Test.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,8 @@
  * @summary Language model api test basics for repeating annotations
  * @library /tools/javac/lib
  * @library supportingAnnotations
+ * @modules java.compiler
+ *          jdk.compiler
  * @build   JavacTestingAbstractProcessor ElementRepAnnoTester
  * @compile -processor ElementRepAnnoTester -proc:only
  * MixSingularAndUnofficialContainerInheritedB1Test.java
--- a/langtools/test/tools/javac/processing/model/element/repeatingAnnotations/MixSingularAndUnofficialContainerInheritedB2Test.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/processing/model/element/repeatingAnnotations/MixSingularAndUnofficialContainerInheritedB2Test.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,8 @@
  * @summary Language model api test basics for repeating annotations
  * @library /tools/javac/lib
  * @library supportingAnnotations
+ * @modules java.compiler
+ *          jdk.compiler
  * @build   JavacTestingAbstractProcessor ElementRepAnnoTester
  * @compile -processor ElementRepAnnoTester -proc:only
  * MixSingularAndUnofficialContainerInheritedB2Test.java
--- a/langtools/test/tools/javac/processing/model/element/repeatingAnnotations/OfficialContainerBasicTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/processing/model/element/repeatingAnnotations/OfficialContainerBasicTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,8 @@
  * @summary Language model api test basics for repeating annotations
  * @library /tools/javac/lib
  * @library supportingAnnotations
+ * @modules java.compiler
+ *          jdk.compiler
  * @build   JavacTestingAbstractProcessor ElementRepAnnoTester
  * @compile -processor ElementRepAnnoTester -proc:only OfficialContainerBasicTest.java
  */
--- a/langtools/test/tools/javac/processing/model/element/repeatingAnnotations/OfficialContainerInheritedTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/processing/model/element/repeatingAnnotations/OfficialContainerInheritedTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,8 @@
  * @summary Language model api test basics for repeating annotations
  * @library /tools/javac/lib
  * @library supportingAnnotations
+ * @modules java.compiler
+ *          jdk.compiler
  * @build   JavacTestingAbstractProcessor ElementRepAnnoTester
  * @compile -processor ElementRepAnnoTester -proc:only OfficialContainerInheritedTest.java
  */
--- a/langtools/test/tools/javac/processing/model/element/repeatingAnnotations/RepeatableBasicTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/processing/model/element/repeatingAnnotations/RepeatableBasicTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,8 @@
  * @summary Language model api test basics for repeating annotations
  * @library /tools/javac/lib
  * @library supportingAnnotations
+ * @modules java.compiler
+ *          jdk.compiler
  * @build   JavacTestingAbstractProcessor ElementRepAnnoTester
  * @compile -processor ElementRepAnnoTester -proc:only RepeatableBasicTest.java
  */
--- a/langtools/test/tools/javac/processing/model/element/repeatingAnnotations/RepeatableInheritedTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/processing/model/element/repeatingAnnotations/RepeatableInheritedTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,8 @@
  * @summary Language model api test basics for repeating annotations
  * @library /tools/javac/lib
  * @library supportingAnnotations
+ * @modules java.compiler
+ *          jdk.compiler
  * @build   JavacTestingAbstractProcessor ElementRepAnnoTester
  * @compile -processor ElementRepAnnoTester -proc:only RepeatableInheritedTest.java
  */
--- a/langtools/test/tools/javac/processing/model/element/repeatingAnnotations/RepeatableOfficialContainerBasicTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/processing/model/element/repeatingAnnotations/RepeatableOfficialContainerBasicTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,8 @@
  * @summary Language model api test basics for repeating annotations
  * @library /tools/javac/lib
  * @library supportingAnnotations
+ * @modules java.compiler
+ *          jdk.compiler
  * @build   JavacTestingAbstractProcessor ElementRepAnnoTester
  * @compile -processor ElementRepAnnoTester -proc:only RepeatableOfficialContainerBasicTest.java
  */
--- a/langtools/test/tools/javac/processing/model/element/repeatingAnnotations/RepeatableOfficialContainerInheritedTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/processing/model/element/repeatingAnnotations/RepeatableOfficialContainerInheritedTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,8 @@
  * @summary Language model api test basics for repeating annotations
  * @library /tools/javac/lib
  * @library supportingAnnotations
+ * @modules java.compiler
+ *          jdk.compiler
  * @build   JavacTestingAbstractProcessor ElementRepAnnoTester
  * @compile -processor ElementRepAnnoTester -proc:only
  * RepeatableOfficialContainerInheritedTest.java
--- a/langtools/test/tools/javac/processing/model/element/repeatingAnnotations/RepeatableOverrideATest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/processing/model/element/repeatingAnnotations/RepeatableOverrideATest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,8 @@
  * @summary Language model api test basics for repeating annotations
  * @library /tools/javac/lib
  * @library supportingAnnotations
+ * @modules java.compiler
+ *          jdk.compiler
  * @build   JavacTestingAbstractProcessor ElementRepAnnoTester
  * @compile -processor ElementRepAnnoTester -proc:only RepeatableOverrideATest.java
  */
--- a/langtools/test/tools/javac/processing/model/element/repeatingAnnotations/RepeatableOverrideBTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/processing/model/element/repeatingAnnotations/RepeatableOverrideBTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,8 @@
  * @summary Language model api test basics for repeating annotations
  * @library /tools/javac/lib
  * @library supportingAnnotations
+ * @modules java.compiler
+ *          jdk.compiler
  * @build   JavacTestingAbstractProcessor ElementRepAnnoTester
  * @compile -processor ElementRepAnnoTester -proc:only RepeatableOverrideBTest.java
  */
--- a/langtools/test/tools/javac/processing/model/element/repeatingAnnotations/SingularBasicTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/processing/model/element/repeatingAnnotations/SingularBasicTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,8 @@
  * @summary Language model api test basics for repeating annotations
  * @library /tools/javac/lib
  * @library supportingAnnotations
+ * @modules java.compiler
+ *          jdk.compiler
  * @build   JavacTestingAbstractProcessor ElementRepAnnoTester
  * @compile -processor ElementRepAnnoTester -proc:only SingularBasicTest.java
  */
--- a/langtools/test/tools/javac/processing/model/element/repeatingAnnotations/SingularInheritedATest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/processing/model/element/repeatingAnnotations/SingularInheritedATest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,8 @@
  * @summary Language model api test basics for repeating annotations
  * @library /tools/javac/lib
  * @library supportingAnnotations
+ * @modules java.compiler
+ *          jdk.compiler
  * @build   JavacTestingAbstractProcessor ElementRepAnnoTester
  * @compile -processor ElementRepAnnoTester -proc:only SingularInheritedATest.java
  */
--- a/langtools/test/tools/javac/processing/model/element/repeatingAnnotations/SingularInheritedBTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/processing/model/element/repeatingAnnotations/SingularInheritedBTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,8 @@
  * @summary Language model api test basics for repeating annotations
  * @library /tools/javac/lib
  * @library supportingAnnotations
+ * @modules java.compiler
+ *          jdk.compiler
  * @build   JavacTestingAbstractProcessor ElementRepAnnoTester
  * @compile -processor ElementRepAnnoTester -proc:only SingularInheritedBTest.java
  */
--- a/langtools/test/tools/javac/processing/model/element/repeatingAnnotations/UnofficialContainerBasicTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/processing/model/element/repeatingAnnotations/UnofficialContainerBasicTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,8 @@
  * @summary Language model api test basics for repeating annotations
  * @library /tools/javac/lib
  * @library supportingAnnotations
+ * @modules java.compiler
+ *          jdk.compiler
  * @build   JavacTestingAbstractProcessor ElementRepAnnoTester
  * @compile -processor ElementRepAnnoTester -proc:only UnofficialContainerBasicTest.java
  */
--- a/langtools/test/tools/javac/processing/model/element/repeatingAnnotations/UnofficialContainerInheritedTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/processing/model/element/repeatingAnnotations/UnofficialContainerInheritedTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,8 @@
  * @summary Language model api test basics for repeating annotations
  * @library /tools/javac/lib
  * @library supportingAnnotations
+ * @modules java.compiler
+ *          jdk.compiler
  * @build   JavacTestingAbstractProcessor ElementRepAnnoTester
  * @compile -processor ElementRepAnnoTester -proc:only
  * UnofficialContainerInheritedTest.java
--- a/langtools/test/tools/javac/processing/model/inheritedByType/EnsureOrder.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/processing/model/inheritedByType/EnsureOrder.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
  * @summary test that order is respected when inheriting both legacy container and single anno
  * @bug 8007961
  * @library /tools/javac/lib
+ * @modules jdk.compiler/com.sun.tools.javac.util
  * @build   JavacTestingAbstractProcessor EnsureOrder
  * @compile -processor EnsureOrder -proc:only EnsureOrder.java
  */
--- a/langtools/test/tools/javac/processing/model/testgetallmembers/Main.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/processing/model/testgetallmembers/Main.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
  * @bug     6374357 6308351 6707027
  * @summary PackageElement.getEnclosedElements() throws ClassReader$BadClassFileException
  * @author  Peter von der Ah\u00e9
+ * @modules jdk.compiler
  * @run main/othervm -Xmx256m Main
  */
 
--- a/langtools/test/tools/javac/processing/model/trees/OnDemandAttribution.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/processing/model/trees/OnDemandAttribution.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
  * @summary Verify that in-method ClassSymbols from one round do not affect ClassSymbols in
  *          following rounds.
  * @library /tools/javac/lib
+ * @modules jdk.compiler
  * @build JavacTestingAbstractProcessor OnDemandAttribution
  * @compile/process -processor OnDemandAttribution OnDemandAttribution.java
  */
--- a/langtools/test/tools/javac/processing/model/type/BasicAnnoTests.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/processing/model/type/BasicAnnoTests.java	Thu May 21 11:41:04 2015 -0700
@@ -26,6 +26,11 @@
  * @bug 8013852 8031744
  * @summary Annotations on types
  * @library /tools/javac/lib
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.code
+ *          jdk.compiler/com.sun.tools.javac.processing
+ *          jdk.compiler/com.sun.tools.javac.tree
+ *          jdk.compiler/com.sun.tools.javac.util
  * @build JavacTestingAbstractProcessor DPrinter BasicAnnoTests
  * @compile/process -processor BasicAnnoTests -proc:only BasicAnnoTests.java
  */
--- a/langtools/test/tools/javac/processing/model/type/BoundsTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/processing/model/type/BoundsTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test
  * @bug 6499673
  * @library /tools/javac/lib
+ * @modules jdk.compiler
  * @build JavacTestingAbstractProcessor BoundsTest
  * @run main BoundsTest
  * @summary Assertion check for TypeVariable.getUpperBound() fails
--- a/langtools/test/tools/javac/processing/model/type/InheritedAP.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/processing/model/type/InheritedAP.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,8 @@
  * @test
  * @bug 8024513
  * @library /tools/javac/lib
+ * @modules java.compiler
+ *          jdk.compiler
  * @build JavacTestingAbstractProcessor InheritedAP
  * @compile -cp . -processor InheritedAP -proc:only InheritedAP.java
  * @summary NPE in annotation processing
--- a/langtools/test/tools/javac/processing/model/type/IntersectionPropertiesTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/processing/model/type/IntersectionPropertiesTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test
  * @bug 6499673 6557966
  * @library /tools/javac/lib
+ * @modules jdk.compiler/com.sun.tools.javac.util
  * @build JavacTestingAbstractProcessor IntersectionPropertiesTest
  * @run main IntersectionPropertiesTest
  * @summary Assertion check for TypeVariable.getUpperBound() fails
--- a/langtools/test/tools/javac/processing/model/type/MirroredTypeEx/NpeTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/processing/model/type/MirroredTypeEx/NpeTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,8 @@
  * @bug     6593082
  * @summary MirroredTypeException constructor should not accept null
  * @author  Joseph D. Darcy
+ * @modules java.compiler
+ *          jdk.compiler
  */
 
 import javax.lang.model.type.*;
--- a/langtools/test/tools/javac/processing/model/type/MirroredTypeEx/OverEager.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/processing/model/type/MirroredTypeEx/OverEager.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,8 @@
  * @summary MirroredType[s]Exception shouldn't be created too eagerly
  * @author  Scott Seligman
  * @library /tools/javac/lib
+ * @modules java.compiler
+ *          jdk.compiler
  * @build JavacTestingAbstractProcessor
  * @compile -g OverEager.java
  * @compile -processor OverEager -proc:only OverEager.java
--- a/langtools/test/tools/javac/processing/model/type/MirroredTypeEx/Plurality.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/processing/model/type/MirroredTypeEx/Plurality.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,8 @@
  * @bug     6519115
  * @summary Verify MirroredTypeException vs MirroredTypesException is thrown
  * @library /tools/javac/lib
+ * @modules java.compiler
+ *          jdk.compiler
  * @build JavacTestingAbstractProcessor
  * @compile Plurality.java
  * @compile -processor Plurality -proc:only Plurality.java
--- a/langtools/test/tools/javac/processing/model/type/NoTypes.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/processing/model/type/NoTypes.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,8 @@
  * @summary Test the NoTypes: VOID, PACKAGE, NONE
  * @author  Scott Seligman
  * @library /tools/javac/lib
+ * @modules java.compiler
+ *          jdk.compiler
  * @build JavacTestingAbstractProcessor
  * @compile -g NoTypes.java
  * @compile -processor NoTypes -proc:only NoTypes.java
--- a/langtools/test/tools/javac/processing/model/type/TestTypeKind.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/processing/model/type/TestTypeKind.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,8 @@
  * @bug     6347716
  * @summary Test TypeKind.isPrimitive
  * @author  Joseph D. Darcy
+ * @modules java.compiler
+ *          jdk.compiler
  */
 
 import javax.lang.model.type.TypeKind;
--- a/langtools/test/tools/javac/processing/model/type/TestUnionType.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/processing/model/type/TestUnionType.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
  * @bug     7029150 7025809
  * @summary Test support for union types
  * @library /tools/javac/lib
+ * @modules jdk.compiler
  */
 
 import java.net.URI;
--- a/langtools/test/tools/javac/processing/model/util/BinaryName.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/processing/model/util/BinaryName.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,8 @@
  * @summary Test Elements.getBinaryName
  * @author  Scott Seligman
  * @library /tools/javac/lib
+ * @modules java.compiler
+ *          jdk.compiler
  * @build   JavacTestingAbstractProcessor BinaryName
  * @compile -processor BinaryName -proc:only BinaryName.java
  */
--- a/langtools/test/tools/javac/processing/model/util/DirectSuperOfInt.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/processing/model/util/DirectSuperOfInt.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,8 @@
  * @bug     8034933
  * @summary Types.directSupertypes should return Object as the super type of interfaces
  * @library /tools/javac/lib
+ * @modules java.compiler
+ *          jdk.compiler
  * @build   JavacTestingAbstractProcessor DirectSuperOfInt
  * @compile -processor DirectSuperOfInt -proc:only DirectSuperOfInt.java
  */
--- a/langtools/test/tools/javac/processing/model/util/GetTypeElemBadArg.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/processing/model/util/GetTypeElemBadArg.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,8 @@
  * @summary getTypeElement should tolerate a type that can't be found
  * @author  Scott Seligman
  * @library /tools/javac/lib
+ * @modules java.compiler
+ *          jdk.compiler
  * @build   JavacTestingAbstractProcessor GetTypeElemBadArg
  * @compile -processor GetTypeElemBadArg -proc:only GetTypeElemBadArg.java
  */
--- a/langtools/test/tools/javac/processing/model/util/NoSupers.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/processing/model/util/NoSupers.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,8 @@
  * @summary directSupertypes should return empty list if arg has no supertypes
  * @author  Scott Seligman
  * @library /tools/javac/lib
+ * @modules java.compiler
+ *          jdk.compiler
  * @build   JavacTestingAbstractProcessor NoSupers
  * @compile -processor NoSupers -proc:only NoSupers.java
  */
--- a/langtools/test/tools/javac/processing/model/util/OverridesSpecEx.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/processing/model/util/OverridesSpecEx.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,8 @@
  * @summary Verify that example code in Elements.overrides works as spec'ed.
  * @author  Scott Seligman
  * @library /tools/javac/lib
+ * @modules java.compiler
+ *          jdk.compiler
  * @build JavacTestingAbstractProcessor
  * @compile -g OverridesSpecEx.java
  * @compile -processor OverridesSpecEx -proc:only OverridesSpecEx.java
--- a/langtools/test/tools/javac/processing/model/util/TestIntersectionTypeVisitors.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/processing/model/util/TestIntersectionTypeVisitors.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,8 @@
  * @test
  * @bug     8027730
  * @summary Test visitor support for intersection types
+ * @modules java.compiler
+ *          jdk.compiler
  */
 
 import java.lang.annotation.Annotation;
--- a/langtools/test/tools/javac/processing/model/util/TypesBadArg.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/processing/model/util/TypesBadArg.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,8 @@
  * @summary Validate argument kinds in Types utilities
  * @author  Scott Seligman
  * @library /tools/javac/lib
+ * @modules java.compiler
+ *          jdk.compiler
  * @build   JavacTestingAbstractProcessor TypesBadArg
  * @compile -processor TypesBadArg -proc:only TypesBadArg.java
  */
--- a/langtools/test/tools/javac/processing/model/util/deprecation/TestDeprecation.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/processing/model/util/deprecation/TestDeprecation.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,8 @@
  * @summary Tests Elements.isDeprecated(Element)
  * @author  Joseph D. Darcy
  * @library /tools/javac/lib
+ * @modules java.compiler
+ *          jdk.compiler
  * @build JavacTestingAbstractProcessor
  * @compile TestDeprecation.java
  * @compile -processor TestDeprecation -proc:only Dep1.java
--- a/langtools/test/tools/javac/processing/model/util/directSupersOfErr/DirectSupersOfErr.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/processing/model/util/directSupersOfErr/DirectSupersOfErr.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,8 @@
  * @summary directSupertypes(t) should not return t
  * @author  Scott Seligman
  * @library /tools/javac/lib
+ * @modules java.compiler
+ *          jdk.compiler
  * @build   JavacTestingAbstractProcessor DirectSupersOfErr
  * @compile/fail/ref=DirectSupersOfErr.ref -processor DirectSupersOfErr -proc:only -XDrawDiagnostics C1.java
  */
--- a/langtools/test/tools/javac/processing/model/util/elements/TestGetConstantExpression.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/processing/model/util/elements/TestGetConstantExpression.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,8 @@
  * @summary Test Elements.getConstantExpression
  * @author  Joseph D. Darcy
  * @library /tools/javac/lib
+ * @modules java.compiler
+ *          jdk.compiler
  * @build   JavacTestingAbstractProcessor TestGetConstantExpression
  * @compile -processor TestGetConstantExpression Foo.java
  */
--- a/langtools/test/tools/javac/processing/model/util/elements/TestGetPackageOf.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/processing/model/util/elements/TestGetPackageOf.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,8 @@
  * @summary Test Elements.getPackageOf
  * @author  Joseph D. Darcy
  * @library /tools/javac/lib
+ * @modules java.compiler
+ *          jdk.compiler
  * @build   JavacTestingAbstractProcessor TestGetPackageOf
  * @compile -processor TestGetPackageOf -proc:only TestGetPackageOf.java
  */
--- a/langtools/test/tools/javac/processing/model/util/elements/TestIsFunctionalInterface.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/processing/model/util/elements/TestIsFunctionalInterface.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,8 @@
  * @summary Test Elements.isFunctionalInterface
  * @author  Joseph D. Darcy
  * @library /tools/javac/lib
+ * @modules java.compiler
+ *          jdk.compiler
  * @build   JavacTestingAbstractProcessor TestIsFunctionalInterface
  * @compile -processor TestIsFunctionalInterface TestIsFunctionalInterface.java
  */
--- a/langtools/test/tools/javac/processing/model/util/elements/doccomments/TestDocComments.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/processing/model/util/elements/doccomments/TestDocComments.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
  * @bug 6877202 6986246
  * @summary Elements.getDocComment() is not getting JavaDocComments
  * @library /tools/javac/lib
+ * @modules jdk.compiler
  * @build JavacTestingAbstractProcessor TestDocComments
  * @run main TestDocComments
  */
--- a/langtools/test/tools/javac/processing/model/util/elements/doccomments/TestPackageInfoComments.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/processing/model/util/elements/doccomments/TestPackageInfoComments.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
  * @bug 8042345
  * @summary getDocComment() fails for doc comments on PackageElement found in package-info.java
  * @library /tools/javac/lib
+ * @modules jdk.compiler
  * @build JavacTestingAbstractProcessor TestPackageInfoComments
  * @run main TestPackageInfoComments
  */
--- a/langtools/test/tools/javac/processing/model/util/filter/TestIterables.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/processing/model/util/filter/TestIterables.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,8 @@
  * @summary Test that ElementFilter iterable methods behave properly.
  * @author  Joseph D. Darcy
  * @library /tools/javac/lib
+ * @modules java.compiler
+ *          jdk.compiler
  * @build JavacTestingAbstractProcessor
  * @compile TestIterables.java
  * @compile -processor TestIterables -proc:only Foo1.java
--- a/langtools/test/tools/javac/processing/options/TestImplicitNone.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/processing/options/TestImplicitNone.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test
  * @bug 6935638
  * @summary -implicit:none prevents compilation with annotation processing
+ * @modules jdk.compiler
  */
 
 import java.io.*;
--- a/langtools/test/tools/javac/processing/options/Xprint.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/processing/options/Xprint.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,8 @@
  * @bug     6266828
  * @summary JSR 269: Java Language Model API
  * @author  Peter von der Ah\u00e9
+ * @modules java.compiler
+ *          jdk.compiler
  */
 import javax.tools.JavaCompiler;
 import javax.tools.ToolProvider;
--- a/langtools/test/tools/javac/processing/options/testCommandLineClasses/Test.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/processing/options/testCommandLineClasses/Test.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,8 @@
  * @bug 6930508
  * @summary Passing nested class names on javac command line interfere with subsequent name -> class lookup
  * @library /tools/javac/lib
+ * @modules java.compiler
+ *          jdk.compiler
  * @build JavacTestingAbstractProcessor p.NestedExamples Test
  * @run main Test
  */
--- a/langtools/test/tools/javac/processing/options/testPrintProcessorInfo/Test.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/processing/options/testPrintProcessorInfo/Test.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,8 @@
  * @bug 6987384
  * @summary -XprintProcessorRoundsInfo message printed with different timing than previous
  * @library /tools/javac/lib
+ * @modules java.compiler
+ *          jdk.compiler
  * @build JavacTestingAbstractProcessor Test
  * @compile/fail/ref=Test.out -XDrawDiagnostics -XprintProcessorInfo -Werror -proc:only -processor Test Test.java
  */
--- a/langtools/test/tools/javac/processing/options/testPrintProcessorInfo/TestWithXstdout.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/processing/options/testPrintProcessorInfo/TestWithXstdout.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,8 @@
  * @bug 6987384
  * @summary -XprintProcessorRoundsInfo message printed with different timing than previous
  * @library /tools/javac/lib
+ * @modules java.compiler
+ *          jdk.compiler
  * @build JavacTestingAbstractProcessor Test TestWithXstdout
  * @run main TestWithXstdout
  */
--- a/langtools/test/tools/javac/processing/rounds/BaseClassesNotReRead.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/processing/rounds/BaseClassesNotReRead.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
  * @bug 8038455
  * @summary Check that classfiles are read only once in common cases despite several rounds of
  *          annotation processing.
+ * @modules jdk.compiler
  * @clean *
  * @run main BaseClassesNotReRead
  */
--- a/langtools/test/tools/javac/processing/rounds/ClassDependingOnGenerated.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/processing/rounds/ClassDependingOnGenerated.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
  * @summary Verify situation when a classfile depends on another type, which is missing and
  *          generated by an annotation processor, is handled properly
  * @library /tools/javac/lib/
+ * @modules jdk.compiler/com.sun.tools.javac.code
  * @clean *
  * @build ClassWithSuperType ClassDependingOnGenerated JavacTestingAbstractProcessor
  * @clean SuperClass
--- a/langtools/test/tools/javac/processing/rounds/CompleteOnClosed.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/processing/rounds/CompleteOnClosed.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,9 @@
  * @summary Ensure that formatting diagnostics with an already closed JavaCompiler won't crash
  *          the compiler.
  * @library /tools/lib /tools/javac/lib
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.main
  * @build ToolBox JavacTestingAbstractProcessor
  * @run main CompleteOnClosed
  */
--- a/langtools/test/tools/javac/processing/rounds/MethodsDroppedBetweenRounds.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/processing/rounds/MethodsDroppedBetweenRounds.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,8 @@
  * @summary Ensure that Symbols for members (methods and fields) are dropped across annotation
  *          processing rounds. ClassSymbols need to be kept.
  * @library /tools/javac/lib
+ * @modules java.compiler
+ *          jdk.compiler
  * @build JavacTestingAbstractProcessor MethodsDroppedBetweenRounds
  * @compile/process -processor MethodsDroppedBetweenRounds MethodsDroppedBetweenRounds.java
  */
--- a/langtools/test/tools/javac/processing/rounds/OverwriteBetweenCompilations.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/processing/rounds/OverwriteBetweenCompilations.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,11 @@
  * @summary Verify that annotation processor can overwrite source and class files it generated
  *          during previous compilations, and that the Symbols are updated appropriatelly.
  * @library /tools/lib /tools/javac/lib/
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.main
+ *          jdk.compiler/com.sun.tools.javac.processing
+ *          jdk.compiler/com.sun.tools.javac.util
  * @clean *
  * @build OverwriteBetweenCompilations ToolBox JavacTestingAbstractProcessor
  * @compile/ref=OverwriteBetweenCompilations_1.out -processor OverwriteBetweenCompilations -Apass=1 -parameters -XDrawDiagnostics OverwriteBetweenCompilationsSource.java
--- a/langtools/test/tools/javac/processing/rounds/TypesCachesCleared.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/processing/rounds/TypesCachesCleared.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
  * @bug 8038455
  * @summary Verify that Types caches (in particular MembersClosureCache) get cleared between rounds.
  * @library /tools/javac/lib
+ * @modules jdk.compiler
  * @build JavacTestingAbstractProcessor TypesCachesCleared
  * @compile/process -processor TypesCachesCleared TypesCachesCleared.java
  */
--- a/langtools/test/tools/javac/processing/warnings/TestSourceVersionWarnings.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/processing/warnings/TestSourceVersionWarnings.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,8 @@
  * @bug 6376083 6376084 6458819 7025784 7025786 7025789
  * @summary Test that warnings about source versions are output as expected.
  * @author  Joseph D. Darcy
+ * @modules java.compiler
+ *          jdk.compiler
  * @compile TestSourceVersionWarnings.java
  * @compile/ref=gold_0.out             -XDrawDiagnostics -processor TestSourceVersionWarnings -proc:only                           -source 1.6 -Xlint:-options HelloWorld.java
  * @compile/ref=gold_sv_warn_5_6.out   -XDrawDiagnostics -processor TestSourceVersionWarnings -proc:only -ASourceVersion=RELEASE_5 -source 1.6 -Xlint:-options HelloWorld.java
--- a/langtools/test/tools/javac/processing/warnings/UseImplicit/TestProcUseImplicitWarning.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/processing/warnings/UseImplicit/TestProcUseImplicitWarning.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,8 @@
  * @bug 6986892
  * @summary confusing warning given after errors in annotation processing
  * @library /tools/javac/lib
+ * @modules java.compiler
+ *          jdk.compiler
  * @build JavacTestingAbstractProcessor TestProcUseImplicitWarning
  * @clean C1 p.C2
  * @compile/fail/ref=err.out -XDrawDiagnostics -processor TestProcUseImplicitWarning -Aerror C1.java
--- a/langtools/test/tools/javac/processing/werror/WError1.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/processing/werror/WError1.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,8 @@
  * @test 6403456
  * @summary -Werror should work with annotation processing
  * @library /tools/javac/lib
+ * @modules java.compiler
+ *          jdk.compiler
  * @build   JavacTestingAbstractProcessor
  * @compile WError1.java
  * @compile -proc:only -processor WError1 WError1.java
--- a/langtools/test/tools/javac/processing/werror/WErrorGen.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/processing/werror/WErrorGen.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,8 @@
  * @test 6403456
  * @summary -Werror should work with annotation processing
  * @library /tools/javac/lib
+ * @modules java.compiler
+ *          jdk.compiler
  * @build   JavacTestingAbstractProcessor
  * @compile WErrorGen.java
  * @compile -proc:only -processor WErrorGen WErrorGen.java
--- a/langtools/test/tools/javac/processing/werror/WErrorLast.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/processing/werror/WErrorLast.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,8 @@
  * @test 6403456
  * @summary -Werror should work with annotation processing
  * @library /tools/javac/lib
+ * @modules java.compiler
+ *          jdk.compiler
  * @build   JavacTestingAbstractProcessor
  * @compile WErrorLast.java
  * @compile -proc:only -processor WErrorLast WErrorLast.java
--- a/langtools/test/tools/javac/profiles/ProfileOptionTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/profiles/ProfileOptionTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,11 @@
  * @test
  * @bug 8004182 8028545
  * @summary Add support for profiles in javac
+ * @modules java.desktop
+ *          java.sql.rowset
+ *          jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.jvm
+ *          jdk.security.auth
  */
 
 import java.io.PrintWriter;
--- a/langtools/test/tools/javac/profiles/ProfileTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/profiles/ProfileTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test
  * @bug 8022287
  * @summary javac.sym.Profiles uses a static Map when it should not
+ * @modules jdk.compiler/com.sun.tools.javac.sym
  */
 
 import java.io.File;
--- a/langtools/test/tools/javac/proprietary/WarnClass.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/proprietary/WarnClass.java	Thu May 21 11:41:04 2015 -0700
@@ -3,6 +3,7 @@
  * @bug     6380059
  * @summary Emit warnings for proprietary packages in the boot class path
  * @author  Peter von der Ah\u00e9
+ * @modules java.base/sun.misc
  * @compile WarnClass.java
  * @compile/fail/ref=WarnClass.out -XDrawDiagnostics  -Werror WarnClass.java
  * @compile/fail/ref=WarnClass.out -XDrawDiagnostics  -Werror -nowarn WarnClass.java
--- a/langtools/test/tools/javac/proprietary/WarnMethod.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/proprietary/WarnMethod.java	Thu May 21 11:41:04 2015 -0700
@@ -3,6 +3,7 @@
  * @bug     6380059
  * @summary Emit warnings for proprietary packages in the boot class path
  * @author  Peter von der Ah\u00e9
+ * @modules java.base/sun.misc
  * @compile WarnMethod.java
  * @compile/fail/ref=WarnMethod.out -XDrawDiagnostics  -Werror WarnMethod.java
  * @compile/fail/ref=WarnMethod.out -XDrawDiagnostics  -Werror -nowarn WarnMethod.java
--- a/langtools/test/tools/javac/proprietary/WarnVariable.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/proprietary/WarnVariable.java	Thu May 21 11:41:04 2015 -0700
@@ -3,6 +3,7 @@
  * @bug     6380059
  * @summary Emit warnings for proprietary packages in the boot class path
  * @author  Peter von der Ah\u00e9
+ * @modules java.base/sun.misc
  * @compile WarnVariable.java
  * @compile/fail/ref=WarnVariable.out -XDrawDiagnostics  -Werror WarnVariable.java
  * @compile/fail/ref=WarnVariable.out -XDrawDiagnostics  -Werror -nowarn WarnVariable.java
--- a/langtools/test/tools/javac/proprietary/WarnWildcard.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/proprietary/WarnWildcard.java	Thu May 21 11:41:04 2015 -0700
@@ -3,6 +3,7 @@
  * @bug     6380059
  * @summary Emit warnings for proprietary packages in the boot class path
  * @author  Peter von der Ah\u00e9
+ * @modules java.base/sun.misc
  * @compile WarnWildcard.java
  * @compile/fail/ref=WarnWildcard.out -XDrawDiagnostics  -Werror WarnWildcard.java
  * @compile/fail/ref=WarnWildcard.out -XDrawDiagnostics  -Werror -nowarn WarnWildcard.java
--- a/langtools/test/tools/javac/resolve/ResolveHarness.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/resolve/ResolveHarness.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,9 @@
  * @bug 7098660 8014649 8034223
  * @summary Test harness for overload resolution/inference tests
  * @library /tools/javac/lib
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.code
+ *          jdk.compiler/com.sun.tools.javac.util
  * @build JavacTestingAbstractProcessor ResolveHarness
  * @run main ResolveHarness
  */
--- a/langtools/test/tools/javac/scope/7017664/CompoundScopeTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/scope/7017664/CompoundScopeTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,9 @@
  * @test
  * @bug 7017664 7036906
  * @summary Basher for CompoundScopes
+ * @modules jdk.compiler/com.sun.tools.javac.code
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.util
  */
 
 import java.util.Random;
--- a/langtools/test/tools/javac/scope/7017664/ImplementationCacheTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/scope/7017664/ImplementationCacheTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,9 @@
  * @test
  * @bug 7017664
  * @summary Basher for CompoundScopes
+ * @modules jdk.compiler/com.sun.tools.javac.code
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.util
  */
 
 import com.sun.source.util.JavacTask;
--- a/langtools/test/tools/javac/scope/7046348/EagerInterfaceCompletionTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/scope/7046348/EagerInterfaceCompletionTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,8 @@
  * @test
  * @bug     7046348
  * @summary Regression: javac complains of missing classfile for a seemingly unrelated interface
+ * @modules java.compiler
+ *          jdk.compiler
  */
 
 import java.io.File;
--- a/langtools/test/tools/javac/scope/DupUnsharedTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/scope/DupUnsharedTest.java	Thu May 21 11:41:04 2015 -0700
@@ -24,6 +24,9 @@
 /*
  * @test
  * @summary WriteableScope.dupUnshared not working properly for shared Scopes.
+ * @modules jdk.compiler/com.sun.tools.javac.code
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.util
  */
 
 import com.sun.tools.javac.util.*;
--- a/langtools/test/tools/javac/scope/HashCollisionTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/scope/HashCollisionTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,11 @@
  * @bug 7004029
  * @summary Ensure Scope impl can cope with hash collisions
  * @library /tools/javac/lib
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.code
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.tree
+ *          jdk.compiler/com.sun.tools.javac.util
  * @build DPrinter HashCollisionTest
  * @run main HashCollisionTest
  */
--- a/langtools/test/tools/javac/scope/StarImportTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/scope/StarImportTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,9 @@
  * @test
  * @bug 7004029
  * @summary Basher for star-import scopes
+ * @modules jdk.compiler/com.sun.tools.javac.code
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.util
  */
 
 import java.util.*;
--- a/langtools/test/tools/javac/stackmap/StackMapTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/stackmap/StackMapTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,9 @@
  * @bug 4955930
  * @summary The "method0" StackMap attribute should have two entries instead of three
  * @library /tools/lib
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.main
  * @build ToolBox
  * @run compile StackMapTest.java
  * @run main StackMapTest
--- a/langtools/test/tools/javac/synthesize/Main.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/synthesize/Main.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test
  * @bug 6627364 6627366
  * @summary Synthesize important classes if they are missing from the (boot)classpath
+ * @modules jdk.compiler
  */
 
 import java.io.*;
--- a/langtools/test/tools/javac/tree/8067914/NukeExtraCast.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/tree/8067914/NukeExtraCast.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,9 @@
  * @bug 8067914
  * @summary Redunant type cast nodes in AST (follow up from JDK-8043741)
  * @library /tools/lib
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.main
  * @build ToolBox
  * @run compile -XD-printsource T8067914.java
  * @run main NukeExtraCast
--- a/langtools/test/tools/javac/tree/ArrayTypeToString.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/tree/ArrayTypeToString.java	Thu May 21 11:41:04 2015 -0700
@@ -25,6 +25,7 @@
  * @test
  * @bug 8068737
  * @summary Tests ArrayType.toString with type annotations present
+ * @modules jdk.compiler/com.sun.tools.javac.code
  * @build ArrayTypeToString
  * @compile/ref=ArrayTypeToString.out -XDrawDiagnostics -processor ArrayTypeToString -proc:only ArrayTypeToString.java
  */
--- a/langtools/test/tools/javac/tree/ClassTreeTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/tree/ClassTreeTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,8 @@
  * @test
  * @bug 6570730
  * @summary com.sun.source.tree.ModifiersTree.getFlags() should return class type
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
  */
 
 import java.io.*;
--- a/langtools/test/tools/javac/tree/DocCommentToplevelTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/tree/DocCommentToplevelTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,8 @@
  * @test
  * @bug 7096014
  * @summary Javac tokens should retain state
+ * @modules jdk.compiler/com.sun.tools.javac.parser
+ *          jdk.compiler/com.sun.tools.javac.tree
  */
 
 import com.sun.source.tree.*;
--- a/langtools/test/tools/javac/tree/JavacTreeScannerTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/tree/JavacTreeScannerTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -37,6 +37,10 @@
  * @test
  * @bug 6923080
  * @summary TreeScanner.visitNewClass should scan tree.typeargs
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.tree
+ *          jdk.compiler/com.sun.tools.javac.util
  * @build AbstractTreeScannerTest JavacTreeScannerTest
  * @run main JavacTreeScannerTest -q -r .
  */
--- a/langtools/test/tools/javac/tree/MakeLiteralTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/tree/MakeLiteralTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,10 @@
  * @test
  * @bug 6504896 8028415
  * @summary TreeMaker.Literal(Object) does not support Booleans
+ * @modules jdk.compiler/com.sun.tools.javac.code
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.tree
+ *          jdk.compiler/com.sun.tools.javac.util
  */
 
 import com.sun.tools.javac.code.Type;
--- a/langtools/test/tools/javac/tree/MakeQualIdent.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/tree/MakeQualIdent.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,10 @@
  * @bug     8023835
  * @summary Verify that TreeMaker.QualIdent(Symbol) field access cascade ends with
  *          the top-level package (when no toplevel is set in TreeMaker)
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.code
+ *          jdk.compiler/com.sun.tools.javac.tree
+ *          jdk.compiler/com.sun.tools.javac.util
  * @run main MakeQualIdent
  */
 
--- a/langtools/test/tools/javac/tree/MakeTypeTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/tree/MakeTypeTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,11 @@
  * @bug     8042239
  * @summary Verify that TreeMaker.Type(Type) can handle all reasonable types
  * @library /tools/javac/lib
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.code
+ *          jdk.compiler/com.sun.tools.javac.processing
+ *          jdk.compiler/com.sun.tools.javac.tree
+ *          jdk.compiler/com.sun.tools.javac.util
  * @build JavacTestingAbstractProcessor MakeTypeTest
  * @compile/process/ref=MakeTypeTest.out -processor MakeTypeTest MakeTypeTest.java
  */
--- a/langtools/test/tools/javac/tree/MissingSemicolonTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/tree/MissingSemicolonTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,11 @@
  * @test
  * @bug 8041648
  * @summary Verify that end positions are sane if semicolons are missing.
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.parser
+ *          jdk.compiler/com.sun.tools.javac.tree
+ *          jdk.compiler/com.sun.tools.javac.util
  * @run main MissingSemicolonTest MissingSemicolonTest.java
  */
 
--- a/langtools/test/tools/javac/tree/NewArrayPretty.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/tree/NewArrayPretty.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,8 @@
  * @bug 8014826
  * @summary test Pretty print of NewArray
  * @author ksrini
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.tree
  */
 import com.sun.source.tree.ClassTree;
 import com.sun.source.tree.CompilationUnitTree;
--- a/langtools/test/tools/javac/tree/NoPrivateTypesExported.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/tree/NoPrivateTypesExported.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,8 @@
  * @summary Ensuring javax.lang.model.**, javax.tools.**, javax.annotation.processing.**
  *          and com.sun.source.** don't export inappropriate types.
  * @library /tools/javac/lib
+ * @modules java.compiler
+ *          jdk.compiler
  * @build JavacTestingAbstractProcessor NoPrivateTypesExported
  * @compile -processor NoPrivateTypesExported NoPrivateTypesExported.java
  */
--- a/langtools/test/tools/javac/tree/PrettySimpleStringTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/tree/PrettySimpleStringTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,9 @@
  * @test
  * @bug 8006033
  * @summary bug in Pretty.toSimpleString
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.tree
  */
 
 import java.io.File;
--- a/langtools/test/tools/javac/tree/ScopeTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/tree/ScopeTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,9 @@
  * @bug     8023835
  * @summary Verify that implicit type of lambda parameter is correctly attributed
  *          in Scope
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.model
+ *          jdk.compiler/com.sun.tools.javac.util
  * @run main ScopeTest
  */
 
--- a/langtools/test/tools/javac/tree/SourceTreeScannerTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/tree/SourceTreeScannerTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -37,6 +37,10 @@
  * @test
  * @bug 6923080
  * @summary TreeScanner.visitNewClass should scan tree.typeargs
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.tree
+ *          jdk.compiler/com.sun.tools.javac.util
  * @build AbstractTreeScannerTest SourceTreeScannerTest
  * @run main SourceTreeScannerTest -q -r .
  */
--- a/langtools/test/tools/javac/tree/T6963934.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/tree/T6963934.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test
  * @bug     6963934
  * @summary JCCompilationUnit.getImports does not report all imports
+ * @modules jdk.compiler
  */
 
 import java.io.File;
--- a/langtools/test/tools/javac/tree/T6993305.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/tree/T6993305.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,8 @@
  * @test
  * @bug 6993305
  * @summary starting position of a method without modifiers and with type parameters is incorrect
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
  */
 
 import java.io.File;
--- a/langtools/test/tools/javac/tree/T8024415.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/tree/T8024415.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,9 @@
  * @bug 8024415
  * @summary Pretty printing of JCConditional does not follow the precedence and
  *          associativity rules of JCConditional
+ * @modules jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.tree
+ *          jdk.compiler/com.sun.tools.javac.util
  * @run testng T8024415
  */
 
--- a/langtools/test/tools/javac/tree/TestToString.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/tree/TestToString.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,8 @@
  * @bug 7080267
  * @summary Call to toString() from an ExpressionStatementTree doesn't take in
  *      consideration the ";" at the end
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
  */
 
 import com.sun.source.tree.BlockTree;
--- a/langtools/test/tools/javac/tree/TreeKindTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/tree/TreeKindTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test
  * @bug 6341023
  * @summary Tree API: Tree.Kind should have mapping to interface
+ * @modules jdk.compiler
  */
 
 import com.sun.source.tree.*;
--- a/langtools/test/tools/javac/tree/TreePosRoundsTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/tree/TreePosRoundsTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test
  * @bug 6985205 6986246
  * @summary access to tree positions and doc comments may be lost across annotation processing rounds
+ * @modules jdk.compiler
  * @build TreePosRoundsTest
  * @compile -proc:only -processor TreePosRoundsTest TreePosRoundsTest.java
  * @run main TreePosRoundsTest
--- a/langtools/test/tools/javac/tree/TreePosTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/tree/TreePosTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -102,6 +102,12 @@
  * @bug 6919889
  * @summary assorted position errors in compiler syntax trees
  * OLD: -q -r -ef ./tools/javac/typeAnnotations -ef ./tools/javap/typeAnnotations -et ANNOTATED_TYPE .
+ * @modules java.desktop
+ *          jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.code
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.tree
+ *          jdk.compiler/com.sun.tools.javac.util
  * @run main TreePosTest -q -r .
  */
 public class TreePosTest {
--- a/langtools/test/tools/javac/tree/TypeAnnotationsPretty.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/tree/TypeAnnotationsPretty.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,8 @@
  * @bug 8023522
  * @summary test Pretty print of type annotations
  * @author wmdietl
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.tree
  */
 
 import com.sun.source.tree.ClassTree;
--- a/langtools/test/tools/javac/treeannotests/AnnoTreeTests.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/treeannotests/AnnoTreeTests.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,6 +23,9 @@
 
 /*
  * @test
+ * @modules jdk.compiler/com.sun.tools.javac.code
+ *          jdk.compiler/com.sun.tools.javac.tree
+ *          jdk.compiler/com.sun.tools.javac.util
  * @build DA TA Test TestProcessor
  * @compile -proc:only -processor TestProcessor AnnoTreeTests.java
  */
--- a/langtools/test/tools/javac/types/BoxingConversionTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/types/BoxingConversionTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,10 @@
  * @summary Add test library to simplify the task of writing automated type-system tests
  * @author mcimadamore
  * @library .
+ * @modules jdk.compiler/com.sun.tools.javac.code
+ *          jdk.compiler/com.sun.tools.javac.comp
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.util
  * @run main BoxingConversionTest
  */
 
--- a/langtools/test/tools/javac/types/CastTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/types/CastTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,10 @@
  * @summary Add test library to simplify the task of writing automated type-system tests
  * @author mcimadamore
  * @library .
+ * @modules jdk.compiler/com.sun.tools.javac.code
+ *          jdk.compiler/com.sun.tools.javac.comp
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.util
  * @run main CastTest
  */
 
--- a/langtools/test/tools/javac/types/GenericTypeWellFormednessTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/types/GenericTypeWellFormednessTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,10 @@
  * @summary Test generic types well-formedness
  * @author mcimadamore
  * @library .
+ * @modules jdk.compiler/com.sun.tools.javac.code
+ *          jdk.compiler/com.sun.tools.javac.comp
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.util
  * @run main GenericTypeWellFormednessTest
  */
 
--- a/langtools/test/tools/javac/types/PrimitiveConversionTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/types/PrimitiveConversionTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,10 @@
  * @summary Add test library to simplify the task of writing automated type-system tests
  * @author mcimadamore
  * @library .
+ * @modules jdk.compiler/com.sun.tools.javac.code
+ *          jdk.compiler/com.sun.tools.javac.comp
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.util
  * @run main PrimitiveConversionTest
  */
 
--- a/langtools/test/tools/javac/types/TestComparisons.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/types/TestComparisons.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test
  * @bug 8013357
  * @summary javac should correctly enforce binary comparison rules.
+ * @modules jdk.compiler
  */
 import com.sun.tools.javac.code.Type;
 import com.sun.tools.javac.code.Type.*;
--- a/langtools/test/tools/javac/unicode/SupplementaryJavaID6.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/unicode/SupplementaryJavaID6.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
  * @bug 4914724 4973116 5014511
  * @summary Ensure that a supplementary character can be used as part/whole of a
  * class name on platforms that have Unicode aware filesystems.
+ * @modules jdk.compiler
  * @build Wrapper
  * @run main Wrapper SupplementaryJavaID6
  */
--- a/langtools/test/tools/javac/unit/T6198196.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/unit/T6198196.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,8 @@
  * @bug     6198196 6278523
  * @summary package-info.java: Weird compiler error
  * @author  Peter von der Ah\u00e9
+ * @modules java.compiler
+ *          jdk.compiler
  */
 
 import java.io.IOException;
--- a/langtools/test/tools/javac/unit/util/convert/EnclosingCandidates.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/unit/util/convert/EnclosingCandidates.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
  * @bug     6397652
  * @summary javac compilation failure when imported class with $ sign in the name
  * @author  Peter von der Ah\u00e9
+ * @modules jdk.compiler/com.sun.tools.javac.util
  */
 
 import static com.sun.tools.javac.util.Convert.enclosingCandidates;
--- a/langtools/test/tools/javac/unit/util/list/AbstractList.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/unit/util/list/AbstractList.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
  * @summary com.sun.tools.javac.util.List.from(A[]) shouldn't be deprecated
  * @author  Peter von der Ah\u00e9
  * @library ../..
+ * @modules jdk.compiler/com.sun.tools.javac.util
  * @compile ../../util/list/AbstractList.java
  * @run main util.list.AbstractList
  */
--- a/langtools/test/tools/javac/unit/util/list/FromArray.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/unit/util/list/FromArray.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
  * @summary com.sun.tools.javac.util.List.from(A[]) shouldn't be deprecated
  * @author  Peter von der Ah\u00e9
  * @library ../..
+ * @modules jdk.compiler/com.sun.tools.javac.util
  * @compile ../../util/list/FromArray.java
  * @run main util.list.FromArray
  */
--- a/langtools/test/tools/javac/util/BitsTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/util/BitsTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test
  * @bug 8028267
  * @summary Unit tests for the com.sun.tools.javac.util.Bits class.
+ * @modules jdk.compiler/com.sun.tools.javac.util
  * @run main BitsTest
  */
 
--- a/langtools/test/tools/javac/util/NewlineOnlyDiagnostic.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/util/NewlineOnlyDiagnostic.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,6 +32,8 @@
  * @summary Test that javac doesn't throw ArrayIndexOutOfBoundsException
  *          when logging the message "\n"
  * @library /tools/javac/lib
+ * @modules java.compiler
+ *          jdk.compiler
  * @build   JavacTestingAbstractProcessor NewlineOnlyDiagnostic
  * @compile -processor NewlineOnlyDiagnostic NewlineOnlyDiagnostic.java
  */
--- a/langtools/test/tools/javac/util/StringUtilsTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/util/StringUtilsTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test
  * @bug 8029800 8043186
  * @summary Unit test StringUtils
+ * @modules jdk.compiler/com.sun.tools.javac.util
  * @run main StringUtilsTest
  */
 
--- a/langtools/test/tools/javac/util/T6597678.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/util/T6597678.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,8 @@
  * @bug 6597678 6449184
  * @summary Ensure Messages propogated between rounds
  * @library /tools/javac/lib
+ * @modules jdk.compiler/com.sun.tools.javac.processing
+ *          jdk.compiler/com.sun.tools.javac.util
  * @build JavacTestingAbstractProcessor T6597678
  * @run main T6597678
  */
--- a/langtools/test/tools/javac/util/context/T7021650.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/util/context/T7021650.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,11 @@
  * @bug 7021650
  * @summary Fix Context issues
  * @library /tools/javac/lib
+ * @modules jdk.compiler/com.sun.tools.javac.comp
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.main
+ *          jdk.compiler/com.sun.tools.javac.processing
+ *          jdk.compiler/com.sun.tools.javac.util
  * @build JavacTestingAbstractProcessor T7021650
  * @run main T7021650
  */
--- a/langtools/test/tools/javac/util/filemanager/TestName.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/util/filemanager/TestName.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
  * @summary JSR 199: enforce the use of valid package and class names
  *                   in get{Java,}FileFor{Input,Output}
  * @author  Peter von der Ah\u00e9
+ * @modules jdk.compiler/com.sun.tools.javac.file
  */
 
 import com.sun.tools.javac.file.JavacFileManager;
--- a/langtools/test/tools/javac/util/list/ListBufferTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/util/list/ListBufferTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test
  * @bug 8004504
  * @summary Ensure that ListBuffer is working properly
+ * @modules jdk.compiler/com.sun.tools.javac.util
  */
 
 import com.sun.tools.javac.util.List;
--- a/langtools/test/tools/javac/util/list/TList.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/util/list/TList.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test
  * @bug 6267067 6351336 6389198
  * @summary unit test for javac List
+ * @modules jdk.compiler/com.sun.tools.javac.util
  */
 
 import java.util.*;
--- a/langtools/test/tools/javac/varargs/6199075/T6199075.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/varargs/6199075/T6199075.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,10 @@
  * @summary Unambiguous varargs method calls flagged as ambiguous
  * @author mcimadamore
  *
+ * @modules jdk.compiler/com.sun.tools.classfile
+ *          jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.util
  */
 
 import com.sun.source.util.JavacTask;
--- a/langtools/test/tools/javac/varargs/7042566/T7042566.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/varargs/7042566/T7042566.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,8 @@
  * @summary Unambiguous varargs method calls flagged as ambiguous
  *  temporarily workaround combo tests are causing time out in several platforms
  * @library ../../lib
+ * @modules jdk.compiler/com.sun.tools.classfile
+ *          jdk.compiler/com.sun.tools.javac.util
  * @build JavacTestingAbstractThreadedTest
  * @run main/othervm T7042566
  */
--- a/langtools/test/tools/javac/varargs/7043922/T7043922.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/varargs/7043922/T7043922.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,9 @@
  * @test
  * @bug 7043922
  * @summary Regression: internal compiler error for nested anonymous inner class featuring varargs constructor
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.util
  */
 
 import com.sun.source.util.JavacTask;
--- a/langtools/test/tools/javac/varargs/warning/Warn4.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/varargs/warning/Warn4.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,7 @@
  *  temporarily workaround combo tests are causing time out in several platforms
  * @author  mcimadamore
  * @library ../../lib
+ * @modules jdk.compiler
  * @build JavacTestingAbstractThreadedTest
  * @run main/othervm Warn4
  */
--- a/langtools/test/tools/javac/varargs/warning/Warn5.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/varargs/warning/Warn5.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,7 @@
  *  temporarily workaround combo tests are causing time out in several platforms
  * @author  mcimadamore
  * @library ../../lib
+ * @modules jdk.compiler
  * @build JavacTestingAbstractThreadedTest
  * @run main/othervm Warn5
  */
--- a/langtools/test/tools/javac/versions/SourceTargetTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/versions/SourceTargetTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,8 @@
  * @test
  * @bug 8050106
  * @summary JavaCompiler relies on inappropriate result from comparison
+ * @modules jdk.compiler/com.sun.tools.javac.code
+ *          jdk.compiler/com.sun.tools.javac.jvm
  */
 
 import java.io.*;
--- a/langtools/test/tools/javac/versions/Versions.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/versions/Versions.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,8 @@
  * @test
  * @bug 4981566 5028634 5094412 6304984 7025786 7025789 8001112 8028545 8000961 8030610
  * @summary Check interpretation of -target and -source options
+ * @modules java.compiler
+ *          jdk.compiler
  * @run main Versions
  */
 
--- a/langtools/test/tools/javac/warnings/6594914/T6594914b.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/warnings/6594914/T6594914b.java	Thu May 21 11:41:04 2015 -0700
@@ -2,6 +2,7 @@
  * @test /nodynamiccopyright/
  * @bug 6594914
  * @summary \\@SuppressWarnings("deprecation") does not not work for the type of a variable
+ * @modules java.base/sun.misc
  * @compile/ref=T6594914b.out -XDenableSunApiLintControl -XDrawDiagnostics -Xlint:sunapi T6594914b.java
  */
 
--- a/langtools/test/tools/javac/warnings/6594914/T6594914b.out	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/warnings/6594914/T6594914b.out	Thu May 21 11:41:04 2015 -0700
@@ -1,7 +1,7 @@
-T6594914b.java:11:13: compiler.warn.sun.proprietary: sun.misc.Lock
-T6594914b.java:16:24: compiler.warn.sun.proprietary: sun.misc.Lock
-T6594914b.java:16:39: compiler.warn.sun.proprietary: sun.misc.Lock
-T6594914b.java:17:28: compiler.warn.sun.proprietary: sun.misc.CEFormatException
-T6594914b.java:16:56: compiler.warn.sun.proprietary: sun.misc.Lock
-T6594914b.java:24:17: compiler.warn.sun.proprietary: sun.misc.Lock
+T6594914b.java:12:13: compiler.warn.sun.proprietary: sun.misc.Lock
+T6594914b.java:17:24: compiler.warn.sun.proprietary: sun.misc.Lock
+T6594914b.java:17:39: compiler.warn.sun.proprietary: sun.misc.Lock
+T6594914b.java:18:28: compiler.warn.sun.proprietary: sun.misc.CEFormatException
+T6594914b.java:17:56: compiler.warn.sun.proprietary: sun.misc.Lock
+T6594914b.java:25:17: compiler.warn.sun.proprietary: sun.misc.Lock
 6 warnings
--- a/langtools/test/tools/javac/warnings/VerifyLintDescriptions.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/warnings/VerifyLintDescriptions.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,8 @@
  * @test
  * @bug 8033961
  * @summary Verify that all LintCategories have their descriptions filled.
+ * @modules jdk.compiler/com.sun.tools.javac.code
+ *          jdk.compiler/com.sun.tools.javac.util
  */
 
 import java.util.ArrayList;
--- a/langtools/test/tools/javac/warnings/suppress/Overridden.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/warnings/suppress/Overridden.java	Thu May 21 11:41:04 2015 -0700
@@ -2,6 +2,10 @@
  * @test /nodynamiccopyright/
  * @bug 8033421
  * @summary Check that \\@SuppressWarnings works properly when overriding deprecated method.
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.code
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.tree
  * @build VerifySuppressWarnings
  * @compile/ref=Overridden.out -XDrawDiagnostics -Xlint:deprecation Overridden.java
  * @run main VerifySuppressWarnings Overridden.java
--- a/langtools/test/tools/javac/warnings/suppress/Overridden.out	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/warnings/suppress/Overridden.out	Thu May 21 11:41:04 2015 -0700
@@ -1,2 +1,2 @@
-Overridden.java:11:17: compiler.warn.has.been.deprecated: test(), Interface
+Overridden.java:15:17: compiler.warn.has.been.deprecated: test(), Interface
 1 warning
--- a/langtools/test/tools/javac/warnings/suppress/T6480588.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/warnings/suppress/T6480588.java	Thu May 21 11:41:04 2015 -0700
@@ -3,6 +3,10 @@
  * @bug 6470588
  * @summary Verify that \\@SuppressWarnings("deprecation") works OK for all parts
  *          of class/method/field "header", including (declaration) annotations
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.code
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.tree
  * @build VerifySuppressWarnings
  * @compile/ref=T6480588.out -XDrawDiagnostics -Xlint:unchecked,deprecation,cast T6480588.java
  * @run main VerifySuppressWarnings T6480588.java
--- a/langtools/test/tools/javac/warnings/suppress/T6480588.out	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/warnings/suppress/T6480588.out	Thu May 21 11:41:04 2015 -0700
@@ -1,18 +1,18 @@
-T6480588.java:12:24: compiler.warn.has.been.deprecated: DeprecatedClass, compiler.misc.unnamed.package
-T6480588.java:12:51: compiler.warn.has.been.deprecated: DeprecatedInterface, compiler.misc.unnamed.package
-T6480588.java:11:2: compiler.warn.has.been.deprecated: DeprecatedAnnotation, compiler.misc.unnamed.package
-T6480588.java:14:12: compiler.warn.has.been.deprecated: DeprecatedClass, compiler.misc.unnamed.package
-T6480588.java:14:65: compiler.warn.has.been.deprecated: DeprecatedClass, compiler.misc.unnamed.package
-T6480588.java:13:6: compiler.warn.has.been.deprecated: DeprecatedAnnotation, compiler.misc.unnamed.package
-T6480588.java:14:35: compiler.warn.has.been.deprecated: DeprecatedClass, compiler.misc.unnamed.package
-T6480588.java:15:9: compiler.warn.has.been.deprecated: DeprecatedClass, compiler.misc.unnamed.package
-T6480588.java:15:34: compiler.warn.has.been.deprecated: DeprecatedClass, compiler.misc.unnamed.package
-T6480588.java:17:9: compiler.warn.has.been.deprecated: DeprecatedClass, compiler.misc.unnamed.package
-T6480588.java:17:35: compiler.warn.has.been.deprecated: DeprecatedClass, compiler.misc.unnamed.package
-T6480588.java:26:5: compiler.warn.has.been.deprecated: DeprecatedClass, compiler.misc.unnamed.package
-T6480588.java:25:6: compiler.warn.has.been.deprecated: DeprecatedAnnotation, compiler.misc.unnamed.package
-T6480588.java:26:33: compiler.warn.has.been.deprecated: DeprecatedClass, compiler.misc.unnamed.package
-T6480588.java:29:25: compiler.warn.has.been.deprecated: DeprecatedClass, compiler.misc.unnamed.package
-T6480588.java:29:52: compiler.warn.has.been.deprecated: DeprecatedInterface, compiler.misc.unnamed.package
-T6480588.java:28:6: compiler.warn.has.been.deprecated: DeprecatedAnnotation, compiler.misc.unnamed.package
+T6480588.java:16:24: compiler.warn.has.been.deprecated: DeprecatedClass, compiler.misc.unnamed.package
+T6480588.java:16:51: compiler.warn.has.been.deprecated: DeprecatedInterface, compiler.misc.unnamed.package
+T6480588.java:15:2: compiler.warn.has.been.deprecated: DeprecatedAnnotation, compiler.misc.unnamed.package
+T6480588.java:18:12: compiler.warn.has.been.deprecated: DeprecatedClass, compiler.misc.unnamed.package
+T6480588.java:18:65: compiler.warn.has.been.deprecated: DeprecatedClass, compiler.misc.unnamed.package
+T6480588.java:17:6: compiler.warn.has.been.deprecated: DeprecatedAnnotation, compiler.misc.unnamed.package
+T6480588.java:18:35: compiler.warn.has.been.deprecated: DeprecatedClass, compiler.misc.unnamed.package
+T6480588.java:19:9: compiler.warn.has.been.deprecated: DeprecatedClass, compiler.misc.unnamed.package
+T6480588.java:19:34: compiler.warn.has.been.deprecated: DeprecatedClass, compiler.misc.unnamed.package
+T6480588.java:21:9: compiler.warn.has.been.deprecated: DeprecatedClass, compiler.misc.unnamed.package
+T6480588.java:21:35: compiler.warn.has.been.deprecated: DeprecatedClass, compiler.misc.unnamed.package
+T6480588.java:30:5: compiler.warn.has.been.deprecated: DeprecatedClass, compiler.misc.unnamed.package
+T6480588.java:29:6: compiler.warn.has.been.deprecated: DeprecatedAnnotation, compiler.misc.unnamed.package
+T6480588.java:30:33: compiler.warn.has.been.deprecated: DeprecatedClass, compiler.misc.unnamed.package
+T6480588.java:33:25: compiler.warn.has.been.deprecated: DeprecatedClass, compiler.misc.unnamed.package
+T6480588.java:33:52: compiler.warn.has.been.deprecated: DeprecatedInterface, compiler.misc.unnamed.package
+T6480588.java:32:6: compiler.warn.has.been.deprecated: DeprecatedAnnotation, compiler.misc.unnamed.package
 17 warnings
--- a/langtools/test/tools/javac/warnings/suppress/T6707032.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/warnings/suppress/T6707032.java	Thu May 21 11:41:04 2015 -0700
@@ -2,6 +2,10 @@
  * @test /nodynamiccopyright/
  * @bug 6707032
  * @summary Verify that \\@SuppressWarnings("divzero") works for constant initializers
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.code
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.tree
  * @build VerifySuppressWarnings
  * @compile/ref=T6707032.out -XDrawDiagnostics -Xlint:divzero T6707032.java
  * @run main VerifySuppressWarnings T6707032.java
--- a/langtools/test/tools/javac/warnings/suppress/T6707032.out	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/warnings/suppress/T6707032.out	Thu May 21 11:41:04 2015 -0700
@@ -1,3 +1,3 @@
-T6707032.java:12:36: compiler.warn.div.zero
 T6707032.java:16:36: compiler.warn.div.zero
+T6707032.java:20:36: compiler.warn.div.zero
 2 warnings
--- a/langtools/test/tools/javac/warnings/suppress/T8021112b.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/warnings/suppress/T8021112b.java	Thu May 21 11:41:04 2015 -0700
@@ -2,6 +2,10 @@
  * @test /nodynamiccopyright/
  * @bug 8021112
  * @summary Verify that \\@SuppressWarnings("unchecked") works correctly for lazy attrib values
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.code
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.tree
  * @build VerifySuppressWarnings
  * @compile/ref=T8021112b.out -XDrawDiagnostics -Xlint:unchecked,deprecation,cast T8021112b.java
  * @run main VerifySuppressWarnings T8021112b.java
--- a/langtools/test/tools/javac/warnings/suppress/T8021112b.out	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/warnings/suppress/T8021112b.out	Thu May 21 11:41:04 2015 -0700
@@ -1,3 +1,3 @@
-T8021112b.java:11:37: compiler.warn.has.been.deprecated: Dep, compiler.misc.unnamed.package
-T8021112b.java:15:13: compiler.warn.has.been.deprecated: Dep, compiler.misc.unnamed.package
-2 warnings
\ No newline at end of file
+T8021112b.java:15:37: compiler.warn.has.been.deprecated: Dep, compiler.misc.unnamed.package
+T8021112b.java:19:13: compiler.warn.has.been.deprecated: Dep, compiler.misc.unnamed.package
+2 warnings
--- a/langtools/test/tools/javac/warnings/suppress/T8069094.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/warnings/suppress/T8069094.java	Thu May 21 11:41:04 2015 -0700
@@ -2,6 +2,10 @@
  * @test /nodynamiccopyright/
  * @bug 8069094
  * @summary Verify that \\@SuppressWarnings("unchecked") works correctly for annotation default values
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.code
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.tree
  * @build VerifySuppressWarnings
  * @compile/ref=T8069094.out -XDrawDiagnostics -Xlint:unchecked,deprecation,cast T8069094.java
  * @run main VerifySuppressWarnings T8069094.java
--- a/langtools/test/tools/javac/warnings/suppress/T8069094.out	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/warnings/suppress/T8069094.out	Thu May 21 11:41:04 2015 -0700
@@ -1,3 +1,3 @@
-T8069094.java:11:5: compiler.warn.has.been.deprecated: T8069094A, compiler.misc.unnamed.package
-T8069094.java:11:29: compiler.warn.has.been.deprecated: T8069094A, compiler.misc.unnamed.package
+T8069094.java:15:5: compiler.warn.has.been.deprecated: T8069094A, compiler.misc.unnamed.package
+T8069094.java:15:29: compiler.warn.has.been.deprecated: T8069094A, compiler.misc.unnamed.package
 2 warnings
--- a/langtools/test/tools/javac/warnings/suppress/TypeAnnotations.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javac/warnings/suppress/TypeAnnotations.java	Thu May 21 11:41:04 2015 -0700
@@ -2,6 +2,10 @@
  * @test /nodynamiccopyright/
  * @bug 8021112
  * @summary Verify that \\@SuppressWarnings("unchecked") works for type annotations
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.code
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.tree
  * @ignore  8057683 improve ordering of errors with type annotations
  * @build VerifySuppressWarnings
  * @compile/ref=TypeAnnotations.out -XDrawDiagnostics -Xlint:unchecked,deprecation,cast TypeAnnotations.java
--- a/langtools/test/tools/javadoc/6176978/T6176978.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javadoc/6176978/T6176978.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test
  * @bug 6176978
  * @summary current Javadoc's invocation and extension (Doclet) mechanisms are problematic
+ * @modules jdk.javadoc
  * @build T6176978
  * @run main T6176978
  */
--- a/langtools/test/tools/javadoc/6227454/Test.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javadoc/6227454/Test.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test
  * @bug 6227454
  * @summary package.html and overview.html may not be read fully
+ * @modules jdk.javadoc
  */
 
 import java.io.*;
--- a/langtools/test/tools/javadoc/6942366/T6942366.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javadoc/6942366/T6942366.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test
  * @bug 6942366
  * @summary javadoc no longer inherits doc from sourcepath
+ * @modules jdk.javadoc
  * @build p.Base Test
  * @run main T6942366
  */
--- a/langtools/test/tools/javadoc/6958836/Test.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javadoc/6958836/Test.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test
  * @bug 6958836 8002168
  * @summary javadoc should support -Xmaxerrs and -Xmaxwarns
+ * @modules jdk.javadoc
  */
 
 import java.io.*;
--- a/langtools/test/tools/javadoc/6964914/Test.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javadoc/6964914/Test.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test
  * @bug 6964914
  * @summary javadoc does not output number of warnings using user written doclet
+ * @modules jdk.javadoc/com.sun.tools.doclets.standard
  */
 
 import java.io.*;
--- a/langtools/test/tools/javadoc/6964914/TestUserDoclet.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javadoc/6964914/TestUserDoclet.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test
  * @bug 6964914
  * @summary javadoc does not output number of warnings using user written doclet
+ * @modules jdk.javadoc
  */
 
 import java.io.*;
--- a/langtools/test/tools/javadoc/8025693/Test.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javadoc/8025693/Test.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test
  * @bug 8025693
  * @summary javadoc should ignore <clinit> methods found in classes on classpath
+ * @modules jdk.javadoc
  */
 
 import java.io.*;
--- a/langtools/test/tools/javadoc/BooleanConst.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javadoc/BooleanConst.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
  * @bug 4587494
  * @summary Constant field values for boolean Data-Types don't use true and false
  * @author gafter
+ * @modules jdk.javadoc
  * @run main BooleanConst
  */
 
--- a/langtools/test/tools/javadoc/BreakIteratorWarning.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javadoc/BreakIteratorWarning.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
  * @summary Verify that (verbose) warnings are no longer generated when
  *          the default first-sentence algorithm doesn't match the
  *          BreakIterator algorithm.
+ * @modules jdk.javadoc
  */
 
 import com.sun.javadoc.*;
--- a/langtools/test/tools/javadoc/CheckResourceKeys.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javadoc/CheckResourceKeys.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test
  * @bug 8000612
  * @summary need test program to validate javadoc resource bundles
+ * @modules jdk.compiler/com.sun.tools.classfile
  */
 
 import java.io.*;
--- a/langtools/test/tools/javadoc/FlagsTooEarly.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javadoc/FlagsTooEarly.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
  * @bug 4904495
  * @summary Compilation may go awry if we ask a symbol for its flags during
  *          javac's Enter phase, before the flags are generally available.
+ * @modules jdk.javadoc
  */
 
 import com.sun.javadoc.*;
--- a/langtools/test/tools/javadoc/InlineTagsWithBraces.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javadoc/InlineTagsWithBraces.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test
  * @bug 4965490
  * @summary Verify that matching braces can appear within inline tags.
+ * @modules jdk.javadoc
  */
 
 import com.sun.javadoc.*;
--- a/langtools/test/tools/javadoc/LangVers.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javadoc/LangVers.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
  * @bug 4909767
  * @summary Verify that omitting Doclet.languageVersion() hides 1.5 language
  *      features from the doclet.
+ * @modules jdk.javadoc
  */
 
 import java.util.List;
--- a/langtools/test/tools/javadoc/MaxWarns.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javadoc/MaxWarns.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test
  * @bug 8005644
  * @summary set default max errs and max warns
+ * @modules jdk.javadoc/com.sun.tools.doclets.standard
  */
 
 import java.io.File;
--- a/langtools/test/tools/javadoc/MethodLinks.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javadoc/MethodLinks.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
  * @bug 4628281
  * @summary Int. links missing from return/param types when .java files passd in
  * @author gafter
+ * @modules jdk.javadoc
  * @run main MethodLinks
  */
 
--- a/langtools/test/tools/javadoc/NoStar.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javadoc/NoStar.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
  * @bug 4587562
  * @summary tool: Indentation messed up for javadoc comments omitting preceding *
  * @author gafter
+ * @modules jdk.javadoc
  * @run main NoStar
  */
 
--- a/langtools/test/tools/javadoc/T4696488.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javadoc/T4696488.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,7 @@
  * @bug     4696488
  * @summary javadoc doesn't handle UNC paths for destination directory
  * @author  Jesse Glick
+ * @modules jdk.javadoc/com.sun.tools.doclets.internal.toolkit
  * @run main T4696488 T4696488.java
  */
 public class T4696488 {
--- a/langtools/test/tools/javadoc/T4994049/T4994049.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javadoc/T4994049/T4994049.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
  * @bug     4994049
  * @summary Unit test for SourcePosition.column with respect to tab expansion
  * @author  Peter von der Ah\u00e9
+ * @modules jdk.javadoc
  * @run main T4994049 FileWithTabs.java
  */
 
--- a/langtools/test/tools/javadoc/T6551367.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javadoc/T6551367.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
  * @bug     6551367
  * @summary javadoc throws ClassCastException when an link tag tries to reference constructor.
  * @author  A. Sundararajan
+ * @modules jdk.javadoc/com.sun.tools.doclets.standard
  * @run main T6551367 T6551367.java
  */
 
--- a/langtools/test/tools/javadoc/T6968833.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javadoc/T6968833.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test
  * @bug 6968833
  * @summary javadoc reports error but still returns 0
+ * @modules jdk.javadoc
  */
 
 import java.io.*;
--- a/langtools/test/tools/javadoc/XWerror.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javadoc/XWerror.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
  * @bug 4099527
  * @summary javadoc tool: want flag to exit nonzero if there were warnings.
  * @author gafter
+ * @modules jdk.javadoc
  * @run main XWerror
  */
 
--- a/langtools/test/tools/javadoc/annotations/annotateMethodsFields/Main.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javadoc/annotations/annotateMethodsFields/Main.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,7 @@
  *          annotation type elements.
  *          Test an annotation type with a type nested within.
  * @library ../../lib
+ * @modules jdk.javadoc
  * @compile  ../../lib/Tester.java Main.java
  * @run main Main
  */
--- a/langtools/test/tools/javadoc/annotations/annotatePackage/Main.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javadoc/annotations/annotatePackage/Main.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
  * @bug 5031168
  * @summary Test package annotations and package-info.java package comments.
  * @library ../../lib
+ * @modules jdk.javadoc
  * @compile  ../../lib/Tester.java Main.java
  * @run main Main
  */
--- a/langtools/test/tools/javadoc/annotations/annotateParams/Main.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javadoc/annotations/annotateParams/Main.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
  * @bug 5031171
  * @summary Test parameter annotations.
  * @library ../../lib
+ * @modules jdk.javadoc
  * @compile  ../../lib/Tester.java Main.java
  * @run main Main
  */
--- a/langtools/test/tools/javadoc/annotations/badVals/Main.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javadoc/annotations/badVals/Main.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
  * @bug 5029874
  * @summary Verify that bad annotation values don't result in NPE
  * @library ../../lib
+ * @modules jdk.javadoc
  */
 
 import java.io.IOException;
--- a/langtools/test/tools/javadoc/annotations/defaults/Main.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javadoc/annotations/defaults/Main.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
  * @summary Test an annotation type with default element values, and
  *          annotations that use them.
  * @library ../../lib
+ * @modules jdk.javadoc
  * @compile  ../../lib/Tester.java Main.java
  * @run main Main
  */
--- a/langtools/test/tools/javadoc/annotations/elementTypes/Main.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javadoc/annotations/elementTypes/Main.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
  * @summary Test an annotation type and annotations with elements of various
  *          types.
  * @library ../../lib
+ * @modules jdk.javadoc
  * @compile  ../../lib/Tester.java Main.java
  * @run main Main
  */
--- a/langtools/test/tools/javadoc/annotations/missing/Main.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javadoc/annotations/missing/Main.java	Thu May 21 11:41:04 2015 -0700
@@ -26,6 +26,7 @@
  * @bug 6709246
  * @summary Class-cast exception when annotation type is missing.
  * @library ../../lib
+ * @modules jdk.javadoc
  */
 
 import java.io.IOException;
--- a/langtools/test/tools/javadoc/annotations/shortcuts/Main.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javadoc/annotations/shortcuts/Main.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
  * @bug 4904495
  * @summary Verify that "shortcuts" are used when printing annotations.
  * @library ../../lib
+ * @modules jdk.javadoc
  * @compile  ../../lib/Tester.java Main.java
  * @run main Main
  */
--- a/langtools/test/tools/javadoc/api/basic/DocletPathTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javadoc/api/basic/DocletPathTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,8 @@
  * @test
  * @bug 6493690
  * @summary javadoc should have a javax.tools.Tool service provider
+ * @modules java.compiler
+ *          jdk.compiler
  * @build APITest
  * @run main DocletPathTest
  */
--- a/langtools/test/tools/javadoc/api/basic/DocumentationToolLocationTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javadoc/api/basic/DocumentationToolLocationTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,8 @@
  * @test
  * @bug 8025844
  * @summary test DocumentationTool.Location methods
+ * @modules java.compiler
+ *          jdk.compiler
  * @build APITest
  * @run main DocumentationToolLocationTest
  */
--- a/langtools/test/tools/javadoc/api/basic/GetSourceVersionsTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javadoc/api/basic/GetSourceVersionsTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,8 @@
  * @test
  * @bug 6493690
  * @summary javadoc should have a javax.tools.Tool service provider
+ * @modules java.compiler
+ *          jdk.compiler
  * @build APITest
  * @run main GetSourceVersionsTest
  */
--- a/langtools/test/tools/javadoc/api/basic/GetTask_DiagListenerTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javadoc/api/basic/GetTask_DiagListenerTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,8 @@
  * @test
  * @bug 6493690
  * @summary javadoc should have a javax.tools.Tool service provider
+ * @modules java.compiler
+ *          jdk.compiler
  * @build APITest
  * @run main GetTask_DiagListenerTest
  */
--- a/langtools/test/tools/javadoc/api/basic/GetTask_DocletClassTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javadoc/api/basic/GetTask_DocletClassTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test
  * @bug 6493690
  * @summary javadoc should have a javax.tools.Tool service provider
+ * @modules jdk.javadoc
  * @build APITest
  * @run main GetTask_DocletClassTest
  */
--- a/langtools/test/tools/javadoc/api/basic/GetTask_FileManagerTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javadoc/api/basic/GetTask_FileManagerTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,8 @@
  * @test
  * @bug 6493690 8024434
  * @summary javadoc should have a javax.tools.Tool service provider
+ * @modules jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.util
  * @build APITest
  * @run main GetTask_FileManagerTest
  */
--- a/langtools/test/tools/javadoc/api/basic/GetTask_FileObjectsTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javadoc/api/basic/GetTask_FileObjectsTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,8 @@
  * @test
  * @bug 6493690
  * @summary javadoc should have a javax.tools.Tool service provider
+ * @modules java.compiler
+ *          jdk.compiler
  * @build APITest
  * @run main GetTask_FileObjectsTest
  */
--- a/langtools/test/tools/javadoc/api/basic/GetTask_OptionsTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javadoc/api/basic/GetTask_OptionsTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,8 @@
  * @test
  * @bug 6493690
  * @summary javadoc should have a javax.tools.Tool service provider
+ * @modules java.compiler
+ *          jdk.compiler
  * @build APITest
  * @run main GetTask_OptionsTest
  */
--- a/langtools/test/tools/javadoc/api/basic/GetTask_WriterTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javadoc/api/basic/GetTask_WriterTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,8 @@
  * @test
  * @bug 6493690
  * @summary javadoc should have a javax.tools.Tool service provider
+ * @modules java.compiler
+ *          jdk.compiler
  * @build APITest
  * @run main GetTask_WriterTest
  */
--- a/langtools/test/tools/javadoc/api/basic/IsSupportedOptionTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javadoc/api/basic/IsSupportedOptionTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,8 @@
  * @test
  * @bug 6493690
  * @summary javadoc should have a javax.tools.Tool service provider
+ * @modules java.compiler
+ *          jdk.compiler
  * @build APITest
  * @run main IsSupportedOptionTest
  */
--- a/langtools/test/tools/javadoc/api/basic/JavadocTaskImplTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javadoc/api/basic/JavadocTaskImplTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,9 @@
  * @test
  * @bug 6493690
  * @summary javadoc should have a javax.tools.Tool service provider
+ * @modules jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.util
+ *          jdk.javadoc/com.sun.tools.javadoc.api
  * @build APITest
  * @run main JavadocTaskImplTest
  */
--- a/langtools/test/tools/javadoc/api/basic/RunTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javadoc/api/basic/RunTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,8 @@
  * @test
  * @bug 6493690 8007490
  * @summary javadoc should have a javax.tools.Tool service provider
+ * @modules java.compiler
+ *          jdk.compiler
  * @build APITest
  * @run main RunTest
  */
--- a/langtools/test/tools/javadoc/api/basic/TagletPathTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javadoc/api/basic/TagletPathTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,8 @@
  * @test
  * @bug 6493690
  * @summary javadoc should have a javax.tools.Tool service provider
+ * @modules java.compiler
+ *          jdk.compiler
  * @build APITest
  * @run main TagletPathTest
  */
--- a/langtools/test/tools/javadoc/api/basic/Task_reuseTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javadoc/api/basic/Task_reuseTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,8 @@
  * @test
  * @bug 6493690
  * @summary javadoc should have a javax.tools.Tool service provider
+ * @modules java.compiler
+ *          jdk.compiler
  * @build APITest
  * @run main Task_reuseTest
  */
--- a/langtools/test/tools/javadoc/badSuper/BadSuper.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javadoc/badSuper/BadSuper.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test
  * @bug 4983023
  * @summary A bad superclass shouldn't throw the standard doclet into a loop
+ * @modules jdk.javadoc
  */
 
 public class BadSuper {
--- a/langtools/test/tools/javadoc/completionFailure/CompletionFailure.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javadoc/completionFailure/CompletionFailure.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
  * @bug 4670772 6328529
  * @summary Completion failures should be ignored in javadoc.
  * @author gafter
+ * @modules jdk.javadoc
  */
 
 import com.sun.javadoc.*;
--- a/langtools/test/tools/javadoc/doclint/DocLintTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javadoc/doclint/DocLintTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test
  * @bug 8004834 8007610
  * @summary Add doclint support into javadoc
+ * @modules jdk.compiler/com.sun.tools.javac.main
  */
 
 import java.io.File;
--- a/langtools/test/tools/javadoc/doclint/ImplicitHeadersTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javadoc/doclint/ImplicitHeadersTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test
  * @bug 8006346
  * @summary doclint should make allowance for headers generated by standard doclet
+ * @modules jdk.javadoc
  */
 
 import java.io.File;
--- a/langtools/test/tools/javadoc/dupOk/DupOk.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javadoc/dupOk/DupOk.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
  * @bug 4673477
  * @summary The first definition found for each class should be documented
  * @author gafter
+ * @modules jdk.javadoc
  */
 
 import com.sun.javadoc.*;
--- a/langtools/test/tools/javadoc/enum/docComments/Main.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javadoc/enum/docComments/Main.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
  * @bug 4421066
  * @summary Verify the comments in an enum type.
  * @library ../../lib
+ * @modules jdk.javadoc
  * @compile  ../../lib/Tester.java Main.java
  * @run main Main
  */
--- a/langtools/test/tools/javadoc/enum/enumType/Main.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javadoc/enum/enumType/Main.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
  * @bug 4421066
  * @summary Verify the contents of an enum type.
  * @library ../../lib
+ * @modules jdk.javadoc
  * @compile  ../../lib/Tester.java Main.java
  * @run main Main
  */
--- a/langtools/test/tools/javadoc/generics/genericClass/Main.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javadoc/generics/genericClass/Main.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
  * @bug 4421066
  * @summary Verify the contents of the ClassDoc of a generic class.
  * @library ../../lib
+ * @modules jdk.javadoc
  * @compile  ../../lib/Tester.java Main.java
  * @run main Main
  */
--- a/langtools/test/tools/javadoc/generics/genericInnerAndOuter/Main.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javadoc/generics/genericInnerAndOuter/Main.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
  * @summary Verify the contents of the ClassDoc of
  *          a generic class with a generic inner class.
  * @library ../../lib
+ * @modules jdk.javadoc
  * @compile  ../../lib/Tester.java Main.java
  * @run main Main
  */
--- a/langtools/test/tools/javadoc/generics/genericInterface/Main.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javadoc/generics/genericInterface/Main.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
  * @bug 4421066
  * @summary Verify the contents of the ClassDoc of a generic interface.
  * @library ../../lib
+ * @modules jdk.javadoc
  * @compile  ../../lib/Tester.java Main.java
  * @run main Main
  */
--- a/langtools/test/tools/javadoc/generics/genericMethod/Main.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javadoc/generics/genericMethod/Main.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
  * @bug 4421066
  * @summary Verify the reading of generic methods and constructors.
  * @library ../../lib
+ * @modules jdk.javadoc
  * @compile  ../../lib/Tester.java Main.java
  * @run main Main
  */
--- a/langtools/test/tools/javadoc/generics/genericSuper/Main.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javadoc/generics/genericSuper/Main.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
  * @bug 4421066
  * @summary Verify the contents of the ClassDoc of a generic class.
  * @library ../../lib
+ * @modules jdk.javadoc
  * @compile  ../../lib/Tester.java Main.java
  * @run main Main
  */
--- a/langtools/test/tools/javadoc/generics/supertypes/Main.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javadoc/generics/supertypes/Main.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
  * @bug 4922918
  * @summary Check supertypes and superinterfaces of parameterized types.
  * @library ../../lib
+ * @modules jdk.javadoc
  * @compile  ../../lib/Tester.java Main.java
  * @run main Main
  */
--- a/langtools/test/tools/javadoc/generics/throwsGeneric/Main.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javadoc/generics/throwsGeneric/Main.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
  * @bug 4421066
  * @summary Verify the reading of generic methods and constructors.
  * @library ../../lib
+ * @modules jdk.javadoc
  * @compile  ../../lib/Tester.java Main.java
  * @run main Main
  */
--- a/langtools/test/tools/javadoc/generics/tparamCycle/Main.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javadoc/generics/tparamCycle/Main.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
  * @bug 4421066
  * @summary Check a type parameter whose bound cycles back on itself.
  * @library ../../lib
+ * @modules jdk.javadoc
  * @compile  ../../lib/Tester.java Main.java
  * @run main Main
  */
--- a/langtools/test/tools/javadoc/generics/tparamTagOnMethod/Main.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javadoc/generics/tparamTagOnMethod/Main.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
  * @bug 4421066
  * @summary Verify the reading of type parameter tags on methods.
  * @library ../../lib
+ * @modules jdk.javadoc
  * @compile  ../../lib/Tester.java Main.java
  * @run main Main
  */
--- a/langtools/test/tools/javadoc/generics/tparamTagOnType/Main.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javadoc/generics/tparamTagOnType/Main.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
  * @bug 4421066
  * @summary Verify the reading of a type parameter tag on an interface.
  * @library ../../lib
+ * @modules jdk.javadoc
  * @compile  ../../lib/Tester.java Main.java
  * @run main Main
  */
--- a/langtools/test/tools/javadoc/generics/wildcards/Main.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javadoc/generics/wildcards/Main.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
  * @bug 4421066
  * @summary Verify the contents of the ClassDoc of a generic class.
  * @library ../../lib
+ * @modules jdk.javadoc
  * @compile  ../../lib/Tester.java Main.java
  * @run main Main
  */
--- a/langtools/test/tools/javadoc/imports/MissingImport.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javadoc/imports/MissingImport.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
  * @bug 5012972
  * @summary ClassDoc.getImportedClasses should return a class even if
  *          it's not in the classpath.
+ * @modules jdk.javadoc
  */
 
 import com.sun.javadoc.*;
--- a/langtools/test/tools/javadoc/nestedClass/NestedClass.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javadoc/nestedClass/NestedClass.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
  * @bug 4694497
  * @summary BDoclet API: Bad ClassDoc for nested classes when built from .class files
  * @author gafter
+ * @modules jdk.javadoc
  * @compile NestedClass.java NestedClassB.java
  * @run main NestedClass
  */
--- a/langtools/test/tools/javadoc/nonConstExprs/Test.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javadoc/nonConstExprs/Test.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test
  * @bug     8010310
  * @summary Error processing sources with -private
+ * @modules jdk.javadoc
  */
 
 import java.io.File;
--- a/langtools/test/tools/javadoc/outputRedirect/Test.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javadoc/outputRedirect/Test.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @bug 4587487
  * @summary com.sun.tools.javadoc.Main.execute ignores PrintWriters
  * @author gafter
+ * @modules jdk.javadoc
  * @compile p/OutputRedirect.java
  * @run main p.OutputRedirect
  */
--- a/langtools/test/tools/javadoc/parser/7091528/T7091528.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javadoc/parser/7091528/T7091528.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test
  * @bug     7091528 8029145 8037484
  * @summary ensures javadoc parses unique source files and ignores all class files
+ * @modules jdk.javadoc/com.sun.tools.doclets.standard
  * @compile p/C1.java p/q/C2.java
  * @run main T7091528
  */
--- a/langtools/test/tools/javadoc/sourceOnly/Test.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javadoc/sourceOnly/Test.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
  * @bug 4548768
  * @summary Javadoc in JDK 1.4 uses classpath and not just source dir
  * @author gafter
+ * @modules jdk.javadoc
  * @compile p/SourceOnly.java
  * @run main p.SourceOnly
  */
--- a/langtools/test/tools/javadoc/sourceOption/SourceOption.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javadoc/sourceOption/SourceOption.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
  * @bug     6507179
  * @summary Ensure that "-source" option isn't ignored.
  * @author  Scott Seligman
+ * @modules jdk.javadoc
  * @run main/fail SourceOption 7
  * @run main      SourceOption 9
  * @run main      SourceOption
--- a/langtools/test/tools/javadoc/subpackageIgnore/SubpackageIgnore.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javadoc/subpackageIgnore/SubpackageIgnore.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
  * @bug 4773013
  * @summary When hunting subpackages, silently ignore any directory name that
  *          can't be part of a subpackage.
+ * @modules jdk.javadoc
  */
 
 import com.sun.javadoc.*;
--- a/langtools/test/tools/javadoc/varArgs/Main.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javadoc/varArgs/Main.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
  * @summary Verify the contents of a ClassDoc containing a varArgs method.
  *          Verify that see/link tags can use "..." notation.
  * @library ../lib
+ * @modules jdk.javadoc
  * @compile  ../lib/Tester.java Main.java
  * @run main Main
  */
--- a/langtools/test/tools/javah/4942232/Test.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javah/4942232/Test.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test
  * @bug 4942232
  * @summary missing param class processes without error
+ * @modules jdk.compiler
  * @build ParamClassTest Test
  * @run main Test
  */
--- a/langtools/test/tools/javah/6257087/T6257087.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javah/6257087/T6257087.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,9 @@
  * @bug 6257087
  * @summary javah doesn't produce proper signatures for inner class native methods
  * @library /tools/lib
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.main
  * @build ToolBox
  * @run main T6257087
  */
--- a/langtools/test/tools/javah/6572945/T6572945.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javah/6572945/T6572945.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test
  * @bug 6572945
  * @summary rewrite javah as an annotation processor, instead of as a doclet
+ * @modules jdk.compiler
  * @build TestClass1 TestClass2 TestClass3
  * @run main T6572945
  */
--- a/langtools/test/tools/javah/T4942232/MissingParamClassTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javah/T4942232/MissingParamClassTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,9 @@
  * native method in a supplied class contains a parameter type whose corresponding
  * class is missing or not in the classpath
  * @library /tools/lib
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.main
  * @build ToolBox
  * @run compile MissingParamClassTest.java
  * @clean MissingParamClassException
--- a/langtools/test/tools/javah/T5070898.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javah/T5070898.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,6 +24,8 @@
 /* @test
  * @bug 5070898
  * @summary javah command doesn't throw correct exit code in case of error
+ * @modules java.compiler
+ *          jdk.compiler
  */
 
 import java.io.*;
--- a/langtools/test/tools/javah/T6893943.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javah/T6893943.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test
  * @bug 6893943 6937318
  * @summary exit code from javah with no args is 0
+ * @modules jdk.compiler
  */
 
 import java.io.*;
--- a/langtools/test/tools/javah/T6994608.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javah/T6994608.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test
  * @bug 6994608
  * @summary javah no longer accepts parameter files as input
+ * @modules jdk.compiler
  */
 
 import java.io.*;
--- a/langtools/test/tools/javah/T7126832/T7126832.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javah/T7126832/T7126832.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,6 +24,7 @@
 /*
  * @test
  * @bug 7126832
+ * @modules jdk.compiler
  * @compile java.java
  * @summary com.sun.tools.javac.api.ClientCodeWrapper$WrappedJavaFileManager cannot be cast
  * @run main T7126832
--- a/langtools/test/tools/javah/T7185778.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javah/T7185778.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,7 @@
  *   The first two tests are on an inner class name whose name does not contain $.
  *   The second two tests are on an inner class name whose name does contain $.
  *   The last test is on an outer class whose name contains $.
+ * @modules jdk.compiler
  * @run main T7185778 T7185778$inner
  * @run main T7185778 T7185778.inner
  * @run main T7185778 T7185778$inner$
--- a/langtools/test/tools/javah/TestHelpOpts.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javah/TestHelpOpts.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test
  * @bug 6893932 6990390
  * @summary javah help screen lists -h and -? but does not accept them
+ * @modules jdk.compiler
  */
 
 import java.io.*;
--- a/langtools/test/tools/javah/VersionTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javah/VersionTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test
  * @bug 6890226
  * @summary javah -version is broken
+ * @modules jdk.compiler
  */
 
 import java.io.*;
--- a/langtools/test/tools/javah/constMacroTest/ConstMacroTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javah/constMacroTest/ConstMacroTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,9 @@
  * ensures that the appropriate macro definitions are placed in the generated
  * header file.
  * @library /tools/lib
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.main
  * @build ToolBox
  * @run main ConstMacroTest
  */
--- a/langtools/test/tools/javap/4111861/T4111861.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javap/4111861/T4111861.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
  * @test
  * @bug 4111861
  * @summary static final field contents are not displayed
+ * @modules jdk.compiler
  */
 public class T4111861 {
     public static void main(String... args) throws Exception {
--- a/langtools/test/tools/javap/4798312/JavapShouldLoadClassesFromRTJarTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javap/4798312/JavapShouldLoadClassesFromRTJarTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,9 @@
  * @bug 4798312
  * @summary In Windows, javap doesn't load classes from rt.jar
  * @library /tools/lib
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.main
  * @build ToolBox
  * @run main JavapShouldLoadClassesFromRTJarTest
  */
--- a/langtools/test/tools/javap/4866831/PublicInterfaceTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javap/4866831/PublicInterfaceTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,9 @@
  * @bug 4866831
  * @summary Verify that javap marks public interfaces as public
  * @library /tools/lib
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.main
  * @build ToolBox
  * @run main PublicInterfaceTest
  */
--- a/langtools/test/tools/javap/4870651/T4870651.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javap/4870651/T4870651.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
  * @bug 4870651 6715757
  * @summary javap should recognize generics, varargs, enum;
  *          javap prints "extends java.lang.Object"
+ * @modules jdk.compiler
  * @build T4870651 Test
  * @run main T4870651
  */
--- a/langtools/test/tools/javap/6937244/T6937244.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javap/6937244/T6937244.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test
  * @bug 6937244
  * @summary fields display with JVMS names, not Java names
+ * @modules jdk.compiler
  */
 
 import java.io.*;
--- a/langtools/test/tools/javap/6937244/T6937244A.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javap/6937244/T6937244A.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test
  * @bug 6937244
  * @summary fields display with JVMS names, not Java names
+ * @modules jdk.compiler
  */
 
 import java.io.*;
--- a/langtools/test/tools/javap/8006334/JavapTaskCtorFailWithNPE.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javap/8006334/JavapTaskCtorFailWithNPE.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
  * @bug 8006334
  * @summary javap: JavapTask constructor breaks with null pointer exception if
  * parameter options is null
+ * @modules jdk.compiler
  */
 
 import java.io.File;
--- a/langtools/test/tools/javap/8007907/JavapReturns0AfterClassNotFoundTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javap/8007907/JavapReturns0AfterClassNotFoundTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
  * @bug 8007907
  * @summary javap, method com.sun.tools.javap.Main.run returns 0 even in case
  * of class not found error
+ * @modules jdk.compiler
  */
 
 import java.io.IOException;
--- a/langtools/test/tools/javap/AccessModifiers.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javap/AccessModifiers.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test
  * @bug 8027530
  * @summary test -public, -protected, -package, -private options
+ * @modules jdk.compiler
  */
 
 import java.io.*;
--- a/langtools/test/tools/javap/BadAttributeLength.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javap/BadAttributeLength.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test
  * @bug 8047072
  * @summary javap OOM on fuzzed classfile
+ * @modules jdk.compiler
  * @run main BadAttributeLength
  */
 
--- a/langtools/test/tools/javap/BoundsTypeVariableTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javap/BoundsTypeVariableTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test
  * @bug 8003537
  * @summary javap should not use / in Bounds Type Variables
+ * @modules jdk.compiler
  */
 
 import java.io.File;
--- a/langtools/test/tools/javap/DescriptorTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javap/DescriptorTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test
  * @bug     8007052
  * @summary javap should include the descriptor for a method in verbose mode
+ * @modules jdk.compiler
  */
 
 import java.io.File;
--- a/langtools/test/tools/javap/ExtPath.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javap/ExtPath.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
  * @bug     6428896
  * @summary javap cannot read multiple entries on the extension classpath
  * @author  Wei Tao
+ * @modules jdk.compiler
  * @run main/othervm ExtPath com.sun.crypto.provider.SunJCE
  */
 
--- a/langtools/test/tools/javap/InvalidOptions.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javap/InvalidOptions.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test
  * @bug 8027411 8032869
  * @summary test an invalid option
+ * @modules jdk.compiler
  */
 
 import java.io.*;
--- a/langtools/test/tools/javap/MethodParameters.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javap/MethodParameters.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test
  * @bug 8004727 8005647
  * @summary javac should generate method parameters correctly.
+ * @modules jdk.compiler
  */
 
 import java.io.*;
--- a/langtools/test/tools/javap/StackMapTableTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javap/StackMapTableTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test
  * @bug 8033930 8033913
  * @summary bad formatting of StackMapTable entries
+ * @modules jdk.compiler
  */
 
 import java.io.*;
--- a/langtools/test/tools/javap/T4075403.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javap/T4075403.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test
  * @bug 4075403
  * @summary Use javap to inquire about a specific inner class
+ * @modules jdk.compiler
  */
 
 
--- a/langtools/test/tools/javap/T4459541.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javap/T4459541.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test
  * @bug 4459541
  * @summary "javap -l" shows line numbers as signed short; they should be unsigned.
+ * @modules jdk.compiler
  */
 
 import java.io.*;
--- a/langtools/test/tools/javap/T4501660.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javap/T4501660.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
  * @bug 4501660
  * @summary change diagnostic of -help as 'print this help message and exit'
  *            (actually, verify -help does not cause premature exit)
+ * @modules jdk.compiler
  */
 
 import java.io.*;
--- a/langtools/test/tools/javap/T4501661.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javap/T4501661.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,7 @@
  * @test
  * @bug 4501661
  * @summary disallow mixing -public, -private, and -protected
+ * @modules jdk.compiler
  */
 public class T4501661 {
     public static void main(String... args) throws Exception {
--- a/langtools/test/tools/javap/T4777949.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javap/T4777949.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,6 +30,7 @@
  * @test
  * @bug 4777949
  * @summary Warn javap usage on package with simple name
+ * @modules jdk.compiler
  */
 public class T4777949 {
     public static void main(String... args) throws Exception {
--- a/langtools/test/tools/javap/T4876942.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javap/T4876942.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test
  * @bug 4876942 6715251
  * @summary javap invoked without args does not print help screen
+ * @modules jdk.compiler
  */
 
 import java.io.*;
--- a/langtools/test/tools/javap/T4880663.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javap/T4880663.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
  * @bug 4880663 6715757 7031005
  * @summary javap could output whitespace between class name and opening brace
  *          javap prints "extends java.lang.Object"
+ * @modules jdk.compiler
  */
 
 
--- a/langtools/test/tools/javap/T4880672.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javap/T4880672.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
  * @test
  * @bug 4880672 7031005
  * @summary javap does not output inner interfaces of an interface
+ * @modules jdk.compiler
  */
 
 import java.io.*;
--- a/langtools/test/tools/javap/T4884240.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javap/T4884240.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
  * @test
  * @bug 4884240
  * @summary additional option required for javap
+ * @modules jdk.compiler
  */
 
 import java.io.*;
--- a/langtools/test/tools/javap/T4975569.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javap/T4975569.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test
  * @bug 4975569 6622215 8034861
  * @summary javap doesn't print new flag bits
+ * @modules jdk.compiler
  */
 
 import java.io.*;
--- a/langtools/test/tools/javap/T6271787.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javap/T6271787.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test
  * @bug 6271787
  * @summary javap dumps LocalVariableTypeTable attribute in hex, needs to print a table
+ * @modules jdk.compiler
  */
 
 import java.io.*;
--- a/langtools/test/tools/javap/T6474890.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javap/T6474890.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test
  * @bug 6474890
  * @summary javap does not open .zip files in -classpath
+ * @modules jdk.compiler
  */
 
 import java.io.*;
--- a/langtools/test/tools/javap/T6587786.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javap/T6587786.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test
  * @bug 6587786
  * @summary Javap throws error : "ERROR:Could not find <classname>" for JRE classes
+ * @modules jdk.compiler
  */
 
 import java.io.*;
--- a/langtools/test/tools/javap/T6622216.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javap/T6622216.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test
  * @bug 6622216
  * @summary javap names some attributes incorrectly
+ * @modules jdk.compiler
  */
 
 import java.io.*;
--- a/langtools/test/tools/javap/T6622232.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javap/T6622232.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test
  * @bug 6622232
  * @summary javap gets whitespace confused
+ * @modules jdk.compiler
  */
 
 import java.io.*;
--- a/langtools/test/tools/javap/T6622260.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javap/T6622260.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test
  * @bug 6622260
  * @summary javap prints negative bytes incorrectly in hex
+ * @modules jdk.compiler
  */
 
 import java.io.*;
--- a/langtools/test/tools/javap/T6715251.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javap/T6715251.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,7 @@
  * @test
  * @bug 6715251
  * @summary javap should be consistent with javac and return 2 if given no arguments
+ * @modules jdk.compiler
  */
 
 public class T6715251 {
--- a/langtools/test/tools/javap/T6715753.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javap/T6715753.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
  * @test
  * @bug 6715753
  * @summary Use javap to inquire about a specific inner class
+ * @modules jdk.compiler
  */
 
 public class T6715753 {
--- a/langtools/test/tools/javap/T6715767.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javap/T6715767.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test
  * @bug 6715767
  * @summary javap on java.lang.ClassLoader crashes
+ * @modules jdk.compiler
  */
 
 import java.io.*;
--- a/langtools/test/tools/javap/T6716452.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javap/T6716452.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,6 +24,7 @@
 /*
  * @test 6716452
  * @summary need a method to get an index of an attribute
+ * @modules jdk.compiler/com.sun.tools.classfile
  */
 
 import java.io.*;
--- a/langtools/test/tools/javap/T6729471.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javap/T6729471.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,9 @@
  * @bug 6729471
  * @summary javap does not output inner interfaces of an interface
  * @library /tools/lib
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.main
  * @build ToolBox
  * @run main T6729471
  */
--- a/langtools/test/tools/javap/T6824493.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javap/T6824493.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,7 @@
  * @test
  * @bug 6824493
  * @summary experimental support for additional info for instructions
+ * @modules jdk.compiler
  * @compile -g T6824493.java
  * @run main T6824493
  */
--- a/langtools/test/tools/javap/T6863746.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javap/T6863746.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
  * @test
  * @bug 6863746
  * @summary javap should not scan ct.sym by default
+ * @modules jdk.compiler
  */
 
 public class T6863746 {
--- a/langtools/test/tools/javap/T6866657.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javap/T6866657.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
  * @test
  * @bug 6866657
  * @summary add byteLength() method to primary classfile types
+ * @modules jdk.compiler/com.sun.tools.classfile
  */
 
 import java.io.*;
--- a/langtools/test/tools/javap/T6868539.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javap/T6868539.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
  * @bug 6868539 6868548 8035364
  * @summary javap should use current names for constant pool entries,
  *              remove spurious ';' from constant pool entries
+ * @modules jdk.compiler
  */
 
 import java.io.*;
--- a/langtools/test/tools/javap/T6879371.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javap/T6879371.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test
  * @bug 6879371
  * @summary javap does not close internal default file manager
+ * @modules jdk.compiler
  */
 
 import java.io.*;
--- a/langtools/test/tools/javap/T6980017.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javap/T6980017.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test
  * @bug 6980017
  * @summary javap -XDdetail:source behaves badly if source not available.
+ * @modules jdk.compiler
  */
 
 import java.io.*;
--- a/langtools/test/tools/javap/T7004698.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javap/T7004698.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test
  * @bug 7004698
  * @summary javap does not output CharacterRangeTable attributes correctly
+ * @modules jdk.compiler
  */
 
 import java.io.*;
--- a/langtools/test/tools/javap/T7186925.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javap/T7186925.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test
  * @bug 7186925
  * @summary JavapTask passes null to java.io.Writer
+ * @modules jdk.compiler/com.sun.tools.classfile
  */
 
 import java.io.*;
--- a/langtools/test/tools/javap/T7190862.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javap/T7190862.java	Thu May 21 11:41:04 2015 -0700
@@ -3,6 +3,7 @@
  * @test /nodynamiccopyright/
  * @bug 7190862 7109747
  * @summary javap shows an incorrect type for operands if the 'wide' prefix is used
+ * @modules jdk.compiler
  */
 
 import com.sun.source.util.JavacTask;
--- a/langtools/test/tools/javap/T8032814.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javap/T8032814.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
  * @bug 8032814
  * @summary LineNumberTable/LocalVariableTable tables duplication for the
  *          "-v -l" combination of options
+ * @modules jdk.compiler
  * @compile -g T8032814.java
  * @run main T8032814
  */
--- a/langtools/test/tools/javap/T8032819.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javap/T8032819.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test
  * @bug 8032819
  * @summary Extra empty line between field declarations for the "-v -c" and "-v -l" combination of options
+ * @modules jdk.compiler
  * @compile -g T8032819.java
  * @run main T8032819
  */
--- a/langtools/test/tools/javap/T8033180.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javap/T8033180.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test
  * @bug 8033180
  * @summary Bad newline characters
+ * @modules jdk.compiler
  */
 
 import java.io.*;
--- a/langtools/test/tools/javap/T8033711.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javap/T8033711.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test
  * @bug 8033711
  * @summary An exception is thrown if using the "-classpath" option with no arguments
+ * @modules jdk.compiler
  */
 
 
--- a/langtools/test/tools/javap/T8035104.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javap/T8035104.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test
  * @bug 8035104
  * @summary reorder class file attributes in javap listing
+ * @modules jdk.compiler
  */
 
 import java.io.*;
--- a/langtools/test/tools/javap/T8038414.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javap/T8038414.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,6 +32,7 @@
  * @test
  * @bug 8038414
  * @summary Constant pool's strings are not escaped properly
+ * @modules jdk.compiler
  */
 public class T8038414 {
     private static final String NEW_LINE = System.getProperty("line.separator");
--- a/langtools/test/tools/javap/TestSuperclass.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javap/TestSuperclass.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test
  * @bug 7031005
  * @summary javap prints "extends java.lang.Object"
+ * @modules jdk.compiler
  */
 
 import java.io.File;
--- a/langtools/test/tools/javap/WhitespaceTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javap/WhitespaceTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test
  * @bug 8033581 8033798 8033726
  * @summary Check whitespace in generated output
+ * @modules jdk.compiler
  */
 
 import java.io.*;
--- a/langtools/test/tools/javap/classfile/T6887895.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javap/classfile/T6887895.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
  * @test
  * @bug 6887895
  * @summary CONSTANT_Class_info getBaseName does not handle arrays of primitives correctly
+ * @modules jdk.compiler/com.sun.tools.classfile
  */
 
 import java.io.*;
--- a/langtools/test/tools/javap/classfile/deps/T6907575.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javap/classfile/deps/T6907575.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,9 @@
 /*
  * @test
  * @bug 6907575
+ * @modules jdk.compiler/com.sun.tools.classfile
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.util
  * @build GetDeps p.C1
  * @run main T6907575
  */
--- a/langtools/test/tools/javap/stackmap/StackmapTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javap/stackmap/StackmapTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,9 @@
  * @bug 6271292
  * @summary Verify that javap prints StackMapTable attribute contents
  * @library /tools/lib
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.main
  * @build ToolBox
  * @run main StackmapTest
  */
--- a/langtools/test/tools/javap/typeAnnotations/JSR175Annotations.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javap/typeAnnotations/JSR175Annotations.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,7 @@
  * @test JSR175Annotations
  * @bug 6843077
  * @summary test that only type annotations are recorded as such in classfile
+ * @modules jdk.compiler/com.sun.tools.classfile
  */
 
 public class JSR175Annotations {
--- a/langtools/test/tools/javap/typeAnnotations/NewArray.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javap/typeAnnotations/NewArray.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,7 @@
  * @test NewArray
  * @bug 6843077
  * @summary Test type annotations on local array are in method's code attribute.
+ * @modules jdk.compiler/com.sun.tools.classfile
  */
 
 public class NewArray {
--- a/langtools/test/tools/javap/typeAnnotations/Presence.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javap/typeAnnotations/Presence.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,6 +30,7 @@
  * @test Presence
  * @bug 6843077
  * @summary test that all type annotations are present in the classfile
+ * @modules jdk.compiler/com.sun.tools.classfile
  */
 
 public class Presence {
--- a/langtools/test/tools/javap/typeAnnotations/PresenceInner.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javap/typeAnnotations/PresenceInner.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,7 @@
  * @test PresenceInner
  * @bug 6843077
  * @summary test that annotations in inner types count only once
+ * @modules jdk.compiler/com.sun.tools.classfile
  */
 
 public class PresenceInner {
--- a/langtools/test/tools/javap/typeAnnotations/T6855990.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javap/typeAnnotations/T6855990.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
  * @test
  * @bug 6855990
  * @summary InstructionDetailWriter should support new 308 annotations attribute
+ * @modules jdk.compiler
  */
 
 public class T6855990 {
--- a/langtools/test/tools/javap/typeAnnotations/TypeCasts.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javap/typeAnnotations/TypeCasts.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,6 +29,7 @@
  * @bug 6843077
  * @summary test that typecasts annotation are emitted if only the cast
  *          expression is optimized away
+ * @modules jdk.compiler/com.sun.tools.classfile
  */
 
 public class TypeCasts {
--- a/langtools/test/tools/javap/typeAnnotations/Visibility.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javap/typeAnnotations/Visibility.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,7 @@
  * @test Visibility
  * @bug 6843077
  * @summary test that type annotations are recorded in the classfile
+ * @modules jdk.compiler/com.sun.tools.classfile
  */
 
 public class Visibility {
--- a/langtools/test/tools/javap/typeAnnotations/Wildcards.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/javap/typeAnnotations/Wildcards.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,7 @@
  * @test Wildcards
  * @bug 6843077
  * @summary test that annotations target wildcards get emitted to classfile
+ * @modules jdk.compiler/com.sun.tools.classfile
  */
 public class Wildcards {
     public static void main(String[] args) throws Exception {
--- a/langtools/test/tools/jdeps/APIDeps.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/jdeps/APIDeps.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,10 @@
  * @test
  * @bug 8015912 8029216 8048063 8050804
  * @summary Test -apionly and -jdkinternals options
+ * @modules java.base/sun.misc
+ *          java.management
+ *          jdk.compiler/com.sun.tools.classfile
+ *          jdk.dev/com.sun.tools.jdeps
  * @build m.Bar m.Foo m.Gee b.B c.C c.I d.D e.E f.F g.G
  * @run main APIDeps
  */
--- a/langtools/test/tools/jdeps/Basic.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/jdeps/Basic.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,8 @@
  * @test
  * @bug 8003562 8005428 8015912 8027481 8048063 8068937
  * @summary Basic tests for jdeps tool
+ * @modules java.management
+ *          jdk.dev/com.sun.tools.jdeps
  * @build Test p.Foo p.Bar p.C p.SubClass q.Gee javax.activity.NotCompactProfile
  * @run main Basic
  */
--- a/langtools/test/tools/jdeps/DotFileTest.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/jdeps/DotFileTest.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,8 @@
  * @test
  * @bug 8003562
  * @summary Basic tests for jdeps -dotoutput option
+ * @modules java.management
+ *          jdk.dev/com.sun.tools.jdeps
  * @build Test p.Foo p.Bar javax.activity.NotCompactProfile
  * @run main DotFileTest
  */
--- a/langtools/test/tools/sjavac/CompileCircularSources.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/sjavac/CompileCircularSources.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,6 +30,10 @@
  * @author Fredrik O
  * @author sogoel (rewrite)
  * @library /tools/lib
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.main
+ *          jdk.compiler/com.sun.tools.sjavac
  * @build Wrapper ToolBox
  * @run main Wrapper CompileCircularSources
  */
--- a/langtools/test/tools/sjavac/CompileExcludingDependency.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/sjavac/CompileExcludingDependency.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,6 +30,10 @@
  * @author Fredrik O
  * @author sogoel (rewrite)
  * @library /tools/lib
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.main
+ *          jdk.compiler/com.sun.tools.sjavac
  * @build Wrapper ToolBox
  * @run main Wrapper CompileExcludingDependency
  */
--- a/langtools/test/tools/sjavac/CompileWithAtFile.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/sjavac/CompileWithAtFile.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,6 +30,10 @@
  * @author Fredrik O
  * @author sogoel (rewrite)
  * @library /tools/lib
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.main
+ *          jdk.compiler/com.sun.tools.sjavac
  * @build Wrapper ToolBox
  * @run main Wrapper CompileWithAtFile
  */
--- a/langtools/test/tools/sjavac/CompileWithInvisibleSources.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/sjavac/CompileWithInvisibleSources.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,6 +30,10 @@
  * @author Fredrik O
  * @author sogoel (rewrite)
  * @library /tools/lib
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.main
+ *          jdk.compiler/com.sun.tools.sjavac
  * @build Wrapper ToolBox
  * @run main Wrapper CompileWithInvisibleSources
  */
--- a/langtools/test/tools/sjavac/CompileWithOverrideSources.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/sjavac/CompileWithOverrideSources.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,6 +30,10 @@
  * @author Fredrik O
  * @author sogoel (rewrite)
  * @library /tools/lib
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.main
+ *          jdk.compiler/com.sun.tools.sjavac
  * @build Wrapper ToolBox
  * @run main Wrapper CompileWithOverrideSources
  */
--- a/langtools/test/tools/sjavac/DependencyCollection.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/sjavac/DependencyCollection.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,13 @@
  * @bug 8056258 8048609
  * @summary Ensures that the DependencyCollector covers various cases.
  * @library /tools/lib
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.code
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.main
+ *          jdk.compiler/com.sun.tools.javac.util
+ *          jdk.compiler/com.sun.tools.sjavac.comp
+ *          jdk.compiler/com.sun.tools.sjavac.comp.dependencies
  * @build Wrapper ToolBox
  * @run main Wrapper DependencyCollection
  */
--- a/langtools/test/tools/sjavac/ExclPattern.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/sjavac/ExclPattern.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,6 +29,7 @@
  * @bug 8037085
  * @summary Ensures that sjavac can handle various exclusion patterns.
  *
+ * @modules jdk.compiler/com.sun.tools.sjavac
  * @build Wrapper
  * @run main Wrapper ExclPattern
  */
--- a/langtools/test/tools/sjavac/IdleShutdown.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/sjavac/IdleShutdown.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
  * @test
  * @bug 8044131
  * @summary Tests the hooks used for detecting idleness of the sjavac server.
+ * @modules jdk.compiler/com.sun.tools.sjavac.server
  * @build Wrapper
  * @run main Wrapper IdleShutdown
  */
--- a/langtools/test/tools/sjavac/IgnoreSymbolFile.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/sjavac/IgnoreSymbolFile.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,7 @@
  * @bug 8047183
  * @summary JDK build fails with sjavac enabled
  *
+ * @modules jdk.compiler
  * @build Wrapper
  * @run main Wrapper IgnoreSymbolFile
  */
--- a/langtools/test/tools/sjavac/IncCompInheritance.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/sjavac/IncCompInheritance.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,9 @@
  * @bug 8056258
  * @summary Analysis of public API does not take super classes into account
  * @library /tools/lib
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.main
  * @build Wrapper ToolBox
  * @run main Wrapper IncCompInheritance
  */
--- a/langtools/test/tools/sjavac/IncCompileChangeNative.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/sjavac/IncCompileChangeNative.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,10 @@
  * @author Fredrik O
  * @author sogoel (rewrite)
  * @library /tools/lib
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.main
+ *          jdk.compiler/com.sun.tools.sjavac
  * @build Wrapper ToolBox
  * @run main Wrapper IncCompileChangeNative
  */
--- a/langtools/test/tools/sjavac/IncCompileDropClasses.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/sjavac/IncCompileDropClasses.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,10 @@
  * @author Fredrik O
  * @author sogoel (rewrite)
  * @library /tools/lib
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.main
+ *          jdk.compiler/com.sun.tools.sjavac
  * @build Wrapper ToolBox
  * @run main Wrapper IncCompileDropClasses
  */
--- a/langtools/test/tools/sjavac/IncCompileFullyQualifiedRef.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/sjavac/IncCompileFullyQualifiedRef.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,6 +30,10 @@
  * @author Fredrik O
  * @author sogoel (rewrite)
  * @library /tools/lib
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.main
+ *          jdk.compiler/com.sun.tools.sjavac
  * @build Wrapper ToolBox
  * @run main Wrapper IncCompileFullyQualifiedRef
  */
--- a/langtools/test/tools/sjavac/IncCompileNoChanges.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/sjavac/IncCompileNoChanges.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,10 @@
  * @author Fredrik O
  * @author sogoel (rewrite)
  * @library /tools/lib
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.main
+ *          jdk.compiler/com.sun.tools.sjavac
  * @build Wrapper ToolBox
  * @run main Wrapper IncCompileNoChanges
  */
--- a/langtools/test/tools/sjavac/IncCompileUpdateNative.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/sjavac/IncCompileUpdateNative.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,10 @@
  * @author Fredrik O
  * @author sogoel (rewrite)
  * @library /tools/lib
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.main
+ *          jdk.compiler/com.sun.tools.sjavac
  * @build Wrapper ToolBox
  * @run main Wrapper IncCompileUpdateNative
  */
--- a/langtools/test/tools/sjavac/IncCompileWithChanges.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/sjavac/IncCompileWithChanges.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,10 @@
  * @author Fredrik O
  * @author sogoel (rewrite)
  * @library /tools/lib
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.main
+ *          jdk.compiler/com.sun.tools.sjavac
  * @build Wrapper ToolBox
  * @run main Wrapper IncCompileWithChanges
  */
--- a/langtools/test/tools/sjavac/JavacOptionPrep.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/sjavac/JavacOptionPrep.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,7 @@
  * @bug 8035063
  * @summary Tests the preparation of javac-arguments.
  *
+ * @modules jdk.compiler/com.sun.tools.sjavac.options
  * @build Wrapper
  * @run main Wrapper JavacOptionPrep
  */
--- a/langtools/test/tools/sjavac/OptionDecoding.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/sjavac/OptionDecoding.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,9 @@
  * @bug 8035063 8054465
  * @summary Tests decoding of String[] into Options.
  *
+ * @modules jdk.compiler/com.sun.tools.sjavac
+ *          jdk.compiler/com.sun.tools.sjavac.client
+ *          jdk.compiler/com.sun.tools.sjavac.options
  * @build Wrapper
  * @run main Wrapper OptionDecoding
  */
--- a/langtools/test/tools/sjavac/PackagePathMismatch.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/sjavac/PackagePathMismatch.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,9 @@
  * @bug 8059349
  * @summary This test makes sure file paths matches package declarations
  * @library /tools/lib
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.main
  * @build Wrapper ToolBox
  * @run main Wrapper PackagePathMismatch
  */
--- a/langtools/test/tools/sjavac/ParallelCompilations.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/sjavac/ParallelCompilations.java	Thu May 21 11:41:04 2015 -0700
@@ -29,6 +29,10 @@
  * @bug 8071629
  * @author sogoel
  * @library /tools/lib
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.main
+ *          jdk.compiler/com.sun.tools.sjavac
  * @build Wrapper ToolBox
  * @run main Wrapper ParallelCompilations
  */
--- a/langtools/test/tools/sjavac/PermittedArtifact.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/sjavac/PermittedArtifact.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,6 +30,10 @@
  * @author Fredrik O
  * @author sogoel (rewrite)
  * @library /tools/lib
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.main
+ *          jdk.compiler/com.sun.tools.sjavac
  * @build Wrapper ToolBox
  * @run main Wrapper PermittedArtifact
  */
--- a/langtools/test/tools/sjavac/PooledExecution.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/sjavac/PooledExecution.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,8 @@
  * @test
  * @bug 8044131
  * @summary Makes sure sjavac poolsize option is honored.
+ * @modules jdk.compiler/com.sun.tools.sjavac.comp
+ *          jdk.compiler/com.sun.tools.sjavac.server
  * @build Wrapper
  * @run main Wrapper PooledExecution
  */
--- a/langtools/test/tools/sjavac/Serialization.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/sjavac/Serialization.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,6 +29,8 @@
  *          and saved in the state file since the files need to be recompiled
  *          if new options are provided.
  *
+ * @modules jdk.compiler/com.sun.tools.sjavac
+ *          jdk.compiler/com.sun.tools.sjavac.options
  * @build Wrapper
  * @run main Wrapper Serialization
  */
--- a/langtools/test/tools/sjavac/StateDir.java	Mon May 18 14:48:41 2015 +0200
+++ b/langtools/test/tools/sjavac/StateDir.java	Thu May 21 11:41:04 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,6 +30,10 @@
  * @author Fredrik O
  * @author sogoel (rewrite)
  * @library /tools/lib
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.file
+ *          jdk.compiler/com.sun.tools.javac.main
+ *          jdk.compiler/com.sun.tools.sjavac
  * @build Wrapper ToolBox
  * @run main Wrapper StateDir
  */