6843761: Update langtools tests to remove unncessary -source and -target options

Reviewed-by: jjg

langtools/test/com/sun/javadoc/testIndex/TestIndex.java

@@ -41,7 +41,7 @@ public class TestIndex extends JavadocTester {
 
     //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.

langtools/test/com/sun/javadoc/testInterface/TestInterface.java

@@ -42,7 +42,7 @@ public class TestInterface extends JavadocTester {
 
     //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.

langtools/test/com/sun/javadoc/testNavagation/TestNavagation.java

@@ -40,7 +40,7 @@ public class TestNavagation extends JavadocTester {
 
     //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.

langtools/test/com/sun/javadoc/testTagInheritence/TestTagInheritence.java

@@ -36,7 +36,7 @@ public class TestTagInheritence extends JavadocTester {
 
     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"
     };
 
     /**

langtools/test/tools/javac/5005368.java

@@ -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      -Werror                  5005368.java
- * @compile/fail -source 1.5 -Werror -Xlint:unchecked 5005368.java
+ * @compile/fail -Werror -Xlint:unchecked 5005368.java
  */
 
 package p5005368;

langtools/test/tools/javac/Ambig3.java

@@ -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> {

langtools/test/tools/javac/ArrayCast.java

@@ -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 {

langtools/test/tools/javac/BadCovar.java

@@ -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;

langtools/test/tools/javac/ClassLiterals/InitializeOuter.java

@@ -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
  */
 

langtools/test/tools/javac/ClassLiterals/InitializeTarget.java

@@ -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
  */
 

langtools/test/tools/javac/ClassToTypeParm.java

@@ -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> {

langtools/test/tools/javac/Closure1.java

@@ -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
  */
 

langtools/test/tools/javac/Closure2.java

@@ -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
  */
 

langtools/test/tools/javac/Closure3.java

@@ -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
  */
 

langtools/test/tools/javac/Closure4.java

@@ -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
  */
 

langtools/test/tools/javac/Closure5.java

@@ -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
  */
 

langtools/test/tools/javac/CompoundBox.java

@@ -27,7 +27,7 @@
  * @summary drop compound boxing operations
  * @author gafter
  *
- * @compile/fail -source 1.5 CompoundBox.java
+ * @compile/fail CompoundBox.java
  */
 
 class CompoundBox {

langtools/test/tools/javac/ConditionalArgTypes_1.java

@@ -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.

langtools/test/tools/javac/ConditionalArgTypes_2.java

@@ -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.

langtools/test/tools/javac/DefiniteAssignment/DUAssert.java

@@ -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 {

langtools/test/tools/javac/EarlyAssert.java

@@ -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
  */
 
 /*

langtools/test/tools/javac/Enum1.java

@@ -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 {

langtools/test/tools/javac/GoodCovar.java

@@ -27,7 +27,7 @@
  * @summary multiple methods inheritence
  * @author gafter
  *
- * @compile -source 1.5 GoodCovar.java
+ * @compile GoodCovar.java
  */
 
 package good.covar;

langtools/test/tools/javac/HexFloatLiterals.java

@@ -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 {

langtools/test/tools/javac/HexThree.java

@@ -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 {

langtools/test/tools/javac/InterfaceAssert.java

@@ -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
  */
 
 /*

langtools/test/tools/javac/InvalidIntfCast.java

@@ -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 {

langtools/test/tools/javac/NewGeneric.java

@@ -27,7 +27,7 @@
  * @summary unclear diagnostic for "new T()"
  * @author never
  *
- * @compile/fail -source 1.5 NewGeneric.java
+ * @compile/fail NewGeneric.java
  */
 
 

langtools/test/tools/javac/ObjectMethodRefFromInterface.java

@@ -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 {

langtools/test/tools/javac/PrivateLocalConstructor.java

@@ -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 {

langtools/test/tools/javac/RawCrash.java

@@ -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> {

langtools/test/tools/javac/SynthName2.java

@@ -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;

langtools/test/tools/javac/T5090006/compiler.sh

@@ -63,7 +63,7 @@ case "$OS" in
     ;;
 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=$?
 

langtools/test/tools/javac/T5092545.java

@@ -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(); }

langtools/test/tools/javac/T5105890.java

@@ -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 {

langtools/test/tools/javac/annotations/default/A.java

@@ -27,11 +27,11 @@
  * @summary Constraints regarding annotation defaults
  * @author gafter
  *
- * @compile -source 1.5 A.java
+ * @compile A.java
- * @compile -source 1.5 B.java
+ * @compile B.java
- * @compile -source 1.5 C.java
+ * @compile C.java
- * @compile/fail -source 1.5 Derr.java
+ * @compile/fail Derr.java
- * @compile/fail -source 1.5 Eerr.java
+ * @compile/fail Eerr.java
  */
 
 public @interface A {

langtools/test/tools/javac/annotations/neg/AnnComma.java

@@ -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;

langtools/test/tools/javac/annotations/neg/ArrayLit.java

@@ -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})

langtools/test/tools/javac/annotations/neg/Constant.java

@@ -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;

langtools/test/tools/javac/annotations/neg/Cycle1.java

@@ -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;

langtools/test/tools/javac/annotations/neg/Cycle2.java

@@ -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;

langtools/test/tools/javac/annotations/neg/Cycle3.java

@@ -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;

langtools/test/tools/javac/annotations/neg/Dep.java

@@ -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/fail             -Xlint:dep-ann -Werror Dep.java
- * @compile      -source 1.5 -Xlint:dep-ann         Dep.java
+ * @compile                  -Xlint:dep-ann         Dep.java
  */
 
 /** @deprecated */

langtools/test/tools/javac/annotations/neg/Dup.java

@@ -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

langtools/test/tools/javac/annotations/neg/DupTarget.java

@@ -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})

langtools/test/tools/javac/annotations/neg/MemberOver.java

@@ -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;

langtools/test/tools/javac/annotations/neg/ObjectMembers.java

@@ -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)

langtools/test/tools/javac/annotations/neg/OverrideNo.java

@@ -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;

langtools/test/tools/javac/annotations/neg/Package.java

@@ -27,7 +27,7 @@
  * @summary Package annotations
  * @author gafter
  *
- * @compile/fail -source 1.5 Package.java
+ * @compile/fail Package.java
  */
 
 @java.lang.annotation.Documented

langtools/test/tools/javac/annotations/neg/Recovery.java

@@ -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.*;

langtools/test/tools/javac/annotations/neg/Recovery1.java

@@ -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;

langtools/test/tools/javac/annotations/neg/Scope.java

@@ -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;

langtools/test/tools/javac/annotations/neg/Syntax1.java

@@ -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;

langtools/test/tools/javac/annotations/neg/WrongTarget.java

@@ -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})

langtools/test/tools/javac/annotations/neg/WrongTarget2.java

@@ -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;

langtools/test/tools/javac/annotations/neg/WrongValue.java

@@ -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 {

langtools/test/tools/javac/annotations/neg/Z1.java

@@ -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 }

langtools/test/tools/javac/annotations/neg/Z10.java

@@ -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 }

langtools/test/tools/javac/annotations/neg/Z11.java

@@ -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 }

langtools/test/tools/javac/annotations/neg/Z12.java

@@ -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 }

langtools/test/tools/javac/annotations/neg/Z13.java

@@ -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 {

langtools/test/tools/javac/annotations/neg/Z14.java

@@ -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> {

langtools/test/tools/javac/annotations/neg/Z15.java

@@ -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 {

langtools/test/tools/javac/annotations/neg/Z16.java

@@ -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 }

langtools/test/tools/javac/annotations/neg/Z2.java

@@ -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 }

langtools/test/tools/javac/annotations/neg/Z3.java

@@ -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 }

langtools/test/tools/javac/annotations/neg/Z4.java

@@ -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 }

langtools/test/tools/javac/annotations/neg/Z5.java

@@ -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 {}

langtools/test/tools/javac/annotations/neg/Z8.java

@@ -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 {

langtools/test/tools/javac/annotations/neg/Z9.java

@@ -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 {

langtools/test/tools/javac/annotations/pos/AnnoteElideBraces.java

@@ -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 {

langtools/test/tools/javac/annotations/pos/ClassA.java

@@ -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 ClassA.java ClassB.java
- * @compile -source 1.5 ClassB.java
+ * @compile ClassB.java
  */
 
 @interface ClassA {

langtools/test/tools/javac/annotations/pos/Dep.java

@@ -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 */

langtools/test/tools/javac/annotations/pos/Enum1.java

@@ -27,7 +27,7 @@
  * @summary JSR175: annotations on enum constant
  * @author gafter
  *
- * @compile -source 1.5 Enum1.java
+ * @compile Enum1.java
  */
 
 package annotation.enums;

langtools/test/tools/javac/annotations/pos/Local.java

@@ -27,7 +27,7 @@
  * @summary local variable annotations
  * @author gafter
  *
- * @compile -source 1.5 Local.java
+ * @compile Local.java
  */
 
 class Local {

langtools/test/tools/javac/annotations/pos/Members.java

@@ -27,7 +27,7 @@
  * @summary annotation types may contain constants, types
  * @author gafter
  *
- * @compile -source 1.5 Members.java
+ * @compile Members.java
  */
 
 package members;

langtools/test/tools/javac/annotations/pos/NType.java

@@ -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;

langtools/test/tools/javac/annotations/pos/OverrideCheck.java

@@ -27,7 +27,7 @@
  * @summary crash in annotation class file reader
  * @author gafter
  *
- * @compile -source 1.5 OverrideCheck.java
+ * @compile OverrideCheck.java
  */
 
 class OverrideCheck {

langtools/test/tools/javac/annotations/pos/OverrideOK.java

@@ -27,7 +27,7 @@
  * @summary JSR175 (7): implement <at>Overrides
  * @author gafter
  *
- * @compile -source 1.5 OverrideOK.java
+ * @compile OverrideOK.java
  */
 
 package overrideOK;

langtools/test/tools/javac/annotations/pos/Parameter.java

@@ -27,7 +27,7 @@
  * @summary JSR175: Parameter annotations
  * @author gafter
  *
- * @compile -source 1.5 Parameter.java
+ * @compile Parameter.java
  */
 
 package annotation.parameter;

langtools/test/tools/javac/annotations/pos/Primitives.java

@@ -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 {

langtools/test/tools/javac/annotations/pos/RightTarget.java

@@ -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;

langtools/test/tools/javac/annotations/pos/Z1.java

@@ -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 }

langtools/test/tools/javac/annotations/pos/Z2.java

@@ -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 }

langtools/test/tools/javac/annotations/pos/Z3.java

@@ -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 }

langtools/test/tools/javac/annotations/pos/Z4.java

@@ -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 {

langtools/test/tools/javac/annotations/pos/package-info.java

@@ -27,7 +27,7 @@
  * @summary Package annotations
  * @author gafter
  *
- * @compile -source 1.5 package-info.java
+ * @compile package-info.java
  */
 
 @java.lang.annotation.Documented

langtools/test/tools/javac/assert/Attach.java

@@ -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 {

langtools/test/tools/javac/assert/DU1.java

@@ -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 {

langtools/test/tools/javac/assert/DU2.java

@@ -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 {

langtools/test/tools/javac/assert/Position.java

@@ -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 {

langtools/test/tools/javac/boxing/BoxedForeach.java

@@ -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
  */
 

langtools/test/tools/javac/boxing/Boxing1.java

@@ -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 {

langtools/test/tools/javac/boxing/Boxing2.java

@@ -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 {

langtools/test/tools/javac/boxing/Boxing4.java

@@ -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 {

langtools/test/tools/javac/boxing/BoxingCaching.java

@@ -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 {

langtools/test/tools/javac/capture/Capture1.java

@@ -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;

langtools/test/tools/javac/capture/Capture2.java

@@ -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;

langtools/test/tools/javac/capture/Capture3.java

@@ -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;

langtools/test/tools/javac/capture/Capture5.java

@@ -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;