changeset 2985:f43e1241e7fb

6843761: Update langtools tests to remove unncessary -source and -target options Reviewed-by: jjg
author darcy
date Wed, 27 May 2009 22:34:43 -0700
parents e15ff3a34054
children 5370c4ae4f6f
files langtools/test/com/sun/javadoc/testIndex/TestIndex.java langtools/test/com/sun/javadoc/testInterface/TestInterface.java langtools/test/com/sun/javadoc/testNavagation/TestNavagation.java langtools/test/com/sun/javadoc/testTagInheritence/TestTagInheritence.java langtools/test/tools/javac/5005368.java langtools/test/tools/javac/Ambig3.java langtools/test/tools/javac/ArrayCast.java langtools/test/tools/javac/BadCovar.java langtools/test/tools/javac/ClassLiterals/InitializeOuter.java langtools/test/tools/javac/ClassLiterals/InitializeTarget.java langtools/test/tools/javac/ClassToTypeParm.java langtools/test/tools/javac/Closure1.java langtools/test/tools/javac/Closure2.java langtools/test/tools/javac/Closure3.java langtools/test/tools/javac/Closure4.java langtools/test/tools/javac/Closure5.java langtools/test/tools/javac/CompoundBox.java langtools/test/tools/javac/ConditionalArgTypes_1.java langtools/test/tools/javac/ConditionalArgTypes_2.java langtools/test/tools/javac/DefiniteAssignment/DUAssert.java langtools/test/tools/javac/EarlyAssert.java langtools/test/tools/javac/Enum1.java langtools/test/tools/javac/GoodCovar.java langtools/test/tools/javac/HexFloatLiterals.java langtools/test/tools/javac/HexThree.java langtools/test/tools/javac/InterfaceAssert.java langtools/test/tools/javac/InvalidIntfCast.java langtools/test/tools/javac/NewGeneric.java langtools/test/tools/javac/ObjectMethodRefFromInterface.java langtools/test/tools/javac/PrivateLocalConstructor.java langtools/test/tools/javac/RawCrash.java langtools/test/tools/javac/SynthName2.java langtools/test/tools/javac/T5090006/compiler.sh langtools/test/tools/javac/T5092545.java langtools/test/tools/javac/T5105890.java langtools/test/tools/javac/annotations/default/A.java langtools/test/tools/javac/annotations/neg/AnnComma.java langtools/test/tools/javac/annotations/neg/ArrayLit.java langtools/test/tools/javac/annotations/neg/Constant.java langtools/test/tools/javac/annotations/neg/Cycle1.java langtools/test/tools/javac/annotations/neg/Cycle2.java langtools/test/tools/javac/annotations/neg/Cycle3.java langtools/test/tools/javac/annotations/neg/Dep.java langtools/test/tools/javac/annotations/neg/Dup.java langtools/test/tools/javac/annotations/neg/DupTarget.java langtools/test/tools/javac/annotations/neg/MemberOver.java langtools/test/tools/javac/annotations/neg/ObjectMembers.java langtools/test/tools/javac/annotations/neg/OverrideNo.java langtools/test/tools/javac/annotations/neg/Package.java langtools/test/tools/javac/annotations/neg/Recovery.java langtools/test/tools/javac/annotations/neg/Recovery1.java langtools/test/tools/javac/annotations/neg/Scope.java langtools/test/tools/javac/annotations/neg/Syntax1.java langtools/test/tools/javac/annotations/neg/WrongTarget.java langtools/test/tools/javac/annotations/neg/WrongTarget2.java langtools/test/tools/javac/annotations/neg/WrongValue.java langtools/test/tools/javac/annotations/neg/Z1.java langtools/test/tools/javac/annotations/neg/Z10.java langtools/test/tools/javac/annotations/neg/Z11.java langtools/test/tools/javac/annotations/neg/Z12.java langtools/test/tools/javac/annotations/neg/Z13.java langtools/test/tools/javac/annotations/neg/Z14.java langtools/test/tools/javac/annotations/neg/Z15.java langtools/test/tools/javac/annotations/neg/Z16.java langtools/test/tools/javac/annotations/neg/Z2.java langtools/test/tools/javac/annotations/neg/Z3.java langtools/test/tools/javac/annotations/neg/Z4.java langtools/test/tools/javac/annotations/neg/Z5.java langtools/test/tools/javac/annotations/neg/Z8.java langtools/test/tools/javac/annotations/neg/Z9.java langtools/test/tools/javac/annotations/pos/AnnoteElideBraces.java langtools/test/tools/javac/annotations/pos/ClassA.java langtools/test/tools/javac/annotations/pos/Dep.java langtools/test/tools/javac/annotations/pos/Enum1.java langtools/test/tools/javac/annotations/pos/Local.java langtools/test/tools/javac/annotations/pos/Members.java langtools/test/tools/javac/annotations/pos/NType.java langtools/test/tools/javac/annotations/pos/OverrideCheck.java langtools/test/tools/javac/annotations/pos/OverrideOK.java langtools/test/tools/javac/annotations/pos/Parameter.java langtools/test/tools/javac/annotations/pos/Primitives.java langtools/test/tools/javac/annotations/pos/RightTarget.java langtools/test/tools/javac/annotations/pos/Z1.java langtools/test/tools/javac/annotations/pos/Z2.java langtools/test/tools/javac/annotations/pos/Z3.java langtools/test/tools/javac/annotations/pos/Z4.java langtools/test/tools/javac/annotations/pos/package-info.java langtools/test/tools/javac/assert/Attach.java langtools/test/tools/javac/assert/DU1.java langtools/test/tools/javac/assert/DU2.java langtools/test/tools/javac/assert/Position.java langtools/test/tools/javac/boxing/BoxedForeach.java langtools/test/tools/javac/boxing/Boxing1.java langtools/test/tools/javac/boxing/Boxing2.java langtools/test/tools/javac/boxing/Boxing4.java langtools/test/tools/javac/boxing/BoxingCaching.java langtools/test/tools/javac/capture/Capture1.java langtools/test/tools/javac/capture/Capture2.java langtools/test/tools/javac/capture/Capture3.java langtools/test/tools/javac/capture/Capture5.java langtools/test/tools/javac/cast/BoxedArray.java langtools/test/tools/javac/enum/AbstractEmptyEnum.java langtools/test/tools/javac/enum/AbstractEnum1.java langtools/test/tools/javac/enum/DA1.java langtools/test/tools/javac/enum/DA2.java langtools/test/tools/javac/enum/DA3.java langtools/test/tools/javac/enum/Def.java langtools/test/tools/javac/enum/Enum1.java langtools/test/tools/javac/enum/Enum2.java langtools/test/tools/javac/enum/Enum3.java langtools/test/tools/javac/enum/EnumImplicitPrivateConstructor.java langtools/test/tools/javac/enum/EnumInit.java langtools/test/tools/javac/enum/EnumPrivateConstructor.java langtools/test/tools/javac/enum/EnumProtectedConstructor.java langtools/test/tools/javac/enum/EnumPublicConstructor.java langtools/test/tools/javac/enum/EnumSwitch1.java langtools/test/tools/javac/enum/EnumSwitch2.java langtools/test/tools/javac/enum/EnumSwitch3.java langtools/test/tools/javac/enum/EnumSwitch4.java langtools/test/tools/javac/enum/ExplicitlyAbstractEnum1.java langtools/test/tools/javac/enum/ExplicitlyAbstractEnum2.java langtools/test/tools/javac/enum/ExplicitlyFinalEnum1.java langtools/test/tools/javac/enum/ExplicitlyFinalEnum2.java langtools/test/tools/javac/enum/FauxEnum1.java langtools/test/tools/javac/enum/FauxEnum3.java langtools/test/tools/javac/enum/FauxSpecialEnum1.java langtools/test/tools/javac/enum/FauxSpecialEnum2.java langtools/test/tools/javac/enum/LocalEnum.java langtools/test/tools/javac/enum/NoFinal.java langtools/test/tools/javac/enum/NoFinal2.java langtools/test/tools/javac/enum/NoFinal3.java langtools/test/tools/javac/enum/NoFinal4.java langtools/test/tools/javac/enum/NoFinal5.java langtools/test/tools/javac/enum/OkFinal.java langtools/test/tools/javac/enum/SynthValues.java langtools/test/tools/javac/enum/T5075242.java langtools/test/tools/javac/enum/T5081785.java langtools/test/tools/javac/enum/TrailingComma.java langtools/test/tools/javac/enum/UserValue.java langtools/test/tools/javac/enum/ValueOf.java langtools/test/tools/javac/enum/enumSwitch/EnumSwitch.java langtools/test/tools/javac/foreach/Foreach.java langtools/test/tools/javac/foreach/GenericIterator.java langtools/test/tools/javac/foreach/IntersectIterator.java langtools/test/tools/javac/foreach/ListOfListTest.java langtools/test/tools/javac/foreach/SpecIterable.java langtools/test/tools/javac/foreach/StaticBlock.java langtools/test/tools/javac/foreach/SuperfluousAbstract.java langtools/test/tools/javac/generics/ArrayClone.java langtools/test/tools/javac/generics/ArrayTypearg.java langtools/test/tools/javac/generics/BridgeClash.java langtools/test/tools/javac/generics/BridgeOrder.java langtools/test/tools/javac/generics/CastCrash.java langtools/test/tools/javac/generics/Casting.java langtools/test/tools/javac/generics/Casting2.java langtools/test/tools/javac/generics/Casting3.java langtools/test/tools/javac/generics/Casting4.java langtools/test/tools/javac/generics/Conditional.java langtools/test/tools/javac/generics/Covar2.java langtools/test/tools/javac/generics/Covar3.java langtools/test/tools/javac/generics/Covar4.java langtools/test/tools/javac/generics/Crash01.java langtools/test/tools/javac/generics/Crash02.java langtools/test/tools/javac/generics/CyclicInheritance3.java langtools/test/tools/javac/generics/CyclicInheritance5.java langtools/test/tools/javac/generics/ErasureClashCrash.java langtools/test/tools/javac/generics/ExtendedRaw1.java langtools/test/tools/javac/generics/ExtendedRaw2.java langtools/test/tools/javac/generics/ExtendedRaw3.java langtools/test/tools/javac/generics/ExtendedRaw4.java langtools/test/tools/javac/generics/FinalBridge.java langtools/test/tools/javac/generics/GenLit1.java langtools/test/tools/javac/generics/GenLit2.java langtools/test/tools/javac/generics/GenericAnonCtor.java langtools/test/tools/javac/generics/GenericMerge.java langtools/test/tools/javac/generics/GenericOverride.java langtools/test/tools/javac/generics/GenericThrowable.java langtools/test/tools/javac/generics/GetClass.java langtools/test/tools/javac/generics/GetClass2.java langtools/test/tools/javac/generics/InheritanceConflict.java langtools/test/tools/javac/generics/InheritanceConflict2.java langtools/test/tools/javac/generics/InheritanceConflict3.java langtools/test/tools/javac/generics/InnerInterface1.java langtools/test/tools/javac/generics/InnerInterface2.java langtools/test/tools/javac/generics/InstanceOf1.java langtools/test/tools/javac/generics/InstanceOf2.java langtools/test/tools/javac/generics/InstanceOf3.java langtools/test/tools/javac/generics/InterfaceCast1.java langtools/test/tools/javac/generics/LoadOrder.java langtools/test/tools/javac/generics/MissingBridge.java langtools/test/tools/javac/generics/MissingCast.java langtools/test/tools/javac/generics/Multibound1.java langtools/test/tools/javac/generics/MultipleInheritance.java langtools/test/tools/javac/generics/NameOrder.java langtools/test/tools/javac/generics/Nonlinear.java langtools/test/tools/javac/generics/ParametricException.java langtools/test/tools/javac/generics/ParenVerify.java langtools/test/tools/javac/generics/PermuteBound.java langtools/test/tools/javac/generics/PrimitiveClass.java langtools/test/tools/javac/generics/PrimitiveVariant.java langtools/test/tools/javac/generics/RawClient.java langtools/test/tools/javac/generics/RefEqual.java langtools/test/tools/javac/generics/RelaxedArrays.java langtools/test/tools/javac/generics/ReverseOrder.java langtools/test/tools/javac/generics/SelfImplement.java langtools/test/tools/javac/generics/SilentUnchecked.java langtools/test/tools/javac/generics/SuperTypeargs.java langtools/test/tools/javac/generics/T4661029.java langtools/test/tools/javac/generics/T4683314.java langtools/test/tools/javac/generics/T4684378.java langtools/test/tools/javac/generics/T4695348.java langtools/test/tools/javac/generics/T4695415.java langtools/test/tools/javac/generics/T4695847.java langtools/test/tools/javac/generics/T4711570.java langtools/test/tools/javac/generics/T4711572.java langtools/test/tools/javac/generics/T4711694.java langtools/test/tools/javac/generics/T4738171.java langtools/test/tools/javac/generics/T4739399.java langtools/test/tools/javac/generics/T4757416.java langtools/test/tools/javac/generics/T4784207a.java langtools/test/tools/javac/generics/T4784219.java langtools/test/tools/javac/generics/T5011073.java langtools/test/tools/javac/generics/T5094318.java langtools/test/tools/javac/generics/TyparamLit.java langtools/test/tools/javac/generics/TyparamStaticScope.java langtools/test/tools/javac/generics/TyparamStaticScope2.java langtools/test/tools/javac/generics/UncheckedArray.java langtools/test/tools/javac/generics/UncheckedConstructor.java langtools/test/tools/javac/generics/UncheckedCovariance.java langtools/test/tools/javac/generics/UnsoundInference.java langtools/test/tools/javac/generics/Varargs.java langtools/test/tools/javac/generics/Varargs2.java langtools/test/tools/javac/generics/WrongNew.java langtools/test/tools/javac/generics/abstract/T4717181c.java langtools/test/tools/javac/generics/bridge1/D.java langtools/test/tools/javac/generics/classreader/HArrayMethod.java langtools/test/tools/javac/generics/compat/CovariantCompat1.java langtools/test/tools/javac/generics/compat/OverrideBridge1.java langtools/test/tools/javac/generics/forwardSeparateBound/ForwardSeparateBound2.java langtools/test/tools/javac/generics/genericAbstract/A.java langtools/test/tools/javac/generics/odersky/BadTest.java langtools/test/tools/javac/generics/odersky/BadTest2.java langtools/test/tools/javac/generics/odersky/BadTest3.java langtools/test/tools/javac/generics/odersky/BadTest4.java langtools/test/tools/javac/generics/odersky/Test.java langtools/test/tools/javac/generics/odersky/Test2.java langtools/test/tools/javac/generics/odersky/Test3.java langtools/test/tools/javac/generics/odersky/Test4.java langtools/test/tools/javac/generics/parametricException/J.java langtools/test/tools/javac/generics/rare/Rare1.java langtools/test/tools/javac/generics/rare/Rare10.java langtools/test/tools/javac/generics/rare/Rare11.java langtools/test/tools/javac/generics/rare/Rare2.java langtools/test/tools/javac/generics/rare/Rare3.java langtools/test/tools/javac/generics/rare/Rare4.java langtools/test/tools/javac/generics/rare/Rare5.java langtools/test/tools/javac/generics/rare/Rare6.java langtools/test/tools/javac/generics/rare/Rare7.java langtools/test/tools/javac/generics/rare/Rare8.java langtools/test/tools/javac/generics/rare/Rare9.java langtools/test/tools/javac/generics/rawSeparate/RetroLexer.java langtools/test/tools/javac/generics/typeargs/Basic.java langtools/test/tools/javac/generics/typeargs/Metharg1.java langtools/test/tools/javac/generics/typeargs/Metharg2.java langtools/test/tools/javac/generics/typeargs/Newarg1.java langtools/test/tools/javac/generics/typeargs/Newarg2.java langtools/test/tools/javac/generics/typeargs/Superarg1.java langtools/test/tools/javac/generics/typeargs/Superarg2.java langtools/test/tools/javac/generics/typeargs/ThisArg.java langtools/test/tools/javac/generics/typevars/4856983/T4856983.java langtools/test/tools/javac/generics/typevars/4856983/T4856983a.java langtools/test/tools/javac/generics/typevars/4856983/T4856983b.java langtools/test/tools/javac/generics/wildcards/AssignmentDifferentTypes1.java langtools/test/tools/javac/generics/wildcards/AssignmentDifferentTypes2.java langtools/test/tools/javac/generics/wildcards/AssignmentDifferentTypes3.java langtools/test/tools/javac/generics/wildcards/AssignmentDifferentTypes4.java langtools/test/tools/javac/generics/wildcards/AssignmentDifferentTypes5.java langtools/test/tools/javac/generics/wildcards/AssignmentDifferentTypes6.java langtools/test/tools/javac/generics/wildcards/AssignmentDifferentTypes7.java langtools/test/tools/javac/generics/wildcards/AssignmentDifferentTypes8.java langtools/test/tools/javac/generics/wildcards/AssignmentDifferentTypes9.java langtools/test/tools/javac/generics/wildcards/AssignmentSameType1.java langtools/test/tools/javac/generics/wildcards/AssignmentSameType2.java langtools/test/tools/javac/generics/wildcards/AssignmentSameType3.java langtools/test/tools/javac/generics/wildcards/AssignmentSameType4.java langtools/test/tools/javac/generics/wildcards/AssignmentSameType5.java langtools/test/tools/javac/generics/wildcards/AssignmentSameType6.java langtools/test/tools/javac/generics/wildcards/AssignmentSameType7.java langtools/test/tools/javac/generics/wildcards/AssignmentSameType8.java langtools/test/tools/javac/generics/wildcards/BoundBug.java langtools/test/tools/javac/generics/wildcards/ContraArg.java langtools/test/tools/javac/generics/wildcards/T5097548.java langtools/test/tools/javac/generics/wildcards/T5097548b.java langtools/test/tools/javac/generics/wildcards/UnboundArray.java langtools/test/tools/javac/generics/wildcards/neg/AmbiguousCast.java langtools/test/tools/javac/generics/wildcards/neg/Capture.java langtools/test/tools/javac/generics/wildcards/neg/CastFail1.java langtools/test/tools/javac/generics/wildcards/neg/CastFail10.java langtools/test/tools/javac/generics/wildcards/neg/CastFail11.java langtools/test/tools/javac/generics/wildcards/neg/CastFail12.java langtools/test/tools/javac/generics/wildcards/neg/CastFail13.java langtools/test/tools/javac/generics/wildcards/neg/CastFail14.java langtools/test/tools/javac/generics/wildcards/neg/CastFail15.java langtools/test/tools/javac/generics/wildcards/neg/CastFail16.java langtools/test/tools/javac/generics/wildcards/neg/CastFail17.java langtools/test/tools/javac/generics/wildcards/neg/CastFail18.java langtools/test/tools/javac/generics/wildcards/neg/CastFail19.java langtools/test/tools/javac/generics/wildcards/neg/CastFail2.java langtools/test/tools/javac/generics/wildcards/neg/CastFail20.java langtools/test/tools/javac/generics/wildcards/neg/CastFail21.java langtools/test/tools/javac/generics/wildcards/neg/CastFail3.java langtools/test/tools/javac/generics/wildcards/neg/CastFail4.java langtools/test/tools/javac/generics/wildcards/neg/CastFail5.java langtools/test/tools/javac/generics/wildcards/neg/CastFail6.java langtools/test/tools/javac/generics/wildcards/neg/CastFail7.java langtools/test/tools/javac/generics/wildcards/neg/CastFail8.java langtools/test/tools/javac/generics/wildcards/neg/CastFail9.java langtools/test/tools/javac/generics/wildcards/neg/CastWarn10.java langtools/test/tools/javac/generics/wildcards/neg/CastWarn11.java langtools/test/tools/javac/generics/wildcards/neg/CastWarn12.java langtools/test/tools/javac/generics/wildcards/neg/CastWarn13.java langtools/test/tools/javac/generics/wildcards/neg/CastWarn14.java langtools/test/tools/javac/generics/wildcards/neg/CastWarn2.java langtools/test/tools/javac/generics/wildcards/neg/CastWarn3.java langtools/test/tools/javac/generics/wildcards/neg/CastWarn4.java langtools/test/tools/javac/generics/wildcards/neg/CastWarn5.java langtools/test/tools/javac/generics/wildcards/neg/CastWarn6.java langtools/test/tools/javac/generics/wildcards/neg/CastWarn7.java langtools/test/tools/javac/generics/wildcards/neg/CastWarn8.java langtools/test/tools/javac/generics/wildcards/neg/CastWarn9.java langtools/test/tools/javac/generics/wildcards/neg/ParamCast.java langtools/test/tools/javac/generics/wildcards/neg/Readonly.java langtools/test/tools/javac/generics/wildcards/neg/Unbounded.java langtools/test/tools/javac/generics/wildcards/pos/AmbiguousCast2.java langtools/test/tools/javac/generics/wildcards/pos/BoundsCollision.java langtools/test/tools/javac/generics/wildcards/pos/Capture.java langtools/test/tools/javac/generics/wildcards/pos/CastTest.java langtools/test/tools/javac/generics/wildcards/pos/InstanceOf.java langtools/test/tools/javac/generics/wildcards/pos/ParamCast.java langtools/test/tools/javac/generics/wildcards/pos/RvalConversion.java langtools/test/tools/javac/generics/wildcards/pos/UncheckedCast1.java langtools/test/tools/javac/importscope/A.java langtools/test/tools/javac/limits/FinallyNesting.java langtools/test/tools/javac/lint/Unchecked.java langtools/test/tools/javac/miranda/T4711325.java langtools/test/tools/javac/mixedTarget/CompatibleAbstracts1.java langtools/test/tools/javac/mixedTarget/ExtendCovariant2.java langtools/test/tools/javac/overload/T5090220.java langtools/test/tools/javac/processing/environment/TestSourceVersion.java langtools/test/tools/javac/stackmap/UninitThis.java langtools/test/tools/javac/staticImport/Ambig1.java langtools/test/tools/javac/staticImport/ImportInherit.java langtools/test/tools/javac/staticImport/ImportPrivate.java langtools/test/tools/javac/staticImport/PrivateStaticImport.java langtools/test/tools/javac/staticImport/Shadow.java langtools/test/tools/javac/staticImport/StaticImport.java langtools/test/tools/javac/staticImport/StaticImport2.java langtools/test/tools/javac/unicode/Unmappable.java langtools/test/tools/javac/varargs/Anon.java langtools/test/tools/javac/varargs/BadSyntax2.java langtools/test/tools/javac/varargs/Varargs1.java langtools/test/tools/javac/varargs/VarargsOverride.java langtools/test/tools/javac/varargs/Warn1.java langtools/test/tools/javac/varargs/Warn2.java langtools/test/tools/javac/varargs/warning/Warn2.java langtools/test/tools/javac/varargs/warning/Warn3.java langtools/test/tools/javadoc/LangVers.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/defaults/Main.java langtools/test/tools/javadoc/annotations/elementTypes/Main.java langtools/test/tools/javadoc/annotations/shortcuts/Main.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/lib/Tester.java langtools/test/tools/javadoc/varArgs/Main.java
diffstat 388 files changed, 391 insertions(+), 473 deletions(-) [+]
line wrap: on
line diff
--- a/langtools/test/com/sun/javadoc/testIndex/TestIndex.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/com/sun/javadoc/testIndex/TestIndex.java	Wed May 27 22:34:43 2009 -0700
@@ -41,7 +41,7 @@
 
     //Javadoc arguments.
     private static final String[] ARGS = new String[] {
-        "-d", BUG_ID, "-source", "1.5", "-sourcepath", SRC_DIR, "pkg", SRC_DIR + FS + "NoPackage.java"
+        "-d", BUG_ID, "-sourcepath", SRC_DIR, "pkg", SRC_DIR + FS + "NoPackage.java"
     };
 
     //Input for string search tests.
