Mercurial > jdk8-mips64-public > langtools / changeset

     1.1 --- a/test/com/sun/javadoc/testIndex/TestIndex.java	Thu May 21 10:56:36 2009 +0100
     1.2 +++ b/test/com/sun/javadoc/testIndex/TestIndex.java	Wed May 27 22:34:43 2009 -0700
     1.3 @@ -41,7 +41,7 @@
     1.4  
     1.5      //Javadoc arguments.
     1.6      private static final String[] ARGS = new String[] {
     1.7 -        "-d", BUG_ID, "-source", "1.5", "-sourcepath", SRC_DIR, "pkg", SRC_DIR + FS + "NoPackage.java"
     1.8 +        "-d", BUG_ID, "-sourcepath", SRC_DIR, "pkg", SRC_DIR + FS + "NoPackage.java"
     1.9      };
    1.10  
    1.11      //Input for string search tests.

     2.1 --- a/test/com/sun/javadoc/testInterface/TestInterface.java	Thu May 21 10:56:36 2009 +0100
     2.2 +++ b/test/com/sun/javadoc/testInterface/TestInterface.java	Wed May 27 22:34:43 2009 -0700
     2.3 @@ -42,7 +42,7 @@
     2.4  
     2.5      //Javadoc arguments.
     2.6      private static final String[] ARGS = new String[] {
     2.7 -        "-source", "1.5", "-d", BUG_ID, "-sourcepath", SRC_DIR, "pkg"
     2.8 +        "-d", BUG_ID, "-sourcepath", SRC_DIR, "pkg"
     2.9      };
    2.10  
    2.11      //Input for string search tests.

     3.1 --- a/test/com/sun/javadoc/testNavagation/TestNavagation.java	Thu May 21 10:56:36 2009 +0100
     3.2 +++ b/test/com/sun/javadoc/testNavagation/TestNavagation.java	Wed May 27 22:34:43 2009 -0700
     3.3 @@ -40,7 +40,7 @@
     3.4  
     3.5      //Javadoc arguments.
     3.6      private static final String[] ARGS = new String[] {
     3.7 -        "-d", BUG_ID, "-sourcepath", SRC_DIR, "-source", "1.5", "pkg"
     3.8 +        "-d", BUG_ID, "-sourcepath", SRC_DIR, "pkg"
     3.9      };
    3.10  
    3.11      //Input for string search tests.

     4.1 --- a/test/com/sun/javadoc/testTagInheritence/TestTagInheritence.java	Thu May 21 10:56:36 2009 +0100
     4.2 +++ b/test/com/sun/javadoc/testTagInheritence/TestTagInheritence.java	Wed May 27 22:34:43 2009 -0700
     4.3 @@ -36,7 +36,7 @@
     4.4  
     4.5      private static final String BUG_ID = "4496223-4496270-4618686-4720974-4812240-6253614-6253604";
     4.6      private static final String[] ARGS = new String[] {
     4.7 -        "-source", "1.5", "-d", BUG_ID, "-sourcepath", SRC_DIR, "pkg", "firstSentence", "firstSentence2"
     4.8 +        "-d", BUG_ID, "-sourcepath", SRC_DIR, "pkg", "firstSentence", "firstSentence2"
     4.9      };
    4.10  
    4.11      /**

     5.1 --- a/test/tools/javac/5005368.java	Thu May 21 10:56:36 2009 +0100
     5.2 +++ b/test/tools/javac/5005368.java	Wed May 27 22:34:43 2009 -0700
     5.3 @@ -27,8 +27,8 @@
     5.4   * @summary com/sun/tools/javac/comp/Check.java refers to the undefined resource
     5.5   * @author gafter
     5.6   *
     5.7 - * @compile      -source 1.5 -Werror                  5005368.java
     5.8 - * @compile/fail -source 1.5 -Werror -Xlint:unchecked 5005368.java
     5.9 + * @compile      -Werror                  5005368.java
    5.10 + * @compile/fail -Werror -Xlint:unchecked 5005368.java
    5.11   */
    5.12  
    5.13  package p5005368;

     6.1 --- a/test/tools/javac/Ambig3.java	Thu May 21 10:56:36 2009 +0100
     6.2 +++ b/test/tools/javac/Ambig3.java	Wed May 27 22:34:43 2009 -0700
     6.3 @@ -27,7 +27,7 @@
     6.4   * @summary Missing ambiguity error when two methods are equally specific
     6.5   * @author gafter
     6.6   *
     6.7 - * @compile/fail -source 1.5 Ambig3.java
     6.8 + * @compile/fail Ambig3.java
     6.9   */
    6.10  
    6.11  class Test<T,E> {

     7.1 --- a/test/tools/javac/ArrayCast.java	Thu May 21 10:56:36 2009 +0100
     7.2 +++ b/test/tools/javac/ArrayCast.java	Wed May 27 22:34:43 2009 -0700
     7.3 @@ -28,7 +28,7 @@
     7.4   *          compilation.  This was fixed in 1.2beta2.
     7.5   * @author turnidge
     7.6   *
     7.7 - * @compile -source 1.4 ArrayCast.java
     7.8 + * @compile ArrayCast.java
     7.9   */
    7.10  
    7.11  public class ArrayCast {

     8.1 --- a/test/tools/javac/BadCovar.java	Thu May 21 10:56:36 2009 +0100
     8.2 +++ b/test/tools/javac/BadCovar.java	Wed May 27 22:34:43 2009 -0700
     8.3 @@ -27,7 +27,7 @@
     8.4   * @summary Compiler allows inheritance of multiple methods with unrelated return types
     8.5   * @author gafter
     8.6   *
     8.7 - * @compile/fail -source 1.5 BadCovar.java
     8.8 + * @compile/fail BadCovar.java
     8.9   */
    8.10  
    8.11  package bad.covar;

     9.1 --- a/test/tools/javac/ClassLiterals/InitializeOuter.java	Thu May 21 10:56:36 2009 +0100
     9.2 +++ b/test/tools/javac/ClassLiterals/InitializeOuter.java	Wed May 27 22:34:43 2009 -0700
     9.3 @@ -27,7 +27,7 @@
     9.4   * @summary Using a class literal causes outermost class to be initialized early
     9.5   * @author gafter
     9.6   *
     9.7 - * @compile -source 1.4 -target 1.4.2 InitializeOuter.java
     9.8 + * @compile InitializeOuter.java
     9.9   * @run main InitializeOuter
    9.10   */
    9.11  

    10.1 --- a/test/tools/javac/ClassLiterals/InitializeTarget.java	Thu May 21 10:56:36 2009 +0100
    10.2 +++ b/test/tools/javac/ClassLiterals/InitializeTarget.java	Wed May 27 22:34:43 2009 -0700
    10.3 @@ -27,7 +27,7 @@
    10.4   * @summary class literal causes the referenced class to be initialized
    10.5   * @author gafter
    10.6   *
    10.7 - * @compile -source 1.4 -target 1.4.2 InitializeTarget.java
    10.8 + * @compile InitializeTarget.java
    10.9   * @run main InitializeTarget
   10.10   */
   10.11  

    11.1 --- a/test/tools/javac/ClassToTypeParm.java	Thu May 21 10:56:36 2009 +0100
    11.2 +++ b/test/tools/javac/ClassToTypeParm.java	Wed May 27 22:34:43 2009 -0700
    11.3 @@ -27,7 +27,7 @@
    11.4   * @summary Generics: assignment of Class to type parm's default should elicit error
    11.5   * @author never
    11.6   *
    11.7 - * @compile/fail -source 1.5 ClassToTypeParm.java
    11.8 + * @compile/fail ClassToTypeParm.java
    11.9   */
   11.10  
   11.11  class ClassToTypeParm<T> {

    12.1 --- a/test/tools/javac/Closure1.java	Thu May 21 10:56:36 2009 +0100
    12.2 +++ b/test/tools/javac/Closure1.java	Wed May 27 22:34:43 2009 -0700
    12.3 @@ -27,7 +27,7 @@
    12.4   * @summary Initialization of up-level links, immediately after super(), occurs too late.
    12.5   * @author gafter
    12.6   *
    12.7 - * @compile -source 1.4 -target 1.4 Closure1.java
    12.8 + * @compile Closure1.java
    12.9   * @run main Closure1
   12.10   */
   12.11  

    13.1 --- a/test/tools/javac/Closure2.java	Thu May 21 10:56:36 2009 +0100
    13.2 +++ b/test/tools/javac/Closure2.java	Wed May 27 22:34:43 2009 -0700
    13.3 @@ -27,7 +27,7 @@
    13.4   * @summary Initialization of up-level links, immediately after super(), occurs too late.
    13.5   * @author gafter
    13.6   *
    13.7 - * @compile -source 1.4 -target 1.4 Closure2.java
    13.8 + * @compile Closure2.java
    13.9   * @run main Closure2
   13.10   */
   13.11  

    14.1 --- a/test/tools/javac/Closure3.java	Thu May 21 10:56:36 2009 +0100
    14.2 +++ b/test/tools/javac/Closure3.java	Wed May 27 22:34:43 2009 -0700
    14.3 @@ -27,7 +27,7 @@
    14.4   * @summary Initialization of up-level links, immediately after super(), occurs too late.
    14.5   * @author gafter
    14.6   *
    14.7 - * @compile -source 1.4 -target 1.4 Closure3.java
    14.8 + * @compile Closure3.java
    14.9   * @run main Closure3
   14.10   */
   14.11  

    15.1 --- a/test/tools/javac/Closure4.java	Thu May 21 10:56:36 2009 +0100
    15.2 +++ b/test/tools/javac/Closure4.java	Wed May 27 22:34:43 2009 -0700
    15.3 @@ -27,7 +27,7 @@
    15.4   * @summary Initialization of up-level links, immediately after super(), occurs too late.
    15.5   * @author gafter
    15.6   *
    15.7 - * @compile -source 1.4 -target 1.4 Closure4.java
    15.8 + * @compile Closure4.java
    15.9   * @run main Closure4
   15.10   */
   15.11  

    16.1 --- a/test/tools/javac/Closure5.java	Thu May 21 10:56:36 2009 +0100
    16.2 +++ b/test/tools/javac/Closure5.java	Wed May 27 22:34:43 2009 -0700
    16.3 @@ -27,7 +27,7 @@
    16.4   * @summary Incorrect order for initializers in nested class
    16.5   * @author gafter
    16.6   *
    16.7 - * @compile -source 1.4 -target 1.4 Closure5.java
    16.8 + * @compile Closure5.java
    16.9   * @run main Closure5
   16.10   */
   16.11  

    17.1 --- a/test/tools/javac/CompoundBox.java	Thu May 21 10:56:36 2009 +0100
    17.2 +++ b/test/tools/javac/CompoundBox.java	Wed May 27 22:34:43 2009 -0700
    17.3 @@ -27,7 +27,7 @@
    17.4   * @summary drop compound boxing operations
    17.5   * @author gafter
    17.6   *
    17.7 - * @compile/fail -source 1.5 CompoundBox.java
    17.8 + * @compile/fail CompoundBox.java
    17.9   */
   17.10  
   17.11  class CompoundBox {

    18.1 --- a/test/tools/javac/ConditionalArgTypes_1.java	Thu May 21 10:56:36 2009 +0100
    18.2 +++ b/test/tools/javac/ConditionalArgTypes_1.java	Wed May 27 22:34:43 2009 -0700
    18.3 @@ -28,7 +28,7 @@
    18.4   * @author maddox
    18.5   *
    18.6   * @compile/fail -source 1.4 ConditionalArgTypes_1.java
    18.7 - * @compile -source 1.5 ConditionalArgTypes_1.java
    18.8 + * @compile                  ConditionalArgTypes_1.java
    18.9   */
   18.10  
   18.11  // This is the problematic case -- the controlling expression is a boolean constant.

    19.1 --- a/test/tools/javac/ConditionalArgTypes_2.java	Thu May 21 10:56:36 2009 +0100
    19.2 +++ b/test/tools/javac/ConditionalArgTypes_2.java	Wed May 27 22:34:43 2009 -0700
    19.3 @@ -28,7 +28,7 @@
    19.4   * @author maddox
    19.5   *
    19.6   * @compile/fail -source 1.4 ConditionalArgTypes_2.java
    19.7 - * @compile -source 1.5 ConditionalArgTypes_2.java
    19.8 + * @compile                  ConditionalArgTypes_2.java
    19.9   */
   19.10  
   19.11  // This case was working before -- controlling expression is not a constant.

    20.1 --- a/test/tools/javac/DefiniteAssignment/DUAssert.java	Thu May 21 10:56:36 2009 +0100
    20.2 +++ b/test/tools/javac/DefiniteAssignment/DUAssert.java	Wed May 27 22:34:43 2009 -0700
    20.3 @@ -22,12 +22,12 @@
    20.4   */
    20.5  
    20.6  /*
    20.7 - * @test %E
    20.8 + * @test
    20.9   * @bug 4478838 4533580
   20.10   * @summary Check correct handling of DU in assert statements
   20.11   * @author Neal Gafter (gafter)
   20.12   *
   20.13 - * @run compile -source 1.4 DUAssert.java
   20.14 + * @run compile DUAssert.java
   20.15   */
   20.16  
   20.17  class DUSwitch {

    21.1 --- a/test/tools/javac/EarlyAssert.java	Thu May 21 10:56:36 2009 +0100
    21.2 +++ b/test/tools/javac/EarlyAssert.java	Wed May 27 22:34:43 2009 -0700
    21.3 @@ -27,9 +27,6 @@
    21.4   * @summary Verify that assertions are enabled before the class is initialized
    21.5   * and not thereafter
    21.6   * @author gafter
    21.7 - *
    21.8 - * @compile -source 1.4 EarlyAssert.java
    21.9 - * @run main EarlyAssert
   21.10   */
   21.11  
   21.12  /*

    22.1 --- a/test/tools/javac/Enum1.java	Thu May 21 10:56:36 2009 +0100
    22.2 +++ b/test/tools/javac/Enum1.java	Wed May 27 22:34:43 2009 -0700
    22.3 @@ -26,9 +26,6 @@
    22.4   * @bug 4934060
    22.5   * @summary private enum ctor versus specialized enum constant crashes javac
    22.6   * @author gafter
    22.7 - *
    22.8 - * @compile -source 1.5 Enum1.java
    22.9 - * @run main Enum1
   22.10   */
   22.11  
   22.12  public enum Enum1 {

    23.1 --- a/test/tools/javac/GoodCovar.java	Thu May 21 10:56:36 2009 +0100
    23.2 +++ b/test/tools/javac/GoodCovar.java	Wed May 27 22:34:43 2009 -0700
    23.3 @@ -27,7 +27,7 @@
    23.4   * @summary multiple methods inheritence
    23.5   * @author gafter
    23.6   *
    23.7 - * @compile -source 1.5 GoodCovar.java
    23.8 + * @compile GoodCovar.java
    23.9   */
   23.10  
   23.11  package good.covar;

    24.1 --- a/test/tools/javac/HexFloatLiterals.java	Thu May 21 10:56:36 2009 +0100
    24.2 +++ b/test/tools/javac/HexFloatLiterals.java	Wed May 27 22:34:43 2009 -0700
    24.3 @@ -26,9 +26,6 @@
    24.4   * @bug 4920023
    24.5   * @summary add "hexadecimal floating-point literal" support to javac as per 4896828
    24.6   * @author gafter
    24.7 - *
    24.8 - * @compile -source 1.5 HexFloatLiterals.java
    24.9 - * @run main HexFloatLiterals
   24.10   */
   24.11  
   24.12  public class HexFloatLiterals {

    25.1 --- a/test/tools/javac/HexThree.java	Thu May 21 10:56:36 2009 +0100
    25.2 +++ b/test/tools/javac/HexThree.java	Wed May 27 22:34:43 2009 -0700
    25.3 @@ -26,9 +26,6 @@
    25.4   * @bug 4920023
    25.5   * @summary Test hex floating-point literals
    25.6   * @author darcy
    25.7 - *
    25.8 - * @compile -source 1.5 HexThree.java
    25.9 - * @run main HexThree
   25.10   */
   25.11  
   25.12  public class HexThree {

    26.1 --- a/test/tools/javac/InterfaceAssert.java	Thu May 21 10:56:36 2009 +0100
    26.2 +++ b/test/tools/javac/InterfaceAssert.java	Wed May 27 22:34:43 2009 -0700
    26.3 @@ -26,9 +26,6 @@
    26.4   * @bug 4399129
    26.5   * @summary Check that assertions compile properly when nested in an interface
    26.6   * @author gafter
    26.7 - *
    26.8 - * @compile -source 1.4 InterfaceAssert.java
    26.9 - * @run main InterfaceAssert
   26.10   */
   26.11  
   26.12  /*

    27.1 --- a/test/tools/javac/InvalidIntfCast.java	Thu May 21 10:56:36 2009 +0100
    27.2 +++ b/test/tools/javac/InvalidIntfCast.java	Wed May 27 22:34:43 2009 -0700
    27.3 @@ -27,7 +27,7 @@
    27.4   * @summary The compiler should detect an invalid cast between interfaces.
    27.5   * @author turnidge
    27.6   *
    27.7 - * @compile -source 1.5 InvalidIntfCast.java
    27.8 + * @compile InvalidIntfCast.java
    27.9   */
   27.10  
   27.11  interface I {

    28.1 --- a/test/tools/javac/NewGeneric.java	Thu May 21 10:56:36 2009 +0100
    28.2 +++ b/test/tools/javac/NewGeneric.java	Wed May 27 22:34:43 2009 -0700
    28.3 @@ -27,7 +27,7 @@
    28.4   * @summary unclear diagnostic for "new T()"
    28.5   * @author never
    28.6   *
    28.7 - * @compile/fail -source 1.5 NewGeneric.java
    28.8 + * @compile/fail NewGeneric.java
    28.9   */
   28.10  
   28.11  

    29.1 --- a/test/tools/javac/ObjectMethodRefFromInterface.java	Thu May 21 10:56:36 2009 +0100
    29.2 +++ b/test/tools/javac/ObjectMethodRefFromInterface.java	Wed May 27 22:34:43 2009 -0700
    29.3 @@ -27,9 +27,6 @@
    29.4   * @summary Verify that access to member of java.lang.Object via qualification of
    29.5   * object of an interface type is handled successfully.
    29.6   * @author maddox
    29.7 - *
    29.8 - * @run compile -source 1.3 -target 1.2 -g ObjectMethodRefFromInterface.java
    29.9 - * @run main/othervm ObjectMethodRefFromInterface
   29.10   */
   29.11  
   29.12  public class ObjectMethodRefFromInterface {

    30.1 --- a/test/tools/javac/PrivateLocalConstructor.java	Thu May 21 10:56:36 2009 +0100
    30.2 +++ b/test/tools/javac/PrivateLocalConstructor.java	Wed May 27 22:34:43 2009 -0700
    30.3 @@ -26,9 +26,6 @@
    30.4   * @bug 4365809
    30.5   * @summary Incorrect access method for private constructor in local class.
    30.6   * @author gafter
    30.7 - *
    30.8 - * @compile -source 1.4 -target 1.4 PrivateLocalConstructor.java
    30.9 - * @run main PrivateLocalConstructor
   30.10   */
   30.11  
   30.12  public class PrivateLocalConstructor {

    31.1 --- a/test/tools/javac/RawCrash.java	Thu May 21 10:56:36 2009 +0100
    31.2 +++ b/test/tools/javac/RawCrash.java	Wed May 27 22:34:43 2009 -0700
    31.3 @@ -27,7 +27,7 @@
    31.4   * @summary compiler crash with raw instantiation of generic inner class
    31.5   * @author gafter
    31.6   *
    31.7 - * @compile -source 1.5 RawCrash.java
    31.8 + * @compile RawCrash.java
    31.9   */
   31.10  
   31.11  class A<E> {

    32.1 --- a/test/tools/javac/SynthName2.java	Thu May 21 10:56:36 2009 +0100
    32.2 +++ b/test/tools/javac/SynthName2.java	Wed May 27 22:34:43 2009 -0700
    32.3 @@ -27,7 +27,7 @@
    32.4   * @summary using of synthetic names in local class causes ClassFormatError
    32.5   * @author gafter
    32.6   *
    32.7 - * @compile/fail -source 1.4 -target 1.4 SynthName2.java
    32.8 + * @compile/fail SynthName2.java
    32.9   */
   32.10  
   32.11  import java.io.PrintStream;

    33.1 --- a/test/tools/javac/T5090006/compiler.sh	Thu May 21 10:56:36 2009 +0100
    33.2 +++ b/test/tools/javac/T5090006/compiler.sh	Wed May 27 22:34:43 2009 -0700
    33.3 @@ -63,7 +63,7 @@
    33.4      ;;
    33.5  esac
    33.6  
    33.7 -"${TESTJAVA}${FS}bin${FS}javac" ${TESTTOOLVMOPTS} -verbose -source 5 -d "${TESTCLASSES}" -cp "${TESTSRC}${FS}broken.jar" "${TESTSRC}${FS}$1"
    33.8 +"${TESTJAVA}${FS}bin${FS}javac" ${TESTTOOLVMOPTS} -verbose -d "${TESTCLASSES}" -cp "${TESTSRC}${FS}broken.jar" "${TESTSRC}${FS}$1"
    33.9  
   33.10  result=$?
   33.11  

    34.1 --- a/test/tools/javac/T5092545.java	Thu May 21 10:56:36 2009 +0100
    34.2 +++ b/test/tools/javac/T5092545.java	Wed May 27 22:34:43 2009 -0700
    34.3 @@ -26,8 +26,6 @@
    34.4   * @bug 5092545
    34.5   * @summary Assertion failed in javac (ClassWriter.java:513)
    34.6   * @author Peter von der Ah\u00e9
    34.7 - * @compile -source 5 T5092545.java
    34.8 - * @run main T5092545
    34.9   */
   34.10  
   34.11  interface A { void g(); }

    35.1 --- a/test/tools/javac/T5105890.java	Thu May 21 10:56:36 2009 +0100
    35.2 +++ b/test/tools/javac/T5105890.java	Wed May 27 22:34:43 2009 -0700
    35.3 @@ -26,8 +26,6 @@
    35.4   * @bug 5105890
    35.5   * @summary (codegen) constant folding broken for conditional operator
    35.6   * @author Peter von der Ah\u00e9
    35.7 - * @compile -source 5 T5105890.java
    35.8 - * @run main T5105890
    35.9   */
   35.10  
   35.11  public class T5105890 {

    36.1 --- a/test/tools/javac/annotations/default/A.java	Thu May 21 10:56:36 2009 +0100
    36.2 +++ b/test/tools/javac/annotations/default/A.java	Wed May 27 22:34:43 2009 -0700
    36.3 @@ -27,11 +27,11 @@
    36.4   * @summary Constraints regarding annotation defaults
    36.5   * @author gafter
    36.6   *
    36.7 - * @compile -source 1.5 A.java
    36.8 - * @compile -source 1.5 B.java
    36.9 - * @compile -source 1.5 C.java
   36.10 - * @compile/fail -source 1.5 Derr.java
   36.11 - * @compile/fail -source 1.5 Eerr.java
   36.12 + * @compile A.java
   36.13 + * @compile B.java
   36.14 + * @compile C.java
   36.15 + * @compile/fail Derr.java
   36.16 + * @compile/fail Eerr.java
   36.17   */
   36.18  
   36.19  public @interface A {

    37.1 --- a/test/tools/javac/annotations/neg/AnnComma.java	Thu May 21 10:56:36 2009 +0100
    37.2 +++ b/test/tools/javac/annotations/neg/AnnComma.java	Wed May 27 22:34:43 2009 -0700
    37.3 @@ -27,7 +27,7 @@
    37.4   * @summary annotation syntax allows extra ',' in parameter list.
    37.5   * @author gafter
    37.6   *
    37.7 - * @compile/fail -source 1.5 AnnComma.java
    37.8 + * @compile/fail AnnComma.java
    37.9   */
   37.10  
   37.11  package annComma;

    38.1 --- a/test/tools/javac/annotations/neg/ArrayLit.java	Thu May 21 10:56:36 2009 +0100
    38.2 +++ b/test/tools/javac/annotations/neg/ArrayLit.java	Wed May 27 22:34:43 2009 -0700
    38.3 @@ -27,7 +27,7 @@
    38.4   * @summary JSR175 (4): don't allow "new" in annotations
    38.5   * @author gafter
    38.6   *
    38.7 - * @compile/fail -source 1.5 ArrayLit.java
    38.8 + * @compile/fail ArrayLit.java
    38.9   */
   38.10  
   38.11  @ArrayLit(new int[] {1, 2, 3})

    39.1 --- a/test/tools/javac/annotations/neg/Constant.java	Thu May 21 10:56:36 2009 +0100
    39.2 +++ b/test/tools/javac/annotations/neg/Constant.java	Wed May 27 22:34:43 2009 -0700
    39.3 @@ -27,7 +27,7 @@
    39.4   * @summary JSR175 (5): annotations must be "constants"
    39.5   * @author gafter
    39.6   *
    39.7 - * @compile/fail -source 1.5 Constant.java
    39.8 + * @compile/fail Constant.java
    39.9   */
   39.10  
   39.11  package test.tools.javac.annotation.Constant;

    40.1 --- a/test/tools/javac/annotations/neg/Cycle1.java	Thu May 21 10:56:36 2009 +0100
    40.2 +++ b/test/tools/javac/annotations/neg/Cycle1.java	Wed May 27 22:34:43 2009 -0700
    40.3 @@ -27,7 +27,7 @@
    40.4   * @summary (JSR175) compiler allows self-containing annotation types
    40.5   * @author gafter
    40.6   *
    40.7 - * @compile/fail -source 1.5 Cycle1.java
    40.8 + * @compile/fail Cycle1.java
    40.9   */
   40.10  
   40.11  package cycle1;

    41.1 --- a/test/tools/javac/annotations/neg/Cycle2.java	Thu May 21 10:56:36 2009 +0100
    41.2 +++ b/test/tools/javac/annotations/neg/Cycle2.java	Wed May 27 22:34:43 2009 -0700
    41.3 @@ -27,7 +27,7 @@
    41.4   * @summary (JSR175) compiler allows self-containing annotation types
    41.5   * @author gafter
    41.6   *
    41.7 - * @compile/fail -source 1.5 Cycle2.java
    41.8 + * @compile/fail Cycle2.java
    41.9   */
   41.10  
   41.11  package cycle2;

    42.1 --- a/test/tools/javac/annotations/neg/Cycle3.java	Thu May 21 10:56:36 2009 +0100
    42.2 +++ b/test/tools/javac/annotations/neg/Cycle3.java	Wed May 27 22:34:43 2009 -0700
    42.3 @@ -27,7 +27,7 @@
    42.4   * @summary javac allows cyclic annotation interfaces with arrays
    42.5   * @author gafter
    42.6   *
    42.7 - * @compile/fail -source 1.5 Cycle3.java
    42.8 + * @compile/fail Cycle3.java
    42.9   */
   42.10  
   42.11  package cycle3;

    43.1 --- a/test/tools/javac/annotations/neg/Dep.java	Thu May 21 10:56:36 2009 +0100
    43.2 +++ b/test/tools/javac/annotations/neg/Dep.java	Wed May 27 22:34:43 2009 -0700
    43.3 @@ -28,8 +28,8 @@
    43.4   * @author gafter
    43.5   *
    43.6   * @compile      -source 1.4 -Xlint:dep-ann -Werror Dep.java
    43.7 - * @compile/fail -source 1.5 -Xlint:dep-ann -Werror Dep.java
    43.8 - * @compile      -source 1.5 -Xlint:dep-ann         Dep.java
    43.9 + * @compile/fail             -Xlint:dep-ann -Werror Dep.java
   43.10 + * @compile                  -Xlint:dep-ann         Dep.java
   43.11   */
   43.12  
   43.13  /** @deprecated */

    44.1 --- a/test/tools/javac/annotations/neg/Dup.java	Thu May 21 10:56:36 2009 +0100
    44.2 +++ b/test/tools/javac/annotations/neg/Dup.java	Wed May 27 22:34:43 2009 -0700
    44.3 @@ -27,7 +27,7 @@
    44.4   * @summary JSR175 (3): don't allow repeated annotations
    44.5   * @author gafter
    44.6   *
    44.7 - * @compile/fail -source 1.5 Dup.java
    44.8 + * @compile/fail Dup.java
    44.9   */
   44.10  
   44.11  @Dup

    45.1 --- a/test/tools/javac/annotations/neg/DupTarget.java	Thu May 21 10:56:36 2009 +0100
    45.2 +++ b/test/tools/javac/annotations/neg/DupTarget.java	Wed May 27 22:34:43 2009 -0700
    45.3 @@ -27,7 +27,7 @@
    45.4   * @summary <at>Target
    45.5   * @author gafter
    45.6   *
    45.7 - * @compile/fail -source 1.5 DupTarget.java
    45.8 + * @compile/fail DupTarget.java
    45.9   */
   45.10  
   45.11  @java.lang.annotation.Target({TYPE, FIELD, PACKAGE, FIELD})

    46.1 --- a/test/tools/javac/annotations/neg/MemberOver.java	Thu May 21 10:56:36 2009 +0100
    46.2 +++ b/test/tools/javac/annotations/neg/MemberOver.java	Wed May 27 22:34:43 2009 -0700
    46.3 @@ -27,7 +27,7 @@
    46.4   * @summary Annotation members must not have same signature as Object or Annotation members
    46.5   * @author gafter
    46.6   *
    46.7 - * @compile/fail -source 1.5 MemberOver.java
    46.8 + * @compile/fail MemberOver.java
    46.9   */
   46.10  
   46.11  package memberOver;

    47.1 --- a/test/tools/javac/annotations/neg/ObjectMembers.java	Thu May 21 10:56:36 2009 +0100
    47.2 +++ b/test/tools/javac/annotations/neg/ObjectMembers.java	Wed May 27 22:34:43 2009 -0700
    47.3 @@ -27,7 +27,7 @@
    47.4   * @summary JSR175 (2): don't allow annotating members from Object
    47.5   * @author gafter
    47.6   *
    47.7 - * @compile/fail -source 1.5 ObjectMembers.java
    47.8 + * @compile/fail ObjectMembers.java
    47.9   */
   47.10  
   47.11  @ObjectMembers(hashCode = 23)

    48.1 --- a/test/tools/javac/annotations/neg/OverrideNo.java	Thu May 21 10:56:36 2009 +0100
    48.2 +++ b/test/tools/javac/annotations/neg/OverrideNo.java	Wed May 27 22:34:43 2009 -0700
    48.3 @@ -27,7 +27,7 @@
    48.4   * @summary JSR175 (7): implement <at>Overrides
    48.5   * @author gafter
    48.6   *
    48.7 - * @compile/fail -source 1.5 OverrideNo.java
    48.8 + * @compile/fail OverrideNo.java
    48.9   */
   48.10  
   48.11  package overrideNo;

    49.1 --- a/test/tools/javac/annotations/neg/Package.java	Thu May 21 10:56:36 2009 +0100
    49.2 +++ b/test/tools/javac/annotations/neg/Package.java	Wed May 27 22:34:43 2009 -0700
    49.3 @@ -27,7 +27,7 @@
    49.4   * @summary Package annotations
    49.5   * @author gafter
    49.6   *
    49.7 - * @compile/fail -source 1.5 Package.java
    49.8 + * @compile/fail Package.java
    49.9   */
   49.10  
   49.11  @java.lang.annotation.Documented

    50.1 --- a/test/tools/javac/annotations/neg/Recovery.java	Thu May 21 10:56:36 2009 +0100
    50.2 +++ b/test/tools/javac/annotations/neg/Recovery.java	Wed May 27 22:34:43 2009 -0700
    50.3 @@ -27,7 +27,7 @@
    50.4   * @summary compiler crash with malformed annotations
    50.5   * @author gafter
    50.6   *
    50.7 - * @compile/fail -source 1.5 Recovery.java
    50.8 + * @compile/fail Recovery.java
    50.9   */
   50.10  
   50.11  import java.lang.annotation.*;

    51.1 --- a/test/tools/javac/annotations/neg/Recovery1.java	Thu May 21 10:56:36 2009 +0100
    51.2 +++ b/test/tools/javac/annotations/neg/Recovery1.java	Wed May 27 22:34:43 2009 -0700
    51.3 @@ -27,7 +27,7 @@
    51.4   * @summary Assertion error is thrown when an annotation class cannot be found.
    51.5   * @author gafter
    51.6   *
    51.7 - * @compile/fail -source 1.5 Recovery1.java
    51.8 + * @compile/fail Recovery1.java
    51.9   */
   51.10  
   51.11  package recovery1;

    52.1 --- a/test/tools/javac/annotations/neg/Scope.java	Thu May 21 10:56:36 2009 +0100
    52.2 +++ b/test/tools/javac/annotations/neg/Scope.java	Wed May 27 22:34:43 2009 -0700
    52.3 @@ -27,7 +27,7 @@
    52.4   * @summary name lookup scope for annotations
    52.5   * @author gafter
    52.6   *
    52.7 - * @compile/fail -source 1.5 Scope.java
    52.8 + * @compile/fail Scope.java
    52.9   */
   52.10  
   52.11  package annotation.scope;

    53.1 --- a/test/tools/javac/annotations/neg/Syntax1.java	Thu May 21 10:56:36 2009 +0100
    53.2 +++ b/test/tools/javac/annotations/neg/Syntax1.java	Wed May 27 22:34:43 2009 -0700
    53.3 @@ -27,7 +27,7 @@
    53.4   * @summary compiler crash with ill-formed annotation
    53.5   * @author gafter
    53.6   *
    53.7 - * @compile/fail -source 1.5 Syntax1.java
    53.8 + * @compile/fail Syntax1.java
    53.9   */
   53.10  
   53.11  package syntax1;

    54.1 --- a/test/tools/javac/annotations/neg/WrongTarget.java	Thu May 21 10:56:36 2009 +0100
    54.2 +++ b/test/tools/javac/annotations/neg/WrongTarget.java	Wed May 27 22:34:43 2009 -0700
    54.3 @@ -27,7 +27,7 @@
    54.4   * @summary java.lang.annotation.Target
    54.5   * @author gafter
    54.6   *
    54.7 - * @compile/fail -source 1.5 WrongTarget.java
    54.8 + * @compile/fail WrongTarget.java
    54.9   */
   54.10  
   54.11  @java.lang.annotation.Target({FIELD})

    55.1 --- a/test/tools/javac/annotations/neg/WrongTarget2.java	Thu May 21 10:56:36 2009 +0100
    55.2 +++ b/test/tools/javac/annotations/neg/WrongTarget2.java	Wed May 27 22:34:43 2009 -0700
    55.3 @@ -27,7 +27,7 @@
    55.4   * @summary Compiler allows Inherited meta-attribute on local variable declaration.
    55.5   * @author gafter
    55.6   *
    55.7 - * @compile/fail -source 1.5 WrongTarget2.java
    55.8 + * @compile/fail WrongTarget2.java
    55.9   */
   55.10  
   55.11  import java.lang.annotation.Inherited;

    56.1 --- a/test/tools/javac/annotations/neg/WrongValue.java	Thu May 21 10:56:36 2009 +0100
    56.2 +++ b/test/tools/javac/annotations/neg/WrongValue.java	Wed May 27 22:34:43 2009 -0700
    56.3 @@ -27,7 +27,7 @@
    56.4   * @summary compiler: crashes when attributes with same elements are used in place of other
    56.5   * @author gafter
    56.6   *
    56.7 - * @compile/fail -source 1.5 WrongValue.java
    56.8 + * @compile/fail WrongValue.java
    56.9   */
   56.10  
   56.11  @interface TestM2 {

    57.1 --- a/test/tools/javac/annotations/neg/Z1.java	Thu May 21 10:56:36 2009 +0100
    57.2 +++ b/test/tools/javac/annotations/neg/Z1.java	Wed May 27 22:34:43 2009 -0700
    57.3 @@ -27,7 +27,7 @@
    57.4   * @summary implement "metadata" (attribute interfaces and program annotations)
    57.5   * @author gafter
    57.6   *
    57.7 - * @compile/fail -source 1.5 Z1.java
    57.8 + * @compile/fail Z1.java
    57.9   */
   57.10  
   57.11  enum Color { red, green, blue }

    58.1 --- a/test/tools/javac/annotations/neg/Z10.java	Thu May 21 10:56:36 2009 +0100
    58.2 +++ b/test/tools/javac/annotations/neg/Z10.java	Wed May 27 22:34:43 2009 -0700
    58.3 @@ -27,7 +27,7 @@
    58.4   * @summary implement "metadata" (attribute interfaces and program annotations)
    58.5   * @author gafter
    58.6   *
    58.7 - * @compile/fail -source 1.5 Z10.java
    58.8 + * @compile/fail Z10.java
    58.9   */
   58.10  
   58.11  enum Color { red, green, blue }

    59.1 --- a/test/tools/javac/annotations/neg/Z11.java	Thu May 21 10:56:36 2009 +0100
    59.2 +++ b/test/tools/javac/annotations/neg/Z11.java	Wed May 27 22:34:43 2009 -0700
    59.3 @@ -27,7 +27,7 @@
    59.4   * @summary implement "metadata" (attribute interfaces and program annotations)
    59.5   * @author gafter
    59.6   *
    59.7 - * @compile/fail -source 1.5 Z11.java
    59.8 + * @compile/fail Z11.java
    59.9   */
   59.10  
   59.11  enum Color { red, green, blue }

    60.1 --- a/test/tools/javac/annotations/neg/Z12.java	Thu May 21 10:56:36 2009 +0100
    60.2 +++ b/test/tools/javac/annotations/neg/Z12.java	Wed May 27 22:34:43 2009 -0700
    60.3 @@ -27,7 +27,7 @@
    60.4   * @summary implement "metadata" (attribute interfaces and program annotations)
    60.5   * @author gafter
    60.6   *
    60.7 - * @compile/fail -source 1.5 Z12.java
    60.8 + * @compile/fail Z12.java
    60.9   */
   60.10  
   60.11  enum Color { red, green, blue }

    61.1 --- a/test/tools/javac/annotations/neg/Z13.java	Thu May 21 10:56:36 2009 +0100
    61.2 +++ b/test/tools/javac/annotations/neg/Z13.java	Wed May 27 22:34:43 2009 -0700
    61.3 @@ -27,7 +27,7 @@
    61.4   * @summary implement "metadata" (attribute interfaces and program annotations)
    61.5   * @author gafter
    61.6   *
    61.7 - * @compile/fail -source 1.5 Z13.java
    61.8 + * @compile/fail Z13.java
    61.9   */
   61.10  
   61.11  @interface An {

    62.1 --- a/test/tools/javac/annotations/neg/Z14.java	Thu May 21 10:56:36 2009 +0100
    62.2 +++ b/test/tools/javac/annotations/neg/Z14.java	Wed May 27 22:34:43 2009 -0700
    62.3 @@ -27,7 +27,7 @@
    62.4   * @summary implement "metadata" (attribute interfaces and program annotations)
    62.5   * @author gafter
    62.6   *
    62.7 - * @compile/fail -source 1.5 Z14.java
    62.8 + * @compile/fail Z14.java
    62.9   */
   62.10  
   62.11  @interface An<T> {

    63.1 --- a/test/tools/javac/annotations/neg/Z15.java	Thu May 21 10:56:36 2009 +0100
    63.2 +++ b/test/tools/javac/annotations/neg/Z15.java	Wed May 27 22:34:43 2009 -0700
    63.3 @@ -27,7 +27,7 @@
    63.4   * @summary implement "metadata" (attribute interfaces and program annotations)
    63.5   * @author gafter
    63.6   *
    63.7 - * @compile/fail -source 1.5 Z15.java
    63.8 + * @compile/fail Z15.java
    63.9   */
   63.10  
   63.11  @interface An {

    64.1 --- a/test/tools/javac/annotations/neg/Z16.java	Thu May 21 10:56:36 2009 +0100
    64.2 +++ b/test/tools/javac/annotations/neg/Z16.java	Wed May 27 22:34:43 2009 -0700
    64.3 @@ -27,7 +27,7 @@
    64.4   * @summary implement "metadata" (attribute interfaces and program annotations)
    64.5   * @author gafter
    64.6   *
    64.7 - * @compile/fail -source 1.5 Z16.java
    64.8 + * @compile/fail Z16.java
    64.9   */
   64.10  
   64.11  enum Color { red, green, blue }

    65.1 --- a/test/tools/javac/annotations/neg/Z2.java	Thu May 21 10:56:36 2009 +0100
    65.2 +++ b/test/tools/javac/annotations/neg/Z2.java	Wed May 27 22:34:43 2009 -0700
    65.3 @@ -27,7 +27,7 @@
    65.4   * @summary implement "metadata" (attribute interfaces and program annotations)
    65.5   * @author gafter
    65.6   *
    65.7 - * @compile/fail -source 1.5 Z2.java
    65.8 + * @compile/fail Z2.java
    65.9   */
   65.10  
   65.11  enum Color { red, green, blue }

    66.1 --- a/test/tools/javac/annotations/neg/Z3.java	Thu May 21 10:56:36 2009 +0100
    66.2 +++ b/test/tools/javac/annotations/neg/Z3.java	Wed May 27 22:34:43 2009 -0700
    66.3 @@ -27,7 +27,7 @@
    66.4   * @summary implement "metadata" (attribute interfaces and program annotations)
    66.5   * @author gafter
    66.6   *
    66.7 - * @compile/fail -source 1.5 Z3.java
    66.8 + * @compile/fail Z3.java
    66.9   */
   66.10  
   66.11  enum Color { red, green, blue }

    67.1 --- a/test/tools/javac/annotations/neg/Z4.java	Thu May 21 10:56:36 2009 +0100
    67.2 +++ b/test/tools/javac/annotations/neg/Z4.java	Wed May 27 22:34:43 2009 -0700
    67.3 @@ -27,7 +27,7 @@
    67.4   * @summary implement "metadata" (attribute interfaces and program annotations)
    67.5   * @author gafter
    67.6   *
    67.7 - * @compile/fail -source 1.5 Z4.java
    67.8 + * @compile/fail Z4.java
    67.9   */
   67.10  
   67.11  enum Color { red, green, blue }

    68.1 --- a/test/tools/javac/annotations/neg/Z5.java	Thu May 21 10:56:36 2009 +0100
    68.2 +++ b/test/tools/javac/annotations/neg/Z5.java	Wed May 27 22:34:43 2009 -0700
    68.3 @@ -27,7 +27,7 @@
    68.4   * @summary implement "metadata" (attribute interfaces and program annotations)
    68.5   * @author gafter
    68.6   *
    68.7 - * @compile/fail -source 1.5 Z5.java
    68.8 + * @compile/fail Z5.java
    68.9   */
   68.10  
   68.11  interface Foo {}

    69.1 --- a/test/tools/javac/annotations/neg/Z8.java	Thu May 21 10:56:36 2009 +0100
    69.2 +++ b/test/tools/javac/annotations/neg/Z8.java	Wed May 27 22:34:43 2009 -0700
    69.3 @@ -27,7 +27,7 @@
    69.4   * @summary implement "metadata" (attribute interfaces and program annotations)
    69.5   * @author gafter
    69.6   *
    69.7 - * @compile/fail -source 1.5 Z8.java
    69.8 + * @compile/fail Z8.java
    69.9   */
   69.10  
   69.11  @interface An {

    70.1 --- a/test/tools/javac/annotations/neg/Z9.java	Thu May 21 10:56:36 2009 +0100
    70.2 +++ b/test/tools/javac/annotations/neg/Z9.java	Wed May 27 22:34:43 2009 -0700
    70.3 @@ -27,7 +27,7 @@
    70.4   * @summary implement "metadata" (attribute interfaces and program annotations)
    70.5   * @author gafter
    70.6   *
    70.7 - * @compile/fail -source 1.5 Z9.java
    70.8 + * @compile/fail Z9.java
    70.9   */
   70.10  
   70.11  @interface An {

    71.1 --- a/test/tools/javac/annotations/pos/AnnoteElideBraces.java	Thu May 21 10:56:36 2009 +0100
    71.2 +++ b/test/tools/javac/annotations/pos/AnnoteElideBraces.java	Wed May 27 22:34:43 2009 -0700
    71.3 @@ -27,7 +27,7 @@
    71.4   * @summary JSR175 (15): single element array annotation value
    71.5   * @author gafter
    71.6   *
    71.7 - * @compile -source 1.5 AnnoteElideBraces.java
    71.8 + * @compile AnnoteElideBraces.java
    71.9   */
   71.10  
   71.11  @interface D {

    72.1 --- a/test/tools/javac/annotations/pos/ClassA.java	Thu May 21 10:56:36 2009 +0100
    72.2 +++ b/test/tools/javac/annotations/pos/ClassA.java	Wed May 27 22:34:43 2009 -0700
    72.3 @@ -27,8 +27,8 @@
    72.4   * @summary javac crash loading class files containing Class-valued annotation fields
    72.5   * @author gafter
    72.6   *
    72.7 - * @compile -source 1.5 ClassA.java ClassB.java
    72.8 - * @compile -source 1.5 ClassB.java
    72.9 + * @compile ClassA.java ClassB.java
   72.10 + * @compile ClassB.java
   72.11   */
   72.12  
   72.13  @interface ClassA {

    73.1 --- a/test/tools/javac/annotations/pos/Dep.java	Thu May 21 10:56:36 2009 +0100
    73.2 +++ b/test/tools/javac/annotations/pos/Dep.java	Wed May 27 22:34:43 2009 -0700
    73.3 @@ -27,7 +27,7 @@
    73.4   * @summary Please add annotation <at>Deprecated to supplant the javadoc tag
    73.5   * @author gafter
    73.6   *
    73.7 - * @compile -source 1.5 -Xlint:dep-ann -Werror Dep.java
    73.8 + * @compile -Xlint:dep-ann -Werror Dep.java
    73.9   */
   73.10  
   73.11  /** @deprecated */

    74.1 --- a/test/tools/javac/annotations/pos/Enum1.java	Thu May 21 10:56:36 2009 +0100
    74.2 +++ b/test/tools/javac/annotations/pos/Enum1.java	Wed May 27 22:34:43 2009 -0700
    74.3 @@ -27,7 +27,7 @@
    74.4   * @summary JSR175: annotations on enum constant
    74.5   * @author gafter
    74.6   *
    74.7 - * @compile -source 1.5 Enum1.java
    74.8 + * @compile Enum1.java
    74.9   */
   74.10  
   74.11  package annotation.enums;

    75.1 --- a/test/tools/javac/annotations/pos/Local.java	Thu May 21 10:56:36 2009 +0100
    75.2 +++ b/test/tools/javac/annotations/pos/Local.java	Wed May 27 22:34:43 2009 -0700
    75.3 @@ -27,7 +27,7 @@
    75.4   * @summary local variable annotations
    75.5   * @author gafter
    75.6   *
    75.7 - * @compile -source 1.5 Local.java
    75.8 + * @compile Local.java
    75.9   */
   75.10  
   75.11  class Local {

    76.1 --- a/test/tools/javac/annotations/pos/Members.java	Thu May 21 10:56:36 2009 +0100
    76.2 +++ b/test/tools/javac/annotations/pos/Members.java	Wed May 27 22:34:43 2009 -0700
    76.3 @@ -27,7 +27,7 @@
    76.4   * @summary annotation types may contain constants, types
    76.5   * @author gafter
    76.6   *
    76.7 - * @compile -source 1.5 Members.java
    76.8 + * @compile Members.java
    76.9   */
   76.10  
   76.11  package members;

    77.1 --- a/test/tools/javac/annotations/pos/NType.java	Thu May 21 10:56:36 2009 +0100
    77.2 +++ b/test/tools/javac/annotations/pos/NType.java	Wed May 27 22:34:43 2009 -0700
    77.3 @@ -27,7 +27,7 @@
    77.4   * @summary compiler crash if annotation using an enum type defined inside the annotation
    77.5   * @author gafter
    77.6   *
    77.7 - * @compile -source 1.5 NType.java
    77.8 + * @compile NType.java
    77.9   */
   77.10  
   77.11  package ntype;

    78.1 --- a/test/tools/javac/annotations/pos/OverrideCheck.java	Thu May 21 10:56:36 2009 +0100
    78.2 +++ b/test/tools/javac/annotations/pos/OverrideCheck.java	Wed May 27 22:34:43 2009 -0700
    78.3 @@ -27,7 +27,7 @@
    78.4   * @summary crash in annotation class file reader
    78.5   * @author gafter
    78.6   *
    78.7 - * @compile -source 1.5 OverrideCheck.java
    78.8 + * @compile OverrideCheck.java
    78.9   */
   78.10  
   78.11  class OverrideCheck {

    79.1 --- a/test/tools/javac/annotations/pos/OverrideOK.java	Thu May 21 10:56:36 2009 +0100
    79.2 +++ b/test/tools/javac/annotations/pos/OverrideOK.java	Wed May 27 22:34:43 2009 -0700
    79.3 @@ -27,7 +27,7 @@
    79.4   * @summary JSR175 (7): implement <at>Overrides
    79.5   * @author gafter
    79.6   *
    79.7 - * @compile -source 1.5 OverrideOK.java
    79.8 + * @compile OverrideOK.java
    79.9   */
   79.10  
   79.11  package overrideOK;

    80.1 --- a/test/tools/javac/annotations/pos/Parameter.java	Thu May 21 10:56:36 2009 +0100
    80.2 +++ b/test/tools/javac/annotations/pos/Parameter.java	Wed May 27 22:34:43 2009 -0700
    80.3 @@ -27,7 +27,7 @@
    80.4   * @summary JSR175: Parameter annotations
    80.5   * @author gafter
    80.6   *
    80.7 - * @compile -source 1.5 Parameter.java
    80.8 + * @compile Parameter.java
    80.9   */
   80.10  
   80.11  package annotation.parameter;

    81.1 --- a/test/tools/javac/annotations/pos/Primitives.java	Thu May 21 10:56:36 2009 +0100
    81.2 +++ b/test/tools/javac/annotations/pos/Primitives.java	Wed May 27 22:34:43 2009 -0700
    81.3 @@ -26,9 +26,6 @@
    81.4   * @bug 5034991 5040842 5040853
    81.5   * @summary Modify class-file representation of Class-valued annotation elements
    81.6   * @author gafter
    81.7 - *
    81.8 - * @compile -source 1.5 Primitives.java
    81.9 - * @run main Primitives
   81.10   */
   81.11  
   81.12  public class Primitives {

    82.1 --- a/test/tools/javac/annotations/pos/RightTarget.java	Thu May 21 10:56:36 2009 +0100
    82.2 +++ b/test/tools/javac/annotations/pos/RightTarget.java	Wed May 27 22:34:43 2009 -0700
    82.3 @@ -27,7 +27,7 @@
    82.4   * @summary java.lang.annotation.Target
    82.5   * @author gafter
    82.6   *
    82.7 - * @compile -source 1.5 RightTarget.java
    82.8 + * @compile RightTarget.java
    82.9   */
   82.10  
   82.11  import java.lang.annotation.ElementType;

    83.1 --- a/test/tools/javac/annotations/pos/Z1.java	Thu May 21 10:56:36 2009 +0100
    83.2 +++ b/test/tools/javac/annotations/pos/Z1.java	Wed May 27 22:34:43 2009 -0700
    83.3 @@ -27,7 +27,7 @@
    83.4   * @summary implement "metadata" (attribute interfaces and program annotations)
    83.5   * @author gafter
    83.6   *
    83.7 - * @compile -source 1.5 Z1.java
    83.8 + * @compile Z1.java
    83.9   */
   83.10  
   83.11  enum Color { red, green, blue }

    84.1 --- a/test/tools/javac/annotations/pos/Z2.java	Thu May 21 10:56:36 2009 +0100
    84.2 +++ b/test/tools/javac/annotations/pos/Z2.java	Wed May 27 22:34:43 2009 -0700
    84.3 @@ -27,7 +27,7 @@
    84.4   * @summary implement "metadata" (attribute interfaces and program annotations)
    84.5   * @author gafter
    84.6   *
    84.7 - * @compile -source 1.5 Z2.java
    84.8 + * @compile Z2.java
    84.9   */
   84.10  
   84.11  enum Color { red, green, blue }

    85.1 --- a/test/tools/javac/annotations/pos/Z3.java	Thu May 21 10:56:36 2009 +0100
    85.2 +++ b/test/tools/javac/annotations/pos/Z3.java	Wed May 27 22:34:43 2009 -0700
    85.3 @@ -27,7 +27,7 @@
    85.4   * @summary implement "metadata" (attribute interfaces and program annotations)
    85.5   * @author gafter
    85.6   *
    85.7 - * @compile -source 1.5 Z3.java
    85.8 + * @compile Z3.java
    85.9   */
   85.10  
   85.11  enum Color { red, green, blue }

    86.1 --- a/test/tools/javac/annotations/pos/Z4.java	Thu May 21 10:56:36 2009 +0100
    86.2 +++ b/test/tools/javac/annotations/pos/Z4.java	Wed May 27 22:34:43 2009 -0700
    86.3 @@ -27,7 +27,7 @@
    86.4   * @summary implement "metadata" (attribute interfaces and program annotations)
    86.5   * @author gafter
    86.6   *
    86.7 - * @compile -source 1.5 Z4.java
    86.8 + * @compile Z4.java
    86.9   */
   86.10  
   86.11  @interface An {

    87.1 --- a/test/tools/javac/annotations/pos/package-info.java	Thu May 21 10:56:36 2009 +0100
    87.2 +++ b/test/tools/javac/annotations/pos/package-info.java	Wed May 27 22:34:43 2009 -0700
    87.3 @@ -27,7 +27,7 @@
    87.4   * @summary Package annotations
    87.5   * @author gafter
    87.6   *
    87.7 - * @compile -source 1.5 package-info.java
    87.8 + * @compile package-info.java
    87.9   */
   87.10  
   87.11  @java.lang.annotation.Documented

    88.1 --- a/test/tools/javac/assert/Attach.java	Thu May 21 10:56:36 2009 +0100
    88.2 +++ b/test/tools/javac/assert/Attach.java	Wed May 27 22:34:43 2009 -0700
    88.3 @@ -26,9 +26,6 @@
    88.4   * @bug 4478095
    88.5   * @summary assertion flag attached to wrong class
    88.6   * @author gafter
    88.7 - *
    88.8 - * @compile -source 1.4 Attach.java
    88.9 - * @run main Attach
   88.10   */
   88.11  
   88.12  public class Attach {

    89.1 --- a/test/tools/javac/assert/DU1.java	Thu May 21 10:56:36 2009 +0100
    89.2 +++ b/test/tools/javac/assert/DU1.java	Wed May 27 22:34:43 2009 -0700
    89.3 @@ -27,7 +27,7 @@
    89.4   * @summary Check correct DU computation for assertions.
    89.5   * @author gafter
    89.6   *
    89.7 - * @compile/fail -source 1.4 DU1.java
    89.8 + * @compile/fail DU1.java
    89.9   */
   89.10  
   89.11  class DU1 {

    90.1 --- a/test/tools/javac/assert/DU2.java	Thu May 21 10:56:36 2009 +0100
    90.2 +++ b/test/tools/javac/assert/DU2.java	Wed May 27 22:34:43 2009 -0700
    90.3 @@ -27,7 +27,7 @@
    90.4   * @summary Check correct DU computation for assertions.
    90.5   * @author gafter
    90.6   *
    90.7 - * @compile/fail -source 1.4 DU2.java
    90.8 + * @compile/fail DU2.java
    90.9   */
   90.10  
   90.11  class DU2 {

    91.1 --- a/test/tools/javac/assert/Position.java	Thu May 21 10:56:36 2009 +0100
    91.2 +++ b/test/tools/javac/assert/Position.java	Wed May 27 22:34:43 2009 -0700
    91.3 @@ -3,17 +3,17 @@
    91.4   * @bug 4469737
    91.5   * @summary Verify the source position for assertions.
    91.6   * @author gafter
    91.7 - *
    91.8 - * @compile -source 1.4 Position.java
    91.9 - * @run main Position
   91.10   */
   91.11  
   91.12 +
   91.13  public class Position {
   91.14      static public void main(String[] args) {
   91.15          Position.class.getClassLoader().setClassAssertionStatus("U", true);
   91.16          new U().main();
   91.17      }
   91.18  }
   91.19 +
   91.20 +
   91.21  class U {
   91.22      void main() {
   91.23          try {

    92.1 --- a/test/tools/javac/boxing/BoxedForeach.java	Thu May 21 10:56:36 2009 +0100
    92.2 +++ b/test/tools/javac/boxing/BoxedForeach.java	Wed May 27 22:34:43 2009 -0700
    92.3 @@ -27,7 +27,7 @@
    92.4   * @summary boxing/unboxing versus foreach crashes javac
    92.5   * @author gafter
    92.6   *
    92.7 - * @compile -source 1.5 BoxedForeach.java
    92.8 + * @compile BoxedForeach.java
    92.9   * @run main BoxedForeach
   92.10   */
   92.11  

    93.1 --- a/test/tools/javac/boxing/Boxing1.java	Thu May 21 10:56:36 2009 +0100
    93.2 +++ b/test/tools/javac/boxing/Boxing1.java	Wed May 27 22:34:43 2009 -0700
    93.3 @@ -26,9 +26,6 @@
    93.4   * @bug 4869233 4872709 4868735 4921949 4921209 4965701 4934916 4975565 4974939
    93.5   * @summary Boxing/unboxing positive unit and regression tests
    93.6   * @author gafter
    93.7 - *
    93.8 - * @compile -source 1.5 Boxing1.java
    93.9 - * @run main Boxing1
   93.10   */
   93.11  
   93.12  public class Boxing1 {

    94.1 --- a/test/tools/javac/boxing/Boxing2.java	Thu May 21 10:56:36 2009 +0100
    94.2 +++ b/test/tools/javac/boxing/Boxing2.java	Wed May 27 22:34:43 2009 -0700
    94.3 @@ -27,7 +27,7 @@
    94.4   * @summary Boxing/unboxing negative unit and regression tests
    94.5   * @author gafter
    94.6   *
    94.7 - * @compile/fail -source 1.5 Boxing2.java
    94.8 + * @compile/fail Boxing2.java
    94.9   */
   94.10  
   94.11  public class Boxing2 {

    95.1 --- a/test/tools/javac/boxing/Boxing4.java	Thu May 21 10:56:36 2009 +0100
    95.2 +++ b/test/tools/javac/boxing/Boxing4.java	Wed May 27 22:34:43 2009 -0700
    95.3 @@ -26,9 +26,6 @@
    95.4   * @bug 4999689
    95.5   * @summary Compiler incorrectly create Integer in "Character c = 95"
    95.6   * @author gafter
    95.7 - *
    95.8 - * @compile -source 1.5 Boxing4.java
    95.9 - * @run main Boxing4
   95.10   */
   95.11  
   95.12  public class Boxing4 {

    96.1 --- a/test/tools/javac/boxing/BoxingCaching.java	Thu May 21 10:56:36 2009 +0100
    96.2 +++ b/test/tools/javac/boxing/BoxingCaching.java	Wed May 27 22:34:43 2009 -0700
    96.3 @@ -26,9 +26,6 @@
    96.4   * @bug 4990346
    96.5   * @summary Verify autoboxed values are cached as required.
    96.6   * @author Joseph D. Darcy
    96.7 - *
    96.8 - * @compile -source 1.5 BoxingCaching.java
    96.9 - * @run main BoxingCaching
   96.10   */
   96.11  
   96.12  public class BoxingCaching {

    97.1 --- a/test/tools/javac/capture/Capture1.java	Thu May 21 10:56:36 2009 +0100
    97.2 +++ b/test/tools/javac/capture/Capture1.java	Wed May 27 22:34:43 2009 -0700
    97.3 @@ -27,7 +27,7 @@
    97.4   * @summary wildcard capture (snapshotting)
    97.5   * @author gafter
    97.6   *
    97.7 - * @compile -Xlint:unchecked -Werror -source 1.5 Capture1.java
    97.8 + * @compile -Xlint:unchecked -Werror Capture1.java
    97.9   */
   97.10  
   97.11  package capture1;

    98.1 --- a/test/tools/javac/capture/Capture2.java	Thu May 21 10:56:36 2009 +0100
    98.2 +++ b/test/tools/javac/capture/Capture2.java	Wed May 27 22:34:43 2009 -0700
    98.3 @@ -27,7 +27,7 @@
    98.4   * @summary soundness problem with failure to subsitute wildcard as type formal argument
    98.5   * @author gafter
    98.6   *
    98.7 - * @compile/fail -source 1.5 Capture2.java
    98.8 + * @compile/fail Capture2.java
    98.9   */
   98.10  
   98.11  package capture2;

    99.1 --- a/test/tools/javac/capture/Capture3.java	Thu May 21 10:56:36 2009 +0100
    99.2 +++ b/test/tools/javac/capture/Capture3.java	Wed May 27 22:34:43 2009 -0700
    99.3 @@ -27,7 +27,7 @@
    99.4   * @summary new wildcard subst scheme breaks java.lang.ref
    99.5   * @author gafter
    99.6   *
    99.7 - * @compile -source 1.5 Capture3.java
    99.8 + * @compile Capture3.java
    99.9   */
   99.10  
   99.11  package capture3;

   100.1 --- a/test/tools/javac/capture/Capture5.java	Thu May 21 10:56:36 2009 +0100
   100.2 +++ b/test/tools/javac/capture/Capture5.java	Wed May 27 22:34:43 2009 -0700
   100.3 @@ -27,7 +27,7 @@
   100.4   * @summary wildcards versus recursive F-bounds
   100.5   * @author Peter von der Ahe
   100.6   *
   100.7 - * @compile -source 1.5 Capture5.java
   100.8 + * @compile Capture5.java
   100.9   */
  100.10  
  100.11  package capture5;

   101.1 --- a/test/tools/javac/cast/BoxedArray.java	Thu May 21 10:56:36 2009 +0100
   101.2 +++ b/test/tools/javac/cast/BoxedArray.java	Wed May 27 22:34:43 2009 -0700
   101.3 @@ -27,7 +27,7 @@
   101.4   * @summary REGRESSION: compiler allows cast from Integer[] to int[]
   101.5   * @author gafter
   101.6   *
   101.7 - * @compile/fail -source 1.5 BoxedArray.java
   101.8 + * @compile/fail BoxedArray.java
   101.9   */
  101.10  
  101.11  public class BoxedArray {

   102.1 --- a/test/tools/javac/enum/AbstractEmptyEnum.java	Thu May 21 10:56:36 2009 +0100
   102.2 +++ b/test/tools/javac/enum/AbstractEmptyEnum.java	Wed May 27 22:34:43 2009 -0700
   102.3 @@ -27,7 +27,7 @@
   102.4   * @summary empty enum cannot be abstract
   102.5   * @author Joseph D. Darcy
   102.6   *
   102.7 - * @compile/fail -source 1.5 AbstractEmptyEnum.java
   102.8 + * @compile/fail AbstractEmptyEnum.java
   102.9   */
  102.10  
  102.11  public enum AbstractEmptyEnum {

   103.1 --- a/test/tools/javac/enum/AbstractEnum1.java	Thu May 21 10:56:36 2009 +0100
   103.2 +++ b/test/tools/javac/enum/AbstractEnum1.java	Wed May 27 22:34:43 2009 -0700
   103.3 @@ -26,9 +26,6 @@
   103.4   * @bug 5054976
   103.5   * @summary compiler fails to flag an enum abstract
   103.6   * @author gafter
   103.7 - *
   103.8 - * @compile -source 1.5 AbstractEnum1.java
   103.9 - * @run main AbstractEnum1
  103.10   */
  103.11  
  103.12  import java.lang.reflect.Modifier;

   104.1 --- a/test/tools/javac/enum/DA1.java	Thu May 21 10:56:36 2009 +0100
   104.2 +++ b/test/tools/javac/enum/DA1.java	Wed May 27 22:34:43 2009 -0700
   104.3 @@ -27,7 +27,7 @@
   104.4   * @summary One can refer static, const static variables from instance initializers of enum
   104.5   * @author gafter
   104.6   *
   104.7 - * @compile/fail -source 1.5 DA1.java
   104.8 + * @compile/fail DA1.java
   104.9   */
  104.10  
  104.11  package da1;

   105.1 --- a/test/tools/javac/enum/DA2.java	Thu May 21 10:56:36 2009 +0100
   105.2 +++ b/test/tools/javac/enum/DA2.java	Wed May 27 22:34:43 2009 -0700
   105.3 @@ -27,7 +27,7 @@
   105.4   * @summary One can refer static, const static variables from instance initializers of enum
   105.5   * @author gafter
   105.6   *
   105.7 - * @compile/fail -source 1.5 DA2.java
   105.8 + * @compile/fail DA2.java
   105.9   */
  105.10  
  105.11  package da2;

   106.1 --- a/test/tools/javac/enum/DA3.java	Thu May 21 10:56:36 2009 +0100
   106.2 +++ b/test/tools/javac/enum/DA3.java	Wed May 27 22:34:43 2009 -0700
   106.3 @@ -27,7 +27,7 @@
   106.4   * @summary One can refer static, const static variables from instance initializers of enum
   106.5   * @author gafter
   106.6   *
   106.7 - * @compile/fail -source 1.5 DA3.java
   106.8 + * @compile/fail DA3.java
   106.9   */
  106.10  
  106.11  package da3;

   107.1 --- a/test/tools/javac/enum/Def.java	Thu May 21 10:56:36 2009 +0100
   107.2 +++ b/test/tools/javac/enum/Def.java	Wed May 27 22:34:43 2009 -0700
   107.3 @@ -27,7 +27,7 @@
   107.4   * @summary constant static fields cannot be referenced from const, instance initializers
   107.5   * @author gafter
   107.6   *
   107.7 - * @compile -source 1.5 Def.java
   107.8 + * @compile Def.java
   107.9   */
  107.10  
  107.11  package _enum.def;

   108.1 --- a/test/tools/javac/enum/Enum1.java	Thu May 21 10:56:36 2009 +0100
   108.2 +++ b/test/tools/javac/enum/Enum1.java	Wed May 27 22:34:43 2009 -0700
   108.3 @@ -26,9 +26,6 @@
   108.4   * @bug 4945532
   108.5   * @summary enums: test output of values().toString()
   108.6   * @author gafter
   108.7 - *
   108.8 - * @compile -source 1.5 Enum1.java
   108.9 - * @run main Enum1
  108.10   */
  108.11  
  108.12  import java.util.*;

   109.1 --- a/test/tools/javac/enum/Enum2.java	Thu May 21 10:56:36 2009 +0100
   109.2 +++ b/test/tools/javac/enum/Enum2.java	Wed May 27 22:34:43 2009 -0700
   109.3 @@ -26,7 +26,7 @@
   109.4   * @summary enums: an enumeration type may not be extended
   109.5   * @author gafter
   109.6   *
   109.7 - * @compile/fail -source 1.5 Enum2.java
   109.8 + * @compile/fail Enum2.java
   109.9   */
  109.10  
  109.11  public class Enum2 {

   110.1 --- a/test/tools/javac/enum/Enum3.java	Thu May 21 10:56:36 2009 +0100
   110.2 +++ b/test/tools/javac/enum/Enum3.java	Wed May 27 22:34:43 2009 -0700
   110.3 @@ -26,9 +26,6 @@
   110.4   * @bug 4945532
   110.5   * @summary enums: test switch
   110.6   * @author gafter
   110.7 - *
   110.8 - * @compile -source 1.5 Enum3.java
   110.9 - * @run main Enum3
  110.10   */
  110.11  
  110.12  public enum Enum3 {

   111.1 --- a/test/tools/javac/enum/EnumImplicitPrivateConstructor.java	Thu May 21 10:56:36 2009 +0100
   111.2 +++ b/test/tools/javac/enum/EnumImplicitPrivateConstructor.java	Wed May 27 22:34:43 2009 -0700
   111.3 @@ -26,9 +26,6 @@
   111.4   * @bug 5009601 5010455 5005748
   111.5   * @summary enum constructors can be declared private
   111.6   * @author Joseph D. Darcy
   111.7 - *
   111.8 - * @compile -source 1.5 EnumImplicitPrivateConstructor.java
   111.9 - * @run main EnumImplicitPrivateConstructor
  111.10   */
  111.11  
  111.12  import java.util.*;

   112.1 --- a/test/tools/javac/enum/EnumInit.java	Thu May 21 10:56:36 2009 +0100
   112.2 +++ b/test/tools/javac/enum/EnumInit.java	Wed May 27 22:34:43 2009 -0700
   112.3 @@ -27,7 +27,7 @@
   112.4   * @summary compiling annatations with nested enums issuing *.java leads to crash
   112.5   * @author gafter
   112.6   *
   112.7 - * @compile -source 1.5 EnumInit.java
   112.8 + * @compile EnumInit.java
   112.9   */
  112.10  
  112.11  package enum_init_;

   113.1 --- a/test/tools/javac/enum/EnumPrivateConstructor.java	Thu May 21 10:56:36 2009 +0100
   113.2 +++ b/test/tools/javac/enum/EnumPrivateConstructor.java	Wed May 27 22:34:43 2009 -0700
   113.3 @@ -27,7 +27,7 @@
   113.4   * @summary enum constructors can be declared private
   113.5   * @author Joseph D. Darcy
   113.6   *
   113.7 - * @compile -source 1.5 EnumPrivateConstructor.java
   113.8 + * @compile EnumPrivateConstructor.java
   113.9   */
  113.10  
  113.11  enum EnumPrivateConstructor {

   114.1 --- a/test/tools/javac/enum/EnumProtectedConstructor.java	Thu May 21 10:56:36 2009 +0100
   114.2 +++ b/test/tools/javac/enum/EnumProtectedConstructor.java	Wed May 27 22:34:43 2009 -0700
   114.3 @@ -27,7 +27,7 @@
   114.4   * @summary enum constructors cannot be declared public or protected
   114.5   * @author Joseph D. Darcy
   114.6   *
   114.7 - * @compile/fail -source 1.5 EnumProtectedConstructor.java
   114.8 + * @compile/fail EnumProtectedConstructor.java
   114.9   */
  114.10  
  114.11  enum EnumProtectedConstructor {

   115.1 --- a/test/tools/javac/enum/EnumPublicConstructor.java	Thu May 21 10:56:36 2009 +0100
   115.2 +++ b/test/tools/javac/enum/EnumPublicConstructor.java	Wed May 27 22:34:43 2009 -0700
   115.3 @@ -27,7 +27,7 @@
   115.4   * @summary enum constructors cannot be declared public or protected
   115.5   * @author Joseph D. Darcy
   115.6   *
   115.7 - * @compile/fail -source 1.5 EnumPublicConstructor.java
   115.8 + * @compile/fail EnumPublicConstructor.java
   115.9   */
  115.10  
  115.11  enum EnumPublicConstructor {

   116.1 --- a/test/tools/javac/enum/EnumSwitch1.java	Thu May 21 10:56:36 2009 +0100
   116.2 +++ b/test/tools/javac/enum/EnumSwitch1.java	Wed May 27 22:34:43 2009 -0700
   116.3 @@ -27,7 +27,7 @@
   116.4   * @summary enum switch case labels required to be unqualified.
   116.5   * @author gafter
   116.6   *
   116.7 - * @compile -source 1.5 EnumSwitch1.java
   116.8 + * @compile EnumSwitch1.java
   116.9   */
  116.10  
  116.11  package enumswitch1;

   117.1 --- a/test/tools/javac/enum/EnumSwitch2.java	Thu May 21 10:56:36 2009 +0100
   117.2 +++ b/test/tools/javac/enum/EnumSwitch2.java	Wed May 27 22:34:43 2009 -0700
   117.3 @@ -27,7 +27,7 @@
   117.4   * @summary enum switch case labels required to be unqualified.
   117.5   * @author gafter
   117.6   *
   117.7 - * @compile/fail -source 1.5 EnumSwitch2.java
   117.8 + * @compile/fail EnumSwitch2.java
   117.9   */
  117.10  
  117.11  package enumswitch2;

   118.1 --- a/test/tools/javac/enum/EnumSwitch3.java	Thu May 21 10:56:36 2009 +0100
   118.2 +++ b/test/tools/javac/enum/EnumSwitch3.java	Wed May 27 22:34:43 2009 -0700
   118.3 @@ -27,7 +27,7 @@
   118.4   * @summary javac crash when enum defined after use
   118.5   * @author gafter
   118.6   *
   118.7 - * @compile -source 1.5 EnumSwitch3.java
   118.8 + * @compile EnumSwitch3.java
   118.9   */
  118.10  
  118.11  package enumswitch3;

   119.1 --- a/test/tools/javac/enum/EnumSwitch4.java	Thu May 21 10:56:36 2009 +0100
   119.2 +++ b/test/tools/javac/enum/EnumSwitch4.java	Wed May 27 22:34:43 2009 -0700
   119.3 @@ -26,9 +26,6 @@
   119.4   * @bug 5006662
   119.5   * @summary enum switch on null fails to throw NullPointerException
   119.6   * @author gafter
   119.7 - *
   119.8 - * @compile -source 1.5 EnumSwitch4.java
   119.9 - * @run main EnumSwitch4
  119.10   */
  119.11  
  119.12  public enum EnumSwitch4 {

   120.1 --- a/test/tools/javac/enum/ExplicitlyAbstractEnum1.java	Thu May 21 10:56:36 2009 +0100
   120.2 +++ b/test/tools/javac/enum/ExplicitlyAbstractEnum1.java	Wed May 27 22:34:43 2009 -0700
   120.3 @@ -27,7 +27,7 @@
   120.4   * @summary enum's cannot be explicitly declared abstract
   120.5   * @author Joseph D. Darcy
   120.6   *
   120.7 - * @compile/fail -source 1.5 ExplicitlyAbstractEnum1.java
   120.8 + * @compile/fail ExplicitlyAbstractEnum1.java
   120.9   */
  120.10  
  120.11  abstract enum ExplicitlyAbstractEnum1 {

   121.1 --- a/test/tools/javac/enum/ExplicitlyAbstractEnum2.java	Thu May 21 10:56:36 2009 +0100
   121.2 +++ b/test/tools/javac/enum/ExplicitlyAbstractEnum2.java	Wed May 27 22:34:43 2009 -0700
   121.3 @@ -27,7 +27,7 @@
   121.4   * @summary enum's cannot be explicitly declared abstract even if they are abstract
   121.5   * @author Joseph D. Darcy
   121.6   *
   121.7 - * @compile/fail -source 1.5 ExplicitlyAbstractEnum2.java
   121.8 + * @compile/fail ExplicitlyAbstractEnum2.java
   121.9   */
  121.10  
  121.11  abstract enum ExplicitlyAbstractEnum2 {

   122.1 --- a/test/tools/javac/enum/ExplicitlyFinalEnum1.java	Thu May 21 10:56:36 2009 +0100
   122.2 +++ b/test/tools/javac/enum/ExplicitlyFinalEnum1.java	Wed May 27 22:34:43 2009 -0700
   122.3 @@ -27,7 +27,7 @@
   122.4   * @summary enum's cannot be explicitly declared final even if they are
   122.5   * @author Joseph D. Darcy
   122.6   *
   122.7 - * @compile/fail -source 1.5 ExplicitlyFinalEnum1.java
   122.8 + * @compile/fail ExplicitlyFinalEnum1.java
   122.9   */
  122.10  
  122.11  final enum ExplicitlyFinalEnum1 {

   123.1 --- a/test/tools/javac/enum/ExplicitlyFinalEnum2.java	Thu May 21 10:56:36 2009 +0100
   123.2 +++ b/test/tools/javac/enum/ExplicitlyFinalEnum2.java	Wed May 27 22:34:43 2009 -0700
   123.3 @@ -27,7 +27,7 @@
   123.4   * @summary enum's cannot be explicitly declared final
   123.5   * @author Joseph D. Darcy
   123.6   *
   123.7 - * @compile/fail -source 1.5 ExplicitlyFinalEnum2.java
   123.8 + * @compile/fail ExplicitlyFinalEnum2.java
   123.9   */
  123.10  
  123.11  final enum ExplicitlyFinalEnum2 {

   124.1 --- a/test/tools/javac/enum/FauxEnum1.java	Thu May 21 10:56:36 2009 +0100
   124.2 +++ b/test/tools/javac/enum/FauxEnum1.java	Wed May 27 22:34:43 2009 -0700
   124.3 @@ -27,7 +27,7 @@
   124.4   * @summary verify java.lang.Enum can't be directly subclassed
   124.5   * @author Joseph D. Darcy
   124.6   *
   124.7 - * @compile/fail -source 1.5 FauxEnum1.java
   124.8 + * @compile/fail FauxEnum1.java
   124.9   */
  124.10  
  124.11  public class FauxEnum1 extends java.lang.Enum {

   125.1 --- a/test/tools/javac/enum/FauxEnum3.java	Thu May 21 10:56:36 2009 +0100
   125.2 +++ b/test/tools/javac/enum/FauxEnum3.java	Wed May 27 22:34:43 2009 -0700
   125.3 @@ -27,7 +27,7 @@
   125.4   * @summary verify an enum type can't be directly subclassed
   125.5   * @author Joseph D. Darcy
   125.6   *
   125.7 - * @compile/fail -source 1.5 FauxEnum3.java
   125.8 + * @compile/fail FauxEnum3.java
   125.9   */
  125.10  
  125.11  public class FauxEnum3 extends SpecializedEnum {

   126.1 --- a/test/tools/javac/enum/FauxSpecialEnum1.java	Thu May 21 10:56:36 2009 +0100
   126.2 +++ b/test/tools/javac/enum/FauxSpecialEnum1.java	Wed May 27 22:34:43 2009 -0700
   126.3 @@ -27,7 +27,7 @@
   126.4   * @summary verify specialized enum classes can't be abstract
   126.5   * @author Joseph D. Darcy
   126.6   *
   126.7 - * @compile/fail -source 1.5 FauxSpecialEnum1.java
   126.8 + * @compile/fail FauxSpecialEnum1.java
   126.9   */
  126.10  
  126.11  public enum FauxSpecialEnum1 {

   127.1 --- a/test/tools/javac/enum/FauxSpecialEnum2.java	Thu May 21 10:56:36 2009 +0100
   127.2 +++ b/test/tools/javac/enum/FauxSpecialEnum2.java	Wed May 27 22:34:43 2009 -0700
   127.3 @@ -27,7 +27,7 @@
   127.4   * @summary verify specialized enum classes can't be abstract
   127.5   * @author Joseph D. Darcy
   127.6   *
   127.7 - * @compile/fail -source 1.5 FauxSpecialEnum2.java
   127.8 + * @compile/fail FauxSpecialEnum2.java
   127.9   */
  127.10  
  127.11  public enum FauxSpecialEnum2 {

   128.1 --- a/test/tools/javac/enum/LocalEnum.java	Thu May 21 10:56:36 2009 +0100
   128.2 +++ b/test/tools/javac/enum/LocalEnum.java	Wed May 27 22:34:43 2009 -0700
   128.3 @@ -27,7 +27,7 @@
   128.4   * @summary javac fails to reject local enums
   128.5   * @author gafter
   128.6   *
   128.7 - * @compile/fail -source 1.5 LocalEnum.java
   128.8 + * @compile/fail LocalEnum.java
   128.9   */
  128.10  
  128.11  public class LocalEnum {

   129.1 --- a/test/tools/javac/enum/NoFinal.java	Thu May 21 10:56:36 2009 +0100
   129.2 +++ b/test/tools/javac/enum/NoFinal.java	Wed May 27 22:34:43 2009 -0700
   129.3 @@ -26,7 +26,7 @@
   129.4   * @bug 5097250 5087624
   129.5   * @summary Finalize methods on enums must be compile time error
   129.6   * @author Peter von der Ah\u00e9
   129.7 - * @compile/fail -source 5 NoFinal.java
   129.8 + * @compile/fail NoFinal.java
   129.9   */
  129.10  
  129.11  enum NoFinal {

   130.1 --- a/test/tools/javac/enum/NoFinal2.java	Thu May 21 10:56:36 2009 +0100
   130.2 +++ b/test/tools/javac/enum/NoFinal2.java	Wed May 27 22:34:43 2009 -0700
   130.3 @@ -26,7 +26,7 @@
   130.4   * @bug 5097250 5087624
   130.5   * @summary Finalize methods on enums must be compile time error
   130.6   * @author Peter von der Ah\u00e9
   130.7 - * @compile/fail -source 5 NoFinal2.java
   130.8 + * @compile/fail NoFinal2.java
   130.9   */
  130.10  
  130.11  enum NoFinal2 {

   131.1 --- a/test/tools/javac/enum/NoFinal3.java	Thu May 21 10:56:36 2009 +0100
   131.2 +++ b/test/tools/javac/enum/NoFinal3.java	Wed May 27 22:34:43 2009 -0700
   131.3 @@ -26,7 +26,7 @@
   131.4   * @bug 5097250 5087624
   131.5   * @summary Finalize methods on enums must be compile time error
   131.6   * @author Peter von der Ah\u00e9
   131.7 - * @compile/fail -source 5 NoFinal3.java
   131.8 + * @compile/fail NoFinal3.java
   131.9   */
  131.10  
  131.11  enum NoFinal3 {

   132.1 --- a/test/tools/javac/enum/NoFinal4.java	Thu May 21 10:56:36 2009 +0100
   132.2 +++ b/test/tools/javac/enum/NoFinal4.java	Wed May 27 22:34:43 2009 -0700
   132.3 @@ -26,7 +26,7 @@
   132.4   * @bug 5097250 5087624
   132.5   * @summary Finalize methods on enums must be compile time error
   132.6   * @author Peter von der Ah\u00e9
   132.7 - * @compile/fail -source 5 NoFinal4.java
   132.8 + * @compile/fail NoFinal4.java
   132.9   */
  132.10  
  132.11  enum NoFinal4 {

   133.1 --- a/test/tools/javac/enum/NoFinal5.java	Thu May 21 10:56:36 2009 +0100
   133.2 +++ b/test/tools/javac/enum/NoFinal5.java	Wed May 27 22:34:43 2009 -0700
   133.3 @@ -26,7 +26,7 @@
   133.4   * @bug 5097250 5087624
   133.5   * @summary Finalize methods on enums must be compile time error
   133.6   * @author Peter von der Ah\u00e9
   133.7 - * @compile/fail -source 5 NoFinal5.java
   133.8 + * @compile/fail NoFinal5.java
   133.9   */
  133.10  
  133.11  enum NoFinal5 {

   134.1 --- a/test/tools/javac/enum/OkFinal.java	Thu May 21 10:56:36 2009 +0100
   134.2 +++ b/test/tools/javac/enum/OkFinal.java	Wed May 27 22:34:43 2009 -0700
   134.3 @@ -26,8 +26,6 @@
   134.4   * @bug 5097250
   134.5   * @summary Finalize methods on enums must be compile time error
   134.6   * @author Peter von der Ah\u00e9
   134.7 - * @compile -source 5 OkFinal.java
   134.8 - * @run main OkFinal
   134.9   */
  134.10  
  134.11  public enum OkFinal {

   135.1 --- a/test/tools/javac/enum/SynthValues.java	Thu May 21 10:56:36 2009 +0100
   135.2 +++ b/test/tools/javac/enum/SynthValues.java	Wed May 27 22:34:43 2009 -0700
   135.3 @@ -26,9 +26,6 @@
   135.4   * @bug 4984627
   135.5   * @summary Enums: +VALUES field has no synthetic attribute
   135.6   * @author gafter
   135.7 - *
   135.8 - * @compile -source 1.5 SynthValues.java
   135.9 - * @run main SynthValues
  135.10   */
  135.11  
  135.12  public enum SynthValues {

   136.1 --- a/test/tools/javac/enum/T5075242.java	Thu May 21 10:56:36 2009 +0100
   136.2 +++ b/test/tools/javac/enum/T5075242.java	Wed May 27 22:34:43 2009 -0700
   136.3 @@ -27,7 +27,7 @@
   136.4   * @summary Cannot make compound type involving Enums
   136.5   * @author Peter von der Ah\u00e9
   136.6   *
   136.7 - * @compile -source 5 T5075242.java
   136.8 + * @compile T5075242.java
   136.9   */
  136.10  
  136.11  interface Iface {

   137.1 --- a/test/tools/javac/enum/T5081785.java	Thu May 21 10:56:36 2009 +0100
   137.2 +++ b/test/tools/javac/enum/T5081785.java	Wed May 27 22:34:43 2009 -0700
   137.3 @@ -28,10 +28,10 @@
   137.4   * @summary Empty Enums allowed in non-static contexts
   137.5   * @author Peter von der Ah\u00e9
   137.6   *
   137.7 - * @compile/fail -source 1.5 T5081785.java
   137.8 - * @compile/fail -source 1.5 T5081785a.java
   137.9 - * @compile/fail -source 1.5 T5081785b.java
  137.10 - * @compile/fail -source 1.5 T5081785c.java
  137.11 + * @compile/fail T5081785.java
  137.12 + * @compile/fail T5081785a.java
  137.13 + * @compile/fail T5081785b.java
  137.14 + * @compile/fail T5081785c.java
  137.15   */
  137.16  
  137.17  class A {

   138.1 --- a/test/tools/javac/enum/TrailingComma.java	Thu May 21 10:56:36 2009 +0100
   138.2 +++ b/test/tools/javac/enum/TrailingComma.java	Wed May 27 22:34:43 2009 -0700
   138.3 @@ -27,7 +27,7 @@
   138.4   * @summary enum spec allows trailing comma on enum constant list
   138.5   * @author gafter
   138.6   *
   138.7 - * @compile -source 1.5 TrailingComma.java
   138.8 + * @compile TrailingComma.java
   138.9   */
  138.10  
  138.11  class TrailingComma {

   139.1 --- a/test/tools/javac/enum/UserValue.java	Thu May 21 10:56:36 2009 +0100
   139.2 +++ b/test/tools/javac/enum/UserValue.java	Wed May 27 22:34:43 2009 -0700
   139.3 @@ -27,7 +27,7 @@
   139.4   * @summary compiler crash on user-defined valueOf in enum
   139.5   * @author gafter
   139.6   *
   139.7 - * @compile -source 1.5 UserValue.java
   139.8 + * @compile UserValue.java
   139.9   */
  139.10  
  139.11  public enum UserValue {

   140.1 --- a/test/tools/javac/enum/ValueOf.java	Thu May 21 10:56:36 2009 +0100
   140.2 +++ b/test/tools/javac/enum/ValueOf.java	Wed May 27 22:34:43 2009 -0700
   140.3 @@ -26,9 +26,6 @@
   140.4   * @bug 4872708 5058132
   140.5   * @summary Improper signature for valueOf
   140.6   * @author gafter
   140.7 - *
   140.8 - * @compile -source 1.5 ValueOf.java
   140.9 - * @run main ValueOf
  140.10   */
  140.11  
  140.12  public enum ValueOf {

   141.1 --- a/test/tools/javac/enum/enumSwitch/EnumSwitch.java	Thu May 21 10:56:36 2009 +0100
   141.2 +++ b/test/tools/javac/enum/enumSwitch/EnumSwitch.java	Wed May 27 22:34:43 2009 -0700
   141.3 @@ -27,8 +27,8 @@
   141.4   * @summary javac-generated code doesn't obey binary compatibility for enums
   141.5   * @author gafter
   141.6   *
   141.7 - * @compile -source 1.5 EnumSwitch.java
   141.8 - * @compile -source 1.5 Color2.java
   141.9 + * @compile EnumSwitch.java
  141.10 + * @compile Color2.java
  141.11   * @run main EnumSwitch
  141.12   */
  141.13  

   142.1 --- a/test/tools/javac/foreach/Foreach.java	Thu May 21 10:56:36 2009 +0100
   142.2 +++ b/test/tools/javac/foreach/Foreach.java	Wed May 27 22:34:43 2009 -0700
   142.3 @@ -26,9 +26,6 @@
   142.4   * @bug 4855355
   142.5   * @summary implement "foreach" loops as specified in JSR 201
   142.6   * @author gafter
   142.7 - *
   142.8 - * @compile -source 1.5 Foreach.java
   142.9 - * @run main Foreach
  142.10   */
  142.11  
  142.12  import java.util.Iterator;

   143.1 --- a/test/tools/javac/foreach/GenericIterator.java	Thu May 21 10:56:36 2009 +0100
   143.2 +++ b/test/tools/javac/foreach/GenericIterator.java	Wed May 27 22:34:43 2009 -0700
   143.3 @@ -27,7 +27,7 @@
   143.4   * @summary extended 'for' with generic collections causes the compiler to crash
   143.5   * @author gafter
   143.6   *
   143.7 - * @compile -source 1.5 GenericIterator.java
   143.8 + * @compile GenericIterator.java
   143.9   */
  143.10  
  143.11  import java.util.*;

   144.1 --- a/test/tools/javac/foreach/IntersectIterator.java	Thu May 21 10:56:36 2009 +0100
   144.2 +++ b/test/tools/javac/foreach/IntersectIterator.java	Wed May 27 22:34:43 2009 -0700
   144.3 @@ -26,9 +26,6 @@
   144.4   * @bug 5003207
   144.5   * @summary new "for" statement  fails to cast to second upper bound
   144.6   * @author gafter
   144.7 - *
   144.8 - * @compile -source 1.5 IntersectIterator.java
   144.9 - * @run main IntersectIterator
  144.10   */
  144.11  
  144.12  import java.util.*;

   145.1 --- a/test/tools/javac/foreach/ListOfListTest.java	Thu May 21 10:56:36 2009 +0100
   145.2 +++ b/test/tools/javac/foreach/ListOfListTest.java	Wed May 27 22:34:43 2009 -0700
   145.3 @@ -26,9 +26,6 @@
   145.4   * @bug 4915435
   145.5   * @summary NullPointerError in Resolve.findMethod() with foreach vs generics
   145.6   * @author gafter
   145.7 - *
   145.8 - * @compile -source 1.5 ListOfListTest.java
   145.9 - * @run main ListOfListTest
  145.10   */
  145.11  
  145.12  import java.util.List;

   146.1 --- a/test/tools/javac/foreach/SpecIterable.java	Thu May 21 10:56:36 2009 +0100
   146.2 +++ b/test/tools/javac/foreach/SpecIterable.java	Wed May 27 22:34:43 2009 -0700
   146.3 @@ -26,9 +26,6 @@
   146.4   * @bug 4911157
   146.5   * @summary Runtime error because of missing method in iterator
   146.6   * @author gafter
   146.7 - *
   146.8 - * @compile -source 1.5 SpecIterable.java
   146.9 - * @run main SpecIterable
  146.10   */
  146.11  
  146.12  import java.util.Iterator;

   147.1 --- a/test/tools/javac/foreach/StaticBlock.java	Thu May 21 10:56:36 2009 +0100
   147.2 +++ b/test/tools/javac/foreach/StaticBlock.java	Wed May 27 22:34:43 2009 -0700
   147.3 @@ -27,7 +27,7 @@
   147.4   * @summary compiler crash (NullPointerException) with foreach in static context
   147.5   * @author gafter
   147.6   *
   147.7 - * @compile -source 1.5 StaticBlock.java
   147.8 + * @compile StaticBlock.java
   147.9   */
  147.10  
  147.11  public class StaticBlock {

   148.1 --- a/test/tools/javac/foreach/SuperfluousAbstract.java	Thu May 21 10:56:36 2009 +0100
   148.2 +++ b/test/tools/javac/foreach/SuperfluousAbstract.java	Wed May 27 22:34:43 2009 -0700
   148.3 @@ -26,9 +26,6 @@
   148.4   * @bug 4912795
   148.5   * @summary AbstractMethodError throws if not redeclare abstract iterator() method
   148.6   * @author gafter
   148.7 - *
   148.8 - * @compile -source 1.5 SuperfluousAbstract.java
   148.9 - * @run main SuperfluousAbstract
  148.10   */
  148.11  
  148.12  import java.util.AbstractCollection;

   149.1 --- a/test/tools/javac/generics/ArrayClone.java	Thu May 21 10:56:36 2009 +0100
   149.2 +++ b/test/tools/javac/generics/ArrayClone.java	Wed May 27 22:34:43 2009 -0700
   149.3 @@ -27,7 +27,7 @@
   149.4   * @summary The clone method on arrays should be strongly typed
   149.5   * @author gafter
   149.6   *
   149.7 - * @compile -source 1.5 ArrayClone.java
   149.8 + * @compile  ArrayClone.java
   149.9   * @run main ArrayClone
  149.10   */
  149.11  

   150.1 --- a/test/tools/javac/generics/ArrayTypearg.java	Thu May 21 10:56:36 2009 +0100
   150.2 +++ b/test/tools/javac/generics/ArrayTypearg.java	Wed May 27 22:34:43 2009 -0700
   150.3 @@ -27,7 +27,7 @@
   150.4   * @summary generics: array as generic argument type fails
   150.5   * @author gafter
   150.6   *
   150.7 - * @compile -source 1.5 ArrayTypearg.java
   150.8 + * @compile  ArrayTypearg.java
   150.9   */
  150.10  
  150.11  import java.util.List;

   151.1 --- a/test/tools/javac/generics/BridgeClash.java	Thu May 21 10:56:36 2009 +0100
   151.2 +++ b/test/tools/javac/generics/BridgeClash.java	Wed May 27 22:34:43 2009 -0700
   151.3 @@ -27,7 +27,7 @@
   151.4   * @summary generics: incorrect erasure clash reported
   151.5   * @author gafter
   151.6   *
   151.7 - * @compile -source 1.5 BridgeClash.java
   151.8 + * @compile  BridgeClash.java
   151.9   */
  151.10  
  151.11  interface I<T> {

   152.1 --- a/test/tools/javac/generics/BridgeOrder.java	Thu May 21 10:56:36 2009 +0100
   152.2 +++ b/test/tools/javac/generics/BridgeOrder.java	Wed May 27 22:34:43 2009 -0700
   152.3 @@ -27,7 +27,7 @@
   152.4   * @summary generics: overridden method gets invoked (bridge method problem)
   152.5   * @author gafter
   152.6   *
   152.7 - * @compile -source 1.5 BridgeOrder.java
   152.8 + * @compile  BridgeOrder.java
   152.9   * @run main BridgeOrder
  152.10   */
  152.11  

   153.1 --- a/test/tools/javac/generics/CastCrash.java	Thu May 21 10:56:36 2009 +0100
   153.2 +++ b/test/tools/javac/generics/CastCrash.java	Wed May 27 22:34:43 2009 -0700
   153.3 @@ -27,7 +27,7 @@
   153.4   * @summary Crash on cast
   153.5   * @author gafter
   153.6   *
   153.7 - * @compile/fail -source 1.5 CastCrash.java
   153.8 + * @compile/fail  CastCrash.java
   153.9   */
  153.10  
  153.11  package cast.crash;

   154.1 --- a/test/tools/javac/generics/Casting.java	Thu May 21 10:56:36 2009 +0100
   154.2 +++ b/test/tools/javac/generics/Casting.java	Wed May 27 22:34:43 2009 -0700
   154.3 @@ -27,7 +27,7 @@
   154.4   * @summary generics problem with casting
   154.5   * @author gafter
   154.6   *
   154.7 - * @compile -source 1.5 Casting.java
   154.8 + * @compile  Casting.java
   154.9   */
  154.10  
  154.11  package test.tools.javac.generics.Casting;

   155.1 --- a/test/tools/javac/generics/Casting2.java	Thu May 21 10:56:36 2009 +0100
   155.2 +++ b/test/tools/javac/generics/Casting2.java	Wed May 27 22:34:43 2009 -0700
   155.3 @@ -27,7 +27,7 @@
   155.4   * @summary stack overflow error compiling EnumSet.java
   155.5   * @author gafter
   155.6   *
   155.7 - * @compile -source 1.5 Casting2.java
   155.8 + * @compile  Casting2.java
   155.9   */
  155.10  
  155.11  import java.util.*;

   156.1 --- a/test/tools/javac/generics/Casting3.java	Thu May 21 10:56:36 2009 +0100
   156.2 +++ b/test/tools/javac/generics/Casting3.java	Wed May 27 22:34:43 2009 -0700
   156.3 @@ -27,7 +27,7 @@
   156.4   * @summary compiler crash with stack overflow on unchecked cast
   156.5   * @author gafter
   156.6   *
   156.7 - * @compile -source 1.5 Casting3.java
   156.8 + * @compile  Casting3.java
   156.9   */
  156.10  
  156.11  package test.tools.javac.generics.Casting3;

   157.1 --- a/test/tools/javac/generics/Casting4.java	Thu May 21 10:56:36 2009 +0100
   157.2 +++ b/test/tools/javac/generics/Casting4.java	Wed May 27 22:34:43 2009 -0700
   157.3 @@ -27,7 +27,7 @@
   157.4   * @summary Cannot cast Comparable<?>s
   157.5   * @author gafter
   157.6   *
   157.7 - * @compile -Werror -Xlint:unchecked -source 1.5 Casting4.java
   157.8 + * @compile -Werror -Xlint:unchecked  Casting4.java
   157.9   */
  157.10  
  157.11  package test.tools.javac.generics.Casting4;

   158.1 --- a/test/tools/javac/generics/Conditional.java	Thu May 21 10:56:36 2009 +0100
   158.2 +++ b/test/tools/javac/generics/Conditional.java	Wed May 27 22:34:43 2009 -0700
   158.3 @@ -27,7 +27,7 @@
   158.4   * @summary Rule for semantics of ?: in the presence of generics and generic class Class
   158.5   * @author gafter
   158.6   *
   158.7 - * @compile -source 1.5 Conditional.java
   158.8 + * @compile  Conditional.java
   158.9   */
  158.10  
  158.11  package conditional;

   159.1 --- a/test/tools/javac/generics/Covar2.java	Thu May 21 10:56:36 2009 +0100
   159.2 +++ b/test/tools/javac/generics/Covar2.java	Wed May 27 22:34:43 2009 -0700
   159.3 @@ -27,7 +27,7 @@
   159.4   * @summary Additional unit tests for covariant returns
   159.5   * @author gafter
   159.6   *
   159.7 - * @compile -source 1.5 Covar2.java
   159.8 + * @compile  Covar2.java
   159.9   * @run main Covar2
  159.10   */
  159.11  

   160.1 --- a/test/tools/javac/generics/Covar3.java	Thu May 21 10:56:36 2009 +0100
   160.2 +++ b/test/tools/javac/generics/Covar3.java	Wed May 27 22:34:43 2009 -0700
   160.3 @@ -27,7 +27,7 @@
   160.4   * @summary missing ambiguity error
   160.5   * @author gafter
   160.6   *
   160.7 - * @compile/fail -source 1.5 Covar3.java
   160.8 + * @compile/fail  Covar3.java
   160.9   */
  160.10  
  160.11  package covar3;

   161.1 --- a/test/tools/javac/generics/Covar4.java	Thu May 21 10:56:36 2009 +0100
   161.2 +++ b/test/tools/javac/generics/Covar4.java	Wed May 27 22:34:43 2009 -0700
   161.3 @@ -27,7 +27,7 @@
   161.4   * @summary no covariant returns involving primitives
   161.5   * @author gafter
   161.6   *
   161.7 - * @compile/fail -source 1.5 Covar4.java
   161.8 + * @compile/fail  Covar4.java
   161.9   */
  161.10  
  161.11  public class Covar4 {

   162.1 --- a/test/tools/javac/generics/Crash01.java	Thu May 21 10:56:36 2009 +0100
   162.2 +++ b/test/tools/javac/generics/Crash01.java	Wed May 27 22:34:43 2009 -0700
   162.3 @@ -27,7 +27,7 @@
   162.4   * @summary generics: crash when using class in bound defined after usage
   162.5   * @author gafter
   162.6   *
   162.7 - * @compile -source 1.5 Crash01.java
   162.8 + * @compile  Crash01.java
   162.9   */
  162.10  
  162.11  public class Crash01<A extends TestClass1 & IA> {

   163.1 --- a/test/tools/javac/generics/Crash02.java	Thu May 21 10:56:36 2009 +0100
   163.2 +++ b/test/tools/javac/generics/Crash02.java	Wed May 27 22:34:43 2009 -0700
   163.3 @@ -27,7 +27,7 @@
   163.4   * @summary compiler crash in class writer
   163.5   * @author gafter
   163.6   *
   163.7 - * @compile -source 1.5 Crash02.java
   163.8 + * @compile  Crash02.java
   163.9   */
  163.10  
  163.11  import java.util.ArrayList;

   164.1 --- a/test/tools/javac/generics/CyclicInheritance3.java	Thu May 21 10:56:36 2009 +0100
   164.2 +++ b/test/tools/javac/generics/CyclicInheritance3.java	Wed May 27 22:34:43 2009 -0700
   164.3 @@ -26,7 +26,7 @@
   164.4   * @bug 4861743
   164.5   * @summary generics: incorrect cyclic inheritance error with type parameters
   164.6   *
   164.7 - * @compile -source 1.5 CyclicInheritance3.java
   164.8 + * @compile  CyclicInheritance3.java
   164.9   */
  164.10  
  164.11  class Cycle {

   165.1 --- a/test/tools/javac/generics/CyclicInheritance5.java	Thu May 21 10:56:36 2009 +0100
   165.2 +++ b/test/tools/javac/generics/CyclicInheritance5.java	Wed May 27 22:34:43 2009 -0700
   165.3 @@ -26,7 +26,7 @@
   165.4   * @bug 4862621
   165.5   * @summary generics: incorrect cyclic inheritance error
   165.6   *
   165.7 - * @compile -source 1.5 CyclicInheritance5.java
   165.8 + * @compile  CyclicInheritance5.java
   165.9   */
  165.10  
  165.11  class G<N extends G.Node<N>> {

   166.1 --- a/test/tools/javac/generics/ErasureClashCrash.java	Thu May 21 10:56:36 2009 +0100
   166.2 +++ b/test/tools/javac/generics/ErasureClashCrash.java	Wed May 27 22:34:43 2009 -0700
   166.3 @@ -27,7 +27,7 @@
   166.4   * @summary javac crash with improper overrider
   166.5   * @author gafter
   166.6   *
   166.7 - * @compile/fail -source 1.5 ErasureClashCrash.java
   166.8 + * @compile/fail  ErasureClashCrash.java
   166.9   */
  166.10  
  166.11  interface Compar<T> {

   167.1 --- a/test/tools/javac/generics/ExtendedRaw1.java	Thu May 21 10:56:36 2009 +0100
   167.2 +++ b/test/tools/javac/generics/ExtendedRaw1.java	Wed May 27 22:34:43 2009 -0700
   167.3 @@ -27,7 +27,7 @@
   167.4   * @summary generics: extension of raw not treated as raw.
   167.5   * @author gafter
   167.6   *
   167.7 - * @compile -source 1.5 ExtendedRaw1.java
   167.8 + * @compile  ExtendedRaw1.java
   167.9   */
  167.10  
  167.11  class Comparator<T> {}

   168.1 --- a/test/tools/javac/generics/ExtendedRaw2.java	Thu May 21 10:56:36 2009 +0100
   168.2 +++ b/test/tools/javac/generics/ExtendedRaw2.java	Wed May 27 22:34:43 2009 -0700
   168.3 @@ -27,7 +27,7 @@
   168.4   * @summary generics: extension of raw not treated as raw.
   168.5   * @author gafter
   168.6   *
   168.7 - * @compile -source 1.5 ExtendedRaw2.java
   168.8 + * @compile  ExtendedRaw2.java
   168.9   */
  168.10  
  168.11  // from library

   169.1 --- a/test/tools/javac/generics/ExtendedRaw3.java	Thu May 21 10:56:36 2009 +0100
   169.2 +++ b/test/tools/javac/generics/ExtendedRaw3.java	Wed May 27 22:34:43 2009 -0700
   169.3 @@ -27,7 +27,7 @@
   169.4   * @summary generics: bridge method not considered to fulfil interface in abstract class
   169.5   * @author gafter
   169.6   *
   169.7 - * @compile -source 1.5 ExtendedRaw3.java
   169.8 + * @compile  ExtendedRaw3.java
   169.9   */
  169.10  
  169.11  interface MyComparable<T extends MyComparable<T>> {

   170.1 --- a/test/tools/javac/generics/ExtendedRaw4.java	Thu May 21 10:56:36 2009 +0100
   170.2 +++ b/test/tools/javac/generics/ExtendedRaw4.java	Wed May 27 22:34:43 2009 -0700
   170.3 @@ -27,7 +27,7 @@
   170.4   * @summary REGRESSION: compatibility problem inheriting raw type
   170.5   * @author gafter
   170.6   *
   170.7 - * @compile -source 1.5 ExtendedRaw4.java
   170.8 + * @compile  ExtendedRaw4.java
   170.9   */
  170.10  
  170.11  class ExtendedRaw4 extends java.util.TreeSet {}

   171.1 --- a/test/tools/javac/generics/FinalBridge.java	Thu May 21 10:56:36 2009 +0100
   171.2 +++ b/test/tools/javac/generics/FinalBridge.java	Wed May 27 22:34:43 2009 -0700
   171.3 @@ -27,7 +27,7 @@
   171.4   * @summary generics: bridge for inherited final method can cause verify error
   171.5   * @author gafter
   171.6   *
   171.7 - * @compile -source 1.5 FinalBridge.java
   171.8 + * @compile  FinalBridge.java
   171.9   * @run main FinalBridge
  171.10   */
  171.11