--- a/langtools/test/com/sun/javadoc/testInterface/TestInterface.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/com/sun/javadoc/testInterface/TestInterface.java	Wed May 27 22:34:43 2009 -0700
@@ -42,7 +42,7 @@
 
     //Javadoc arguments.
     private static final String[] ARGS = new String[] {
-        "-source", "1.5", "-d", BUG_ID, "-sourcepath", SRC_DIR, "pkg"
+        "-d", BUG_ID, "-sourcepath", SRC_DIR, "pkg"
     };
 
     //Input for string search tests.
--- a/langtools/test/com/sun/javadoc/testNavagation/TestNavagation.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/com/sun/javadoc/testNavagation/TestNavagation.java	Wed May 27 22:34:43 2009 -0700
@@ -40,7 +40,7 @@
 
     //Javadoc arguments.
     private static final String[] ARGS = new String[] {
-        "-d", BUG_ID, "-sourcepath", SRC_DIR, "-source", "1.5", "pkg"
+        "-d", BUG_ID, "-sourcepath", SRC_DIR, "pkg"
     };
 
     //Input for string search tests.
--- a/langtools/test/com/sun/javadoc/testTagInheritence/TestTagInheritence.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/com/sun/javadoc/testTagInheritence/TestTagInheritence.java	Wed May 27 22:34:43 2009 -0700
@@ -36,7 +36,7 @@
 
     private static final String BUG_ID = "4496223-4496270-4618686-4720974-4812240-6253614-6253604";
     private static final String[] ARGS = new String[] {
-        "-source", "1.5", "-d", BUG_ID, "-sourcepath", SRC_DIR, "pkg", "firstSentence", "firstSentence2"
+        "-d", BUG_ID, "-sourcepath", SRC_DIR, "pkg", "firstSentence", "firstSentence2"
     };
 
     /**
--- a/langtools/test/tools/javac/5005368.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/5005368.java	Wed May 27 22:34:43 2009 -0700
@@ -27,8 +27,8 @@
  * @summary com/sun/tools/javac/comp/Check.java refers to the undefined resource
  * @author gafter
  *
- * @compile      -source 1.5 -Werror                  5005368.java
- * @compile/fail -source 1.5 -Werror -Xlint:unchecked 5005368.java
+ * @compile      -Werror                  5005368.java
+ * @compile/fail -Werror -Xlint:unchecked 5005368.java
  */
 
 package p5005368;
--- a/langtools/test/tools/javac/Ambig3.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/Ambig3.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary Missing ambiguity error when two methods are equally specific
  * @author gafter
  *
- * @compile/fail -source 1.5 Ambig3.java
+ * @compile/fail Ambig3.java
  */
 
 class Test<T,E> {
--- a/langtools/test/tools/javac/ArrayCast.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/ArrayCast.java	Wed May 27 22:34:43 2009 -0700
@@ -28,7 +28,7 @@
  *          compilation.  This was fixed in 1.2beta2.
  * @author turnidge
  *
- * @compile -source 1.4 ArrayCast.java
+ * @compile ArrayCast.java
  */
 
 public class ArrayCast {
--- a/langtools/test/tools/javac/BadCovar.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/BadCovar.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary Compiler allows inheritance of multiple methods with unrelated return types
  * @author gafter
  *
- * @compile/fail -source 1.5 BadCovar.java
+ * @compile/fail BadCovar.java
  */
 
 package bad.covar;
--- a/langtools/test/tools/javac/ClassLiterals/InitializeOuter.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/ClassLiterals/InitializeOuter.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary Using a class literal causes outermost class to be initialized early
  * @author gafter
  *
- * @compile -source 1.4 -target 1.4.2 InitializeOuter.java
+ * @compile InitializeOuter.java
  * @run main InitializeOuter
  */
 
--- a/langtools/test/tools/javac/ClassLiterals/InitializeTarget.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/ClassLiterals/InitializeTarget.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary class literal causes the referenced class to be initialized
  * @author gafter
  *
- * @compile -source 1.4 -target 1.4.2 InitializeTarget.java
+ * @compile InitializeTarget.java
  * @run main InitializeTarget
  */
 
--- a/langtools/test/tools/javac/ClassToTypeParm.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/ClassToTypeParm.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary Generics: assignment of Class to type parm's default should elicit error
  * @author never
  *
- * @compile/fail -source 1.5 ClassToTypeParm.java
+ * @compile/fail ClassToTypeParm.java
  */
 
 class ClassToTypeParm<T> {
--- a/langtools/test/tools/javac/Closure1.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/Closure1.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary Initialization of up-level links, immediately after super(), occurs too late.
  * @author gafter
  *
- * @compile -source 1.4 -target 1.4 Closure1.java
+ * @compile Closure1.java
  * @run main Closure1
  */
 
--- a/langtools/test/tools/javac/Closure2.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/Closure2.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary Initialization of up-level links, immediately after super(), occurs too late.
  * @author gafter
  *
- * @compile -source 1.4 -target 1.4 Closure2.java
+ * @compile Closure2.java
  * @run main Closure2
  */
 
--- a/langtools/test/tools/javac/Closure3.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/Closure3.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary Initialization of up-level links, immediately after super(), occurs too late.
  * @author gafter
  *
- * @compile -source 1.4 -target 1.4 Closure3.java
+ * @compile Closure3.java
  * @run main Closure3
  */
 
--- a/langtools/test/tools/javac/Closure4.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/Closure4.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary Initialization of up-level links, immediately after super(), occurs too late.
  * @author gafter
  *
- * @compile -source 1.4 -target 1.4 Closure4.java
+ * @compile Closure4.java
  * @run main Closure4
  */
 
--- a/langtools/test/tools/javac/Closure5.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/Closure5.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary Incorrect order for initializers in nested class
  * @author gafter
  *
- * @compile -source 1.4 -target 1.4 Closure5.java
+ * @compile Closure5.java
  * @run main Closure5
  */
 
--- a/langtools/test/tools/javac/CompoundBox.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/CompoundBox.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary drop compound boxing operations
  * @author gafter
  *
- * @compile/fail -source 1.5 CompoundBox.java
+ * @compile/fail CompoundBox.java
  */
 
 class CompoundBox {
--- a/langtools/test/tools/javac/ConditionalArgTypes_1.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/ConditionalArgTypes_1.java	Wed May 27 22:34:43 2009 -0700
@@ -28,7 +28,7 @@
  * @author maddox
  *
  * @compile/fail -source 1.4 ConditionalArgTypes_1.java
- * @compile -source 1.5 ConditionalArgTypes_1.java
+ * @compile                  ConditionalArgTypes_1.java
  */
 
 // This is the problematic case -- the controlling expression is a boolean constant.
--- a/langtools/test/tools/javac/ConditionalArgTypes_2.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/ConditionalArgTypes_2.java	Wed May 27 22:34:43 2009 -0700
@@ -28,7 +28,7 @@
  * @author maddox
  *
  * @compile/fail -source 1.4 ConditionalArgTypes_2.java
- * @compile -source 1.5 ConditionalArgTypes_2.java
+ * @compile                  ConditionalArgTypes_2.java
  */
 
 // This case was working before -- controlling expression is not a constant.
--- a/langtools/test/tools/javac/DefiniteAssignment/DUAssert.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/DefiniteAssignment/DUAssert.java	Wed May 27 22:34:43 2009 -0700
@@ -22,12 +22,12 @@
  */
 
 /*
- * @test %E
+ * @test
  * @bug 4478838 4533580
  * @summary Check correct handling of DU in assert statements
  * @author Neal Gafter (gafter)
  *
- * @run compile -source 1.4 DUAssert.java
+ * @run compile DUAssert.java
  */
 
 class DUSwitch {
--- a/langtools/test/tools/javac/EarlyAssert.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/EarlyAssert.java	Wed May 27 22:34:43 2009 -0700
@@ -27,9 +27,6 @@
  * @summary Verify that assertions are enabled before the class is initialized
  * and not thereafter
  * @author gafter
- *
- * @compile -source 1.4 EarlyAssert.java
- * @run main EarlyAssert
  */
 
 /*
--- a/langtools/test/tools/javac/Enum1.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/Enum1.java	Wed May 27 22:34:43 2009 -0700
@@ -26,9 +26,6 @@
  * @bug 4934060
  * @summary private enum ctor versus specialized enum constant crashes javac
  * @author gafter
- *
- * @compile -source 1.5 Enum1.java
- * @run main Enum1
  */
 
 public enum Enum1 {
--- a/langtools/test/tools/javac/GoodCovar.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/GoodCovar.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary multiple methods inheritence
  * @author gafter
  *
- * @compile -source 1.5 GoodCovar.java
+ * @compile GoodCovar.java
  */
 
 package good.covar;
--- a/langtools/test/tools/javac/HexFloatLiterals.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/HexFloatLiterals.java	Wed May 27 22:34:43 2009 -0700
@@ -26,9 +26,6 @@
  * @bug 4920023
  * @summary add "hexadecimal floating-point literal" support to javac as per 4896828
  * @author gafter
- *
- * @compile -source 1.5 HexFloatLiterals.java
- * @run main HexFloatLiterals
  */
 
 public class HexFloatLiterals {
--- a/langtools/test/tools/javac/HexThree.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/HexThree.java	Wed May 27 22:34:43 2009 -0700
@@ -26,9 +26,6 @@
  * @bug 4920023
  * @summary Test hex floating-point literals
  * @author darcy
- *
- * @compile -source 1.5 HexThree.java
- * @run main HexThree
  */
 
 public class HexThree {
--- a/langtools/test/tools/javac/InterfaceAssert.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/InterfaceAssert.java	Wed May 27 22:34:43 2009 -0700
@@ -26,9 +26,6 @@
  * @bug 4399129
  * @summary Check that assertions compile properly when nested in an interface
  * @author gafter
- *
- * @compile -source 1.4 InterfaceAssert.java
- * @run main InterfaceAssert
  */
 
 /*
--- a/langtools/test/tools/javac/InvalidIntfCast.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/InvalidIntfCast.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary The compiler should detect an invalid cast between interfaces.
  * @author turnidge
  *
- * @compile -source 1.5 InvalidIntfCast.java
+ * @compile InvalidIntfCast.java
  */
 
 interface I {
--- a/langtools/test/tools/javac/NewGeneric.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/NewGeneric.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary unclear diagnostic for "new T()"
  * @author never
  *
- * @compile/fail -source 1.5 NewGeneric.java
+ * @compile/fail NewGeneric.java
  */
 
 
--- a/langtools/test/tools/javac/ObjectMethodRefFromInterface.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/ObjectMethodRefFromInterface.java	Wed May 27 22:34:43 2009 -0700
@@ -27,9 +27,6 @@
  * @summary Verify that access to member of java.lang.Object via qualification of
  * object of an interface type is handled successfully.
  * @author maddox
- *
- * @run compile -source 1.3 -target 1.2 -g ObjectMethodRefFromInterface.java
- * @run main/othervm ObjectMethodRefFromInterface
  */
 
 public class ObjectMethodRefFromInterface {
--- a/langtools/test/tools/javac/PrivateLocalConstructor.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/PrivateLocalConstructor.java	Wed May 27 22:34:43 2009 -0700
@@ -26,9 +26,6 @@
  * @bug 4365809
  * @summary Incorrect access method for private constructor in local class.
  * @author gafter
- *
- * @compile -source 1.4 -target 1.4 PrivateLocalConstructor.java
- * @run main PrivateLocalConstructor
  */
 
 public class PrivateLocalConstructor {
--- a/langtools/test/tools/javac/RawCrash.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/RawCrash.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary compiler crash with raw instantiation of generic inner class
  * @author gafter
  *
- * @compile -source 1.5 RawCrash.java
+ * @compile RawCrash.java
  */
 
 class A<E> {
--- a/langtools/test/tools/javac/SynthName2.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/SynthName2.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary using of synthetic names in local class causes ClassFormatError
  * @author gafter
  *
- * @compile/fail -source 1.4 -target 1.4 SynthName2.java
+ * @compile/fail SynthName2.java
  */
 
 import java.io.PrintStream;
--- a/langtools/test/tools/javac/T5090006/compiler.sh	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/T5090006/compiler.sh	Wed May 27 22:34:43 2009 -0700
@@ -63,7 +63,7 @@
     ;;
 esac
 
-"${TESTJAVA}${FS}bin${FS}javac" ${TESTTOOLVMOPTS} -verbose -source 5 -d "${TESTCLASSES}" -cp "${TESTSRC}${FS}broken.jar" "${TESTSRC}${FS}$1"
+"${TESTJAVA}${FS}bin${FS}javac" ${TESTTOOLVMOPTS} -verbose -d "${TESTCLASSES}" -cp "${TESTSRC}${FS}broken.jar" "${TESTSRC}${FS}$1"
 
 result=$?
 
--- a/langtools/test/tools/javac/T5092545.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/T5092545.java	Wed May 27 22:34:43 2009 -0700
@@ -26,8 +26,6 @@
  * @bug 5092545
  * @summary Assertion failed in javac (ClassWriter.java:513)
  * @author Peter von der Ah\u00e9
- * @compile -source 5 T5092545.java
- * @run main T5092545
  */
 
 interface A { void g(); }
--- a/langtools/test/tools/javac/T5105890.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/T5105890.java	Wed May 27 22:34:43 2009 -0700
@@ -26,8 +26,6 @@
  * @bug 5105890
  * @summary (codegen) constant folding broken for conditional operator
  * @author Peter von der Ah\u00e9
- * @compile -source 5 T5105890.java
- * @run main T5105890
  */
 
 public class T5105890 {
--- a/langtools/test/tools/javac/annotations/default/A.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/annotations/default/A.java	Wed May 27 22:34:43 2009 -0700
@@ -27,11 +27,11 @@
  * @summary Constraints regarding annotation defaults
  * @author gafter
  *
- * @compile -source 1.5 A.java
- * @compile -source 1.5 B.java
- * @compile -source 1.5 C.java
- * @compile/fail -source 1.5 Derr.java
- * @compile/fail -source 1.5 Eerr.java
+ * @compile A.java
+ * @compile B.java
+ * @compile C.java
+ * @compile/fail Derr.java
+ * @compile/fail Eerr.java
  */
 
 public @interface A {
--- a/langtools/test/tools/javac/annotations/neg/AnnComma.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/annotations/neg/AnnComma.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary annotation syntax allows extra ',' in parameter list.
  * @author gafter
  *
- * @compile/fail -source 1.5 AnnComma.java
+ * @compile/fail AnnComma.java
  */
 
 package annComma;
--- a/langtools/test/tools/javac/annotations/neg/ArrayLit.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/annotations/neg/ArrayLit.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary JSR175 (4): don't allow "new" in annotations
  * @author gafter
  *
- * @compile/fail -source 1.5 ArrayLit.java
+ * @compile/fail ArrayLit.java
  */
 
 @ArrayLit(new int[] {1, 2, 3})
--- a/langtools/test/tools/javac/annotations/neg/Constant.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/annotations/neg/Constant.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary JSR175 (5): annotations must be "constants"
  * @author gafter
  *
- * @compile/fail -source 1.5 Constant.java
+ * @compile/fail Constant.java
  */
 
 package test.tools.javac.annotation.Constant;
--- a/langtools/test/tools/javac/annotations/neg/Cycle1.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/annotations/neg/Cycle1.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary (JSR175) compiler allows self-containing annotation types
  * @author gafter
  *
- * @compile/fail -source 1.5 Cycle1.java
+ * @compile/fail Cycle1.java
  */
 
 package cycle1;
--- a/langtools/test/tools/javac/annotations/neg/Cycle2.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/annotations/neg/Cycle2.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary (JSR175) compiler allows self-containing annotation types
  * @author gafter
  *
- * @compile/fail -source 1.5 Cycle2.java
+ * @compile/fail Cycle2.java
  */
 
 package cycle2;
--- a/langtools/test/tools/javac/annotations/neg/Cycle3.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/annotations/neg/Cycle3.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary javac allows cyclic annotation interfaces with arrays
  * @author gafter
  *
- * @compile/fail -source 1.5 Cycle3.java
+ * @compile/fail Cycle3.java
  */
 
 package cycle3;
--- a/langtools/test/tools/javac/annotations/neg/Dep.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/annotations/neg/Dep.java	Wed May 27 22:34:43 2009 -0700
@@ -28,8 +28,8 @@
  * @author gafter
  *
  * @compile      -source 1.4 -Xlint:dep-ann -Werror Dep.java
- * @compile/fail -source 1.5 -Xlint:dep-ann -Werror Dep.java
- * @compile      -source 1.5 -Xlint:dep-ann         Dep.java
+ * @compile/fail             -Xlint:dep-ann -Werror Dep.java
+ * @compile                  -Xlint:dep-ann         Dep.java
  */
 
 /** @deprecated */
--- a/langtools/test/tools/javac/annotations/neg/Dup.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/annotations/neg/Dup.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary JSR175 (3): don't allow repeated annotations
  * @author gafter
  *
- * @compile/fail -source 1.5 Dup.java
+ * @compile/fail Dup.java
  */
 
 @Dup
--- a/langtools/test/tools/javac/annotations/neg/DupTarget.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/annotations/neg/DupTarget.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary <at>Target
  * @author gafter
  *
- * @compile/fail -source 1.5 DupTarget.java
+ * @compile/fail DupTarget.java
  */
 
 @java.lang.annotation.Target({TYPE, FIELD, PACKAGE, FIELD})
--- a/langtools/test/tools/javac/annotations/neg/MemberOver.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/annotations/neg/MemberOver.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary Annotation members must not have same signature as Object or Annotation members
  * @author gafter
  *
- * @compile/fail -source 1.5 MemberOver.java
+ * @compile/fail MemberOver.java
  */
 
 package memberOver;
--- a/langtools/test/tools/javac/annotations/neg/ObjectMembers.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/annotations/neg/ObjectMembers.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary JSR175 (2): don't allow annotating members from Object
  * @author gafter
  *
- * @compile/fail -source 1.5 ObjectMembers.java
+ * @compile/fail ObjectMembers.java
  */
 
 @ObjectMembers(hashCode = 23)
--- a/langtools/test/tools/javac/annotations/neg/OverrideNo.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/annotations/neg/OverrideNo.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary JSR175 (7): implement <at>Overrides
  * @author gafter
  *
- * @compile/fail -source 1.5 OverrideNo.java
+ * @compile/fail OverrideNo.java
  */
 
 package overrideNo;
--- a/langtools/test/tools/javac/annotations/neg/Package.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/annotations/neg/Package.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary Package annotations
  * @author gafter
  *
- * @compile/fail -source 1.5 Package.java
+ * @compile/fail Package.java
  */
 
 @java.lang.annotation.Documented
--- a/langtools/test/tools/javac/annotations/neg/Recovery.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/annotations/neg/Recovery.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary compiler crash with malformed annotations
  * @author gafter
  *
- * @compile/fail -source 1.5 Recovery.java
+ * @compile/fail Recovery.java
  */
 
 import java.lang.annotation.*;
--- a/langtools/test/tools/javac/annotations/neg/Recovery1.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/annotations/neg/Recovery1.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary Assertion error is thrown when an annotation class cannot be found.
  * @author gafter
  *
- * @compile/fail -source 1.5 Recovery1.java
+ * @compile/fail Recovery1.java
  */
 
 package recovery1;
--- a/langtools/test/tools/javac/annotations/neg/Scope.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/annotations/neg/Scope.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary name lookup scope for annotations
  * @author gafter
  *
- * @compile/fail -source 1.5 Scope.java
+ * @compile/fail Scope.java
  */
 
 package annotation.scope;
--- a/langtools/test/tools/javac/annotations/neg/Syntax1.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/annotations/neg/Syntax1.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary compiler crash with ill-formed annotation
  * @author gafter
  *
- * @compile/fail -source 1.5 Syntax1.java
+ * @compile/fail Syntax1.java
  */
 
 package syntax1;
--- a/langtools/test/tools/javac/annotations/neg/WrongTarget.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/annotations/neg/WrongTarget.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary java.lang.annotation.Target
  * @author gafter
  *
- * @compile/fail -source 1.5 WrongTarget.java
+ * @compile/fail WrongTarget.java
  */
 
 @java.lang.annotation.Target({FIELD})
--- a/langtools/test/tools/javac/annotations/neg/WrongTarget2.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/annotations/neg/WrongTarget2.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary Compiler allows Inherited meta-attribute on local variable declaration.
  * @author gafter
  *
- * @compile/fail -source 1.5 WrongTarget2.java
+ * @compile/fail WrongTarget2.java
  */
 
 import java.lang.annotation.Inherited;
--- a/langtools/test/tools/javac/annotations/neg/WrongValue.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/annotations/neg/WrongValue.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary compiler: crashes when attributes with same elements are used in place of other
  * @author gafter
  *
- * @compile/fail -source 1.5 WrongValue.java
+ * @compile/fail WrongValue.java
  */
 
 @interface TestM2 {
--- a/langtools/test/tools/javac/annotations/neg/Z1.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/annotations/neg/Z1.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary implement "metadata" (attribute interfaces and program annotations)
  * @author gafter
  *
- * @compile/fail -source 1.5 Z1.java
+ * @compile/fail Z1.java
  */
 
 enum Color { red, green, blue }
--- a/langtools/test/tools/javac/annotations/neg/Z10.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/annotations/neg/Z10.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary implement "metadata" (attribute interfaces and program annotations)
  * @author gafter
  *
- * @compile/fail -source 1.5 Z10.java
+ * @compile/fail Z10.java
  */
 
 enum Color { red, green, blue }
--- a/langtools/test/tools/javac/annotations/neg/Z11.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/annotations/neg/Z11.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary implement "metadata" (attribute interfaces and program annotations)
  * @author gafter
  *
- * @compile/fail -source 1.5 Z11.java
+ * @compile/fail Z11.java
  */
 
 enum Color { red, green, blue }
--- a/langtools/test/tools/javac/annotations/neg/Z12.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/annotations/neg/Z12.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary implement "metadata" (attribute interfaces and program annotations)
  * @author gafter
  *
- * @compile/fail -source 1.5 Z12.java
+ * @compile/fail Z12.java
  */
 
 enum Color { red, green, blue }
--- a/langtools/test/tools/javac/annotations/neg/Z13.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/annotations/neg/Z13.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary implement "metadata" (attribute interfaces and program annotations)
  * @author gafter
  *
- * @compile/fail -source 1.5 Z13.java
+ * @compile/fail Z13.java
  */
 
 @interface An {
--- a/langtools/test/tools/javac/annotations/neg/Z14.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/annotations/neg/Z14.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary implement "metadata" (attribute interfaces and program annotations)
  * @author gafter
  *
- * @compile/fail -source 1.5 Z14.java
+ * @compile/fail Z14.java
  */
 
 @interface An<T> {
--- a/langtools/test/tools/javac/annotations/neg/Z15.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/annotations/neg/Z15.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary implement "metadata" (attribute interfaces and program annotations)
  * @author gafter
  *
- * @compile/fail -source 1.5 Z15.java
+ * @compile/fail Z15.java
  */
 
 @interface An {
--- a/langtools/test/tools/javac/annotations/neg/Z16.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/annotations/neg/Z16.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary implement "metadata" (attribute interfaces and program annotations)
  * @author gafter
  *
- * @compile/fail -source 1.5 Z16.java
+ * @compile/fail Z16.java
  */
 
 enum Color { red, green, blue }
--- a/langtools/test/tools/javac/annotations/neg/Z2.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/annotations/neg/Z2.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary implement "metadata" (attribute interfaces and program annotations)
  * @author gafter
  *
- * @compile/fail -source 1.5 Z2.java
+ * @compile/fail Z2.java
  */
 
 enum Color { red, green, blue }
--- a/langtools/test/tools/javac/annotations/neg/Z3.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/annotations/neg/Z3.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary implement "metadata" (attribute interfaces and program annotations)
  * @author gafter
  *
- * @compile/fail -source 1.5 Z3.java
+ * @compile/fail Z3.java
  */
 
 enum Color { red, green, blue }
--- a/langtools/test/tools/javac/annotations/neg/Z4.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/annotations/neg/Z4.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary implement "metadata" (attribute interfaces and program annotations)
  * @author gafter
  *
- * @compile/fail -source 1.5 Z4.java
+ * @compile/fail Z4.java
  */
 
 enum Color { red, green, blue }
--- a/langtools/test/tools/javac/annotations/neg/Z5.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/annotations/neg/Z5.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary implement "metadata" (attribute interfaces and program annotations)
  * @author gafter
  *
- * @compile/fail -source 1.5 Z5.java
+ * @compile/fail Z5.java
  */
 
 interface Foo {}
--- a/langtools/test/tools/javac/annotations/neg/Z8.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/annotations/neg/Z8.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary implement "metadata" (attribute interfaces and program annotations)
  * @author gafter
  *
- * @compile/fail -source 1.5 Z8.java
+ * @compile/fail Z8.java
  */
 
 @interface An {
--- a/langtools/test/tools/javac/annotations/neg/Z9.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/annotations/neg/Z9.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary implement "metadata" (attribute interfaces and program annotations)
  * @author gafter
  *
- * @compile/fail -source 1.5 Z9.java
+ * @compile/fail Z9.java
  */
 
 @interface An {
--- a/langtools/test/tools/javac/annotations/pos/AnnoteElideBraces.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/annotations/pos/AnnoteElideBraces.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary JSR175 (15): single element array annotation value
  * @author gafter
  *
- * @compile -source 1.5 AnnoteElideBraces.java
+ * @compile AnnoteElideBraces.java
  */
 
 @interface D {
--- a/langtools/test/tools/javac/annotations/pos/ClassA.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/annotations/pos/ClassA.java	Wed May 27 22:34:43 2009 -0700
@@ -27,8 +27,8 @@
  * @summary javac crash loading class files containing Class-valued annotation fields
  * @author gafter
  *
- * @compile -source 1.5 ClassA.java ClassB.java
- * @compile -source 1.5 ClassB.java
+ * @compile ClassA.java ClassB.java
+ * @compile ClassB.java
  */
 
 @interface ClassA {
--- a/langtools/test/tools/javac/annotations/pos/Dep.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/annotations/pos/Dep.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary Please add annotation <at>Deprecated to supplant the javadoc tag
  * @author gafter
  *
- * @compile -source 1.5 -Xlint:dep-ann -Werror Dep.java
+ * @compile -Xlint:dep-ann -Werror Dep.java
  */
 
 /** @deprecated */
--- a/langtools/test/tools/javac/annotations/pos/Enum1.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/annotations/pos/Enum1.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary JSR175: annotations on enum constant
  * @author gafter
  *
- * @compile -source 1.5 Enum1.java
+ * @compile Enum1.java
  */
 
 package annotation.enums;
--- a/langtools/test/tools/javac/annotations/pos/Local.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/annotations/pos/Local.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary local variable annotations
  * @author gafter
  *
- * @compile -source 1.5 Local.java
+ * @compile Local.java
  */
 
 class Local {
--- a/langtools/test/tools/javac/annotations/pos/Members.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/annotations/pos/Members.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary annotation types may contain constants, types
  * @author gafter
  *
- * @compile -source 1.5 Members.java
+ * @compile Members.java
  */
 
 package members;
--- a/langtools/test/tools/javac/annotations/pos/NType.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/annotations/pos/NType.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary compiler crash if annotation using an enum type defined inside the annotation
  * @author gafter
  *
- * @compile -source 1.5 NType.java
+ * @compile NType.java
  */
 
 package ntype;
--- a/langtools/test/tools/javac/annotations/pos/OverrideCheck.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/annotations/pos/OverrideCheck.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary crash in annotation class file reader
  * @author gafter
  *
- * @compile -source 1.5 OverrideCheck.java
+ * @compile OverrideCheck.java
  */
 
 class OverrideCheck {
--- a/langtools/test/tools/javac/annotations/pos/OverrideOK.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/annotations/pos/OverrideOK.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary JSR175 (7): implement <at>Overrides
  * @author gafter
  *
- * @compile -source 1.5 OverrideOK.java
+ * @compile OverrideOK.java
  */
 
 package overrideOK;
--- a/langtools/test/tools/javac/annotations/pos/Parameter.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/annotations/pos/Parameter.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary JSR175: Parameter annotations
  * @author gafter
  *
- * @compile -source 1.5 Parameter.java
+ * @compile Parameter.java
  */
 
 package annotation.parameter;
--- a/langtools/test/tools/javac/annotations/pos/Primitives.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/annotations/pos/Primitives.java	Wed May 27 22:34:43 2009 -0700
@@ -26,9 +26,6 @@
  * @bug 5034991 5040842 5040853
  * @summary Modify class-file representation of Class-valued annotation elements
  * @author gafter
- *
- * @compile -source 1.5 Primitives.java
- * @run main Primitives
  */
 
 public class Primitives {
--- a/langtools/test/tools/javac/annotations/pos/RightTarget.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/annotations/pos/RightTarget.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary java.lang.annotation.Target
  * @author gafter
  *
- * @compile -source 1.5 RightTarget.java
+ * @compile RightTarget.java
  */
 
 import java.lang.annotation.ElementType;
--- a/langtools/test/tools/javac/annotations/pos/Z1.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/annotations/pos/Z1.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary implement "metadata" (attribute interfaces and program annotations)
  * @author gafter
  *
- * @compile -source 1.5 Z1.java
+ * @compile Z1.java
  */
 
 enum Color { red, green, blue }
--- a/langtools/test/tools/javac/annotations/pos/Z2.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/annotations/pos/Z2.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary implement "metadata" (attribute interfaces and program annotations)
  * @author gafter
  *
- * @compile -source 1.5 Z2.java
+ * @compile Z2.java
  */
 
 enum Color { red, green, blue }
--- a/langtools/test/tools/javac/annotations/pos/Z3.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/annotations/pos/Z3.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary implement "metadata" (attribute interfaces and program annotations)
  * @author gafter
  *
- * @compile -source 1.5 Z3.java
+ * @compile Z3.java
  */
 
 enum Color { red, green, blue }
--- a/langtools/test/tools/javac/annotations/pos/Z4.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/annotations/pos/Z4.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary implement "metadata" (attribute interfaces and program annotations)
  * @author gafter
  *
- * @compile -source 1.5 Z4.java
+ * @compile Z4.java
  */
 
 @interface An {
--- a/langtools/test/tools/javac/annotations/pos/package-info.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/annotations/pos/package-info.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary Package annotations
  * @author gafter
  *
- * @compile -source 1.5 package-info.java
+ * @compile package-info.java
  */
 
 @java.lang.annotation.Documented
--- a/langtools/test/tools/javac/assert/Attach.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/assert/Attach.java	Wed May 27 22:34:43 2009 -0700
@@ -26,9 +26,6 @@
  * @bug 4478095
  * @summary assertion flag attached to wrong class
  * @author gafter
- *
- * @compile -source 1.4 Attach.java
- * @run main Attach
  */
 
 public class Attach {
--- a/langtools/test/tools/javac/assert/DU1.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/assert/DU1.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary Check correct DU computation for assertions.
  * @author gafter
  *
- * @compile/fail -source 1.4 DU1.java
+ * @compile/fail DU1.java
  */
 
 class DU1 {
--- a/langtools/test/tools/javac/assert/DU2.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/assert/DU2.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary Check correct DU computation for assertions.
  * @author gafter
  *
- * @compile/fail -source 1.4 DU2.java
+ * @compile/fail DU2.java
  */
 
 class DU2 {
--- a/langtools/test/tools/javac/assert/Position.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/assert/Position.java	Wed May 27 22:34:43 2009 -0700
@@ -3,17 +3,17 @@
  * @bug 4469737
  * @summary Verify the source position for assertions.
  * @author gafter
- *
- * @compile -source 1.4 Position.java
- * @run main Position
  */
 
+
 public class Position {
     static public void main(String[] args) {
         Position.class.getClassLoader().setClassAssertionStatus("U", true);
         new U().main();
     }
 }
+
+
 class U {
     void main() {
         try {
--- a/langtools/test/tools/javac/boxing/BoxedForeach.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/boxing/BoxedForeach.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary boxing/unboxing versus foreach crashes javac
  * @author gafter
  *
- * @compile -source 1.5 BoxedForeach.java
+ * @compile BoxedForeach.java
  * @run main BoxedForeach
  */
 
--- a/langtools/test/tools/javac/boxing/Boxing1.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/boxing/Boxing1.java	Wed May 27 22:34:43 2009 -0700
@@ -26,9 +26,6 @@
  * @bug 4869233 4872709 4868735 4921949 4921209 4965701 4934916 4975565 4974939
  * @summary Boxing/unboxing positive unit and regression tests
  * @author gafter
- *
- * @compile -source 1.5 Boxing1.java
- * @run main Boxing1
  */
 
 public class Boxing1 {
--- a/langtools/test/tools/javac/boxing/Boxing2.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/boxing/Boxing2.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary Boxing/unboxing negative unit and regression tests
  * @author gafter
  *
- * @compile/fail -source 1.5 Boxing2.java
+ * @compile/fail Boxing2.java
  */
 
 public class Boxing2 {
--- a/langtools/test/tools/javac/boxing/Boxing4.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/boxing/Boxing4.java	Wed May 27 22:34:43 2009 -0700
@@ -26,9 +26,6 @@
  * @bug 4999689
  * @summary Compiler incorrectly create Integer in "Character c = 95"
  * @author gafter
- *
- * @compile -source 1.5 Boxing4.java
- * @run main Boxing4
  */
 
 public class Boxing4 {
--- a/langtools/test/tools/javac/boxing/BoxingCaching.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/boxing/BoxingCaching.java	Wed May 27 22:34:43 2009 -0700
@@ -26,9 +26,6 @@
  * @bug 4990346
  * @summary Verify autoboxed values are cached as required.
  * @author Joseph D. Darcy
- *
- * @compile -source 1.5 BoxingCaching.java
- * @run main BoxingCaching
  */
 
 public class BoxingCaching {
--- a/langtools/test/tools/javac/capture/Capture1.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/capture/Capture1.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary wildcard capture (snapshotting)
  * @author gafter
  *
- * @compile -Xlint:unchecked -Werror -source 1.5 Capture1.java
+ * @compile -Xlint:unchecked -Werror Capture1.java
  */
 
 package capture1;
--- a/langtools/test/tools/javac/capture/Capture2.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/capture/Capture2.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary soundness problem with failure to subsitute wildcard as type formal argument
  * @author gafter
  *
- * @compile/fail -source 1.5 Capture2.java
+ * @compile/fail Capture2.java
  */
 
 package capture2;
--- a/langtools/test/tools/javac/capture/Capture3.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/capture/Capture3.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary new wildcard subst scheme breaks java.lang.ref
  * @author gafter
  *
- * @compile -source 1.5 Capture3.java
+ * @compile Capture3.java
  */
 
 package capture3;
--- a/langtools/test/tools/javac/capture/Capture5.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/capture/Capture5.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary wildcards versus recursive F-bounds
  * @author Peter von der Ahe
  *
- * @compile -source 1.5 Capture5.java
+ * @compile Capture5.java
  */
 
 package capture5;
--- a/langtools/test/tools/javac/cast/BoxedArray.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/cast/BoxedArray.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary REGRESSION: compiler allows cast from Integer[] to int[]
  * @author gafter
  *
- * @compile/fail -source 1.5 BoxedArray.java
+ * @compile/fail BoxedArray.java
  */
 
 public class BoxedArray {
--- a/langtools/test/tools/javac/enum/AbstractEmptyEnum.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/enum/AbstractEmptyEnum.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary empty enum cannot be abstract
  * @author Joseph D. Darcy
  *
- * @compile/fail -source 1.5 AbstractEmptyEnum.java
+ * @compile/fail AbstractEmptyEnum.java
  */
 
 public enum AbstractEmptyEnum {
--- a/langtools/test/tools/javac/enum/AbstractEnum1.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/enum/AbstractEnum1.java	Wed May 27 22:34:43 2009 -0700
@@ -26,9 +26,6 @@
  * @bug 5054976
  * @summary compiler fails to flag an enum abstract
  * @author gafter
- *
- * @compile -source 1.5 AbstractEnum1.java
- * @run main AbstractEnum1
  */
 
 import java.lang.reflect.Modifier;
--- a/langtools/test/tools/javac/enum/DA1.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/enum/DA1.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary One can refer static, const static variables from instance initializers of enum
  * @author gafter
  *
- * @compile/fail -source 1.5 DA1.java
+ * @compile/fail DA1.java
  */
 
 package da1;
--- a/langtools/test/tools/javac/enum/DA2.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/enum/DA2.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary One can refer static, const static variables from instance initializers of enum
  * @author gafter
  *
- * @compile/fail -source 1.5 DA2.java
+ * @compile/fail DA2.java
  */
 
 package da2;
--- a/langtools/test/tools/javac/enum/DA3.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/enum/DA3.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary One can refer static, const static variables from instance initializers of enum
  * @author gafter
  *
- * @compile/fail -source 1.5 DA3.java
+ * @compile/fail DA3.java
  */
 
 package da3;
--- a/langtools/test/tools/javac/enum/Def.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/enum/Def.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary constant static fields cannot be referenced from const, instance initializers
  * @author gafter
  *
- * @compile -source 1.5 Def.java
+ * @compile Def.java
  */
 
 package _enum.def;
--- a/langtools/test/tools/javac/enum/Enum1.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/enum/Enum1.java	Wed May 27 22:34:43 2009 -0700
@@ -26,9 +26,6 @@
  * @bug 4945532
  * @summary enums: test output of values().toString()
  * @author gafter
- *
- * @compile -source 1.5 Enum1.java
- * @run main Enum1
  */
 
 import java.util.*;
--- a/langtools/test/tools/javac/enum/Enum2.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/enum/Enum2.java	Wed May 27 22:34:43 2009 -0700
@@ -26,7 +26,7 @@
  * @summary enums: an enumeration type may not be extended
  * @author gafter
  *
- * @compile/fail -source 1.5 Enum2.java
+ * @compile/fail Enum2.java
  */
 
 public class Enum2 {
--- a/langtools/test/tools/javac/enum/Enum3.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/enum/Enum3.java	Wed May 27 22:34:43 2009 -0700
@@ -26,9 +26,6 @@
  * @bug 4945532
  * @summary enums: test switch
  * @author gafter
- *
- * @compile -source 1.5 Enum3.java
- * @run main Enum3
  */
 
 public enum Enum3 {
--- a/langtools/test/tools/javac/enum/EnumImplicitPrivateConstructor.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/enum/EnumImplicitPrivateConstructor.java	Wed May 27 22:34:43 2009 -0700
@@ -26,9 +26,6 @@
  * @bug 5009601 5010455 5005748
  * @summary enum constructors can be declared private
  * @author Joseph D. Darcy
- *
- * @compile -source 1.5 EnumImplicitPrivateConstructor.java
- * @run main EnumImplicitPrivateConstructor
  */
 
 import java.util.*;
--- a/langtools/test/tools/javac/enum/EnumInit.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/enum/EnumInit.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary compiling annatations with nested enums issuing *.java leads to crash
  * @author gafter
  *
- * @compile -source 1.5 EnumInit.java
+ * @compile EnumInit.java
  */
 
 package enum_init_;
--- a/langtools/test/tools/javac/enum/EnumPrivateConstructor.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/enum/EnumPrivateConstructor.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary enum constructors can be declared private
  * @author Joseph D. Darcy
  *
- * @compile -source 1.5 EnumPrivateConstructor.java
+ * @compile EnumPrivateConstructor.java
  */
 
 enum EnumPrivateConstructor {
--- a/langtools/test/tools/javac/enum/EnumProtectedConstructor.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/enum/EnumProtectedConstructor.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary enum constructors cannot be declared public or protected
  * @author Joseph D. Darcy
  *
- * @compile/fail -source 1.5 EnumProtectedConstructor.java
+ * @compile/fail EnumProtectedConstructor.java
  */
 
 enum EnumProtectedConstructor {
--- a/langtools/test/tools/javac/enum/EnumPublicConstructor.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/enum/EnumPublicConstructor.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary enum constructors cannot be declared public or protected
  * @author Joseph D. Darcy
  *
- * @compile/fail -source 1.5 EnumPublicConstructor.java
+ * @compile/fail EnumPublicConstructor.java
  */
 
 enum EnumPublicConstructor {
--- a/langtools/test/tools/javac/enum/EnumSwitch1.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/enum/EnumSwitch1.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary enum switch case labels required to be unqualified.
  * @author gafter
  *
- * @compile -source 1.5 EnumSwitch1.java
+ * @compile EnumSwitch1.java
  */
 
 package enumswitch1;
--- a/langtools/test/tools/javac/enum/EnumSwitch2.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/enum/EnumSwitch2.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary enum switch case labels required to be unqualified.
  * @author gafter
  *
- * @compile/fail -source 1.5 EnumSwitch2.java
+ * @compile/fail EnumSwitch2.java
  */
 
 package enumswitch2;
--- a/langtools/test/tools/javac/enum/EnumSwitch3.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/enum/EnumSwitch3.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary javac crash when enum defined after use
  * @author gafter
  *
- * @compile -source 1.5 EnumSwitch3.java
+ * @compile EnumSwitch3.java
  */
 
 package enumswitch3;
--- a/langtools/test/tools/javac/enum/EnumSwitch4.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/enum/EnumSwitch4.java	Wed May 27 22:34:43 2009 -0700
@@ -26,9 +26,6 @@
  * @bug 5006662
  * @summary enum switch on null fails to throw NullPointerException
  * @author gafter
- *
- * @compile -source 1.5 EnumSwitch4.java
- * @run main EnumSwitch4
  */
 
 public enum EnumSwitch4 {
--- a/langtools/test/tools/javac/enum/ExplicitlyAbstractEnum1.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/enum/ExplicitlyAbstractEnum1.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary enum's cannot be explicitly declared abstract
  * @author Joseph D. Darcy
  *
- * @compile/fail -source 1.5 ExplicitlyAbstractEnum1.java
+ * @compile/fail ExplicitlyAbstractEnum1.java
  */
 
 abstract enum ExplicitlyAbstractEnum1 {
--- a/langtools/test/tools/javac/enum/ExplicitlyAbstractEnum2.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/enum/ExplicitlyAbstractEnum2.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary enum's cannot be explicitly declared abstract even if they are abstract
  * @author Joseph D. Darcy
  *
- * @compile/fail -source 1.5 ExplicitlyAbstractEnum2.java
+ * @compile/fail ExplicitlyAbstractEnum2.java
  */
 
 abstract enum ExplicitlyAbstractEnum2 {
--- a/langtools/test/tools/javac/enum/ExplicitlyFinalEnum1.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/enum/ExplicitlyFinalEnum1.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary enum's cannot be explicitly declared final even if they are
  * @author Joseph D. Darcy
  *
- * @compile/fail -source 1.5 ExplicitlyFinalEnum1.java
+ * @compile/fail ExplicitlyFinalEnum1.java
  */
 
 final enum ExplicitlyFinalEnum1 {
--- a/langtools/test/tools/javac/enum/ExplicitlyFinalEnum2.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/enum/ExplicitlyFinalEnum2.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary enum's cannot be explicitly declared final
  * @author Joseph D. Darcy
  *
- * @compile/fail -source 1.5 ExplicitlyFinalEnum2.java
+ * @compile/fail ExplicitlyFinalEnum2.java
  */
 
 final enum ExplicitlyFinalEnum2 {
--- a/langtools/test/tools/javac/enum/FauxEnum1.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/enum/FauxEnum1.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary verify java.lang.Enum can't be directly subclassed
  * @author Joseph D. Darcy
  *
- * @compile/fail -source 1.5 FauxEnum1.java
+ * @compile/fail FauxEnum1.java
  */
 
 public class FauxEnum1 extends java.lang.Enum {
--- a/langtools/test/tools/javac/enum/FauxEnum3.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/enum/FauxEnum3.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary verify an enum type can't be directly subclassed
  * @author Joseph D. Darcy
  *
- * @compile/fail -source 1.5 FauxEnum3.java
+ * @compile/fail FauxEnum3.java
  */
 
 public class FauxEnum3 extends SpecializedEnum {
--- a/langtools/test/tools/javac/enum/FauxSpecialEnum1.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/enum/FauxSpecialEnum1.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary verify specialized enum classes can't be abstract
  * @author Joseph D. Darcy
  *
- * @compile/fail -source 1.5 FauxSpecialEnum1.java
+ * @compile/fail FauxSpecialEnum1.java
  */
 
 public enum FauxSpecialEnum1 {
--- a/langtools/test/tools/javac/enum/FauxSpecialEnum2.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/enum/FauxSpecialEnum2.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary verify specialized enum classes can't be abstract
  * @author Joseph D. Darcy
  *
- * @compile/fail -source 1.5 FauxSpecialEnum2.java
+ * @compile/fail FauxSpecialEnum2.java
  */
 
 public enum FauxSpecialEnum2 {
--- a/langtools/test/tools/javac/enum/LocalEnum.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/enum/LocalEnum.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary javac fails to reject local enums
  * @author gafter
  *
- * @compile/fail -source 1.5 LocalEnum.java
+ * @compile/fail LocalEnum.java
  */
 
 public class LocalEnum {
--- a/langtools/test/tools/javac/enum/NoFinal.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/enum/NoFinal.java	Wed May 27 22:34:43 2009 -0700
@@ -26,7 +26,7 @@
  * @bug 5097250 5087624
  * @summary Finalize methods on enums must be compile time error
  * @author Peter von der Ah\u00e9
- * @compile/fail -source 5 NoFinal.java
+ * @compile/fail NoFinal.java
  */
 
 enum NoFinal {
--- a/langtools/test/tools/javac/enum/NoFinal2.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/enum/NoFinal2.java	Wed May 27 22:34:43 2009 -0700
@@ -26,7 +26,7 @@
  * @bug 5097250 5087624
  * @summary Finalize methods on enums must be compile time error
  * @author Peter von der Ah\u00e9
- * @compile/fail -source 5 NoFinal2.java
+ * @compile/fail NoFinal2.java
  */
 
 enum NoFinal2 {
--- a/langtools/test/tools/javac/enum/NoFinal3.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/enum/NoFinal3.java	Wed May 27 22:34:43 2009 -0700
@@ -26,7 +26,7 @@
  * @bug 5097250 5087624
  * @summary Finalize methods on enums must be compile time error
  * @author Peter von der Ah\u00e9
- * @compile/fail -source 5 NoFinal3.java
+ * @compile/fail NoFinal3.java
  */
 
 enum NoFinal3 {
--- a/langtools/test/tools/javac/enum/NoFinal4.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/enum/NoFinal4.java	Wed May 27 22:34:43 2009 -0700
@@ -26,7 +26,7 @@
  * @bug 5097250 5087624
  * @summary Finalize methods on enums must be compile time error
  * @author Peter von der Ah\u00e9
- * @compile/fail -source 5 NoFinal4.java
+ * @compile/fail NoFinal4.java
  */
 
 enum NoFinal4 {
--- a/langtools/test/tools/javac/enum/NoFinal5.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/enum/NoFinal5.java	Wed May 27 22:34:43 2009 -0700
@@ -26,7 +26,7 @@
  * @bug 5097250 5087624
  * @summary Finalize methods on enums must be compile time error
  * @author Peter von der Ah\u00e9
- * @compile/fail -source 5 NoFinal5.java
+ * @compile/fail NoFinal5.java
  */
 
 enum NoFinal5 {
--- a/langtools/test/tools/javac/enum/OkFinal.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/enum/OkFinal.java	Wed May 27 22:34:43 2009 -0700
@@ -26,8 +26,6 @@
  * @bug 5097250
  * @summary Finalize methods on enums must be compile time error
  * @author Peter von der Ah\u00e9
- * @compile -source 5 OkFinal.java
- * @run main OkFinal
  */
 
 public enum OkFinal {
--- a/langtools/test/tools/javac/enum/SynthValues.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/enum/SynthValues.java	Wed May 27 22:34:43 2009 -0700
@@ -26,9 +26,6 @@
  * @bug 4984627
  * @summary Enums: +VALUES field has no synthetic attribute
  * @author gafter
- *
- * @compile -source 1.5 SynthValues.java
- * @run main SynthValues
  */
 
 public enum SynthValues {
--- a/langtools/test/tools/javac/enum/T5075242.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/enum/T5075242.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary Cannot make compound type involving Enums
  * @author Peter von der Ah\u00e9
  *
- * @compile -source 5 T5075242.java
+ * @compile T5075242.java
  */
 
 interface Iface {
--- a/langtools/test/tools/javac/enum/T5081785.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/enum/T5081785.java	Wed May 27 22:34:43 2009 -0700
@@ -28,10 +28,10 @@
  * @summary Empty Enums allowed in non-static contexts
  * @author Peter von der Ah\u00e9
  *
- * @compile/fail -source 1.5 T5081785.java
- * @compile/fail -source 1.5 T5081785a.java
- * @compile/fail -source 1.5 T5081785b.java
- * @compile/fail -source 1.5 T5081785c.java
+ * @compile/fail T5081785.java
+ * @compile/fail T5081785a.java
+ * @compile/fail T5081785b.java
+ * @compile/fail T5081785c.java
  */
 
 class A {
--- a/langtools/test/tools/javac/enum/TrailingComma.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/enum/TrailingComma.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary enum spec allows trailing comma on enum constant list
  * @author gafter
  *
- * @compile -source 1.5 TrailingComma.java
+ * @compile TrailingComma.java
  */
 
 class TrailingComma {
--- a/langtools/test/tools/javac/enum/UserValue.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/enum/UserValue.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary compiler crash on user-defined valueOf in enum
  * @author gafter
  *
- * @compile -source 1.5 UserValue.java
+ * @compile UserValue.java
  */
 
 public enum UserValue {
--- a/langtools/test/tools/javac/enum/ValueOf.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/enum/ValueOf.java	Wed May 27 22:34:43 2009 -0700
@@ -26,9 +26,6 @@
  * @bug 4872708 5058132
  * @summary Improper signature for valueOf
  * @author gafter
- *
- * @compile -source 1.5 ValueOf.java
- * @run main ValueOf
  */
 
 public enum ValueOf {
--- a/langtools/test/tools/javac/enum/enumSwitch/EnumSwitch.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/enum/enumSwitch/EnumSwitch.java	Wed May 27 22:34:43 2009 -0700
@@ -27,8 +27,8 @@
  * @summary javac-generated code doesn't obey binary compatibility for enums
  * @author gafter
  *
- * @compile -source 1.5 EnumSwitch.java
- * @compile -source 1.5 Color2.java
+ * @compile EnumSwitch.java
+ * @compile Color2.java
  * @run main EnumSwitch
  */
 
--- a/langtools/test/tools/javac/foreach/Foreach.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/foreach/Foreach.java	Wed May 27 22:34:43 2009 -0700
@@ -26,9 +26,6 @@
  * @bug 4855355
  * @summary implement "foreach" loops as specified in JSR 201
  * @author gafter
- *
- * @compile -source 1.5 Foreach.java
- * @run main Foreach
  */
 
 import java.util.Iterator;
--- a/langtools/test/tools/javac/foreach/GenericIterator.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/foreach/GenericIterator.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary extended 'for' with generic collections causes the compiler to crash
  * @author gafter
  *
- * @compile -source 1.5 GenericIterator.java
+ * @compile GenericIterator.java
  */
 
 import java.util.*;
--- a/langtools/test/tools/javac/foreach/IntersectIterator.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/foreach/IntersectIterator.java	Wed May 27 22:34:43 2009 -0700
@@ -26,9 +26,6 @@
  * @bug 5003207
  * @summary new "for" statement  fails to cast to second upper bound
  * @author gafter
- *
- * @compile -source 1.5 IntersectIterator.java
- * @run main IntersectIterator
  */
 
 import java.util.*;
--- a/langtools/test/tools/javac/foreach/ListOfListTest.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/foreach/ListOfListTest.java	Wed May 27 22:34:43 2009 -0700
@@ -26,9 +26,6 @@
  * @bug 4915435
  * @summary NullPointerError in Resolve.findMethod() with foreach vs generics
  * @author gafter
- *
- * @compile -source 1.5 ListOfListTest.java
- * @run main ListOfListTest
  */
 
 import java.util.List;
--- a/langtools/test/tools/javac/foreach/SpecIterable.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/foreach/SpecIterable.java	Wed May 27 22:34:43 2009 -0700
@@ -26,9 +26,6 @@
  * @bug 4911157
  * @summary Runtime error because of missing method in iterator
  * @author gafter
- *
- * @compile -source 1.5 SpecIterable.java
- * @run main SpecIterable
  */
 
 import java.util.Iterator;
--- a/langtools/test/tools/javac/foreach/StaticBlock.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/foreach/StaticBlock.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary compiler crash (NullPointerException) with foreach in static context
  * @author gafter
  *
- * @compile -source 1.5 StaticBlock.java
+ * @compile StaticBlock.java
  */
 
 public class StaticBlock {
--- a/langtools/test/tools/javac/foreach/SuperfluousAbstract.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/foreach/SuperfluousAbstract.java	Wed May 27 22:34:43 2009 -0700
@@ -26,9 +26,6 @@
  * @bug 4912795
  * @summary AbstractMethodError throws if not redeclare abstract iterator() method
  * @author gafter
- *
- * @compile -source 1.5 SuperfluousAbstract.java
- * @run main SuperfluousAbstract
  */
 
 import java.util.AbstractCollection;
--- a/langtools/test/tools/javac/generics/ArrayClone.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/ArrayClone.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary The clone method on arrays should be strongly typed
  * @author gafter
  *
- * @compile -source 1.5 ArrayClone.java
+ * @compile  ArrayClone.java
  * @run main ArrayClone
  */
 
--- a/langtools/test/tools/javac/generics/ArrayTypearg.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/ArrayTypearg.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary generics: array as generic argument type fails
  * @author gafter
  *
- * @compile -source 1.5 ArrayTypearg.java
+ * @compile  ArrayTypearg.java
  */
 
 import java.util.List;
--- a/langtools/test/tools/javac/generics/BridgeClash.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/BridgeClash.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary generics: incorrect erasure clash reported
  * @author gafter
  *
- * @compile -source 1.5 BridgeClash.java
+ * @compile  BridgeClash.java
  */
 
 interface I<T> {
--- a/langtools/test/tools/javac/generics/BridgeOrder.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/BridgeOrder.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary generics: overridden method gets invoked (bridge method problem)
  * @author gafter
  *
- * @compile -source 1.5 BridgeOrder.java
+ * @compile  BridgeOrder.java
  * @run main BridgeOrder
  */
 
--- a/langtools/test/tools/javac/generics/CastCrash.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/CastCrash.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary Crash on cast
  * @author gafter
  *
- * @compile/fail -source 1.5 CastCrash.java
+ * @compile/fail  CastCrash.java
  */
 
 package cast.crash;
--- a/langtools/test/tools/javac/generics/Casting.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/Casting.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary generics problem with casting
  * @author gafter
  *
- * @compile -source 1.5 Casting.java
+ * @compile  Casting.java
  */
 
 package test.tools.javac.generics.Casting;
--- a/langtools/test/tools/javac/generics/Casting2.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/Casting2.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary stack overflow error compiling EnumSet.java
  * @author gafter
  *
- * @compile -source 1.5 Casting2.java
+ * @compile  Casting2.java
  */
 
 import java.util.*;
--- a/langtools/test/tools/javac/generics/Casting3.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/Casting3.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary compiler crash with stack overflow on unchecked cast
  * @author gafter
  *
- * @compile -source 1.5 Casting3.java
+ * @compile  Casting3.java
  */
 
 package test.tools.javac.generics.Casting3;
--- a/langtools/test/tools/javac/generics/Casting4.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/Casting4.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary Cannot cast Comparable<?>s
  * @author gafter
  *
- * @compile -Werror -Xlint:unchecked -source 1.5 Casting4.java
+ * @compile -Werror -Xlint:unchecked  Casting4.java
  */
 
 package test.tools.javac.generics.Casting4;
--- a/langtools/test/tools/javac/generics/Conditional.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/Conditional.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary Rule for semantics of ?: in the presence of generics and generic class Class
  * @author gafter
  *
- * @compile -source 1.5 Conditional.java
+ * @compile  Conditional.java
  */
 
 package conditional;
--- a/langtools/test/tools/javac/generics/Covar2.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/Covar2.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary Additional unit tests for covariant returns
  * @author gafter
  *
- * @compile -source 1.5 Covar2.java
+ * @compile  Covar2.java
  * @run main Covar2
  */
 
--- a/langtools/test/tools/javac/generics/Covar3.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/Covar3.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary missing ambiguity error
  * @author gafter
  *
- * @compile/fail -source 1.5 Covar3.java
+ * @compile/fail  Covar3.java
  */
 
 package covar3;
--- a/langtools/test/tools/javac/generics/Covar4.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/Covar4.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary no covariant returns involving primitives
  * @author gafter
  *
- * @compile/fail -source 1.5 Covar4.java
+ * @compile/fail  Covar4.java
  */
 
 public class Covar4 {
--- a/langtools/test/tools/javac/generics/Crash01.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/Crash01.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary generics: crash when using class in bound defined after usage
  * @author gafter
  *
- * @compile -source 1.5 Crash01.java
+ * @compile  Crash01.java
  */
 
 public class Crash01<A extends TestClass1 & IA> {
--- a/langtools/test/tools/javac/generics/Crash02.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/Crash02.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary compiler crash in class writer
  * @author gafter
  *
- * @compile -source 1.5 Crash02.java
+ * @compile  Crash02.java
  */
 
 import java.util.ArrayList;
--- a/langtools/test/tools/javac/generics/CyclicInheritance3.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/CyclicInheritance3.java	Wed May 27 22:34:43 2009 -0700
@@ -26,7 +26,7 @@
  * @bug 4861743
  * @summary generics: incorrect cyclic inheritance error with type parameters
  *
- * @compile -source 1.5 CyclicInheritance3.java
+ * @compile  CyclicInheritance3.java
  */
 
 class Cycle {
--- a/langtools/test/tools/javac/generics/CyclicInheritance5.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/CyclicInheritance5.java	Wed May 27 22:34:43 2009 -0700
@@ -26,7 +26,7 @@
  * @bug 4862621
  * @summary generics: incorrect cyclic inheritance error
  *
- * @compile -source 1.5 CyclicInheritance5.java
+ * @compile  CyclicInheritance5.java
  */
 
 class G<N extends G.Node<N>> {
--- a/langtools/test/tools/javac/generics/ErasureClashCrash.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/ErasureClashCrash.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary javac crash with improper overrider
  * @author gafter
  *
- * @compile/fail -source 1.5 ErasureClashCrash.java
+ * @compile/fail  ErasureClashCrash.java
  */
 
 interface Compar<T> {
--- a/langtools/test/tools/javac/generics/ExtendedRaw1.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/ExtendedRaw1.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary generics: extension of raw not treated as raw.
  * @author gafter
  *
- * @compile -source 1.5 ExtendedRaw1.java
+ * @compile  ExtendedRaw1.java
  */
 
 class Comparator<T> {}
--- a/langtools/test/tools/javac/generics/ExtendedRaw2.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/ExtendedRaw2.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary generics: extension of raw not treated as raw.
  * @author gafter
  *
- * @compile -source 1.5 ExtendedRaw2.java
+ * @compile  ExtendedRaw2.java
  */
 
 // from library
--- a/langtools/test/tools/javac/generics/ExtendedRaw3.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/ExtendedRaw3.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary generics: bridge method not considered to fulfil interface in abstract class
  * @author gafter
  *
- * @compile -source 1.5 ExtendedRaw3.java
+ * @compile  ExtendedRaw3.java
  */
 
 interface MyComparable<T extends MyComparable<T>> {
--- a/langtools/test/tools/javac/generics/ExtendedRaw4.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/ExtendedRaw4.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary REGRESSION: compatibility problem inheriting raw type
  * @author gafter
  *
- * @compile -source 1.5 ExtendedRaw4.java
+ * @compile  ExtendedRaw4.java
  */
 
 class ExtendedRaw4 extends java.util.TreeSet {}
--- a/langtools/test/tools/javac/generics/FinalBridge.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/FinalBridge.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary generics: bridge for inherited final method can cause verify error
  * @author gafter
  *
- * @compile -source 1.5 FinalBridge.java
+ * @compile  FinalBridge.java
  * @run main FinalBridge
  */
 
--- a/langtools/test/tools/javac/generics/GenLit1.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/GenLit1.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary compiler crash with ill-formed annotation
  * @author gafter
  *
- * @compile/fail -source 1.5 GenLit1.java
+ * @compile/fail  GenLit1.java
  */
 
 package genLit1;
--- a/langtools/test/tools/javac/generics/GenLit2.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/GenLit2.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary java allows class literal on generic type parameter array
  * @author gafter
  *
- * @compile/fail -source 1.5 GenLit2.java
+ * @compile/fail  GenLit2.java
  */
 
 package genLit2;
--- a/langtools/test/tools/javac/generics/GenericAnonCtor.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/GenericAnonCtor.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary javac crash on parameterized anonymous constructor invocation
  * @author gafter
  *
- * @compile -source 1.5 GenericAnonCtor.java
+ * @compile  GenericAnonCtor.java
  * @run main GenericAnonCtor
  */
 
--- a/langtools/test/tools/javac/generics/GenericMerge.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/GenericMerge.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary generics: compiler crash merging signatures of generic methods
  * @author gafter
  *
- * @compile -source 1.5 GenericMerge.java
+ * @compile  GenericMerge.java
  */
 
 class Box<T> {}
--- a/langtools/test/tools/javac/generics/GenericOverride.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/GenericOverride.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary Cannot override non-trivial generic method
  * @author gafter
  *
- * @compile -source 1.5 GenericOverride.java
+ * @compile  GenericOverride.java
  */
 
 package generic.override;
--- a/langtools/test/tools/javac/generics/GenericThrowable.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/GenericThrowable.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary java.lang.Throwable inheritance in parameterized type
  * @author gafter
  *
- * @compile/fail -source 1.5 GenericThrowable.java
+ * @compile/fail  GenericThrowable.java
  */
 
 class GenericThrowable<T> extends NullPointerException {
--- a/langtools/test/tools/javac/generics/GetClass.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/GetClass.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary the type of x.getClass() is no longer Class<? extends X>
  * @author gafter
  *
- * @compile/fail -source 1.5 GetClass.java
+ * @compile/fail  GetClass.java
  */
 
 public class GetClass {
--- a/langtools/test/tools/javac/generics/GetClass2.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/GetClass2.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary the type of x.getClass() is Class<? extends |X|>
  * @author seligman
  *
- * @compile -source 1.5 GetClass2.java
+ * @compile  GetClass2.java
  * @run main GetClass2
  */
 
--- a/langtools/test/tools/javac/generics/InheritanceConflict.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/InheritanceConflict.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary two inherited methods with same signature
  * @author gafter, Maurizio Cimadamore
  *
- * @compile/fail -source 1.5 InheritanceConflict.java
+ * @compile/fail  InheritanceConflict.java
  */
 
 package inheritance.conflict;
--- a/langtools/test/tools/javac/generics/InheritanceConflict2.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/InheritanceConflict2.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary two inherited methods with same signature
  * @author gafter, Maurizio Cimadamore
  *
- * @compile -source 1.5 InheritanceConflict2.java
+ * @compile  InheritanceConflict2.java
  */
 
 package inheritance.conflict2;
--- a/langtools/test/tools/javac/generics/InheritanceConflict3.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/InheritanceConflict3.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary two inherited methods with same signature
  * @author darcy
  *
- * @compile/fail -source 1.5 InheritanceConflict3.java
+ * @compile/fail  InheritanceConflict3.java
  */
 
 package inheritance.conflict3;
--- a/langtools/test/tools/javac/generics/InnerInterface1.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/InnerInterface1.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary Inner interfaces are not treated as static
  * @author gafter
  *
- * @compile -source 1.5 InnerInterface1.java
+ * @compile  InnerInterface1.java
  */
 
 package test.tools.javac.generics.InnerInterface1;
--- a/langtools/test/tools/javac/generics/InnerInterface2.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/InnerInterface2.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary inner interface causes "not within bounds"
  * @author gafter
  *
- * @compile -source 1.5 InnerInterface2.java
+ * @compile  InnerInterface2.java
  */
 
 package test.tools.javac.generics.InnerInterface2;
--- a/langtools/test/tools/javac/generics/InstanceOf1.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/InstanceOf1.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary the type in an instanceof expression must be reifiable
  * @author seligman
  *
- * @compile -source 1.5 InstanceOf1.java
+ * @compile  InstanceOf1.java
  */
 
 public class InstanceOf1 {
--- a/langtools/test/tools/javac/generics/InstanceOf2.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/InstanceOf2.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary the type in an instanceof expression must be reifiable
  * @author seligman
  *
- * @compile/fail -source 1.5 InstanceOf2.java
+ * @compile/fail  InstanceOf2.java
  */
 
 public class InstanceOf2 {
--- a/langtools/test/tools/javac/generics/InstanceOf3.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/InstanceOf3.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary the type in an instanceof expression must be reifiable
  * @author seligman
  *
- * @compile/fail -source 1.5 InstanceOf3.java
+ * @compile/fail  InstanceOf3.java
  */
 
 public class InstanceOf3 {
--- a/langtools/test/tools/javac/generics/InterfaceCast1.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/InterfaceCast1.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary overridden interface method causes the compiler to reject cast
  * @author gafter
  *
- * @compile -source 1.5 InterfaceCast1.java
+ * @compile  InterfaceCast1.java
  */
 
 public class InterfaceCast1 {
--- a/langtools/test/tools/javac/generics/LoadOrder.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/LoadOrder.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary generics: generic class files can cause recursive class loading (crashing javac)
  * @author gafter
  *
- * @compile -source 1.5 LoadOrder.java
+ * @compile  LoadOrder.java
  */
 
 import java.util.Collections;
--- a/langtools/test/tools/javac/generics/MissingBridge.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/MissingBridge.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary Calling inherited generics method via interface causes AbstractMethodError
  * @author gafter
  *
- * @compile -source 1.5 MissingBridge.java
+ * @compile  MissingBridge.java
  * @run main MissingBridge
  */
 
--- a/langtools/test/tools/javac/generics/MissingCast.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/MissingCast.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary redundant cast with generified APIs causes verify error
  * @author gafter
  *
- * @compile -source 1.5 MissingCast.java
+ * @compile  MissingCast.java
  * @run main MissingCast
  */
 
--- a/langtools/test/tools/javac/generics/Multibound1.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/Multibound1.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary javac failed to check second bound
  * @author gafter
  *
- * @compile/fail -source 1.5 Multibound1.java
+ * @compile/fail  Multibound1.java
  */
 
 package test.tools.javac.generics.Multibound1;
--- a/langtools/test/tools/javac/generics/MultipleInheritance.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/MultipleInheritance.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary generics problem with multiple interface extension
  * @author gafter
  *
- * @compile -source 1.5 MultipleInheritance.java
+ * @compile  MultipleInheritance.java
  */
 
 package test.tools.javac.generics.MultipleInheritance;
--- a/langtools/test/tools/javac/generics/NameOrder.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/NameOrder.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary generics: type inference failure due to a bug in ClassSymbol.isLess
  * @author gafter
  *
- * @compile -source 1.5 NameOrder.java
+ * @compile  NameOrder.java
  */
 
 package test.tools.javac.generics.NameOrder;
--- a/langtools/test/tools/javac/generics/Nonlinear.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/Nonlinear.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary A bug in the original JSR14 generics specification
  *          created a loophole in the type system.
  *
- * @compile/fail -source 1.5 Nonlinear.java
+ * @compile/fail  Nonlinear.java
  */
 
 
--- a/langtools/test/tools/javac/generics/ParametricException.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/ParametricException.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary generics: parametric exception type versus overriding
  * @author gafter
  *
- * @compile -source 1.5 ParametricException.java
+ * @compile  ParametricException.java
  */
 
 import java.io.*;
--- a/langtools/test/tools/javac/generics/ParenVerify.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/ParenVerify.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary generics: verify error when redundant parens used!
  * @author gafter
  *
- * @compile -source 1.5 ParenVerify.java
+ * @compile  ParenVerify.java
  * @run main ParenVerify
  */
 
--- a/langtools/test/tools/javac/generics/PermuteBound.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/PermuteBound.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary generics: subtyping problem when type parameters permuted
  * @author gafter
  *
- * @compile -source 1.5 PermuteBound.java
+ * @compile  PermuteBound.java
  */
 
 package test.tools.javac.generics.PermuteBound;
--- a/langtools/test/tools/javac/generics/PrimitiveClass.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/PrimitiveClass.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary int.class and ilk have wrong type (5028351 rejected)
  * @author gafter
  *
- * @compile -source 1.5 PrimitiveClass.java
+ * @compile  PrimitiveClass.java
  */
 
 package primitive._class;
--- a/langtools/test/tools/javac/generics/PrimitiveVariant.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/PrimitiveVariant.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary compiler allows overriding with different primitive return type
  * @author gafter
  *
- * @compile/fail -source 1.5 PrimitiveVariant.java
+ * @compile/fail  PrimitiveVariant.java
  */
 
 package test.tools.javac.generics.PrimitiveVariant;
--- a/langtools/test/tools/javac/generics/RawClient.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/RawClient.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary javac should implement JLS3 three-pass overload resolution
  * @author gafter
  *
- * @compile -source 1.5 RawClient.java
+ * @compile  RawClient.java
  */
 
 package rawClient;
--- a/langtools/test/tools/javac/generics/RefEqual.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/RefEqual.java	Wed May 27 22:34:43 2009 -0700
@@ -28,7 +28,7 @@
  * @author gafter
  *
  * @compile -source 1.4 RefEqual.java
- * @compile/fail -source 1.5 RefEqual.java
+ * @compile/fail  RefEqual.java
  */
 
 class RefEqual {
--- a/langtools/test/tools/javac/generics/RelaxedArrays.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/RelaxedArrays.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary relaxed rules for array of generic type and varargs.
  * @author gafter
  *
- * @compile -source 1.5 RelaxedArrays.java
+ * @compile  RelaxedArrays.java
  * @run main RelaxedArrays
  */
 
--- a/langtools/test/tools/javac/generics/ReverseOrder.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/ReverseOrder.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary problem with generic signature for reverseOrder
  * @author gafter
  *
- * @compile -source 1.5 ReverseOrder.java
+ * @compile  ReverseOrder.java
  */
 
 package test.reverseOrder;
--- a/langtools/test/tools/javac/generics/SelfImplement.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/SelfImplement.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary generics: reject implementation with incorrect return type
  * @author gafter
  *
- * @compile/fail -source 1.5 SelfImplement.java
+ * @compile/fail  SelfImplement.java
  */
 
 class SelfImplement {
--- a/langtools/test/tools/javac/generics/SilentUnchecked.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/SilentUnchecked.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary unchecked conversion from raw to reifiable generic requires no warning
  * @author gafter
  *
- * @compile -Xlint:unchecked -Werror -source 1.5 SilentUnchecked.java
+ * @compile -Xlint:unchecked -Werror  SilentUnchecked.java
  */
 
 package silent.unchecked;
--- a/langtools/test/tools/javac/generics/SuperTypeargs.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/SuperTypeargs.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary compilation error for super.<T,E>f() and ClassName.super.<T,E>f()
  * @author gafter
  *
- * @compile -source 1.5 SuperTypeargs.java
+ * @compile  SuperTypeargs.java
  */
 
 package superTypeargs;
--- a/langtools/test/tools/javac/generics/T4661029.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/T4661029.java	Wed May 27 22:34:43 2009 -0700
@@ -26,7 +26,7 @@
  * @summary generics: assertion error using Arrays.fill
  * @author gafter
  *
- * @compile -source 1.5 T4661029.java
+ * @compile  T4661029.java
  */
 
 public class T4661029 {
--- a/langtools/test/tools/javac/generics/T4683314.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/T4683314.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary generics: overload resolution error in non-generic code
  * @author gafter
  *
- * @compile -source 1.5 T4683314.java
+ * @compile  T4683314.java
  */
 
 class T4683314a {
--- a/langtools/test/tools/javac/generics/T4684378.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/T4684378.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary generics: verify error in generated bytecode
  * @author gafter
  *
- * @compile -source 1.5 T4684378.java
+ * @compile  T4684378.java
  * @run main T4684378
  */
 
--- a/langtools/test/tools/javac/generics/T4695348.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/T4695348.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary generics: compiler allows ref to type bounds in static members
  * @author gafter
  *
- * @compile/fail -source 1.5 T4695348.java
+ * @compile/fail  T4695348.java
  */
 
 class T4695348<T> {
--- a/langtools/test/tools/javac/generics/T4695415.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/T4695415.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary generics: bug in type inference when method result used as an argument
  * @author gafter
  *
- * @compile -source 1.5 T4695415.java
+ * @compile  T4695415.java
  */
 
 class X<T extends Number> {
--- a/langtools/test/tools/javac/generics/T4695847.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/T4695847.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary generics: problem with inference of primitive return values
  * @author gafter
  *
- * @compile -source 1.5 T4695847.java
+ * @compile  T4695847.java
  */
 
 public class T4695847<T> {
--- a/langtools/test/tools/javac/generics/T4711570.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/T4711570.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary generics: problem with methods when type parameter doesn't appear in signature
  * @author gafter
  *
- * @compile -source 1.5 T4711570.java
+ * @compile  T4711570.java
  */
 
 class T4711570 {
--- a/langtools/test/tools/javac/generics/T4711572.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/T4711572.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary generics: problem with type inference for recursive methods
  * @author gafter
  *
- * @compile -source 1.5 T4683314.java
+ * @compile  T4683314.java
  */
 
 class T4711572 {
--- a/langtools/test/tools/javac/generics/T4711694.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/T4711694.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary generics: missing bridge method for inherited implementation
  * @author gafter
  *
- * @compile -source 1.5 T4711694.java
+ * @compile  T4711694.java
  * @run main T4711694
  */
 
--- a/langtools/test/tools/javac/generics/T4738171.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/T4738171.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary generics: problem with equivalence of generic types
  * @author gafter
  *
- * @compile/fail -source 1.5 T4738171.java
+ * @compile/fail  T4738171.java
  */
 
 interface If<T> {
--- a/langtools/test/tools/javac/generics/T4739399.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/T4739399.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary generics: crash after error regarding bounds on type variable
  * @author gafter
  *
- * @compile/fail -source 1.5 T4739399.java
+ * @compile/fail  T4739399.java
  */
 
 class T4739399 {
--- a/langtools/test/tools/javac/generics/T4757416.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/T4757416.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary generics: erasure clash not detected
  * @author gafter
  *
- * @compile/fail -source 1.5 T4757416.java
+ * @compile/fail  T4757416.java
  */
 
 class T4756416 {
--- a/langtools/test/tools/javac/generics/T4784207a.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/T4784207a.java	Wed May 27 22:34:43 2009 -0700
@@ -27,8 +27,8 @@
  * @summary generics: method overriding missed with separate compilation
  * @author gafter
  *
- * @compile -source 1.5 T4784207a.java
- * @compile -source 1.5 T4784207b.java
+ * @compile  T4784207a.java
+ * @compile  T4784207b.java
  */
 
 interface T4784207a_i extends Comparable<T4784207a_i>{
--- a/langtools/test/tools/javac/generics/T4784219.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/T4784219.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary generics: compiler crash after diagnostic
  * @author gafter
  *
- * @compile -source 1.5 T4683314.java
+ * @compile  T4683314.java
  */
 
 public class T4784219 {
--- a/langtools/test/tools/javac/generics/T5011073.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/T5011073.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary javac should implement JLS3 three-pass overload resolution
  * @author gafter
  *
- * @compile/fail -source 1.5 T5011073.java
+ * @compile/fail  T5011073.java
  */
 
 import java.util.*;
--- a/langtools/test/tools/javac/generics/T5094318.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/T5094318.java	Wed May 27 22:34:43 2009 -0700
@@ -28,7 +28,7 @@
  *
  * @compile -source 1.4 T5094318.java
  * @run main T5094318
- * @compile -source 1.5 T5094318.java
+ * @compile  T5094318.java
  * @run main/fail T5094318
  */
 
--- a/langtools/test/tools/javac/generics/TyparamLit.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/TyparamLit.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary generics: compiler allows T.class for type variable T
  * @author gafter
  *
- * @compile/fail -source 1.5 TyparamLit.java
+ * @compile/fail  TyparamLit.java
  */
 
 class TyparamLit<T> {
--- a/langtools/test/tools/javac/generics/TyparamStaticScope.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/TyparamStaticScope.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary javac mistakenly reports static use error for enclosing type parameter
  * @author gafter
  *
- * @compile -source 1.5 TyparamStaticScope.java
+ * @compile  TyparamStaticScope.java
  */
 
 package typaram.static_.scope;
--- a/langtools/test/tools/javac/generics/TyparamStaticScope2.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/TyparamStaticScope2.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary type parameter referenced in static inner class improperly allowed!
  * @author gafter
  *
- * @compile/fail -source 1.5 TyparamStaticScope2.java
+ * @compile/fail  TyparamStaticScope2.java
  */
 
 package typaram.static_.scope2;
--- a/langtools/test/tools/javac/generics/UncheckedArray.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/UncheckedArray.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary compiler allows new array of array of type parameter
  * @author gafter
  *
- * @compile/fail -source 1.5 UncheckedArray.java
+ * @compile/fail  UncheckedArray.java
  */
 
 package unchecked.array;
--- a/langtools/test/tools/javac/generics/UncheckedConstructor.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/UncheckedConstructor.java	Wed May 27 22:34:43 2009 -0700
@@ -27,8 +27,8 @@
  * @summary compiler disallows raw call to generic constructor
  * @author gafter
  *
- * @compile      -source 1.5 -Werror                  UncheckedConstructor.java
- * @compile/fail -source 1.5 -Werror -Xlint:unchecked UncheckedConstructor.java
+ * @compile       -Werror                  UncheckedConstructor.java
+ * @compile/fail  -Werror -Xlint:unchecked UncheckedConstructor.java
  */
 
 import java.util.*;
--- a/langtools/test/tools/javac/generics/UncheckedCovariance.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/UncheckedCovariance.java	Wed May 27 22:34:43 2009 -0700
@@ -27,8 +27,8 @@
  * @summary A method returning a raw type cannot override a method returning a generic type
  * @author gafter
  *
- * @compile -source 1.5 UncheckedCovariance.java
- * @compile/fail -Xlint:unchecked -Werror -source 1.5 UncheckedCovariance.java
+ * @compile  UncheckedCovariance.java
+ * @compile/fail -Xlint:unchecked -Werror  UncheckedCovariance.java
  */
 
 class UncheckedCovariance {
--- a/langtools/test/tools/javac/generics/UnsoundInference.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/UnsoundInference.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary Generic method allowing passing of types that don't match collection types
  * @author gafter
  *
- * @compile/fail -source 1.5 UnsoundInference.java
+ * @compile/fail  UnsoundInference.java
  */
 
 import java.util.ArrayList;
--- a/langtools/test/tools/javac/generics/Varargs.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/Varargs.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary varargs doesn't work for generic methods
  * @author gafter
  *
- * @compile -source 1.5 Varargs.java
+ * @compile  Varargs.java
  */
 
 package varargs.versus.generics;
--- a/langtools/test/tools/javac/generics/Varargs2.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/Varargs2.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary generics + varargs API changes
  * @author gafter
  *
- * @compile -source 1.5 Varargs2.java
+ * @compile  Varargs2.java
  * @run main Varargs2
  */
 
--- a/langtools/test/tools/javac/generics/WrongNew.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/WrongNew.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary generics: javac generares "new" of wrong class
  * @author gafter
  *
- * @compile -source 1.5 WrongNew.java
+ * @compile  WrongNew.java
  * @run main WrongNew
  */
 
--- a/langtools/test/tools/javac/generics/abstract/T4717181c.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/abstract/T4717181c.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary javac treats inherited abstract method as an overrider
  * @author gafter
  *
- * @compile/fail -source 1.5 T4717181c.java
+ * @compile/fail  T4717181c.java
  */
 
 class T4717181c {
--- a/langtools/test/tools/javac/generics/bridge1/D.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/bridge1/D.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary generics: missing bridge method
  * @author gafter
  *
- * @compile -source 1.5 A.java C.java D.java E.java
+ * @compile  A.java C.java D.java E.java
  * @run main D
  */
 
--- a/langtools/test/tools/javac/generics/classreader/HArrayMethod.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/classreader/HArrayMethod.java	Wed May 27 22:34:43 2009 -0700
@@ -27,8 +27,8 @@
  * @summary generics: override checks break when using separate compilation
  * @author gafter
  *
- * @compile -source 1.5 HArrayMethod.java HMember.java HMethod.java HMethodImpl.java
- * @compile -source 1.5 HArrayMethod.java
+ * @compile  HArrayMethod.java HMember.java HMethod.java HMethodImpl.java
+ * @compile  HArrayMethod.java
  */
 
 class HArrayMethod extends HMethodImpl {
--- a/langtools/test/tools/javac/generics/compat/CovariantCompat1.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/compat/CovariantCompat1.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary generics: non-generic code should be able to call covariant method
  * @author gafter
  *
- * @compile -source 1.5 CovariantCompat1.java
+ * @compile  CovariantCompat1.java
  * @compile -source 1.4 CovariantCompat2.java
  */
 
--- a/langtools/test/tools/javac/generics/compat/OverrideBridge1.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/compat/OverrideBridge1.java	Wed May 27 22:34:43 2009 -0700
@@ -27,10 +27,10 @@
  * @summary generics: compiler allows 1.4 code to override a bridge method
  * @author gafter
  *
- * @compile -source 1.5 OverrideBridge1.java
+ * @compile  OverrideBridge1.java
  * @compile/fail -Werror -source 1.4 OverrideBridge2.java
  * @compile -source 1.4 OverrideBridge2.java
- * @compile -source 1.5 OverrideBridge3.java
+ * @compile  OverrideBridge3.java
  */
 
 // ALLOW users to override bridge methods.
--- a/langtools/test/tools/javac/generics/forwardSeparateBound/ForwardSeparateBound2.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/forwardSeparateBound/ForwardSeparateBound2.java	Wed May 27 22:34:43 2009 -0700
@@ -27,8 +27,8 @@
  * @summary generics: forward referenced bounds vs separate compilation
  * @author gafter
  *
- * @compile -source 1.5 ForwardSeparateBound1.java ForwardSeparateBound2.java
- * @compile -source 1.5 ForwardSeparateBound2.java
+ * @compile  ForwardSeparateBound1.java ForwardSeparateBound2.java
+ * @compile  ForwardSeparateBound2.java
  */
 
 class Z {}
--- a/langtools/test/tools/javac/generics/genericAbstract/A.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/genericAbstract/A.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary generics: generic interface method not implemented in abstract class causes err
  * @author gafter
  *
- * @compile -source 1.5 A.java B.java
+ * @compile  A.java B.java
  */
 
 interface A {
--- a/langtools/test/tools/javac/generics/odersky/BadTest.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/odersky/BadTest.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary Negative regression test from odersky
  * @author odersky
  *
- * @compile/fail -source 1.5 BadTest.java
+ * @compile/fail  BadTest.java
  */
 
 class BadTest {
--- a/langtools/test/tools/javac/generics/odersky/BadTest2.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/odersky/BadTest2.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary Regression test from odersky
  * @author odersky
  *
- * @compile -source 1.5 BadTest2.java
+ * @compile  BadTest2.java
  */
 
 // this used to be a negative regression test, but when we
--- a/langtools/test/tools/javac/generics/odersky/BadTest3.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/odersky/BadTest3.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary Negative regression test from odersky
  * @author odersky
  *
- * @compile/fail -source 1.5 BadTest3.java
+ * @compile/fail  BadTest3.java
  */
 
 class BadTest3 {
--- a/langtools/test/tools/javac/generics/odersky/BadTest4.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/odersky/BadTest4.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary Negative regression test from odersky
  * @author odersky
  *
- * @compile/fail -source 1.5 BadTest4.java
+ * @compile/fail  BadTest4.java
  */
 
 class BadTest4 {
--- a/langtools/test/tools/javac/generics/odersky/Test.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/odersky/Test.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary Positive regression test from odersky
  * @author odersky
  *
- * @compile -source 1.5 Test.java
+ * @compile  Test.java
  */
 
 class Test {
--- a/langtools/test/tools/javac/generics/odersky/Test2.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/odersky/Test2.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary Positive regression test from odersky
  * @author odersky
  *
- * @compile -source 1.5 Test2.java
+ * @compile  Test2.java
  */
 
 class Test2 {
--- a/langtools/test/tools/javac/generics/odersky/Test3.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/odersky/Test3.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary Positive regression test from odersky
  * @author odersky
  *
- * @compile -source 1.5 Test3.java
+ * @compile  Test3.java
  */
 
 class Test3 {
--- a/langtools/test/tools/javac/generics/odersky/Test4.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/odersky/Test4.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary Positive regression test from odersky
  * @author odersky
  *
- * @compile -source 1.5 Test4.java
+ * @compile  Test4.java
  */
 
 class Test4 {
--- a/langtools/test/tools/javac/generics/parametricException/J.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/parametricException/J.java	Wed May 27 22:34:43 2009 -0700
@@ -27,8 +27,8 @@
  * @summary javac appears to omit throws portion of generic signature attribute
  * @author gafter
  *
- * @compile -source 1.5 J.java
- * @compile -source 1.5 K.java
+ * @compile  J.java
+ * @compile  K.java
  */
 
 class J<T extends Exception> {
--- a/langtools/test/tools/javac/generics/rare/Rare1.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/rare/Rare1.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary "rare" types
  * @author gafter
  *
- * @compile -source 1.5 Rare1.java
+ * @compile  Rare1.java
  */
 
 package rare1;
--- a/langtools/test/tools/javac/generics/rare/Rare10.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/rare/Rare10.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary "rare" types
  * @author gafter
  *
- * @compile -source 1.5 Rare10.java
+ * @compile  Rare10.java
  */
 
 package rare10;
--- a/langtools/test/tools/javac/generics/rare/Rare11.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/rare/Rare11.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary "rare" types
  * @author gafter
  *
- * @compile -source 1.5 Rare11.java
+ * @compile  Rare11.java
  */
 
 package rare11;
--- a/langtools/test/tools/javac/generics/rare/Rare2.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/rare/Rare2.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary "rare" types
  * @author gafter
  *
- * @compile/fail -source 1.5 Rare2.java
+ * @compile/fail  Rare2.java
  */
 
 package rare2;
--- a/langtools/test/tools/javac/generics/rare/Rare3.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/rare/Rare3.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary "rare" types
  * @author gafter
  *
- * @compile/fail -source 1.5 Rare3.java
+ * @compile/fail  Rare3.java
  */
 
 package rare3;
--- a/langtools/test/tools/javac/generics/rare/Rare4.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/rare/Rare4.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary "rare" types
  * @author gafter
  *
- * @compile/fail -source 1.5 Rare4.java
+ * @compile/fail  Rare4.java
  */
 
 package rare4;
--- a/langtools/test/tools/javac/generics/rare/Rare5.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/rare/Rare5.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary "rare" types
  * @author gafter
  *
- * @compile/fail -source 1.5 Rare5.java
+ * @compile/fail  Rare5.java
  */
 
 package rare5;
--- a/langtools/test/tools/javac/generics/rare/Rare6.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/rare/Rare6.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary "rare" types
  * @author gafter
  *
- * @compile/fail -source 1.5 Rare6.java
+ * @compile/fail  Rare6.java
  */
 
 package rare6;
--- a/langtools/test/tools/javac/generics/rare/Rare7.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/rare/Rare7.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary "rare" types
  * @author gafter
  *
- * @compile/fail -source 1.5 Rare7.java
+ * @compile/fail  Rare7.java
  */
 
 package rare7;
--- a/langtools/test/tools/javac/generics/rare/Rare8.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/rare/Rare8.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary "rare" types
  * @author gafter
  *
- * @compile -source 1.5 Rare8.java
+ * @compile  Rare8.java
  */
 
 package rare8;
--- a/langtools/test/tools/javac/generics/rare/Rare9.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/rare/Rare9.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary "rare" types
  * @author gafter
  *
- * @compile -source 1.5 Rare9.java
+ * @compile  Rare9.java
  */
 
 package rare9;
--- a/langtools/test/tools/javac/generics/rawSeparate/RetroLexer.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/rawSeparate/RetroLexer.java	Wed May 27 22:34:43 2009 -0700
@@ -27,9 +27,9 @@
  * @summary raw types versus separate compilation causes type error
  * @author gafter
  *
- * @compile -source 1.5 Hashtable.java
- * @compile -source 1.5 CharScanner.java
- * @compile -source 1.5 RetroLexer.java
+ * @compile  Hashtable.java
+ * @compile  CharScanner.java
+ * @compile  RetroLexer.java
  */
 
 package parser;
--- a/langtools/test/tools/javac/generics/typeargs/Basic.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/typeargs/Basic.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary explicit type arguments
  * @author gafter
  *
- * @compile -source 1.5 Basic.java
+ * @compile  Basic.java
  */
 
 // Test all of the basic forms for explicit type arguments
--- a/langtools/test/tools/javac/generics/typeargs/Metharg1.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/typeargs/Metharg1.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary explicit type arguments
  * @author gafter
  *
- * @compile/fail -source 1.5 Metharg1.java
+ * @compile/fail  Metharg1.java
  */
 
 // Test type mismatch on type argument for method call
--- a/langtools/test/tools/javac/generics/typeargs/Metharg2.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/typeargs/Metharg2.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary explicit type arguments
  * @author gafter
  *
- * @compile/fail -source 1.5 Metharg2.java
+ * @compile/fail  Metharg2.java
  */
 
 // Test type mismatch on type argument for qualified method call
--- a/langtools/test/tools/javac/generics/typeargs/Newarg1.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/typeargs/Newarg1.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary explicit type arguments
  * @author gafter
  *
- * @compile/fail -source 1.5 Newarg1.java
+ * @compile/fail  Newarg1.java
  */
 
 // Test type mismatch on type argument for constructor
--- a/langtools/test/tools/javac/generics/typeargs/Newarg2.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/typeargs/Newarg2.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary explicit type arguments
  * @author gafter
  *
- * @compile/fail -source 1.5 Newarg2.java
+ * @compile/fail  Newarg2.java
  */
 
 // Test type mismatch on type argument for inner constructor
--- a/langtools/test/tools/javac/generics/typeargs/Superarg1.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/typeargs/Superarg1.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary explicit type arguments
  * @author gafter
  *
- * @compile/fail -source 1.5 Superarg1.java
+ * @compile/fail  Superarg1.java
  */
 
 // Test type mismatch on type argument for super constructor
--- a/langtools/test/tools/javac/generics/typeargs/Superarg2.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/typeargs/Superarg2.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary explicit type arguments
  * @author gafter
  *
- * @compile/fail -source 1.5 Superarg2.java
+ * @compile/fail  Superarg2.java
  */
 
 // Test type mismatch on type argument for inner super constructor
--- a/langtools/test/tools/javac/generics/typeargs/ThisArg.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/typeargs/ThisArg.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary explicit type arguments
  * @author gafter
  *
- * @compile/fail -source 1.5 ThisArg.java
+ * @compile/fail  ThisArg.java
  */
 
 // Test type mismatch on type argument for this constructor
--- a/langtools/test/tools/javac/generics/typevars/4856983/T4856983.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/typevars/4856983/T4856983.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary (crash) mutually f-bounded type vars with multiple bounds may crash javac
  * @author Peter von der Ah\u00e9
  *
- * @compile -source 5 T4856983.java
+ * @compile  T4856983.java
  */
 
 import java.lang.Comparable;
--- a/langtools/test/tools/javac/generics/typevars/4856983/T4856983a.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/typevars/4856983/T4856983a.java	Wed May 27 22:34:43 2009 -0700
@@ -26,7 +26,7 @@
  * @bug 4856983
  * @summary (crash) mutually f-bounded type vars with multiple bounds may crash javac
  * @author Peter von der Ah\u00e9
- * @compile/fail -source 5 T4856983a.java
+ * @compile/fail  T4856983a.java
  */
 
 interface I1 { Number m(); }
--- a/langtools/test/tools/javac/generics/typevars/4856983/T4856983b.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/typevars/4856983/T4856983b.java	Wed May 27 22:34:43 2009 -0700
@@ -26,7 +26,7 @@
  * @bug 4856983
  * @summary (crash) mutually f-bounded type vars with multiple bounds may crash javac
  * @author Peter von der Ah\u00e9
- * @compile/fail -source 5 T4856983b.java
+ * @compile/fail  T4856983b.java
  */
 
 interface I1 { Number m(); }
--- a/langtools/test/tools/javac/generics/wildcards/AssignmentDifferentTypes1.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/wildcards/AssignmentDifferentTypes1.java	Wed May 27 22:34:43 2009 -0700
@@ -25,7 +25,7 @@
  * @test
  * @summary Test subtyping for wildcards with related type bounds.
  *
- * @compile -source 1.5 AssignmentDifferentTypes1.java
+ * @compile  AssignmentDifferentTypes1.java
  */
 
 public class AssignmentDifferentTypes1 {
--- a/langtools/test/tools/javac/generics/wildcards/AssignmentDifferentTypes2.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/wildcards/AssignmentDifferentTypes2.java	Wed May 27 22:34:43 2009 -0700
@@ -25,7 +25,7 @@
  * @test
  * @summary Test subtyping for wildcards with related type bounds.
  *
- * @compile/fail -source 1.5 AssignmentDifferentTypes2.java
+ * @compile/fail  AssignmentDifferentTypes2.java
  */
 
 public class AssignmentDifferentTypes2 {
--- a/langtools/test/tools/javac/generics/wildcards/AssignmentDifferentTypes3.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/wildcards/AssignmentDifferentTypes3.java	Wed May 27 22:34:43 2009 -0700
@@ -25,7 +25,7 @@
  * @test
  * @summary Test subtyping for wildcards with related type bounds.
  *
- * @compile/fail -source 1.5 AssignmentDifferentTypes3.java
+ * @compile/fail  AssignmentDifferentTypes3.java
  */
 
 public class AssignmentDifferentTypes3 {
--- a/langtools/test/tools/javac/generics/wildcards/AssignmentDifferentTypes4.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/wildcards/AssignmentDifferentTypes4.java	Wed May 27 22:34:43 2009 -0700
@@ -25,7 +25,7 @@
  * @test
  * @summary Test subtyping for wildcards with related type bounds.
  *
- * @compile/fail -source 1.5 AssignmentDifferentTypes4.java
+ * @compile/fail  AssignmentDifferentTypes4.java
  */
 
 public class AssignmentDifferentTypes4 {
--- a/langtools/test/tools/javac/generics/wildcards/AssignmentDifferentTypes5.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/wildcards/AssignmentDifferentTypes5.java	Wed May 27 22:34:43 2009 -0700
@@ -25,7 +25,7 @@
  * @test
  * @summary Test subtyping for wildcards with related type bounds.
  *
- * @compile/fail -source 1.5 AssignmentDifferentTypes5.java
+ * @compile/fail  AssignmentDifferentTypes5.java
  */
 
 public class AssignmentDifferentTypes5 {
--- a/langtools/test/tools/javac/generics/wildcards/AssignmentDifferentTypes6.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/wildcards/AssignmentDifferentTypes6.java	Wed May 27 22:34:43 2009 -0700
@@ -25,7 +25,7 @@
  * @test
  * @summary Test subtyping for wildcards with related type bounds.
  *
- * @compile/fail -source 1.5 AssignmentDifferentTypes6.java
+ * @compile/fail  AssignmentDifferentTypes6.java
  */
 
 public class AssignmentDifferentTypes6 {
--- a/langtools/test/tools/javac/generics/wildcards/AssignmentDifferentTypes7.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/wildcards/AssignmentDifferentTypes7.java	Wed May 27 22:34:43 2009 -0700
@@ -25,7 +25,7 @@
  * @test
  * @summary Test subtyping for wildcards with related type bounds.
  *
- * @compile/fail -source 1.5 AssignmentDifferentTypes7.java
+ * @compile/fail  AssignmentDifferentTypes7.java
  */
 
 public class AssignmentDifferentTypes7 {
--- a/langtools/test/tools/javac/generics/wildcards/AssignmentDifferentTypes8.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/wildcards/AssignmentDifferentTypes8.java	Wed May 27 22:34:43 2009 -0700
@@ -25,7 +25,7 @@
  * @test
  * @summary Test subtyping for wildcards with related type bounds.
  *
- * @compile/fail -source 1.5 AssignmentDifferentTypes8.java
+ * @compile/fail  AssignmentDifferentTypes8.java
  */
 
 public class AssignmentDifferentTypes8 {
--- a/langtools/test/tools/javac/generics/wildcards/AssignmentDifferentTypes9.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/wildcards/AssignmentDifferentTypes9.java	Wed May 27 22:34:43 2009 -0700
@@ -25,7 +25,7 @@
  * @test
  * @summary Test subtyping for wildcards with related type bounds.
  *
- * @compile/fail -source 1.5 AssignmentDifferentTypes9.java
+ * @compile/fail  AssignmentDifferentTypes9.java
  */
 
 public class AssignmentDifferentTypes9 {
--- a/langtools/test/tools/javac/generics/wildcards/AssignmentSameType1.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/wildcards/AssignmentSameType1.java	Wed May 27 22:34:43 2009 -0700
@@ -25,7 +25,7 @@
  * @test
  * @summary Test subtyping for wildcards with the same type bound.
  *
- * @compile -source 1.5 AssignmentSameType1.java
+ * @compile  AssignmentSameType1.java
  */
 
 public class AssignmentSameType1 {
--- a/langtools/test/tools/javac/generics/wildcards/AssignmentSameType2.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/wildcards/AssignmentSameType2.java	Wed May 27 22:34:43 2009 -0700
@@ -25,7 +25,7 @@
  * @test
  * @summary Test subtyping for wildcards with the same type bound.
  *
- * @compile/fail -source 1.5 AssignmentSameType2.java
+ * @compile/fail  AssignmentSameType2.java
  */
 
 public class AssignmentSameType2 {
--- a/langtools/test/tools/javac/generics/wildcards/AssignmentSameType3.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/wildcards/AssignmentSameType3.java	Wed May 27 22:34:43 2009 -0700
@@ -25,7 +25,7 @@
  * @test
  * @summary Test subtyping for wildcards with the same type bound.
  *
- * @compile/fail -source 1.5 AssignmentSameType3.java
+ * @compile/fail  AssignmentSameType3.java
  */
 
 public class AssignmentSameType3 {
--- a/langtools/test/tools/javac/generics/wildcards/AssignmentSameType4.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/wildcards/AssignmentSameType4.java	Wed May 27 22:34:43 2009 -0700
@@ -25,7 +25,7 @@
  * @test
  * @summary Test subtyping for wildcards with the same type bound.
  *
- * @compile/fail -source 1.5 AssignmentSameType4.java
+ * @compile/fail  AssignmentSameType4.java
  */
 
 public class AssignmentSameType4 {
--- a/langtools/test/tools/javac/generics/wildcards/AssignmentSameType5.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/wildcards/AssignmentSameType5.java	Wed May 27 22:34:43 2009 -0700
@@ -25,7 +25,7 @@
  * @test
  * @summary Test subtyping for wildcards with the same type bound.
  *
- * @compile/fail -source 1.5 AssignmentSameType5.java
+ * @compile/fail  AssignmentSameType5.java
  */
 
 public class AssignmentSameType5 {
--- a/langtools/test/tools/javac/generics/wildcards/AssignmentSameType6.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/wildcards/AssignmentSameType6.java	Wed May 27 22:34:43 2009 -0700
@@ -25,7 +25,7 @@
  * @test
  * @summary Test subtyping for wildcards with the same type bound.
  *
- * @compile/fail -source 1.5 AssignmentSameType6.java
+ * @compile/fail  AssignmentSameType6.java
  */
 
 public class AssignmentSameType6 {
--- a/langtools/test/tools/javac/generics/wildcards/AssignmentSameType7.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/wildcards/AssignmentSameType7.java	Wed May 27 22:34:43 2009 -0700
@@ -25,7 +25,7 @@
  * @test
  * @summary Test subtyping for wildcards with the same type bound.
  *
- * @compile/fail -source 1.5 AssignmentSameType7.java
+ * @compile/fail  AssignmentSameType7.java
  */
 
 public class AssignmentSameType7 {
--- a/langtools/test/tools/javac/generics/wildcards/AssignmentSameType8.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/wildcards/AssignmentSameType8.java	Wed May 27 22:34:43 2009 -0700
@@ -25,7 +25,7 @@
  * @test
  * @summary Test subtyping for wildcards with the same type bound.
  *
- * @compile/fail -source 1.5 AssignmentSameType8.java
+ * @compile/fail  AssignmentSameType8.java
  */
 
 public class AssignmentSameType8 {
--- a/langtools/test/tools/javac/generics/wildcards/BoundBug.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/wildcards/BoundBug.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary generics: used of ? get bound error
  * @author gafter
  *
- * @compile -source 1.5 BoundBug.java
+ * @compile  BoundBug.java
  */
 
 class BoundBug {
--- a/langtools/test/tools/javac/generics/wildcards/ContraArg.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/wildcards/ContraArg.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary generics: incorrect ambiguity error with super-bouded wildcards
  * @author gafter
  *
- * @compile -source 1.5 ContraArg.java
+ * @compile  ContraArg.java
  */
 
 class ContraArg {
--- a/langtools/test/tools/javac/generics/wildcards/T5097548.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/wildcards/T5097548.java	Wed May 27 22:34:43 2009 -0700
@@ -26,7 +26,7 @@
  * @bug 5097548
  * @summary (crash) Stack overflow in capture conversion
  * @author Peter von der Ah\u00e9
- * @compile -source 5 T5097548.java
+ * @compile  T5097548.java
  * @run main T5097548
  */
 
--- a/langtools/test/tools/javac/generics/wildcards/T5097548b.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/wildcards/T5097548b.java	Wed May 27 22:34:43 2009 -0700
@@ -26,7 +26,7 @@
  * @bug 5097548
  * @summary Stack overflow in capture conversion
  * @author Peter von der Ah\u00e9
- * @compile -source 5 T5097548b.java
+ * @compile  T5097548b.java
  */
 
 interface Edge<N extends Node<? extends Edge<N>>> {
--- a/langtools/test/tools/javac/generics/wildcards/UnboundArray.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/wildcards/UnboundArray.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary generics: allow arrays of unbounded generic types
  * @author gafter
  *
- * @compile -source 1.5 UnboundArray.java
+ * @compile  UnboundArray.java
  */
 
 class C<E> {
--- a/langtools/test/tools/javac/generics/wildcards/neg/AmbiguousCast.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/wildcards/neg/AmbiguousCast.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary cast to parameterized type is accepted although it should be rejected
  * @author gafter
  *
- * @compile/fail -source 1.5 -Werror -Xlint:unchecked AmbiguousCast.java
+ * @compile/fail  -Werror -Xlint:unchecked AmbiguousCast.java
  */
 
 class Test {
--- a/langtools/test/tools/javac/generics/wildcards/neg/Capture.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/wildcards/neg/Capture.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary Wildcard capture
  * @author gafter
  *
- * @compile/fail -source 1.5 Capture.java
+ * @compile/fail  Capture.java
  */
 
 class X<T> {}
--- a/langtools/test/tools/javac/generics/wildcards/neg/CastFail1.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/wildcards/neg/CastFail1.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary Test casts (legal, warning, and errors)
  * @author gafter
  *
- * @compile/fail -source 1.5 CastFail1.java
+ * @compile/fail  CastFail1.java
  */
 
 import java.util.*;
--- a/langtools/test/tools/javac/generics/wildcards/neg/CastFail10.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/wildcards/neg/CastFail10.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary Test casts (legal, warning, and errors)
  * @author gafter
  *
- * @compile/fail -source 1.5 CastFail10.java
+ * @compile/fail  CastFail10.java
  */
 
 import java.util.*;
--- a/langtools/test/tools/javac/generics/wildcards/neg/CastFail11.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/wildcards/neg/CastFail11.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary Test casts (legal, warning, and errors)
  * @author gafter
  *
- * @compile/fail -source 1.5 CastFail11.java
+ * @compile/fail  CastFail11.java
  */
 
 import java.util.*;
--- a/langtools/test/tools/javac/generics/wildcards/neg/CastFail12.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/wildcards/neg/CastFail12.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary Test casts (legal, warning, and errors)
  * @author gafter
  *
- * @compile/fail -source 1.5 CastFail12.java
+ * @compile/fail  CastFail12.java
  */
 
 import java.util.*;
--- a/langtools/test/tools/javac/generics/wildcards/neg/CastFail13.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/wildcards/neg/CastFail13.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary Test casts (legal, warning, and errors)
  * @author gafter
  *
- * @compile/fail -source 1.5 CastFail13.java
+ * @compile/fail  CastFail13.java
  */
 
 import java.util.*;
--- a/langtools/test/tools/javac/generics/wildcards/neg/CastFail14.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/wildcards/neg/CastFail14.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary Test casts (legal, warning, and errors)
  * @author gafter
  *
- * @compile/fail -source 1.5 CastFail14.java
+ * @compile/fail  CastFail14.java
  */
 
 import java.util.*;
--- a/langtools/test/tools/javac/generics/wildcards/neg/CastFail15.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/wildcards/neg/CastFail15.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary Test casts (legal, warning, and errors)
  * @author gafter
  *
- * @compile/fail -source 1.5 CastFail15.java
+ * @compile/fail  CastFail15.java
  */
 
 import java.util.*;
--- a/langtools/test/tools/javac/generics/wildcards/neg/CastFail16.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/wildcards/neg/CastFail16.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary Test casts (legal, warning, and errors)
  * @author gafter
  *
- * @compile/fail -source 1.5 CastFail16.java
+ * @compile/fail  CastFail16.java
  */
 
 import java.util.*;
--- a/langtools/test/tools/javac/generics/wildcards/neg/CastFail17.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/wildcards/neg/CastFail17.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary Test casts (legal, warning, and errors)
  * @author gafter
  *
- * @compile/fail -source 1.5 CastFail17.java
+ * @compile/fail  CastFail17.java
  */
 
 import java.util.*;
--- a/langtools/test/tools/javac/generics/wildcards/neg/CastFail18.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/wildcards/neg/CastFail18.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary Test casts (legal, warning, and errors)
  * @author gafter
  *
- * @compile/fail -source 1.5 CastFail18.java
+ * @compile/fail  CastFail18.java
  */
 
 import java.util.*;
--- a/langtools/test/tools/javac/generics/wildcards/neg/CastFail19.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/wildcards/neg/CastFail19.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary Test casts (legal, warning, and errors)
  * @author gafter
  *
- * @compile/fail -source 1.5 CastFail19.java
+ * @compile/fail  CastFail19.java
  */
 
 import java.util.*;
--- a/langtools/test/tools/javac/generics/wildcards/neg/CastFail2.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/wildcards/neg/CastFail2.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary Test casts (legal, warning, and errors)
  * @author gafter
  *
- * @compile/fail -source 1.5 CastFail2.java
+ * @compile/fail  CastFail2.java
  */
 
 import java.util.*;
--- a/langtools/test/tools/javac/generics/wildcards/neg/CastFail20.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/wildcards/neg/CastFail20.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary Test casts (legal, warning, and errors)
  * @author gafter
  *
- * @compile/fail -source 1.5 CastFail20.java
+ * @compile/fail  CastFail20.java
  */
 
 import java.util.*;
--- a/langtools/test/tools/javac/generics/wildcards/neg/CastFail21.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/wildcards/neg/CastFail21.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary Test casts (legal, warning, and errors)
  * @author gafter
  *
- * @compile/fail -source 1.5 CastFail20.java
+ * @compile/fail  CastFail20.java
  */
 
 import java.util.*;
--- a/langtools/test/tools/javac/generics/wildcards/neg/CastFail3.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/wildcards/neg/CastFail3.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary Test casts (legal, warning, and errors)
  * @author gafter
  *
- * @compile/fail -source 1.5 CastFail3.java
+ * @compile/fail  CastFail3.java
  */
 
 import java.util.*;
--- a/langtools/test/tools/javac/generics/wildcards/neg/CastFail4.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/wildcards/neg/CastFail4.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary Test casts (legal, warning, and errors)
  * @author gafter
  *
- * @compile/fail -source 1.5 CastFail4.java
+ * @compile/fail  CastFail4.java
  */
 
 import java.util.*;
--- a/langtools/test/tools/javac/generics/wildcards/neg/CastFail5.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/wildcards/neg/CastFail5.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary Test casts (legal, warning, and errors)
  * @author gafter
  *
- * @compile/fail -source 1.5 CastFail5.java
+ * @compile/fail  CastFail5.java
  */
 
 import java.util.*;
--- a/langtools/test/tools/javac/generics/wildcards/neg/CastFail6.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/wildcards/neg/CastFail6.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary Test casts (legal, warning, and errors)
  * @author gafter
  *
- * @compile/fail -source 1.5 CastFail6.java
+ * @compile/fail  CastFail6.java
  */
 
 import java.util.*;
--- a/langtools/test/tools/javac/generics/wildcards/neg/CastFail7.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/wildcards/neg/CastFail7.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary Test casts (legal, warning, and errors)
  * @author gafter
  *
- * @compile/fail -source 1.5 CastFail7.java
+ * @compile/fail  CastFail7.java
  */
 
 import java.util.*;
--- a/langtools/test/tools/javac/generics/wildcards/neg/CastFail8.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/wildcards/neg/CastFail8.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary Test casts (legal, warning, and errors)
  * @author gafter
  *
- * @compile/fail -source 1.5 CastFail8.java
+ * @compile/fail  CastFail8.java
  */
 
 import java.util.*;
--- a/langtools/test/tools/javac/generics/wildcards/neg/CastFail9.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/wildcards/neg/CastFail9.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary Test casts (legal, warning, and errors)
  * @author gafter
  *
- * @compile/fail -source 1.5 CastFail9.java
+ * @compile/fail  CastFail9.java
  */
 
 import java.util.*;
--- a/langtools/test/tools/javac/generics/wildcards/neg/CastWarn10.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/wildcards/neg/CastWarn10.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary Test casts (legal, warning, and errors)
  * @author gafter
  *
- * @compile/fail -source 1.5 -Werror -Xlint:unchecked CastWarn10.java
+ * @compile/fail  -Werror -Xlint:unchecked CastWarn10.java
  */
 
 import java.util.*;
--- a/langtools/test/tools/javac/generics/wildcards/neg/CastWarn11.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/wildcards/neg/CastWarn11.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary Test casts (legal, warning, and errors)
  * @author gafter
  *
- * @compile/fail -source 1.5 -Werror -Xlint:unchecked CastWarn11.java
+ * @compile/fail  -Werror -Xlint:unchecked CastWarn11.java
  */
 
 import java.util.*;
--- a/langtools/test/tools/javac/generics/wildcards/neg/CastWarn12.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/wildcards/neg/CastWarn12.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary Test casts (legal, warning, and errors)
  * @author gafter
  *
- * @compile/fail -source 1.5 -Werror -Xlint:unchecked CastWarn12.java
+ * @compile/fail  -Werror -Xlint:unchecked CastWarn12.java
  */
 
 import java.util.*;
--- a/langtools/test/tools/javac/generics/wildcards/neg/CastWarn13.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/wildcards/neg/CastWarn13.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary Test casts (legal, warning, and errors)
  * @author gafter
  *
- * @compile/fail -source 1.5 -Werror -Xlint:unchecked CastWarn13.java
+ * @compile/fail  -Werror -Xlint:unchecked CastWarn13.java
  */
 
 import java.util.*;
--- a/langtools/test/tools/javac/generics/wildcards/neg/CastWarn14.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/wildcards/neg/CastWarn14.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary Test casts (legal, warning, and errors)
  * @author gafter
  *
- * @compile/fail -source 1.5 -Werror -Xlint:unchecked CastWarn14.java
+ * @compile/fail  -Werror -Xlint:unchecked CastWarn14.java
  */
 
 import java.util.*;
--- a/langtools/test/tools/javac/generics/wildcards/neg/CastWarn2.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/wildcards/neg/CastWarn2.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary Test casts (legal, warning, and errors)
  * @author gafter
  *
- * @compile/fail -source 1.5 -Werror -Xlint:unchecked CastWarn2.java
+ * @compile/fail  -Werror -Xlint:unchecked CastWarn2.java
  */
 
 import java.util.*;
--- a/langtools/test/tools/javac/generics/wildcards/neg/CastWarn3.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/wildcards/neg/CastWarn3.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary Test casts (legal, warning, and errors)
  * @author gafter
  *
- * @compile/fail -source 1.5 -Werror -Xlint:unchecked CastWarn3.java
+ * @compile/fail  -Werror -Xlint:unchecked CastWarn3.java
  */
 
 import java.util.*;
--- a/langtools/test/tools/javac/generics/wildcards/neg/CastWarn4.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/wildcards/neg/CastWarn4.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary Test casts (legal, warning, and errors)
  * @author gafter
  *
- * @compile/fail -source 1.5 -Werror -Xlint:unchecked CastWarn4.java
+ * @compile/fail  -Werror -Xlint:unchecked CastWarn4.java
  */
 
 import java.util.*;
--- a/langtools/test/tools/javac/generics/wildcards/neg/CastWarn5.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/wildcards/neg/CastWarn5.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary Test casts (legal, warning, and errors)
  * @author gafter
  *
- * @compile/fail -source 1.5 -Werror -Xlint:unchecked CastWarn5.java
+ * @compile/fail  -Werror -Xlint:unchecked CastWarn5.java
  */
 
 import java.util.*;
--- a/langtools/test/tools/javac/generics/wildcards/neg/CastWarn6.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/wildcards/neg/CastWarn6.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary Test casts (legal, warning, and errors)
  * @author gafter
  *
- * @compile/fail -source 1.5 -Werror -Xlint:unchecked CastWarn6.java
+ * @compile/fail  -Werror -Xlint:unchecked CastWarn6.java
  */
 
 import java.util.*;
--- a/langtools/test/tools/javac/generics/wildcards/neg/CastWarn7.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/wildcards/neg/CastWarn7.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary Test casts (legal, warning, and errors)
  * @author gafter
  *
- * @compile/fail -source 1.5 -Werror -Xlint:unchecked CastWarn7.java
+ * @compile/fail  -Werror -Xlint:unchecked CastWarn7.java
  */
 
 import java.util.*;
--- a/langtools/test/tools/javac/generics/wildcards/neg/CastWarn8.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/wildcards/neg/CastWarn8.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary Test casts (legal, warning, and errors)
  * @author gafter
  *
- * @compile/fail -source 1.5 -Werror -Xlint:unchecked CastWarn8.java
+ * @compile/fail  -Werror -Xlint:unchecked CastWarn8.java
  */
 
 import java.util.*;
--- a/langtools/test/tools/javac/generics/wildcards/neg/CastWarn9.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/wildcards/neg/CastWarn9.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary Test casts (legal, warning, and errors)
  * @author gafter
  *
- * @compile/fail -source 1.5 -Werror -Xlint:unchecked CastWarn9.java
+ * @compile/fail  -Werror -Xlint:unchecked CastWarn9.java
  */
 
 import java.util.*;
--- a/langtools/test/tools/javac/generics/wildcards/neg/ParamCast.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/wildcards/neg/ParamCast.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary Description
  * @author gafter
  *
- * @compile/fail -source 1.5 ParamCast.java
+ * @compile/fail  ParamCast.java
  */
 
 class A<T> {}
--- a/langtools/test/tools/javac/generics/wildcards/neg/Readonly.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/wildcards/neg/Readonly.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary an extends-bound (covariant) wildcard is like readonly
  * @author gafter
  *
- * @compile/fail -source 1.5 Readonly.java
+ * @compile/fail  Readonly.java
  */
 
 class Err<T> {
--- a/langtools/test/tools/javac/generics/wildcards/neg/Unbounded.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/wildcards/neg/Unbounded.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary an unbounded (bivariant) wildcard doesn't allow reading
  * @author gafter
  *
- * @compile/fail -source 1.5 Unbounded.java
+ * @compile/fail  Unbounded.java
  */
 
 import java.util.Stack;
--- a/langtools/test/tools/javac/generics/wildcards/pos/AmbiguousCast2.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/wildcards/pos/AmbiguousCast2.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary generics: unable to cast between two convertible types
  * @author gafter
  *
- * @compile -source 1.5 AmbiguousCast2.java
+ * @compile  AmbiguousCast2.java
  */
 
 import java.lang.ref.*;
--- a/langtools/test/tools/javac/generics/wildcards/pos/BoundsCollision.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/wildcards/pos/BoundsCollision.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary when upper bounds and lower bounds collide
  * @author gafter
  *
- * @compile -source 1.5 -Werror BoundsCollision.java
+ * @compile  -Werror BoundsCollision.java
  */
 
 class StreinBug {
--- a/langtools/test/tools/javac/generics/wildcards/pos/Capture.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/wildcards/pos/Capture.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary Wildcard capture
  * @author gafter
  *
- * @compile -source 1.5 -Werror Capture.java
+ * @compile  -Werror Capture.java
  */
 
 class X<T> {}
--- a/langtools/test/tools/javac/generics/wildcards/pos/CastTest.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/wildcards/pos/CastTest.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary Test casts (legal, warning, and errors)
  * @author gafter
  *
- * @compile -source 1.5 -Werror CastTest.java
+ * @compile  -Werror CastTest.java
  */
 
 import java.util.*;
--- a/langtools/test/tools/javac/generics/wildcards/pos/InstanceOf.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/wildcards/pos/InstanceOf.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary generics: type cast with instance of
  * @author gafter
  *
- * @compile -source 1.5 -Werror InstanceOf.java
+ * @compile  -Werror InstanceOf.java
  */
 
 class InstanceOf<T> {
--- a/langtools/test/tools/javac/generics/wildcards/pos/ParamCast.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/wildcards/pos/ParamCast.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary integrate improved wildcard substitution from CPH
  * @author gafter
  *
- * @compile -source 1.5 -Werror -Xlint:unchecked ParamCast.java
+ * @compile  -Werror -Xlint:unchecked ParamCast.java
  */
 
 class A<T> {}
--- a/langtools/test/tools/javac/generics/wildcards/pos/RvalConversion.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/wildcards/pos/RvalConversion.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary rvalue conversion changes "? extends X" to "X".
  * @author gafter
  *
- * @compile -source 1.5 RvalConversion.java
+ * @compile  RvalConversion.java
  */
 
 import java.util.*;
--- a/langtools/test/tools/javac/generics/wildcards/pos/UncheckedCast1.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/generics/wildcards/pos/UncheckedCast1.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary generics: failure of some unchecked casts
  * @author gafter
  *
- * @compile -source 1.5 UncheckedCast1.java
+ * @compile  UncheckedCast1.java
  */
 
 class Z {
--- a/langtools/test/tools/javac/importscope/A.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/importscope/A.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary static import of private field crashes compiler
  * @author gafter
  *
- * @compile -source 1.5 A.java B.java
+ * @compile A.java B.java
  */
 
 package p1;
--- a/langtools/test/tools/javac/limits/FinallyNesting.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/limits/FinallyNesting.java	Wed May 27 22:34:43 2009 -0700
@@ -29,7 +29,7 @@
  *
  * @compile -source 1.4 -target 1.4 FinallyNesting.java
  */
-
+// Source and target 1.4 are needed for the test to pass with default memory sizes.
 class FinallyNesting {
     public static void main(String[] args) {
         int x;
--- a/langtools/test/tools/javac/lint/Unchecked.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/lint/Unchecked.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary Add -Xlint flag
  * @author gafter
  *
- * @compile/fail -source 1.5 -Xlint:unchecked -Werror Unchecked.java
+ * @compile/fail -Xlint:unchecked -Werror Unchecked.java
  */
 
 class Unchecked<T> {
--- a/langtools/test/tools/javac/miranda/T4711325.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/miranda/T4711325.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary compiler allows unimplementable interfaces
  * @author gafter
  *
- * @compile -source 1.5 T4711325.java
+ * @compile                  T4711325.java
  * @compile/fail -source 1.4 T4711325.java
  */
 
--- a/langtools/test/tools/javac/mixedTarget/CompatibleAbstracts1.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/mixedTarget/CompatibleAbstracts1.java	Wed May 27 22:34:43 2009 -0700
@@ -27,14 +27,14 @@
  * @summary 1.4 javac should not accept the Covariant Return Type
  * @author gafter
  *
- * @compile      -source 1.5 CompatibleAbstracts1.java
- * @compile      -source 1.5 CompatibleAbstracts2.java
+ * @compile                  CompatibleAbstracts1.java
+ * @compile                  CompatibleAbstracts2.java
  * @compile      -source 1.4 CompatibleAbstracts2.java
- * @compile      -source 1.5 CompatibleAbstracts3.java
+ * @compile                  CompatibleAbstracts3.java
  * @compile/fail -source 1.4 CompatibleAbstracts3.java
- * @compile      -source 1.5 CompatibleAbstracts4.java
+ * @compile                  CompatibleAbstracts4.java
  * @compile/fail -source 1.4 CompatibleAbstracts4.java
- * @compile      -source 1.5 CompatibleAbstracts5.java
+ * @compile                  CompatibleAbstracts5.java
  * @compile/fail -source 1.4 CompatibleAbstracts5.java
  */
 
--- a/langtools/test/tools/javac/mixedTarget/ExtendCovariant2.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/mixedTarget/ExtendCovariant2.java	Wed May 27 22:34:43 2009 -0700
@@ -28,7 +28,7 @@
  * @author gafter
  *
  * @compile/fail -source 1.4 ExtendCovariant2.java
- * @compile -source 1.5 ExtendCovariant2.java
+ * @compile                  ExtendCovariant2.java
  */
 
 /**
--- a/langtools/test/tools/javac/overload/T5090220.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/overload/T5090220.java	Wed May 27 22:34:43 2009 -0700
@@ -25,7 +25,7 @@
  * @test
  * @bug 5090220
  * @summary Autoboxing applied when calculating most-specific method
- * @compile/fail -source 5 T5090220.java
+ * @compile/fail T5090220.java
  */
 
 class T5090220 {
--- a/langtools/test/tools/javac/processing/environment/TestSourceVersion.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/processing/environment/TestSourceVersion.java	Wed May 27 22:34:43 2009 -0700
@@ -34,6 +34,8 @@
  * @compile -processor TestSourceVersion -proc:only -source   5 -AExpectedVersion=RELEASE_5 HelloWorld.java
  * @compile -processor TestSourceVersion -proc:only -source 1.6 -AExpectedVersion=RELEASE_6 HelloWorld.java
  * @compile -processor TestSourceVersion -proc:only -source   6 -AExpectedVersion=RELEASE_6 HelloWorld.java
+ * @compile -processor TestSourceVersion -proc:only -source 1.7 -AExpectedVersion=RELEASE_7 HelloWorld.java
+ * @compile -processor TestSourceVersion -proc:only -source   7 -AExpectedVersion=RELEASE_7 HelloWorld.java
  */
 
 import java.util.Set;
--- a/langtools/test/tools/javac/stackmap/UninitThis.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/stackmap/UninitThis.java	Wed May 27 22:34:43 2009 -0700
@@ -26,9 +26,6 @@
  * @bug 4948063
  * @summary Invalid java.io.FileInputStream with v49 generate by javac
  * @author gafter
- *
- * @compile -source 1.5 -target 1.5 UninitThis.java
- * @run main UninitThis
  */
 
 // may fail due to VM bug 4948729
--- a/langtools/test/tools/javac/staticImport/Ambig1.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/staticImport/Ambig1.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary Missing ambiguity error when two methods are equally specific
  * @author gafter
  *
- * @compile/fail -source 1.5 Ambig1.java
+ * @compile/fail  Ambig1.java
  */
 
 package ambig1;
--- a/langtools/test/tools/javac/staticImport/ImportInherit.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/staticImport/ImportInherit.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary static import versus inherited members
  * @author gafter
  *
- * @compile -source 1.5 ImportInherit.java
+ * @compile  ImportInherit.java
  */
 
 package importInherit;
--- a/langtools/test/tools/javac/staticImport/ImportPrivate.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/staticImport/ImportPrivate.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary NPE while compiling static import of inaccessible class member
  * @author gafter
  *
- * @compile/fail -source 1.5 ImportPrivate.java
+ * @compile/fail  ImportPrivate.java
  */
 
 package importPrivate;
--- a/langtools/test/tools/javac/staticImport/PrivateStaticImport.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/staticImport/PrivateStaticImport.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary static import of private field crashes compiler
  * @author gafter
  *
- * @compile/fail -source 1.5 PrivateStaticImport.java
+ * @compile/fail  PrivateStaticImport.java
  */
 
 package psi;
--- a/langtools/test/tools/javac/staticImport/Shadow.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/staticImport/Shadow.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary compiler fails to shadow inapplicable method with static import
  * @author gafter
  *
- * @compile/fail -source 1.5 Shadow.java
+ * @compile/fail  Shadow.java
  */
 
 package shadow;
--- a/langtools/test/tools/javac/staticImport/StaticImport.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/staticImport/StaticImport.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary add support for JSR 201's static import facility
  * @author gafter
  *
- * @compile -source 1.5 StaticImport.java
+ * @compile  StaticImport.java
  * @run main StaticImport
  */
 
--- a/langtools/test/tools/javac/staticImport/StaticImport2.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/staticImport/StaticImport2.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary add support for JSR 201's static import facility
  * @author gafter
  *
- * @compile/fail -source 1.5 StaticImport2.java
+ * @compile/fail  StaticImport2.java
  */
 
 package p;
--- a/langtools/test/tools/javac/unicode/Unmappable.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/unicode/Unmappable.java	Wed May 27 22:34:43 2009 -0700
@@ -29,7 +29,7 @@
  *
  * @compile              -encoding ascii -source 1.5 Unmappable.java
  * @compile/fail -Werror -encoding ascii -source 1.5 Unmappable.java
- * @compile/fail         -encoding ascii -source 6 Unmappable.java
+ * @compile/fail         -encoding ascii             Unmappable.java
  */
 
 // example from 4766897
--- a/langtools/test/tools/javac/varargs/Anon.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/varargs/Anon.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary varargs versus anonymous constructors crashes javac
  * @author gafter
  *
- * @compile -source 1.5 Anon.java
+ * @compile  Anon.java
  */
 
 class Anon {
--- a/langtools/test/tools/javac/varargs/BadSyntax2.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/varargs/BadSyntax2.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary generic class method with vararg gets "java.lang.AssertionError: arraycode T"
  * @author gafter
  *
- * @compile -source 1.5 BadSyntax2.java
+ * @compile  BadSyntax2.java
  */
 
 class Tclass<T> {
--- a/langtools/test/tools/javac/varargs/Varargs1.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/varargs/Varargs1.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary varags, auto boxing
  * @author gafter
  *
- * @compile -source 1.5 Varargs1.java
+ * @compile  Varargs1.java
  * @run main Varargs1
  */
 
--- a/langtools/test/tools/javac/varargs/VarargsOverride.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/varargs/VarargsOverride.java	Wed May 27 22:34:43 2009 -0700
@@ -27,8 +27,8 @@
  * @summary overriding with method of different arity is prohibited
  * @author gafter
  *
- * @compile -source 1.5 VarargsOverride.java
- * @compile/fail -source 1.5 -Werror -Xlint VarargsOverride.java
+ * @compile  VarargsOverride.java
+ * @compile/fail  -Werror -Xlint VarargsOverride.java
  */
 
 package varargs.override;
--- a/langtools/test/tools/javac/varargs/Warn1.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/varargs/Warn1.java	Wed May 27 22:34:43 2009 -0700
@@ -27,9 +27,9 @@
  * @summary need warning if varargs argument isn't boxed
  * @author gafter
  *
- * @compile      -source 1.5                     Warn1.java
- * @compile/fail -source 1.5 -Werror             Warn1.java
- * @compile      -source 1.5 -Werror -Xlint:none Warn1.java
+ * @compile                           Warn1.java
+ * @compile/fail  -Werror             Warn1.java
+ * @compile       -Werror -Xlint:none Warn1.java
  */
 
 package varargs.warn1;
--- a/langtools/test/tools/javac/varargs/Warn2.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/varargs/Warn2.java	Wed May 27 22:34:43 2009 -0700
@@ -27,9 +27,9 @@
  * @summary need warning if varargs argument isn't boxed
  * @author gafter
  *
- * @compile      -source 1.5                     Warn2.java
- * @compile/fail -source 1.5 -Werror             Warn2.java
- * @compile      -source 1.5 -Werror -Xlint:none Warn2.java
+ * @compile                           Warn2.java
+ * @compile/fail  -Werror             Warn2.java
+ * @compile       -Werror -Xlint:none Warn2.java
  */
 
 package varargs.warn2;
--- a/langtools/test/tools/javac/varargs/warning/Warn2.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/varargs/warning/Warn2.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary fixed-arity warning given too often
  * @author gafter
  *
- * @compile -Werror -source 1.5 Warn2.java
+ * @compile -Werror  Warn2.java
  */
 
 package varargs.warning.warn2;
--- a/langtools/test/tools/javac/varargs/warning/Warn3.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javac/varargs/warning/Warn3.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary fixed-arity warning given too often
  * @author gafter
  *
- * @compile -Werror -source 1.5 Warn3.java
+ * @compile -Werror  Warn3.java
  */
 
 package varargs.warning.warn3;
--- a/langtools/test/tools/javadoc/LangVers.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javadoc/LangVers.java	Wed May 27 22:34:43 2009 -0700
@@ -26,8 +26,6 @@
  * @bug 4909767
  * @summary Verify that omitting Doclet.languageVersion() hides 1.5 language
  *      features from the doclet.
- * @compile -source 1.5 LangVers.java
- * @run main LangVers
  */
 
 import java.util.List;
--- a/langtools/test/tools/javadoc/annotations/annotateMethodsFields/Main.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javadoc/annotations/annotateMethodsFields/Main.java	Wed May 27 22:34:43 2009 -0700
@@ -28,7 +28,7 @@
  *          annotation type elements.
  *          Test an annotation type with a type nested within.
  * @library ../../lib
- * @compile -source 1.5 ../../lib/Tester.java Main.java
+ * @compile  ../../lib/Tester.java Main.java
  * @run main Main
  */
 
--- a/langtools/test/tools/javadoc/annotations/annotatePackage/Main.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javadoc/annotations/annotatePackage/Main.java	Wed May 27 22:34:43 2009 -0700
@@ -26,7 +26,7 @@
  * @bug 5031168
  * @summary Test package annotations and package-info.java package comments.
  * @library ../../lib
- * @compile -source 1.5 ../../lib/Tester.java Main.java
+ * @compile  ../../lib/Tester.java Main.java
  * @run main Main
  */
 
--- a/langtools/test/tools/javadoc/annotations/annotateParams/Main.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javadoc/annotations/annotateParams/Main.java	Wed May 27 22:34:43 2009 -0700
@@ -26,7 +26,7 @@
  * @bug 5031171
  * @summary Test parameter annotations.
  * @library ../../lib
- * @compile -source 1.5 ../../lib/Tester.java Main.java
+ * @compile  ../../lib/Tester.java Main.java
  * @run main Main
  */
 
--- a/langtools/test/tools/javadoc/annotations/defaults/Main.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javadoc/annotations/defaults/Main.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary Test an annotation type with default element values, and
  *          annotations that use them.
  * @library ../../lib
- * @compile -source 1.5 ../../lib/Tester.java Main.java
+ * @compile  ../../lib/Tester.java Main.java
  * @run main Main
  */
 
--- a/langtools/test/tools/javadoc/annotations/elementTypes/Main.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javadoc/annotations/elementTypes/Main.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary Test an annotation type and annotations with elements of various
  *          types.
  * @library ../../lib
- * @compile -source 1.5 ../../lib/Tester.java Main.java
+ * @compile  ../../lib/Tester.java Main.java
  * @run main Main
  */
 
--- a/langtools/test/tools/javadoc/annotations/shortcuts/Main.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javadoc/annotations/shortcuts/Main.java	Wed May 27 22:34:43 2009 -0700
@@ -26,7 +26,7 @@
  * @bug 4904495
  * @summary Verify that "shortcuts" are used when printing annotations.
  * @library ../../lib
- * @compile -source 1.5 ../../lib/Tester.java Main.java
+ * @compile  ../../lib/Tester.java Main.java
  * @run main Main
  */
 
--- a/langtools/test/tools/javadoc/enum/docComments/Main.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javadoc/enum/docComments/Main.java	Wed May 27 22:34:43 2009 -0700
@@ -26,7 +26,7 @@
  * @bug 4421066
  * @summary Verify the comments in an enum type.
  * @library ../../lib
- * @compile -source 1.5 ../../lib/Tester.java Main.java
+ * @compile  ../../lib/Tester.java Main.java
  * @run main Main
  */
 
--- a/langtools/test/tools/javadoc/enum/enumType/Main.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javadoc/enum/enumType/Main.java	Wed May 27 22:34:43 2009 -0700
@@ -26,7 +26,7 @@
  * @bug 4421066
  * @summary Verify the contents of an enum type.
  * @library ../../lib
- * @compile -source 1.5 ../../lib/Tester.java Main.java
+ * @compile  ../../lib/Tester.java Main.java
  * @run main Main
  */
 
--- a/langtools/test/tools/javadoc/generics/genericClass/Main.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javadoc/generics/genericClass/Main.java	Wed May 27 22:34:43 2009 -0700
@@ -26,7 +26,7 @@
  * @bug 4421066
  * @summary Verify the contents of the ClassDoc of a generic class.
  * @library ../../lib
- * @compile -source 1.5 ../../lib/Tester.java Main.java
+ * @compile  ../../lib/Tester.java Main.java
  * @run main Main
  */
 
--- a/langtools/test/tools/javadoc/generics/genericInnerAndOuter/Main.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javadoc/generics/genericInnerAndOuter/Main.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary Verify the contents of the ClassDoc of
  *          a generic class with a generic inner class.
  * @library ../../lib
- * @compile -source 1.5 ../../lib/Tester.java Main.java
+ * @compile  ../../lib/Tester.java Main.java
  * @run main Main
  */
 
--- a/langtools/test/tools/javadoc/generics/genericInterface/Main.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javadoc/generics/genericInterface/Main.java	Wed May 27 22:34:43 2009 -0700
@@ -26,7 +26,7 @@
  * @bug 4421066
  * @summary Verify the contents of the ClassDoc of a generic interface.
  * @library ../../lib
- * @compile -source 1.5 ../../lib/Tester.java Main.java
+ * @compile  ../../lib/Tester.java Main.java
  * @run main Main
  */
 
--- a/langtools/test/tools/javadoc/generics/genericMethod/Main.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javadoc/generics/genericMethod/Main.java	Wed May 27 22:34:43 2009 -0700
@@ -26,7 +26,7 @@
  * @bug 4421066
  * @summary Verify the reading of generic methods and constructors.
  * @library ../../lib
- * @compile -source 1.5 ../../lib/Tester.java Main.java
+ * @compile  ../../lib/Tester.java Main.java
  * @run main Main
  */
 
--- a/langtools/test/tools/javadoc/generics/genericSuper/Main.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javadoc/generics/genericSuper/Main.java	Wed May 27 22:34:43 2009 -0700
@@ -26,7 +26,7 @@
  * @bug 4421066
  * @summary Verify the contents of the ClassDoc of a generic class.
  * @library ../../lib
- * @compile -source 1.5 ../../lib/Tester.java Main.java
+ * @compile  ../../lib/Tester.java Main.java
  * @run main Main
  */
 
--- a/langtools/test/tools/javadoc/generics/supertypes/Main.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javadoc/generics/supertypes/Main.java	Wed May 27 22:34:43 2009 -0700
@@ -26,7 +26,7 @@
  * @bug 4922918
  * @summary Check supertypes and superinterfaces of parameterized types.
  * @library ../../lib
- * @compile -source 1.5 ../../lib/Tester.java Main.java
+ * @compile  ../../lib/Tester.java Main.java
  * @run main Main
  */
 
--- a/langtools/test/tools/javadoc/generics/throwsGeneric/Main.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javadoc/generics/throwsGeneric/Main.java	Wed May 27 22:34:43 2009 -0700
@@ -26,7 +26,7 @@
  * @bug 4421066
  * @summary Verify the reading of generic methods and constructors.
  * @library ../../lib
- * @compile -source 1.5 ../../lib/Tester.java Main.java
+ * @compile  ../../lib/Tester.java Main.java
  * @run main Main
  */
 
--- a/langtools/test/tools/javadoc/generics/tparamCycle/Main.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javadoc/generics/tparamCycle/Main.java	Wed May 27 22:34:43 2009 -0700
@@ -26,7 +26,7 @@
  * @bug 4421066
  * @summary Check a type parameter whose bound cycles back on itself.
  * @library ../../lib
- * @compile -source 1.5 ../../lib/Tester.java Main.java
+ * @compile  ../../lib/Tester.java Main.java
  * @run main Main
  */
 
--- a/langtools/test/tools/javadoc/generics/tparamTagOnMethod/Main.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javadoc/generics/tparamTagOnMethod/Main.java	Wed May 27 22:34:43 2009 -0700
@@ -26,7 +26,7 @@
  * @bug 4421066
  * @summary Verify the reading of type parameter tags on methods.
  * @library ../../lib
- * @compile -source 1.5 ../../lib/Tester.java Main.java
+ * @compile  ../../lib/Tester.java Main.java
  * @run main Main
  */
 
--- a/langtools/test/tools/javadoc/generics/tparamTagOnType/Main.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javadoc/generics/tparamTagOnType/Main.java	Wed May 27 22:34:43 2009 -0700
@@ -26,7 +26,7 @@
  * @bug 4421066
  * @summary Verify the reading of a type parameter tag on an interface.
  * @library ../../lib
- * @compile -source 1.5 ../../lib/Tester.java Main.java
+ * @compile  ../../lib/Tester.java Main.java
  * @run main Main
  */
 
--- a/langtools/test/tools/javadoc/generics/wildcards/Main.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javadoc/generics/wildcards/Main.java	Wed May 27 22:34:43 2009 -0700
@@ -26,7 +26,7 @@
  * @bug 4421066
  * @summary Verify the contents of the ClassDoc of a generic class.
  * @library ../../lib
- * @compile -source 1.5 ../../lib/Tester.java Main.java
+ * @compile  ../../lib/Tester.java Main.java
  * @run main Main
  */
 
--- a/langtools/test/tools/javadoc/lib/Tester.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javadoc/lib/Tester.java	Wed May 27 22:34:43 2009 -0700
@@ -39,7 +39,6 @@
     protected final String TEST_CLASSES = System.getProperty("test.classes",
                                                              ".");
     private final String DEFAULT_ARGS[] = {
-        "-source", "1.5",
         "-sourcepath", TEST_SRC,
     };
 
--- a/langtools/test/tools/javadoc/varArgs/Main.java	Thu May 21 10:56:36 2009 +0100
+++ b/langtools/test/tools/javadoc/varArgs/Main.java	Wed May 27 22:34:43 2009 -0700
@@ -27,7 +27,7 @@
  * @summary Verify the contents of a ClassDoc containing a varArgs method.
  *          Verify that see/link tags can use "..." notation.
  * @library ../lib
- * @compile -source 1.5 ../lib/Tester.java Main.java
+ * @compile  ../lib/Tester.java Main.java
  * @run main Main
  */