6843761: Update langtools tests to remove unncessary -source and -target options
Reviewed-by: jjg
diff --git a/langtools/test/com/sun/javadoc/testIndex/TestIndex.java b/langtools/test/com/sun/javadoc/testIndex/TestIndex.java
index 52b61a0..755ce87 100644
--- a/langtools/test/com/sun/javadoc/testIndex/TestIndex.java
+++ b/langtools/test/com/sun/javadoc/testIndex/TestIndex.java
@@ -41,7 +41,7 @@
//Javadoc arguments.
private static final String[] ARGS = new String[] {
- "-d", BUG_ID, "-source", "1.5", "-sourcepath", SRC_DIR, "pkg", SRC_DIR + FS + "NoPackage.java"
+ "-d", BUG_ID, "-sourcepath", SRC_DIR, "pkg", SRC_DIR + FS + "NoPackage.java"
};
//Input for string search tests.
diff --git a/langtools/test/com/sun/javadoc/testInterface/TestInterface.java b/langtools/test/com/sun/javadoc/testInterface/TestInterface.java
index d5e33d7..1d3acef 100644
--- a/langtools/test/com/sun/javadoc/testInterface/TestInterface.java
+++ b/langtools/test/com/sun/javadoc/testInterface/TestInterface.java
@@ -42,7 +42,7 @@
//Javadoc arguments.
private static final String[] ARGS = new String[] {
- "-source", "1.5", "-d", BUG_ID, "-sourcepath", SRC_DIR, "pkg"
+ "-d", BUG_ID, "-sourcepath", SRC_DIR, "pkg"
};
//Input for string search tests.
diff --git a/langtools/test/com/sun/javadoc/testNavagation/TestNavagation.java b/langtools/test/com/sun/javadoc/testNavagation/TestNavagation.java
index 3b1b267..7451f18 100644
--- a/langtools/test/com/sun/javadoc/testNavagation/TestNavagation.java
+++ b/langtools/test/com/sun/javadoc/testNavagation/TestNavagation.java
@@ -40,7 +40,7 @@
//Javadoc arguments.
private static final String[] ARGS = new String[] {
- "-d", BUG_ID, "-sourcepath", SRC_DIR, "-source", "1.5", "pkg"
+ "-d", BUG_ID, "-sourcepath", SRC_DIR, "pkg"
};
//Input for string search tests.
diff --git a/langtools/test/com/sun/javadoc/testTagInheritence/TestTagInheritence.java b/langtools/test/com/sun/javadoc/testTagInheritence/TestTagInheritence.java
index 038e857..c1494e0 100644
--- a/langtools/test/com/sun/javadoc/testTagInheritence/TestTagInheritence.java
+++ b/langtools/test/com/sun/javadoc/testTagInheritence/TestTagInheritence.java
@@ -36,7 +36,7 @@
private static final String BUG_ID = "4496223-4496270-4618686-4720974-4812240-6253614-6253604";
private static final String[] ARGS = new String[] {
- "-source", "1.5", "-d", BUG_ID, "-sourcepath", SRC_DIR, "pkg", "firstSentence", "firstSentence2"
+ "-d", BUG_ID, "-sourcepath", SRC_DIR, "pkg", "firstSentence", "firstSentence2"
};
/**
diff --git a/langtools/test/tools/javac/5005368.java b/langtools/test/tools/javac/5005368.java
index abdc709..21b506f 100644
--- a/langtools/test/tools/javac/5005368.java
+++ b/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/fail -source 1.5 -Werror -Xlint:unchecked 5005368.java
+ * @compile -Werror 5005368.java
+ * @compile/fail -Werror -Xlint:unchecked 5005368.java
*/
package p5005368;
diff --git a/langtools/test/tools/javac/Ambig3.java b/langtools/test/tools/javac/Ambig3.java
index 8569a0b..e10db55 100644
--- a/langtools/test/tools/javac/Ambig3.java
+++ b/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> {
diff --git a/langtools/test/tools/javac/ArrayCast.java b/langtools/test/tools/javac/ArrayCast.java
index ce86366..929555d 100644
--- a/langtools/test/tools/javac/ArrayCast.java
+++ b/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 {
diff --git a/langtools/test/tools/javac/BadCovar.java b/langtools/test/tools/javac/BadCovar.java
index ce503ba..d472c53 100644
--- a/langtools/test/tools/javac/BadCovar.java
+++ b/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;
diff --git a/langtools/test/tools/javac/ClassLiterals/InitializeOuter.java b/langtools/test/tools/javac/ClassLiterals/InitializeOuter.java
index 2dd8011..a19aaed 100644
--- a/langtools/test/tools/javac/ClassLiterals/InitializeOuter.java
+++ b/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
*/
diff --git a/langtools/test/tools/javac/ClassLiterals/InitializeTarget.java b/langtools/test/tools/javac/ClassLiterals/InitializeTarget.java
index 8cf6cda..84fafbe 100644
--- a/langtools/test/tools/javac/ClassLiterals/InitializeTarget.java
+++ b/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
*/
diff --git a/langtools/test/tools/javac/ClassToTypeParm.java b/langtools/test/tools/javac/ClassToTypeParm.java
index 6e3e9ab..a645066 100644
--- a/langtools/test/tools/javac/ClassToTypeParm.java
+++ b/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> {
diff --git a/langtools/test/tools/javac/Closure1.java b/langtools/test/tools/javac/Closure1.java
index 32f5ccd..80c516d 100644
--- a/langtools/test/tools/javac/Closure1.java
+++ b/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
*/
diff --git a/langtools/test/tools/javac/Closure2.java b/langtools/test/tools/javac/Closure2.java
index 42f4766..e4f1821 100644
--- a/langtools/test/tools/javac/Closure2.java
+++ b/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
*/
diff --git a/langtools/test/tools/javac/Closure3.java b/langtools/test/tools/javac/Closure3.java
index 84b8b1c..c5edac2 100644
--- a/langtools/test/tools/javac/Closure3.java
+++ b/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
*/
diff --git a/langtools/test/tools/javac/Closure4.java b/langtools/test/tools/javac/Closure4.java
index c462740..7ad839d 100644
--- a/langtools/test/tools/javac/Closure4.java
+++ b/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
*/
diff --git a/langtools/test/tools/javac/Closure5.java b/langtools/test/tools/javac/Closure5.java
index 17cad0a..17b09a4 100644
--- a/langtools/test/tools/javac/Closure5.java
+++ b/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
*/
diff --git a/langtools/test/tools/javac/CompoundBox.java b/langtools/test/tools/javac/CompoundBox.java
index f3ca1fb..6ff81462 100644
--- a/langtools/test/tools/javac/CompoundBox.java
+++ b/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 {
diff --git a/langtools/test/tools/javac/ConditionalArgTypes_1.java b/langtools/test/tools/javac/ConditionalArgTypes_1.java
index 06aa390..102ab04 100644
--- a/langtools/test/tools/javac/ConditionalArgTypes_1.java
+++ b/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.
diff --git a/langtools/test/tools/javac/ConditionalArgTypes_2.java b/langtools/test/tools/javac/ConditionalArgTypes_2.java
index cc5b263..4066f34 100644
--- a/langtools/test/tools/javac/ConditionalArgTypes_2.java
+++ b/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.
diff --git a/langtools/test/tools/javac/DefiniteAssignment/DUAssert.java b/langtools/test/tools/javac/DefiniteAssignment/DUAssert.java
index b6d7db3..fc4de68 100644
--- a/langtools/test/tools/javac/DefiniteAssignment/DUAssert.java
+++ b/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 {
diff --git a/langtools/test/tools/javac/EarlyAssert.java b/langtools/test/tools/javac/EarlyAssert.java
index a552df5..df24f54 100644
--- a/langtools/test/tools/javac/EarlyAssert.java
+++ b/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
*/
/*
diff --git a/langtools/test/tools/javac/Enum1.java b/langtools/test/tools/javac/Enum1.java
index b031e8a7..945848c 100644
--- a/langtools/test/tools/javac/Enum1.java
+++ b/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 {
diff --git a/langtools/test/tools/javac/GoodCovar.java b/langtools/test/tools/javac/GoodCovar.java
index 55c289e..8daaca8 100644
--- a/langtools/test/tools/javac/GoodCovar.java
+++ b/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;
diff --git a/langtools/test/tools/javac/HexFloatLiterals.java b/langtools/test/tools/javac/HexFloatLiterals.java
index 94b39f1..e0bbb2b 100644
--- a/langtools/test/tools/javac/HexFloatLiterals.java
+++ b/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 {
diff --git a/langtools/test/tools/javac/HexThree.java b/langtools/test/tools/javac/HexThree.java
index c63409f..848211a 100644
--- a/langtools/test/tools/javac/HexThree.java
+++ b/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 {
diff --git a/langtools/test/tools/javac/InterfaceAssert.java b/langtools/test/tools/javac/InterfaceAssert.java
index 0de1ce1..141bc31 100644
--- a/langtools/test/tools/javac/InterfaceAssert.java
+++ b/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
*/
/*
diff --git a/langtools/test/tools/javac/InvalidIntfCast.java b/langtools/test/tools/javac/InvalidIntfCast.java
index f9f287c..c320269 100644
--- a/langtools/test/tools/javac/InvalidIntfCast.java
+++ b/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 {
diff --git a/langtools/test/tools/javac/NewGeneric.java b/langtools/test/tools/javac/NewGeneric.java
index 884e736..9e1e6d6 100644
--- a/langtools/test/tools/javac/NewGeneric.java
+++ b/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
*/
diff --git a/langtools/test/tools/javac/ObjectMethodRefFromInterface.java b/langtools/test/tools/javac/ObjectMethodRefFromInterface.java
index be0a93b..3c00c59 100644
--- a/langtools/test/tools/javac/ObjectMethodRefFromInterface.java
+++ b/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 {
diff --git a/langtools/test/tools/javac/PrivateLocalConstructor.java b/langtools/test/tools/javac/PrivateLocalConstructor.java
index 34004d5..c67673c 100644
--- a/langtools/test/tools/javac/PrivateLocalConstructor.java
+++ b/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 {
diff --git a/langtools/test/tools/javac/RawCrash.java b/langtools/test/tools/javac/RawCrash.java
index 5150309..c68af60 100644
--- a/langtools/test/tools/javac/RawCrash.java
+++ b/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> {
diff --git a/langtools/test/tools/javac/SynthName2.java b/langtools/test/tools/javac/SynthName2.java
index 23e146b..64f6421 100644
--- a/langtools/test/tools/javac/SynthName2.java
+++ b/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;
diff --git a/langtools/test/tools/javac/T5090006/compiler.sh b/langtools/test/tools/javac/T5090006/compiler.sh
index 458fefe..7ac92f5 100644
--- a/langtools/test/tools/javac/T5090006/compiler.sh
+++ b/langtools/test/tools/javac/T5090006/compiler.sh
@@ -63,7 +63,7 @@
;;
esac
-"${TESTJAVA}${FS}bin${FS}javac" ${TESTTOOLVMOPTS} -verbose -source 5 -d "${TESTCLASSES}" -cp "${TESTSRC}${FS}broken.jar" "${TESTSRC}${FS}$1"
+"${TESTJAVA}${FS}bin${FS}javac" ${TESTTOOLVMOPTS} -verbose -d "${TESTCLASSES}" -cp "${TESTSRC}${FS}broken.jar" "${TESTSRC}${FS}$1"
result=$?
diff --git a/langtools/test/tools/javac/T5092545.java b/langtools/test/tools/javac/T5092545.java
index 6a569bb..9037b45 100644
--- a/langtools/test/tools/javac/T5092545.java
+++ b/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(); }
diff --git a/langtools/test/tools/javac/T5105890.java b/langtools/test/tools/javac/T5105890.java
index 8778212..7ea88b4 100644
--- a/langtools/test/tools/javac/T5105890.java
+++ b/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 {
diff --git a/langtools/test/tools/javac/annotations/default/A.java b/langtools/test/tools/javac/annotations/default/A.java
index 287b89a..98e4b1a 100644
--- a/langtools/test/tools/javac/annotations/default/A.java
+++ b/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 -source 1.5 B.java
- * @compile -source 1.5 C.java
- * @compile/fail -source 1.5 Derr.java
- * @compile/fail -source 1.5 Eerr.java
+ * @compile A.java
+ * @compile B.java
+ * @compile C.java
+ * @compile/fail Derr.java
+ * @compile/fail Eerr.java
*/
public @interface A {
diff --git a/langtools/test/tools/javac/annotations/neg/AnnComma.java b/langtools/test/tools/javac/annotations/neg/AnnComma.java
index e4ff6f3..4ef640e 100644
--- a/langtools/test/tools/javac/annotations/neg/AnnComma.java
+++ b/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;
diff --git a/langtools/test/tools/javac/annotations/neg/ArrayLit.java b/langtools/test/tools/javac/annotations/neg/ArrayLit.java
index 334b035..ff0b558 100644
--- a/langtools/test/tools/javac/annotations/neg/ArrayLit.java
+++ b/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})
diff --git a/langtools/test/tools/javac/annotations/neg/Constant.java b/langtools/test/tools/javac/annotations/neg/Constant.java
index b350b66..8935a51 100644
--- a/langtools/test/tools/javac/annotations/neg/Constant.java
+++ b/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;
diff --git a/langtools/test/tools/javac/annotations/neg/Cycle1.java b/langtools/test/tools/javac/annotations/neg/Cycle1.java
index 1f54bb6..cebfb06 100644
--- a/langtools/test/tools/javac/annotations/neg/Cycle1.java
+++ b/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;
diff --git a/langtools/test/tools/javac/annotations/neg/Cycle2.java b/langtools/test/tools/javac/annotations/neg/Cycle2.java
index 3e9d416..8fe8dc1 100644
--- a/langtools/test/tools/javac/annotations/neg/Cycle2.java
+++ b/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;
diff --git a/langtools/test/tools/javac/annotations/neg/Cycle3.java b/langtools/test/tools/javac/annotations/neg/Cycle3.java
index 059938e..2f5309c 100644
--- a/langtools/test/tools/javac/annotations/neg/Cycle3.java
+++ b/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;
diff --git a/langtools/test/tools/javac/annotations/neg/Dep.java b/langtools/test/tools/javac/annotations/neg/Dep.java
index c74db43..a94cf3a 100644
--- a/langtools/test/tools/javac/annotations/neg/Dep.java
+++ b/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 -source 1.5 -Xlint:dep-ann Dep.java
+ * @compile/fail -Xlint:dep-ann -Werror Dep.java
+ * @compile -Xlint:dep-ann Dep.java
*/
/** @deprecated */
diff --git a/langtools/test/tools/javac/annotations/neg/Dup.java b/langtools/test/tools/javac/annotations/neg/Dup.java
index eb4400e..2c632e9 100644
--- a/langtools/test/tools/javac/annotations/neg/Dup.java
+++ b/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
diff --git a/langtools/test/tools/javac/annotations/neg/DupTarget.java b/langtools/test/tools/javac/annotations/neg/DupTarget.java
index cd74f1e..a42c575 100644
--- a/langtools/test/tools/javac/annotations/neg/DupTarget.java
+++ b/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})
diff --git a/langtools/test/tools/javac/annotations/neg/MemberOver.java b/langtools/test/tools/javac/annotations/neg/MemberOver.java
index 8cc5c5d..ca453e0 100644
--- a/langtools/test/tools/javac/annotations/neg/MemberOver.java
+++ b/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;
diff --git a/langtools/test/tools/javac/annotations/neg/ObjectMembers.java b/langtools/test/tools/javac/annotations/neg/ObjectMembers.java
index f9b033e..dd6a627 100644
--- a/langtools/test/tools/javac/annotations/neg/ObjectMembers.java
+++ b/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)
diff --git a/langtools/test/tools/javac/annotations/neg/OverrideNo.java b/langtools/test/tools/javac/annotations/neg/OverrideNo.java
index b417802..a2c58a0 100644
--- a/langtools/test/tools/javac/annotations/neg/OverrideNo.java
+++ b/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;
diff --git a/langtools/test/tools/javac/annotations/neg/Package.java b/langtools/test/tools/javac/annotations/neg/Package.java
index cc73410..706a042 100644
--- a/langtools/test/tools/javac/annotations/neg/Package.java
+++ b/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
diff --git a/langtools/test/tools/javac/annotations/neg/Recovery.java b/langtools/test/tools/javac/annotations/neg/Recovery.java
index 55ff435..ba0452f 100644
--- a/langtools/test/tools/javac/annotations/neg/Recovery.java
+++ b/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.*;
diff --git a/langtools/test/tools/javac/annotations/neg/Recovery1.java b/langtools/test/tools/javac/annotations/neg/Recovery1.java
index b7753b2..6f4d72d 100644
--- a/langtools/test/tools/javac/annotations/neg/Recovery1.java
+++ b/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;
diff --git a/langtools/test/tools/javac/annotations/neg/Scope.java b/langtools/test/tools/javac/annotations/neg/Scope.java
index 012e2a7..7eef10d 100644
--- a/langtools/test/tools/javac/annotations/neg/Scope.java
+++ b/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;
diff --git a/langtools/test/tools/javac/annotations/neg/Syntax1.java b/langtools/test/tools/javac/annotations/neg/Syntax1.java
index ca914c3..a4e637b 100644
--- a/langtools/test/tools/javac/annotations/neg/Syntax1.java
+++ b/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;
diff --git a/langtools/test/tools/javac/annotations/neg/WrongTarget.java b/langtools/test/tools/javac/annotations/neg/WrongTarget.java
index 7ab7c0b..9cb24b8 100644
--- a/langtools/test/tools/javac/annotations/neg/WrongTarget.java
+++ b/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})
diff --git a/langtools/test/tools/javac/annotations/neg/WrongTarget2.java b/langtools/test/tools/javac/annotations/neg/WrongTarget2.java
index 01f91c1..1e2f87e 100644
--- a/langtools/test/tools/javac/annotations/neg/WrongTarget2.java
+++ b/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;
diff --git a/langtools/test/tools/javac/annotations/neg/WrongValue.java b/langtools/test/tools/javac/annotations/neg/WrongValue.java
index 8e3504e..bc5d01d 100644
--- a/langtools/test/tools/javac/annotations/neg/WrongValue.java
+++ b/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 {
diff --git a/langtools/test/tools/javac/annotations/neg/Z1.java b/langtools/test/tools/javac/annotations/neg/Z1.java
index a736224..9e17c2f 100644
--- a/langtools/test/tools/javac/annotations/neg/Z1.java
+++ b/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 }
diff --git a/langtools/test/tools/javac/annotations/neg/Z10.java b/langtools/test/tools/javac/annotations/neg/Z10.java
index 4c7b860..69820d8 100644
--- a/langtools/test/tools/javac/annotations/neg/Z10.java
+++ b/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 }
diff --git a/langtools/test/tools/javac/annotations/neg/Z11.java b/langtools/test/tools/javac/annotations/neg/Z11.java
index 3f806c4..8d736c1 100644
--- a/langtools/test/tools/javac/annotations/neg/Z11.java
+++ b/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 }
diff --git a/langtools/test/tools/javac/annotations/neg/Z12.java b/langtools/test/tools/javac/annotations/neg/Z12.java
index 18a288f..065e534 100644
--- a/langtools/test/tools/javac/annotations/neg/Z12.java
+++ b/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 }
diff --git a/langtools/test/tools/javac/annotations/neg/Z13.java b/langtools/test/tools/javac/annotations/neg/Z13.java
index 9362b1e..84f5e2f 100644
--- a/langtools/test/tools/javac/annotations/neg/Z13.java
+++ b/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 {
diff --git a/langtools/test/tools/javac/annotations/neg/Z14.java b/langtools/test/tools/javac/annotations/neg/Z14.java
index 8e2d087..db0a859 100644
--- a/langtools/test/tools/javac/annotations/neg/Z14.java
+++ b/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> {
diff --git a/langtools/test/tools/javac/annotations/neg/Z15.java b/langtools/test/tools/javac/annotations/neg/Z15.java
index aad92f9..b606d1e 100644
--- a/langtools/test/tools/javac/annotations/neg/Z15.java
+++ b/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 {
diff --git a/langtools/test/tools/javac/annotations/neg/Z16.java b/langtools/test/tools/javac/annotations/neg/Z16.java
index 52547f2..af8c62f 100644
--- a/langtools/test/tools/javac/annotations/neg/Z16.java
+++ b/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 }
diff --git a/langtools/test/tools/javac/annotations/neg/Z2.java b/langtools/test/tools/javac/annotations/neg/Z2.java
index 01aa8d4c..1b84def 100644
--- a/langtools/test/tools/javac/annotations/neg/Z2.java
+++ b/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 }
diff --git a/langtools/test/tools/javac/annotations/neg/Z3.java b/langtools/test/tools/javac/annotations/neg/Z3.java
index e28d228..7a7c3d4 100644
--- a/langtools/test/tools/javac/annotations/neg/Z3.java
+++ b/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 }
diff --git a/langtools/test/tools/javac/annotations/neg/Z4.java b/langtools/test/tools/javac/annotations/neg/Z4.java
index 035d160..2bd9aa3 100644
--- a/langtools/test/tools/javac/annotations/neg/Z4.java
+++ b/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 }
diff --git a/langtools/test/tools/javac/annotations/neg/Z5.java b/langtools/test/tools/javac/annotations/neg/Z5.java
index 3a1ca80..2794d1f 100644
--- a/langtools/test/tools/javac/annotations/neg/Z5.java
+++ b/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 {}
diff --git a/langtools/test/tools/javac/annotations/neg/Z8.java b/langtools/test/tools/javac/annotations/neg/Z8.java
index a575b9f..21a99bb 100644
--- a/langtools/test/tools/javac/annotations/neg/Z8.java
+++ b/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 {
diff --git a/langtools/test/tools/javac/annotations/neg/Z9.java b/langtools/test/tools/javac/annotations/neg/Z9.java
index 9241e15..f1d4c31 100644
--- a/langtools/test/tools/javac/annotations/neg/Z9.java
+++ b/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 {
diff --git a/langtools/test/tools/javac/annotations/pos/AnnoteElideBraces.java b/langtools/test/tools/javac/annotations/pos/AnnoteElideBraces.java
index e70c69a..6a25ac9 100644
--- a/langtools/test/tools/javac/annotations/pos/AnnoteElideBraces.java
+++ b/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 {
diff --git a/langtools/test/tools/javac/annotations/pos/ClassA.java b/langtools/test/tools/javac/annotations/pos/ClassA.java
index ab7b471..c07f65a 100644
--- a/langtools/test/tools/javac/annotations/pos/ClassA.java
+++ b/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 -source 1.5 ClassB.java
+ * @compile ClassA.java ClassB.java
+ * @compile ClassB.java
*/
@interface ClassA {
diff --git a/langtools/test/tools/javac/annotations/pos/Dep.java b/langtools/test/tools/javac/annotations/pos/Dep.java
index 0fdbbc1..9e5fea0 100644
--- a/langtools/test/tools/javac/annotations/pos/Dep.java
+++ b/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 */
diff --git a/langtools/test/tools/javac/annotations/pos/Enum1.java b/langtools/test/tools/javac/annotations/pos/Enum1.java
index 07b7784..6f27902 100644
--- a/langtools/test/tools/javac/annotations/pos/Enum1.java
+++ b/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;
diff --git a/langtools/test/tools/javac/annotations/pos/Local.java b/langtools/test/tools/javac/annotations/pos/Local.java
index ab2ffb6..45d25c3 100644
--- a/langtools/test/tools/javac/annotations/pos/Local.java
+++ b/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 {
diff --git a/langtools/test/tools/javac/annotations/pos/Members.java b/langtools/test/tools/javac/annotations/pos/Members.java
index d786066..14ca782 100644
--- a/langtools/test/tools/javac/annotations/pos/Members.java
+++ b/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;
diff --git a/langtools/test/tools/javac/annotations/pos/NType.java b/langtools/test/tools/javac/annotations/pos/NType.java
index a696671..3e92bf4 100644
--- a/langtools/test/tools/javac/annotations/pos/NType.java
+++ b/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;
diff --git a/langtools/test/tools/javac/annotations/pos/OverrideCheck.java b/langtools/test/tools/javac/annotations/pos/OverrideCheck.java
index f8d582e..2b9dcf6 100644
--- a/langtools/test/tools/javac/annotations/pos/OverrideCheck.java
+++ b/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 {
diff --git a/langtools/test/tools/javac/annotations/pos/OverrideOK.java b/langtools/test/tools/javac/annotations/pos/OverrideOK.java
index cf01bbf..41cc8ab 100644
--- a/langtools/test/tools/javac/annotations/pos/OverrideOK.java
+++ b/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;
diff --git a/langtools/test/tools/javac/annotations/pos/Parameter.java b/langtools/test/tools/javac/annotations/pos/Parameter.java
index 1a50302..6d0e22e 100644
--- a/langtools/test/tools/javac/annotations/pos/Parameter.java
+++ b/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;
diff --git a/langtools/test/tools/javac/annotations/pos/Primitives.java b/langtools/test/tools/javac/annotations/pos/Primitives.java
index 9788781..a8d546f 100644
--- a/langtools/test/tools/javac/annotations/pos/Primitives.java
+++ b/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 {
diff --git a/langtools/test/tools/javac/annotations/pos/RightTarget.java b/langtools/test/tools/javac/annotations/pos/RightTarget.java
index 7a3ad3b..5ed2bad 100644
--- a/langtools/test/tools/javac/annotations/pos/RightTarget.java
+++ b/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;
diff --git a/langtools/test/tools/javac/annotations/pos/Z1.java b/langtools/test/tools/javac/annotations/pos/Z1.java
index f67aee21..c347c2d 100644
--- a/langtools/test/tools/javac/annotations/pos/Z1.java
+++ b/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 }
diff --git a/langtools/test/tools/javac/annotations/pos/Z2.java b/langtools/test/tools/javac/annotations/pos/Z2.java
index 989a565..22b816b 100644
--- a/langtools/test/tools/javac/annotations/pos/Z2.java
+++ b/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 }
diff --git a/langtools/test/tools/javac/annotations/pos/Z3.java b/langtools/test/tools/javac/annotations/pos/Z3.java
index 57b4010..3375529 100644
--- a/langtools/test/tools/javac/annotations/pos/Z3.java
+++ b/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 }
diff --git a/langtools/test/tools/javac/annotations/pos/Z4.java b/langtools/test/tools/javac/annotations/pos/Z4.java
index 64c4988..7347572 100644
--- a/langtools/test/tools/javac/annotations/pos/Z4.java
+++ b/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 {
diff --git a/langtools/test/tools/javac/annotations/pos/package-info.java b/langtools/test/tools/javac/annotations/pos/package-info.java
index ccf7374..0f35192 100644
--- a/langtools/test/tools/javac/annotations/pos/package-info.java
+++ b/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
diff --git a/langtools/test/tools/javac/assert/Attach.java b/langtools/test/tools/javac/assert/Attach.java
index 8bc1c72..cdca7c9 100644
--- a/langtools/test/tools/javac/assert/Attach.java
+++ b/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 {
diff --git a/langtools/test/tools/javac/assert/DU1.java b/langtools/test/tools/javac/assert/DU1.java
index 04a849e..1593bae 100644
--- a/langtools/test/tools/javac/assert/DU1.java
+++ b/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 {
diff --git a/langtools/test/tools/javac/assert/DU2.java b/langtools/test/tools/javac/assert/DU2.java
index 0c9ec16..e51af7a 100644
--- a/langtools/test/tools/javac/assert/DU2.java
+++ b/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 {
diff --git a/langtools/test/tools/javac/assert/Position.java b/langtools/test/tools/javac/assert/Position.java
index 800f7db..59a6cee 100644
--- a/langtools/test/tools/javac/assert/Position.java
+++ b/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 {
diff --git a/langtools/test/tools/javac/boxing/BoxedForeach.java b/langtools/test/tools/javac/boxing/BoxedForeach.java
index 53b5949..852ac0b 100644
--- a/langtools/test/tools/javac/boxing/BoxedForeach.java
+++ b/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
*/
diff --git a/langtools/test/tools/javac/boxing/Boxing1.java b/langtools/test/tools/javac/boxing/Boxing1.java
index 7836032..3592d0f 100644
--- a/langtools/test/tools/javac/boxing/Boxing1.java
+++ b/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 {
diff --git a/langtools/test/tools/javac/boxing/Boxing2.java b/langtools/test/tools/javac/boxing/Boxing2.java
index f0345dc..d7def4a 100644
--- a/langtools/test/tools/javac/boxing/Boxing2.java
+++ b/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 {
diff --git a/langtools/test/tools/javac/boxing/Boxing4.java b/langtools/test/tools/javac/boxing/Boxing4.java
index 5aa6d24..8ea3fb6 100644
--- a/langtools/test/tools/javac/boxing/Boxing4.java
+++ b/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 {
diff --git a/langtools/test/tools/javac/boxing/BoxingCaching.java b/langtools/test/tools/javac/boxing/BoxingCaching.java
index 967505a..5c23c47 100644
--- a/langtools/test/tools/javac/boxing/BoxingCaching.java
+++ b/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 {
diff --git a/langtools/test/tools/javac/capture/Capture1.java b/langtools/test/tools/javac/capture/Capture1.java
index 6144674..79f7992 100644
--- a/langtools/test/tools/javac/capture/Capture1.java
+++ b/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;
diff --git a/langtools/test/tools/javac/capture/Capture2.java b/langtools/test/tools/javac/capture/Capture2.java
index f3d86f9..3a5c170 100644
--- a/langtools/test/tools/javac/capture/Capture2.java
+++ b/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;
diff --git a/langtools/test/tools/javac/capture/Capture3.java b/langtools/test/tools/javac/capture/Capture3.java
index fa4a50e..fe6928a 100644
--- a/langtools/test/tools/javac/capture/Capture3.java
+++ b/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;
diff --git a/langtools/test/tools/javac/capture/Capture5.java b/langtools/test/tools/javac/capture/Capture5.java
index aabd5f6..5cf9b27 100644
--- a/langtools/test/tools/javac/capture/Capture5.java
+++ b/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;
diff --git a/langtools/test/tools/javac/cast/BoxedArray.java b/langtools/test/tools/javac/cast/BoxedArray.java
index 726c392..6ae11a5 100644
--- a/langtools/test/tools/javac/cast/BoxedArray.java
+++ b/langtools/test/tools/javac/cast/BoxedArray.java
@@ -27,7 +27,7 @@
* @summary REGRESSION: compiler allows cast from Integer[] to int[]
* @author gafter
*
- * @compile/fail -source 1.5 BoxedArray.java
+ * @compile/fail BoxedArray.java
*/
public class BoxedArray {
diff --git a/langtools/test/tools/javac/enum/AbstractEmptyEnum.java b/langtools/test/tools/javac/enum/AbstractEmptyEnum.java
index 783238b..bb186a7 100644
--- a/langtools/test/tools/javac/enum/AbstractEmptyEnum.java
+++ b/langtools/test/tools/javac/enum/AbstractEmptyEnum.java
@@ -27,7 +27,7 @@
* @summary empty enum cannot be abstract
* @author Joseph D. Darcy
*
- * @compile/fail -source 1.5 AbstractEmptyEnum.java
+ * @compile/fail AbstractEmptyEnum.java
*/
public enum AbstractEmptyEnum {
diff --git a/langtools/test/tools/javac/enum/AbstractEnum1.java b/langtools/test/tools/javac/enum/AbstractEnum1.java
index 26219e27..1a76e69 100644
--- a/langtools/test/tools/javac/enum/AbstractEnum1.java
+++ b/langtools/test/tools/javac/enum/AbstractEnum1.java
@@ -26,9 +26,6 @@
* @bug 5054976
* @summary compiler fails to flag an enum abstract
* @author gafter
- *
- * @compile -source 1.5 AbstractEnum1.java
- * @run main AbstractEnum1
*/
import java.lang.reflect.Modifier;
diff --git a/langtools/test/tools/javac/enum/DA1.java b/langtools/test/tools/javac/enum/DA1.java
index 4a60a79..e9bf795 100644
--- a/langtools/test/tools/javac/enum/DA1.java
+++ b/langtools/test/tools/javac/enum/DA1.java
@@ -27,7 +27,7 @@
* @summary One can refer static, const static variables from instance initializers of enum
* @author gafter
*
- * @compile/fail -source 1.5 DA1.java
+ * @compile/fail DA1.java
*/
package da1;
diff --git a/langtools/test/tools/javac/enum/DA2.java b/langtools/test/tools/javac/enum/DA2.java
index 0b0925e..682b952 100644
--- a/langtools/test/tools/javac/enum/DA2.java
+++ b/langtools/test/tools/javac/enum/DA2.java
@@ -27,7 +27,7 @@
* @summary One can refer static, const static variables from instance initializers of enum
* @author gafter
*
- * @compile/fail -source 1.5 DA2.java
+ * @compile/fail DA2.java
*/
package da2;
diff --git a/langtools/test/tools/javac/enum/DA3.java b/langtools/test/tools/javac/enum/DA3.java
index 3e72d12..013ab84 100644
--- a/langtools/test/tools/javac/enum/DA3.java
+++ b/langtools/test/tools/javac/enum/DA3.java
@@ -27,7 +27,7 @@
* @summary One can refer static, const static variables from instance initializers of enum
* @author gafter
*
- * @compile/fail -source 1.5 DA3.java
+ * @compile/fail DA3.java
*/
package da3;
diff --git a/langtools/test/tools/javac/enum/Def.java b/langtools/test/tools/javac/enum/Def.java
index 7912394..50a823a 100644
--- a/langtools/test/tools/javac/enum/Def.java
+++ b/langtools/test/tools/javac/enum/Def.java
@@ -27,7 +27,7 @@
* @summary constant static fields cannot be referenced from const, instance initializers
* @author gafter
*
- * @compile -source 1.5 Def.java
+ * @compile Def.java
*/
package _enum.def;
diff --git a/langtools/test/tools/javac/enum/Enum1.java b/langtools/test/tools/javac/enum/Enum1.java
index 3038f2c..d7dece4 100644
--- a/langtools/test/tools/javac/enum/Enum1.java
+++ b/langtools/test/tools/javac/enum/Enum1.java
@@ -26,9 +26,6 @@
* @bug 4945532
* @summary enums: test output of values().toString()
* @author gafter
- *
- * @compile -source 1.5 Enum1.java
- * @run main Enum1
*/
import java.util.*;
diff --git a/langtools/test/tools/javac/enum/Enum2.java b/langtools/test/tools/javac/enum/Enum2.java
index 68e80af..b8ff2f0 100644
--- a/langtools/test/tools/javac/enum/Enum2.java
+++ b/langtools/test/tools/javac/enum/Enum2.java
@@ -26,7 +26,7 @@
* @summary enums: an enumeration type may not be extended
* @author gafter
*
- * @compile/fail -source 1.5 Enum2.java
+ * @compile/fail Enum2.java
*/
public class Enum2 {
diff --git a/langtools/test/tools/javac/enum/Enum3.java b/langtools/test/tools/javac/enum/Enum3.java
index b17dbe8..825bd89 100644
--- a/langtools/test/tools/javac/enum/Enum3.java
+++ b/langtools/test/tools/javac/enum/Enum3.java
@@ -26,9 +26,6 @@
* @bug 4945532
* @summary enums: test switch
* @author gafter
- *
- * @compile -source 1.5 Enum3.java
- * @run main Enum3
*/
public enum Enum3 {
diff --git a/langtools/test/tools/javac/enum/EnumImplicitPrivateConstructor.java b/langtools/test/tools/javac/enum/EnumImplicitPrivateConstructor.java
index 3cced2d..aacf980 100644
--- a/langtools/test/tools/javac/enum/EnumImplicitPrivateConstructor.java
+++ b/langtools/test/tools/javac/enum/EnumImplicitPrivateConstructor.java
@@ -26,9 +26,6 @@
* @bug 5009601 5010455 5005748
* @summary enum constructors can be declared private
* @author Joseph D. Darcy
- *
- * @compile -source 1.5 EnumImplicitPrivateConstructor.java
- * @run main EnumImplicitPrivateConstructor
*/
import java.util.*;
diff --git a/langtools/test/tools/javac/enum/EnumInit.java b/langtools/test/tools/javac/enum/EnumInit.java
index 7e38cbc..e09cee3 100644
--- a/langtools/test/tools/javac/enum/EnumInit.java
+++ b/langtools/test/tools/javac/enum/EnumInit.java
@@ -27,7 +27,7 @@
* @summary compiling annatations with nested enums issuing *.java leads to crash
* @author gafter
*
- * @compile -source 1.5 EnumInit.java
+ * @compile EnumInit.java
*/
package enum_init_;
diff --git a/langtools/test/tools/javac/enum/EnumPrivateConstructor.java b/langtools/test/tools/javac/enum/EnumPrivateConstructor.java
index 238b30b..c42d7dd 100644
--- a/langtools/test/tools/javac/enum/EnumPrivateConstructor.java
+++ b/langtools/test/tools/javac/enum/EnumPrivateConstructor.java
@@ -27,7 +27,7 @@
* @summary enum constructors can be declared private
* @author Joseph D. Darcy
*
- * @compile -source 1.5 EnumPrivateConstructor.java
+ * @compile EnumPrivateConstructor.java
*/
enum EnumPrivateConstructor {
diff --git a/langtools/test/tools/javac/enum/EnumProtectedConstructor.java b/langtools/test/tools/javac/enum/EnumProtectedConstructor.java
index 1960d05..ef1c841 100644
--- a/langtools/test/tools/javac/enum/EnumProtectedConstructor.java
+++ b/langtools/test/tools/javac/enum/EnumProtectedConstructor.java
@@ -27,7 +27,7 @@
* @summary enum constructors cannot be declared public or protected
* @author Joseph D. Darcy
*
- * @compile/fail -source 1.5 EnumProtectedConstructor.java
+ * @compile/fail EnumProtectedConstructor.java
*/
enum EnumProtectedConstructor {
diff --git a/langtools/test/tools/javac/enum/EnumPublicConstructor.java b/langtools/test/tools/javac/enum/EnumPublicConstructor.java
index 6d52f23..c9114a0 100644
--- a/langtools/test/tools/javac/enum/EnumPublicConstructor.java
+++ b/langtools/test/tools/javac/enum/EnumPublicConstructor.java
@@ -27,7 +27,7 @@
* @summary enum constructors cannot be declared public or protected
* @author Joseph D. Darcy
*
- * @compile/fail -source 1.5 EnumPublicConstructor.java
+ * @compile/fail EnumPublicConstructor.java
*/
enum EnumPublicConstructor {
diff --git a/langtools/test/tools/javac/enum/EnumSwitch1.java b/langtools/test/tools/javac/enum/EnumSwitch1.java
index 12afc7b..68a7525 100644
--- a/langtools/test/tools/javac/enum/EnumSwitch1.java
+++ b/langtools/test/tools/javac/enum/EnumSwitch1.java
@@ -27,7 +27,7 @@
* @summary enum switch case labels required to be unqualified.
* @author gafter
*
- * @compile -source 1.5 EnumSwitch1.java
+ * @compile EnumSwitch1.java
*/
package enumswitch1;
diff --git a/langtools/test/tools/javac/enum/EnumSwitch2.java b/langtools/test/tools/javac/enum/EnumSwitch2.java
index 1df17f9..c6bc8c1 100644
--- a/langtools/test/tools/javac/enum/EnumSwitch2.java
+++ b/langtools/test/tools/javac/enum/EnumSwitch2.java
@@ -27,7 +27,7 @@
* @summary enum switch case labels required to be unqualified.
* @author gafter
*
- * @compile/fail -source 1.5 EnumSwitch2.java
+ * @compile/fail EnumSwitch2.java
*/
package enumswitch2;
diff --git a/langtools/test/tools/javac/enum/EnumSwitch3.java b/langtools/test/tools/javac/enum/EnumSwitch3.java
index 26c2de3..1b55d1c 100644
--- a/langtools/test/tools/javac/enum/EnumSwitch3.java
+++ b/langtools/test/tools/javac/enum/EnumSwitch3.java
@@ -27,7 +27,7 @@
* @summary javac crash when enum defined after use
* @author gafter
*
- * @compile -source 1.5 EnumSwitch3.java
+ * @compile EnumSwitch3.java
*/
package enumswitch3;
diff --git a/langtools/test/tools/javac/enum/EnumSwitch4.java b/langtools/test/tools/javac/enum/EnumSwitch4.java
index 2ceff6c..6b380db 100644
--- a/langtools/test/tools/javac/enum/EnumSwitch4.java
+++ b/langtools/test/tools/javac/enum/EnumSwitch4.java
@@ -26,9 +26,6 @@
* @bug 5006662
* @summary enum switch on null fails to throw NullPointerException
* @author gafter
- *
- * @compile -source 1.5 EnumSwitch4.java
- * @run main EnumSwitch4
*/
public enum EnumSwitch4 {
diff --git a/langtools/test/tools/javac/enum/ExplicitlyAbstractEnum1.java b/langtools/test/tools/javac/enum/ExplicitlyAbstractEnum1.java
index 8141165..b5a1fa8 100644
--- a/langtools/test/tools/javac/enum/ExplicitlyAbstractEnum1.java
+++ b/langtools/test/tools/javac/enum/ExplicitlyAbstractEnum1.java
@@ -27,7 +27,7 @@
* @summary enum's cannot be explicitly declared abstract
* @author Joseph D. Darcy
*
- * @compile/fail -source 1.5 ExplicitlyAbstractEnum1.java
+ * @compile/fail ExplicitlyAbstractEnum1.java
*/
abstract enum ExplicitlyAbstractEnum1 {
diff --git a/langtools/test/tools/javac/enum/ExplicitlyAbstractEnum2.java b/langtools/test/tools/javac/enum/ExplicitlyAbstractEnum2.java
index ceb1e0d..5f85b81 100644
--- a/langtools/test/tools/javac/enum/ExplicitlyAbstractEnum2.java
+++ b/langtools/test/tools/javac/enum/ExplicitlyAbstractEnum2.java
@@ -27,7 +27,7 @@
* @summary enum's cannot be explicitly declared abstract even if they are abstract
* @author Joseph D. Darcy
*
- * @compile/fail -source 1.5 ExplicitlyAbstractEnum2.java
+ * @compile/fail ExplicitlyAbstractEnum2.java
*/
abstract enum ExplicitlyAbstractEnum2 {
diff --git a/langtools/test/tools/javac/enum/ExplicitlyFinalEnum1.java b/langtools/test/tools/javac/enum/ExplicitlyFinalEnum1.java
index 0d55962..4faf85f 100644
--- a/langtools/test/tools/javac/enum/ExplicitlyFinalEnum1.java
+++ b/langtools/test/tools/javac/enum/ExplicitlyFinalEnum1.java
@@ -27,7 +27,7 @@
* @summary enum's cannot be explicitly declared final even if they are
* @author Joseph D. Darcy
*
- * @compile/fail -source 1.5 ExplicitlyFinalEnum1.java
+ * @compile/fail ExplicitlyFinalEnum1.java
*/
final enum ExplicitlyFinalEnum1 {
diff --git a/langtools/test/tools/javac/enum/ExplicitlyFinalEnum2.java b/langtools/test/tools/javac/enum/ExplicitlyFinalEnum2.java
index bc253ffa6..e3aec0d 100644
--- a/langtools/test/tools/javac/enum/ExplicitlyFinalEnum2.java
+++ b/langtools/test/tools/javac/enum/ExplicitlyFinalEnum2.java
@@ -27,7 +27,7 @@
* @summary enum's cannot be explicitly declared final
* @author Joseph D. Darcy
*
- * @compile/fail -source 1.5 ExplicitlyFinalEnum2.java
+ * @compile/fail ExplicitlyFinalEnum2.java
*/
final enum ExplicitlyFinalEnum2 {
diff --git a/langtools/test/tools/javac/enum/FauxEnum1.java b/langtools/test/tools/javac/enum/FauxEnum1.java
index ef44ca6..6ba7795 100644
--- a/langtools/test/tools/javac/enum/FauxEnum1.java
+++ b/langtools/test/tools/javac/enum/FauxEnum1.java
@@ -27,7 +27,7 @@
* @summary verify java.lang.Enum can't be directly subclassed
* @author Joseph D. Darcy
*
- * @compile/fail -source 1.5 FauxEnum1.java
+ * @compile/fail FauxEnum1.java
*/
public class FauxEnum1 extends java.lang.Enum {
diff --git a/langtools/test/tools/javac/enum/FauxEnum3.java b/langtools/test/tools/javac/enum/FauxEnum3.java
index 5f39fc7..ad0a87e 100644
--- a/langtools/test/tools/javac/enum/FauxEnum3.java
+++ b/langtools/test/tools/javac/enum/FauxEnum3.java
@@ -27,7 +27,7 @@
* @summary verify an enum type can't be directly subclassed
* @author Joseph D. Darcy
*
- * @compile/fail -source 1.5 FauxEnum3.java
+ * @compile/fail FauxEnum3.java
*/
public class FauxEnum3 extends SpecializedEnum {
diff --git a/langtools/test/tools/javac/enum/FauxSpecialEnum1.java b/langtools/test/tools/javac/enum/FauxSpecialEnum1.java
index 83258a0..027b7ab 100644
--- a/langtools/test/tools/javac/enum/FauxSpecialEnum1.java
+++ b/langtools/test/tools/javac/enum/FauxSpecialEnum1.java
@@ -27,7 +27,7 @@
* @summary verify specialized enum classes can't be abstract
* @author Joseph D. Darcy
*
- * @compile/fail -source 1.5 FauxSpecialEnum1.java
+ * @compile/fail FauxSpecialEnum1.java
*/
public enum FauxSpecialEnum1 {
diff --git a/langtools/test/tools/javac/enum/FauxSpecialEnum2.java b/langtools/test/tools/javac/enum/FauxSpecialEnum2.java
index 5990383..6536846 100644
--- a/langtools/test/tools/javac/enum/FauxSpecialEnum2.java
+++ b/langtools/test/tools/javac/enum/FauxSpecialEnum2.java
@@ -27,7 +27,7 @@
* @summary verify specialized enum classes can't be abstract
* @author Joseph D. Darcy
*
- * @compile/fail -source 1.5 FauxSpecialEnum2.java
+ * @compile/fail FauxSpecialEnum2.java
*/
public enum FauxSpecialEnum2 {
diff --git a/langtools/test/tools/javac/enum/LocalEnum.java b/langtools/test/tools/javac/enum/LocalEnum.java
index 21ffa4f..c9e9518 100644
--- a/langtools/test/tools/javac/enum/LocalEnum.java
+++ b/langtools/test/tools/javac/enum/LocalEnum.java
@@ -27,7 +27,7 @@
* @summary javac fails to reject local enums
* @author gafter
*
- * @compile/fail -source 1.5 LocalEnum.java
+ * @compile/fail LocalEnum.java
*/
public class LocalEnum {
diff --git a/langtools/test/tools/javac/enum/NoFinal.java b/langtools/test/tools/javac/enum/NoFinal.java
index f2ce2be..bcad410 100644
--- a/langtools/test/tools/javac/enum/NoFinal.java
+++ b/langtools/test/tools/javac/enum/NoFinal.java
@@ -26,7 +26,7 @@
* @bug 5097250 5087624
* @summary Finalize methods on enums must be compile time error
* @author Peter von der Ah\u00e9
- * @compile/fail -source 5 NoFinal.java
+ * @compile/fail NoFinal.java
*/
enum NoFinal {
diff --git a/langtools/test/tools/javac/enum/NoFinal2.java b/langtools/test/tools/javac/enum/NoFinal2.java
index 5d5b24f..af64080 100644
--- a/langtools/test/tools/javac/enum/NoFinal2.java
+++ b/langtools/test/tools/javac/enum/NoFinal2.java
@@ -26,7 +26,7 @@
* @bug 5097250 5087624
* @summary Finalize methods on enums must be compile time error
* @author Peter von der Ah\u00e9
- * @compile/fail -source 5 NoFinal2.java
+ * @compile/fail NoFinal2.java
*/
enum NoFinal2 {
diff --git a/langtools/test/tools/javac/enum/NoFinal3.java b/langtools/test/tools/javac/enum/NoFinal3.java
index e8a0e51..352a4e8 100644
--- a/langtools/test/tools/javac/enum/NoFinal3.java
+++ b/langtools/test/tools/javac/enum/NoFinal3.java
@@ -26,7 +26,7 @@
* @bug 5097250 5087624
* @summary Finalize methods on enums must be compile time error
* @author Peter von der Ah\u00e9
- * @compile/fail -source 5 NoFinal3.java
+ * @compile/fail NoFinal3.java
*/
enum NoFinal3 {
diff --git a/langtools/test/tools/javac/enum/NoFinal4.java b/langtools/test/tools/javac/enum/NoFinal4.java
index 263c102..939636e 100644
--- a/langtools/test/tools/javac/enum/NoFinal4.java
+++ b/langtools/test/tools/javac/enum/NoFinal4.java
@@ -26,7 +26,7 @@
* @bug 5097250 5087624
* @summary Finalize methods on enums must be compile time error
* @author Peter von der Ah\u00e9
- * @compile/fail -source 5 NoFinal4.java
+ * @compile/fail NoFinal4.java
*/
enum NoFinal4 {
diff --git a/langtools/test/tools/javac/enum/NoFinal5.java b/langtools/test/tools/javac/enum/NoFinal5.java
index 17ae835..400e8be 100644
--- a/langtools/test/tools/javac/enum/NoFinal5.java
+++ b/langtools/test/tools/javac/enum/NoFinal5.java
@@ -26,7 +26,7 @@
* @bug 5097250 5087624
* @summary Finalize methods on enums must be compile time error
* @author Peter von der Ah\u00e9
- * @compile/fail -source 5 NoFinal5.java
+ * @compile/fail NoFinal5.java
*/
enum NoFinal5 {
diff --git a/langtools/test/tools/javac/enum/OkFinal.java b/langtools/test/tools/javac/enum/OkFinal.java
index a07f225..caa7961 100644
--- a/langtools/test/tools/javac/enum/OkFinal.java
+++ b/langtools/test/tools/javac/enum/OkFinal.java
@@ -26,8 +26,6 @@
* @bug 5097250
* @summary Finalize methods on enums must be compile time error
* @author Peter von der Ah\u00e9
- * @compile -source 5 OkFinal.java
- * @run main OkFinal
*/
public enum OkFinal {
diff --git a/langtools/test/tools/javac/enum/SynthValues.java b/langtools/test/tools/javac/enum/SynthValues.java
index 06ef842..09a6d94 100644
--- a/langtools/test/tools/javac/enum/SynthValues.java
+++ b/langtools/test/tools/javac/enum/SynthValues.java
@@ -26,9 +26,6 @@
* @bug 4984627
* @summary Enums: +VALUES field has no synthetic attribute
* @author gafter
- *
- * @compile -source 1.5 SynthValues.java
- * @run main SynthValues
*/
public enum SynthValues {
diff --git a/langtools/test/tools/javac/enum/T5075242.java b/langtools/test/tools/javac/enum/T5075242.java
index f3c1b7b..5d22a8b 100644
--- a/langtools/test/tools/javac/enum/T5075242.java
+++ b/langtools/test/tools/javac/enum/T5075242.java
@@ -27,7 +27,7 @@
* @summary Cannot make compound type involving Enums
* @author Peter von der Ah\u00e9
*
- * @compile -source 5 T5075242.java
+ * @compile T5075242.java
*/
interface Iface {
diff --git a/langtools/test/tools/javac/enum/T5081785.java b/langtools/test/tools/javac/enum/T5081785.java
index 01fc18e..f9ebb02 100644
--- a/langtools/test/tools/javac/enum/T5081785.java
+++ b/langtools/test/tools/javac/enum/T5081785.java
@@ -28,10 +28,10 @@
* @summary Empty Enums allowed in non-static contexts
* @author Peter von der Ah\u00e9
*
- * @compile/fail -source 1.5 T5081785.java
- * @compile/fail -source 1.5 T5081785a.java
- * @compile/fail -source 1.5 T5081785b.java
- * @compile/fail -source 1.5 T5081785c.java
+ * @compile/fail T5081785.java
+ * @compile/fail T5081785a.java
+ * @compile/fail T5081785b.java
+ * @compile/fail T5081785c.java
*/
class A {
diff --git a/langtools/test/tools/javac/enum/TrailingComma.java b/langtools/test/tools/javac/enum/TrailingComma.java
index f08ee95..aaa5186 100644
--- a/langtools/test/tools/javac/enum/TrailingComma.java
+++ b/langtools/test/tools/javac/enum/TrailingComma.java
@@ -27,7 +27,7 @@
* @summary enum spec allows trailing comma on enum constant list
* @author gafter
*
- * @compile -source 1.5 TrailingComma.java
+ * @compile TrailingComma.java
*/
class TrailingComma {
diff --git a/langtools/test/tools/javac/enum/UserValue.java b/langtools/test/tools/javac/enum/UserValue.java
index f14d22c..36cd01d 100644
--- a/langtools/test/tools/javac/enum/UserValue.java
+++ b/langtools/test/tools/javac/enum/UserValue.java
@@ -27,7 +27,7 @@
* @summary compiler crash on user-defined valueOf in enum
* @author gafter
*
- * @compile -source 1.5 UserValue.java
+ * @compile UserValue.java
*/
public enum UserValue {
diff --git a/langtools/test/tools/javac/enum/ValueOf.java b/langtools/test/tools/javac/enum/ValueOf.java
index 6662c6a..13df7fc 100644
--- a/langtools/test/tools/javac/enum/ValueOf.java
+++ b/langtools/test/tools/javac/enum/ValueOf.java
@@ -26,9 +26,6 @@
* @bug 4872708 5058132
* @summary Improper signature for valueOf
* @author gafter
- *
- * @compile -source 1.5 ValueOf.java
- * @run main ValueOf
*/
public enum ValueOf {
diff --git a/langtools/test/tools/javac/enum/enumSwitch/EnumSwitch.java b/langtools/test/tools/javac/enum/enumSwitch/EnumSwitch.java
index 764e928..b2eae3c 100644
--- a/langtools/test/tools/javac/enum/enumSwitch/EnumSwitch.java
+++ b/langtools/test/tools/javac/enum/enumSwitch/EnumSwitch.java
@@ -27,8 +27,8 @@
* @summary javac-generated code doesn't obey binary compatibility for enums
* @author gafter
*
- * @compile -source 1.5 EnumSwitch.java
- * @compile -source 1.5 Color2.java
+ * @compile EnumSwitch.java
+ * @compile Color2.java
* @run main EnumSwitch
*/
diff --git a/langtools/test/tools/javac/foreach/Foreach.java b/langtools/test/tools/javac/foreach/Foreach.java
index 32f0711..5129fda 100644
--- a/langtools/test/tools/javac/foreach/Foreach.java
+++ b/langtools/test/tools/javac/foreach/Foreach.java
@@ -26,9 +26,6 @@
* @bug 4855355
* @summary implement "foreach" loops as specified in JSR 201
* @author gafter
- *
- * @compile -source 1.5 Foreach.java
- * @run main Foreach
*/
import java.util.Iterator;
diff --git a/langtools/test/tools/javac/foreach/GenericIterator.java b/langtools/test/tools/javac/foreach/GenericIterator.java
index efcf80e..9cfaaaf 100644
--- a/langtools/test/tools/javac/foreach/GenericIterator.java
+++ b/langtools/test/tools/javac/foreach/GenericIterator.java
@@ -27,7 +27,7 @@
* @summary extended 'for' with generic collections causes the compiler to crash
* @author gafter
*
- * @compile -source 1.5 GenericIterator.java
+ * @compile GenericIterator.java
*/
import java.util.*;
diff --git a/langtools/test/tools/javac/foreach/IntersectIterator.java b/langtools/test/tools/javac/foreach/IntersectIterator.java
index ee39c53..ca649d0 100644
--- a/langtools/test/tools/javac/foreach/IntersectIterator.java
+++ b/langtools/test/tools/javac/foreach/IntersectIterator.java
@@ -26,9 +26,6 @@
* @bug 5003207
* @summary new "for" statement fails to cast to second upper bound
* @author gafter
- *
- * @compile -source 1.5 IntersectIterator.java
- * @run main IntersectIterator
*/
import java.util.*;
diff --git a/langtools/test/tools/javac/foreach/ListOfListTest.java b/langtools/test/tools/javac/foreach/ListOfListTest.java
index c13bb3f..a695e08 100644
--- a/langtools/test/tools/javac/foreach/ListOfListTest.java
+++ b/langtools/test/tools/javac/foreach/ListOfListTest.java
@@ -26,9 +26,6 @@
* @bug 4915435
* @summary NullPointerError in Resolve.findMethod() with foreach vs generics
* @author gafter
- *
- * @compile -source 1.5 ListOfListTest.java
- * @run main ListOfListTest
*/
import java.util.List;
diff --git a/langtools/test/tools/javac/foreach/SpecIterable.java b/langtools/test/tools/javac/foreach/SpecIterable.java
index c53843f..59adf77 100644
--- a/langtools/test/tools/javac/foreach/SpecIterable.java
+++ b/langtools/test/tools/javac/foreach/SpecIterable.java
@@ -26,9 +26,6 @@
* @bug 4911157
* @summary Runtime error because of missing method in iterator
* @author gafter
- *
- * @compile -source 1.5 SpecIterable.java
- * @run main SpecIterable
*/
import java.util.Iterator;
diff --git a/langtools/test/tools/javac/foreach/StaticBlock.java b/langtools/test/tools/javac/foreach/StaticBlock.java
index 1600ab2..19a5cd4 100644
--- a/langtools/test/tools/javac/foreach/StaticBlock.java
+++ b/langtools/test/tools/javac/foreach/StaticBlock.java
@@ -27,7 +27,7 @@
* @summary compiler crash (NullPointerException) with foreach in static context
* @author gafter
*
- * @compile -source 1.5 StaticBlock.java
+ * @compile StaticBlock.java
*/
public class StaticBlock {
diff --git a/langtools/test/tools/javac/foreach/SuperfluousAbstract.java b/langtools/test/tools/javac/foreach/SuperfluousAbstract.java
index 39608fa..539415b 100644
--- a/langtools/test/tools/javac/foreach/SuperfluousAbstract.java
+++ b/langtools/test/tools/javac/foreach/SuperfluousAbstract.java
@@ -26,9 +26,6 @@
* @bug 4912795
* @summary AbstractMethodError throws if not redeclare abstract iterator() method
* @author gafter
- *
- * @compile -source 1.5 SuperfluousAbstract.java
- * @run main SuperfluousAbstract
*/
import java.util.AbstractCollection;
diff --git a/langtools/test/tools/javac/generics/ArrayClone.java b/langtools/test/tools/javac/generics/ArrayClone.java
index c596f4b..8dc9506 100644
--- a/langtools/test/tools/javac/generics/ArrayClone.java
+++ b/langtools/test/tools/javac/generics/ArrayClone.java
@@ -27,7 +27,7 @@
* @summary The clone method on arrays should be strongly typed
* @author gafter
*
- * @compile -source 1.5 ArrayClone.java
+ * @compile ArrayClone.java
* @run main ArrayClone
*/
diff --git a/langtools/test/tools/javac/generics/ArrayTypearg.java b/langtools/test/tools/javac/generics/ArrayTypearg.java
index 47d645a..3d4f917 100644
--- a/langtools/test/tools/javac/generics/ArrayTypearg.java
+++ b/langtools/test/tools/javac/generics/ArrayTypearg.java
@@ -27,7 +27,7 @@
* @summary generics: array as generic argument type fails
* @author gafter
*
- * @compile -source 1.5 ArrayTypearg.java
+ * @compile ArrayTypearg.java
*/
import java.util.List;
diff --git a/langtools/test/tools/javac/generics/BridgeClash.java b/langtools/test/tools/javac/generics/BridgeClash.java
index 988eab2..c92f8ce 100644
--- a/langtools/test/tools/javac/generics/BridgeClash.java
+++ b/langtools/test/tools/javac/generics/BridgeClash.java
@@ -27,7 +27,7 @@
* @summary generics: incorrect erasure clash reported
* @author gafter
*
- * @compile -source 1.5 BridgeClash.java
+ * @compile BridgeClash.java
*/
interface I<T> {
diff --git a/langtools/test/tools/javac/generics/BridgeOrder.java b/langtools/test/tools/javac/generics/BridgeOrder.java
index 440ccb2..7e25827 100644
--- a/langtools/test/tools/javac/generics/BridgeOrder.java
+++ b/langtools/test/tools/javac/generics/BridgeOrder.java
@@ -27,7 +27,7 @@
* @summary generics: overridden method gets invoked (bridge method problem)
* @author gafter
*
- * @compile -source 1.5 BridgeOrder.java
+ * @compile BridgeOrder.java
* @run main BridgeOrder
*/
diff --git a/langtools/test/tools/javac/generics/CastCrash.java b/langtools/test/tools/javac/generics/CastCrash.java
index f327419..eb361e0 100644
--- a/langtools/test/tools/javac/generics/CastCrash.java
+++ b/langtools/test/tools/javac/generics/CastCrash.java
@@ -27,7 +27,7 @@
* @summary Crash on cast
* @author gafter
*
- * @compile/fail -source 1.5 CastCrash.java
+ * @compile/fail CastCrash.java
*/
package cast.crash;
diff --git a/langtools/test/tools/javac/generics/Casting.java b/langtools/test/tools/javac/generics/Casting.java
index 49f0ab9..e08544c 100644
--- a/langtools/test/tools/javac/generics/Casting.java
+++ b/langtools/test/tools/javac/generics/Casting.java
@@ -27,7 +27,7 @@
* @summary generics problem with casting
* @author gafter
*
- * @compile -source 1.5 Casting.java
+ * @compile Casting.java
*/
package test.tools.javac.generics.Casting;
diff --git a/langtools/test/tools/javac/generics/Casting2.java b/langtools/test/tools/javac/generics/Casting2.java
index 001a1bc..7274624 100644
--- a/langtools/test/tools/javac/generics/Casting2.java
+++ b/langtools/test/tools/javac/generics/Casting2.java
@@ -27,7 +27,7 @@
* @summary stack overflow error compiling EnumSet.java
* @author gafter
*
- * @compile -source 1.5 Casting2.java
+ * @compile Casting2.java
*/
import java.util.*;
diff --git a/langtools/test/tools/javac/generics/Casting3.java b/langtools/test/tools/javac/generics/Casting3.java
index 08058ff..8742081 100644
--- a/langtools/test/tools/javac/generics/Casting3.java
+++ b/langtools/test/tools/javac/generics/Casting3.java
@@ -27,7 +27,7 @@
* @summary compiler crash with stack overflow on unchecked cast
* @author gafter
*
- * @compile -source 1.5 Casting3.java
+ * @compile Casting3.java
*/
package test.tools.javac.generics.Casting3;
diff --git a/langtools/test/tools/javac/generics/Casting4.java b/langtools/test/tools/javac/generics/Casting4.java
index b4eae4c..698630b 100644
--- a/langtools/test/tools/javac/generics/Casting4.java
+++ b/langtools/test/tools/javac/generics/Casting4.java
@@ -27,7 +27,7 @@
* @summary Cannot cast Comparable<?>s
* @author gafter
*
- * @compile -Werror -Xlint:unchecked -source 1.5 Casting4.java
+ * @compile -Werror -Xlint:unchecked Casting4.java
*/
package test.tools.javac.generics.Casting4;
diff --git a/langtools/test/tools/javac/generics/Conditional.java b/langtools/test/tools/javac/generics/Conditional.java
index cceebb9..bbeaf82 100644
--- a/langtools/test/tools/javac/generics/Conditional.java
+++ b/langtools/test/tools/javac/generics/Conditional.java
@@ -27,7 +27,7 @@
* @summary Rule for semantics of ?: in the presence of generics and generic class Class
* @author gafter
*
- * @compile -source 1.5 Conditional.java
+ * @compile Conditional.java
*/
package conditional;
diff --git a/langtools/test/tools/javac/generics/Covar2.java b/langtools/test/tools/javac/generics/Covar2.java
index 9731ac6..8f32f30 100644
--- a/langtools/test/tools/javac/generics/Covar2.java
+++ b/langtools/test/tools/javac/generics/Covar2.java
@@ -27,7 +27,7 @@
* @summary Additional unit tests for covariant returns
* @author gafter
*
- * @compile -source 1.5 Covar2.java
+ * @compile Covar2.java
* @run main Covar2
*/
diff --git a/langtools/test/tools/javac/generics/Covar3.java b/langtools/test/tools/javac/generics/Covar3.java
index b3b525a..dcac25a 100644
--- a/langtools/test/tools/javac/generics/Covar3.java
+++ b/langtools/test/tools/javac/generics/Covar3.java
@@ -27,7 +27,7 @@
* @summary missing ambiguity error
* @author gafter
*
- * @compile/fail -source 1.5 Covar3.java
+ * @compile/fail Covar3.java
*/
package covar3;
diff --git a/langtools/test/tools/javac/generics/Covar4.java b/langtools/test/tools/javac/generics/Covar4.java
index d9ff0bb..61a25e5 100644
--- a/langtools/test/tools/javac/generics/Covar4.java
+++ b/langtools/test/tools/javac/generics/Covar4.java
@@ -27,7 +27,7 @@
* @summary no covariant returns involving primitives
* @author gafter
*
- * @compile/fail -source 1.5 Covar4.java
+ * @compile/fail Covar4.java
*/
public class Covar4 {
diff --git a/langtools/test/tools/javac/generics/Crash01.java b/langtools/test/tools/javac/generics/Crash01.java
index 3238719..7cc4973 100644
--- a/langtools/test/tools/javac/generics/Crash01.java
+++ b/langtools/test/tools/javac/generics/Crash01.java
@@ -27,7 +27,7 @@
* @summary generics: crash when using class in bound defined after usage
* @author gafter
*
- * @compile -source 1.5 Crash01.java
+ * @compile Crash01.java
*/
public class Crash01<A extends TestClass1 & IA> {
diff --git a/langtools/test/tools/javac/generics/Crash02.java b/langtools/test/tools/javac/generics/Crash02.java
index ac61e05..1293743 100644
--- a/langtools/test/tools/javac/generics/Crash02.java
+++ b/langtools/test/tools/javac/generics/Crash02.java
@@ -27,7 +27,7 @@
* @summary compiler crash in class writer
* @author gafter
*
- * @compile -source 1.5 Crash02.java
+ * @compile Crash02.java
*/
import java.util.ArrayList;
diff --git a/langtools/test/tools/javac/generics/CyclicInheritance3.java b/langtools/test/tools/javac/generics/CyclicInheritance3.java
index 3dcda4f..864016e 100644
--- a/langtools/test/tools/javac/generics/CyclicInheritance3.java
+++ b/langtools/test/tools/javac/generics/CyclicInheritance3.java
@@ -26,7 +26,7 @@
* @bug 4861743
* @summary generics: incorrect cyclic inheritance error with type parameters
*
- * @compile -source 1.5 CyclicInheritance3.java
+ * @compile CyclicInheritance3.java
*/
class Cycle {
diff --git a/langtools/test/tools/javac/generics/CyclicInheritance5.java b/langtools/test/tools/javac/generics/CyclicInheritance5.java
index bde56bc..81a5314 100644
--- a/langtools/test/tools/javac/generics/CyclicInheritance5.java
+++ b/langtools/test/tools/javac/generics/CyclicInheritance5.java
@@ -26,7 +26,7 @@
* @bug 4862621
* @summary generics: incorrect cyclic inheritance error
*
- * @compile -source 1.5 CyclicInheritance5.java
+ * @compile CyclicInheritance5.java
*/
class G<N extends G.Node<N>> {
diff --git a/langtools/test/tools/javac/generics/ErasureClashCrash.java b/langtools/test/tools/javac/generics/ErasureClashCrash.java
index bc72356..f420111 100644
--- a/langtools/test/tools/javac/generics/ErasureClashCrash.java
+++ b/langtools/test/tools/javac/generics/ErasureClashCrash.java
@@ -27,7 +27,7 @@
* @summary javac crash with improper overrider
* @author gafter
*
- * @compile/fail -source 1.5 ErasureClashCrash.java
+ * @compile/fail ErasureClashCrash.java
*/
interface Compar<T> {
diff --git a/langtools/test/tools/javac/generics/ExtendedRaw1.java b/langtools/test/tools/javac/generics/ExtendedRaw1.java
index a345175..15e8a49 100644
--- a/langtools/test/tools/javac/generics/ExtendedRaw1.java
+++ b/langtools/test/tools/javac/generics/ExtendedRaw1.java
@@ -27,7 +27,7 @@
* @summary generics: extension of raw not treated as raw.
* @author gafter
*
- * @compile -source 1.5 ExtendedRaw1.java
+ * @compile ExtendedRaw1.java
*/
class Comparator<T> {}
diff --git a/langtools/test/tools/javac/generics/ExtendedRaw2.java b/langtools/test/tools/javac/generics/ExtendedRaw2.java
index 351a868..059ada7 100644
--- a/langtools/test/tools/javac/generics/ExtendedRaw2.java
+++ b/langtools/test/tools/javac/generics/ExtendedRaw2.java
@@ -27,7 +27,7 @@
* @summary generics: extension of raw not treated as raw.
* @author gafter
*
- * @compile -source 1.5 ExtendedRaw2.java
+ * @compile ExtendedRaw2.java
*/
// from library
diff --git a/langtools/test/tools/javac/generics/ExtendedRaw3.java b/langtools/test/tools/javac/generics/ExtendedRaw3.java
index 2e72270..796a063 100644
--- a/langtools/test/tools/javac/generics/ExtendedRaw3.java
+++ b/langtools/test/tools/javac/generics/ExtendedRaw3.java
@@ -27,7 +27,7 @@
* @summary generics: bridge method not considered to fulfil interface in abstract class
* @author gafter
*
- * @compile -source 1.5 ExtendedRaw3.java
+ * @compile ExtendedRaw3.java
*/
interface MyComparable<T extends MyComparable<T>> {
diff --git a/langtools/test/tools/javac/generics/ExtendedRaw4.java b/langtools/test/tools/javac/generics/ExtendedRaw4.java
index bd4bc8a..0a5ef69 100644
--- a/langtools/test/tools/javac/generics/ExtendedRaw4.java
+++ b/langtools/test/tools/javac/generics/ExtendedRaw4.java
@@ -27,7 +27,7 @@
* @summary REGRESSION: compatibility problem inheriting raw type
* @author gafter
*
- * @compile -source 1.5 ExtendedRaw4.java
+ * @compile ExtendedRaw4.java
*/
class ExtendedRaw4 extends java.util.TreeSet {}
diff --git a/langtools/test/tools/javac/generics/FinalBridge.java b/langtools/test/tools/javac/generics/FinalBridge.java
index d18ebee8..2ec1be7 100644
--- a/langtools/test/tools/javac/generics/FinalBridge.java
+++ b/langtools/test/tools/javac/generics/FinalBridge.java
@@ -27,7 +27,7 @@
* @summary generics: bridge for inherited final method can cause verify error
* @author gafter
*
- * @compile -source 1.5 FinalBridge.java
+ * @compile FinalBridge.java
* @run main FinalBridge
*/
diff --git a/langtools/test/tools/javac/generics/GenLit1.java b/langtools/test/tools/javac/generics/GenLit1.java
index 348447a..ad288b0 100644
--- a/langtools/test/tools/javac/generics/GenLit1.java
+++ b/langtools/test/tools/javac/generics/GenLit1.java
@@ -27,7 +27,7 @@
* @summary compiler crash with ill-formed annotation
* @author gafter
*
- * @compile/fail -source 1.5 GenLit1.java
+ * @compile/fail GenLit1.java
*/
package genLit1;
diff --git a/langtools/test/tools/javac/generics/GenLit2.java b/langtools/test/tools/javac/generics/GenLit2.java
index 8437708..4b158c4 100644
--- a/langtools/test/tools/javac/generics/GenLit2.java
+++ b/langtools/test/tools/javac/generics/GenLit2.java
@@ -27,7 +27,7 @@
* @summary java allows class literal on generic type parameter array
* @author gafter
*
- * @compile/fail -source 1.5 GenLit2.java
+ * @compile/fail GenLit2.java
*/
package genLit2;
diff --git a/langtools/test/tools/javac/generics/GenericAnonCtor.java b/langtools/test/tools/javac/generics/GenericAnonCtor.java
index 1090128..a5b46d5 100644
--- a/langtools/test/tools/javac/generics/GenericAnonCtor.java
+++ b/langtools/test/tools/javac/generics/GenericAnonCtor.java
@@ -27,7 +27,7 @@
* @summary javac crash on parameterized anonymous constructor invocation
* @author gafter
*
- * @compile -source 1.5 GenericAnonCtor.java
+ * @compile GenericAnonCtor.java
* @run main GenericAnonCtor
*/
diff --git a/langtools/test/tools/javac/generics/GenericMerge.java b/langtools/test/tools/javac/generics/GenericMerge.java
index 639c985..de0441a 100644
--- a/langtools/test/tools/javac/generics/GenericMerge.java
+++ b/langtools/test/tools/javac/generics/GenericMerge.java
@@ -27,7 +27,7 @@
* @summary generics: compiler crash merging signatures of generic methods
* @author gafter
*
- * @compile -source 1.5 GenericMerge.java
+ * @compile GenericMerge.java
*/
class Box<T> {}
diff --git a/langtools/test/tools/javac/generics/GenericOverride.java b/langtools/test/tools/javac/generics/GenericOverride.java
index 273ba3f..334c1e1 100644
--- a/langtools/test/tools/javac/generics/GenericOverride.java
+++ b/langtools/test/tools/javac/generics/GenericOverride.java
@@ -27,7 +27,7 @@
* @summary Cannot override non-trivial generic method
* @author gafter
*
- * @compile -source 1.5 GenericOverride.java
+ * @compile GenericOverride.java
*/
package generic.override;
diff --git a/langtools/test/tools/javac/generics/GenericThrowable.java b/langtools/test/tools/javac/generics/GenericThrowable.java
index 2de2503..7e89f3b 100644
--- a/langtools/test/tools/javac/generics/GenericThrowable.java
+++ b/langtools/test/tools/javac/generics/GenericThrowable.java
@@ -27,7 +27,7 @@
* @summary java.lang.Throwable inheritance in parameterized type
* @author gafter
*
- * @compile/fail -source 1.5 GenericThrowable.java
+ * @compile/fail GenericThrowable.java
*/
class GenericThrowable<T> extends NullPointerException {
diff --git a/langtools/test/tools/javac/generics/GetClass.java b/langtools/test/tools/javac/generics/GetClass.java
index 3adc913..fbc7209 100644
--- a/langtools/test/tools/javac/generics/GetClass.java
+++ b/langtools/test/tools/javac/generics/GetClass.java
@@ -27,7 +27,7 @@
* @summary the type of x.getClass() is no longer Class<? extends X>
* @author gafter
*
- * @compile/fail -source 1.5 GetClass.java
+ * @compile/fail GetClass.java
*/
public class GetClass {
diff --git a/langtools/test/tools/javac/generics/GetClass2.java b/langtools/test/tools/javac/generics/GetClass2.java
index fccd625..4fa7748 100644
--- a/langtools/test/tools/javac/generics/GetClass2.java
+++ b/langtools/test/tools/javac/generics/GetClass2.java
@@ -27,7 +27,7 @@
* @summary the type of x.getClass() is Class<? extends |X|>
* @author seligman
*
- * @compile -source 1.5 GetClass2.java
+ * @compile GetClass2.java
* @run main GetClass2
*/
diff --git a/langtools/test/tools/javac/generics/InheritanceConflict.java b/langtools/test/tools/javac/generics/InheritanceConflict.java
index c0e0a62..b681ff2 100644
--- a/langtools/test/tools/javac/generics/InheritanceConflict.java
+++ b/langtools/test/tools/javac/generics/InheritanceConflict.java
@@ -27,7 +27,7 @@
* @summary two inherited methods with same signature
* @author gafter, Maurizio Cimadamore
*
- * @compile/fail -source 1.5 InheritanceConflict.java
+ * @compile/fail InheritanceConflict.java
*/
package inheritance.conflict;
diff --git a/langtools/test/tools/javac/generics/InheritanceConflict2.java b/langtools/test/tools/javac/generics/InheritanceConflict2.java
index 1ed122b..d2a746b 100644
--- a/langtools/test/tools/javac/generics/InheritanceConflict2.java
+++ b/langtools/test/tools/javac/generics/InheritanceConflict2.java
@@ -27,7 +27,7 @@
* @summary two inherited methods with same signature
* @author gafter, Maurizio Cimadamore
*
- * @compile -source 1.5 InheritanceConflict2.java
+ * @compile InheritanceConflict2.java
*/
package inheritance.conflict2;
diff --git a/langtools/test/tools/javac/generics/InheritanceConflict3.java b/langtools/test/tools/javac/generics/InheritanceConflict3.java
index aaa2484..9db11b4 100644
--- a/langtools/test/tools/javac/generics/InheritanceConflict3.java
+++ b/langtools/test/tools/javac/generics/InheritanceConflict3.java
@@ -27,7 +27,7 @@
* @summary two inherited methods with same signature
* @author darcy
*
- * @compile/fail -source 1.5 InheritanceConflict3.java
+ * @compile/fail InheritanceConflict3.java
*/
package inheritance.conflict3;
diff --git a/langtools/test/tools/javac/generics/InnerInterface1.java b/langtools/test/tools/javac/generics/InnerInterface1.java
index 0c59950..08bbb0f 100644
--- a/langtools/test/tools/javac/generics/InnerInterface1.java
+++ b/langtools/test/tools/javac/generics/InnerInterface1.java
@@ -27,7 +27,7 @@
* @summary Inner interfaces are not treated as static
* @author gafter
*
- * @compile -source 1.5 InnerInterface1.java
+ * @compile InnerInterface1.java
*/
package test.tools.javac.generics.InnerInterface1;
diff --git a/langtools/test/tools/javac/generics/InnerInterface2.java b/langtools/test/tools/javac/generics/InnerInterface2.java
index dd6e876..50de843 100644
--- a/langtools/test/tools/javac/generics/InnerInterface2.java
+++ b/langtools/test/tools/javac/generics/InnerInterface2.java
@@ -27,7 +27,7 @@
* @summary inner interface causes "not within bounds"
* @author gafter
*
- * @compile -source 1.5 InnerInterface2.java
+ * @compile InnerInterface2.java
*/
package test.tools.javac.generics.InnerInterface2;
diff --git a/langtools/test/tools/javac/generics/InstanceOf1.java b/langtools/test/tools/javac/generics/InstanceOf1.java
index 0069ed3..0841d34 100644
--- a/langtools/test/tools/javac/generics/InstanceOf1.java
+++ b/langtools/test/tools/javac/generics/InstanceOf1.java
@@ -27,7 +27,7 @@
* @summary the type in an instanceof expression must be reifiable
* @author seligman
*
- * @compile -source 1.5 InstanceOf1.java
+ * @compile InstanceOf1.java
*/
public class InstanceOf1 {
diff --git a/langtools/test/tools/javac/generics/InstanceOf2.java b/langtools/test/tools/javac/generics/InstanceOf2.java
index 8afe348..39e5d7b 100644
--- a/langtools/test/tools/javac/generics/InstanceOf2.java
+++ b/langtools/test/tools/javac/generics/InstanceOf2.java
@@ -27,7 +27,7 @@
* @summary the type in an instanceof expression must be reifiable
* @author seligman
*
- * @compile/fail -source 1.5 InstanceOf2.java
+ * @compile/fail InstanceOf2.java
*/
public class InstanceOf2 {
diff --git a/langtools/test/tools/javac/generics/InstanceOf3.java b/langtools/test/tools/javac/generics/InstanceOf3.java
index 2c32b5e..62b2edf 100644
--- a/langtools/test/tools/javac/generics/InstanceOf3.java
+++ b/langtools/test/tools/javac/generics/InstanceOf3.java
@@ -27,7 +27,7 @@
* @summary the type in an instanceof expression must be reifiable
* @author seligman
*
- * @compile/fail -source 1.5 InstanceOf3.java
+ * @compile/fail InstanceOf3.java
*/
public class InstanceOf3 {
diff --git a/langtools/test/tools/javac/generics/InterfaceCast1.java b/langtools/test/tools/javac/generics/InterfaceCast1.java
index a4d961d..65d4cb1 100644
--- a/langtools/test/tools/javac/generics/InterfaceCast1.java
+++ b/langtools/test/tools/javac/generics/InterfaceCast1.java
@@ -27,7 +27,7 @@
* @summary overridden interface method causes the compiler to reject cast
* @author gafter
*
- * @compile -source 1.5 InterfaceCast1.java
+ * @compile InterfaceCast1.java
*/
public class InterfaceCast1 {
diff --git a/langtools/test/tools/javac/generics/LoadOrder.java b/langtools/test/tools/javac/generics/LoadOrder.java
index ee5124a..040714f 100644
--- a/langtools/test/tools/javac/generics/LoadOrder.java
+++ b/langtools/test/tools/javac/generics/LoadOrder.java
@@ -27,7 +27,7 @@
* @summary generics: generic class files can cause recursive class loading (crashing javac)
* @author gafter
*
- * @compile -source 1.5 LoadOrder.java
+ * @compile LoadOrder.java
*/
import java.util.Collections;
diff --git a/langtools/test/tools/javac/generics/MissingBridge.java b/langtools/test/tools/javac/generics/MissingBridge.java
index 43e59de..cf7dea6 100644
--- a/langtools/test/tools/javac/generics/MissingBridge.java
+++ b/langtools/test/tools/javac/generics/MissingBridge.java
@@ -27,7 +27,7 @@
* @summary Calling inherited generics method via interface causes AbstractMethodError
* @author gafter
*
- * @compile -source 1.5 MissingBridge.java
+ * @compile MissingBridge.java
* @run main MissingBridge
*/
diff --git a/langtools/test/tools/javac/generics/MissingCast.java b/langtools/test/tools/javac/generics/MissingCast.java
index 6504a1c..2f8ebbc 100644
--- a/langtools/test/tools/javac/generics/MissingCast.java
+++ b/langtools/test/tools/javac/generics/MissingCast.java
@@ -27,7 +27,7 @@
* @summary redundant cast with generified APIs causes verify error
* @author gafter
*
- * @compile -source 1.5 MissingCast.java
+ * @compile MissingCast.java
* @run main MissingCast
*/
diff --git a/langtools/test/tools/javac/generics/Multibound1.java b/langtools/test/tools/javac/generics/Multibound1.java
index f666325..681c7bd 100644
--- a/langtools/test/tools/javac/generics/Multibound1.java
+++ b/langtools/test/tools/javac/generics/Multibound1.java
@@ -27,7 +27,7 @@
* @summary javac failed to check second bound
* @author gafter
*
- * @compile/fail -source 1.5 Multibound1.java
+ * @compile/fail Multibound1.java
*/
package test.tools.javac.generics.Multibound1;
diff --git a/langtools/test/tools/javac/generics/MultipleInheritance.java b/langtools/test/tools/javac/generics/MultipleInheritance.java
index 2c51a1e..d662949 100644
--- a/langtools/test/tools/javac/generics/MultipleInheritance.java
+++ b/langtools/test/tools/javac/generics/MultipleInheritance.java
@@ -27,7 +27,7 @@
* @summary generics problem with multiple interface extension
* @author gafter
*
- * @compile -source 1.5 MultipleInheritance.java
+ * @compile MultipleInheritance.java
*/
package test.tools.javac.generics.MultipleInheritance;
diff --git a/langtools/test/tools/javac/generics/NameOrder.java b/langtools/test/tools/javac/generics/NameOrder.java
index 879cd52..d9cdcbc 100644
--- a/langtools/test/tools/javac/generics/NameOrder.java
+++ b/langtools/test/tools/javac/generics/NameOrder.java
@@ -27,7 +27,7 @@
* @summary generics: type inference failure due to a bug in ClassSymbol.isLess
* @author gafter
*
- * @compile -source 1.5 NameOrder.java
+ * @compile NameOrder.java
*/
package test.tools.javac.generics.NameOrder;
diff --git a/langtools/test/tools/javac/generics/Nonlinear.java b/langtools/test/tools/javac/generics/Nonlinear.java
index 0f7058a..d95c1fa 100644
--- a/langtools/test/tools/javac/generics/Nonlinear.java
+++ b/langtools/test/tools/javac/generics/Nonlinear.java
@@ -27,7 +27,7 @@
* @summary A bug in the original JSR14 generics specification
* created a loophole in the type system.
*
- * @compile/fail -source 1.5 Nonlinear.java
+ * @compile/fail Nonlinear.java
*/
diff --git a/langtools/test/tools/javac/generics/ParametricException.java b/langtools/test/tools/javac/generics/ParametricException.java
index fdef928..36c2248 100644
--- a/langtools/test/tools/javac/generics/ParametricException.java
+++ b/langtools/test/tools/javac/generics/ParametricException.java
@@ -27,7 +27,7 @@
* @summary generics: parametric exception type versus overriding
* @author gafter
*
- * @compile -source 1.5 ParametricException.java
+ * @compile ParametricException.java
*/
import java.io.*;
diff --git a/langtools/test/tools/javac/generics/ParenVerify.java b/langtools/test/tools/javac/generics/ParenVerify.java
index 72f5232..8949487 100644
--- a/langtools/test/tools/javac/generics/ParenVerify.java
+++ b/langtools/test/tools/javac/generics/ParenVerify.java
@@ -27,7 +27,7 @@
* @summary generics: verify error when redundant parens used!
* @author gafter
*
- * @compile -source 1.5 ParenVerify.java
+ * @compile ParenVerify.java
* @run main ParenVerify
*/
diff --git a/langtools/test/tools/javac/generics/PermuteBound.java b/langtools/test/tools/javac/generics/PermuteBound.java
index a846e1d..9481819 100644
--- a/langtools/test/tools/javac/generics/PermuteBound.java
+++ b/langtools/test/tools/javac/generics/PermuteBound.java
@@ -27,7 +27,7 @@
* @summary generics: subtyping problem when type parameters permuted
* @author gafter
*
- * @compile -source 1.5 PermuteBound.java
+ * @compile PermuteBound.java
*/
package test.tools.javac.generics.PermuteBound;
diff --git a/langtools/test/tools/javac/generics/PrimitiveClass.java b/langtools/test/tools/javac/generics/PrimitiveClass.java
index 2d1e5d9..09a93df 100644
--- a/langtools/test/tools/javac/generics/PrimitiveClass.java
+++ b/langtools/test/tools/javac/generics/PrimitiveClass.java
@@ -27,7 +27,7 @@
* @summary int.class and ilk have wrong type (5028351 rejected)
* @author gafter
*
- * @compile -source 1.5 PrimitiveClass.java
+ * @compile PrimitiveClass.java
*/
package primitive._class;
diff --git a/langtools/test/tools/javac/generics/PrimitiveVariant.java b/langtools/test/tools/javac/generics/PrimitiveVariant.java
index ae80463..5a11a5d 100644
--- a/langtools/test/tools/javac/generics/PrimitiveVariant.java
+++ b/langtools/test/tools/javac/generics/PrimitiveVariant.java
@@ -27,7 +27,7 @@
* @summary compiler allows overriding with different primitive return type
* @author gafter
*
- * @compile/fail -source 1.5 PrimitiveVariant.java
+ * @compile/fail PrimitiveVariant.java
*/
package test.tools.javac.generics.PrimitiveVariant;
diff --git a/langtools/test/tools/javac/generics/RawClient.java b/langtools/test/tools/javac/generics/RawClient.java
index 56320df..e6a6aef 100644
--- a/langtools/test/tools/javac/generics/RawClient.java
+++ b/langtools/test/tools/javac/generics/RawClient.java
@@ -27,7 +27,7 @@
* @summary javac should implement JLS3 three-pass overload resolution
* @author gafter
*
- * @compile -source 1.5 RawClient.java
+ * @compile RawClient.java
*/
package rawClient;
diff --git a/langtools/test/tools/javac/generics/RefEqual.java b/langtools/test/tools/javac/generics/RefEqual.java
index 34ff1a7..f37f3b3 100644
--- a/langtools/test/tools/javac/generics/RefEqual.java
+++ b/langtools/test/tools/javac/generics/RefEqual.java
@@ -28,7 +28,7 @@
* @author gafter
*
* @compile -source 1.4 RefEqual.java
- * @compile/fail -source 1.5 RefEqual.java
+ * @compile/fail RefEqual.java
*/
class RefEqual {
diff --git a/langtools/test/tools/javac/generics/RelaxedArrays.java b/langtools/test/tools/javac/generics/RelaxedArrays.java
index 7cc73ff..f850168 100644
--- a/langtools/test/tools/javac/generics/RelaxedArrays.java
+++ b/langtools/test/tools/javac/generics/RelaxedArrays.java
@@ -27,7 +27,7 @@
* @summary relaxed rules for array of generic type and varargs.
* @author gafter
*
- * @compile -source 1.5 RelaxedArrays.java
+ * @compile RelaxedArrays.java
* @run main RelaxedArrays
*/
diff --git a/langtools/test/tools/javac/generics/ReverseOrder.java b/langtools/test/tools/javac/generics/ReverseOrder.java
index e90b252..873bd2e 100644
--- a/langtools/test/tools/javac/generics/ReverseOrder.java
+++ b/langtools/test/tools/javac/generics/ReverseOrder.java
@@ -27,7 +27,7 @@
* @summary problem with generic signature for reverseOrder
* @author gafter
*
- * @compile -source 1.5 ReverseOrder.java
+ * @compile ReverseOrder.java
*/
package test.reverseOrder;
diff --git a/langtools/test/tools/javac/generics/SelfImplement.java b/langtools/test/tools/javac/generics/SelfImplement.java
index b17d352..73d252b 100644
--- a/langtools/test/tools/javac/generics/SelfImplement.java
+++ b/langtools/test/tools/javac/generics/SelfImplement.java
@@ -27,7 +27,7 @@
* @summary generics: reject implementation with incorrect return type
* @author gafter
*
- * @compile/fail -source 1.5 SelfImplement.java
+ * @compile/fail SelfImplement.java
*/
class SelfImplement {
diff --git a/langtools/test/tools/javac/generics/SilentUnchecked.java b/langtools/test/tools/javac/generics/SilentUnchecked.java
index 7296764..87c687f 100644
--- a/langtools/test/tools/javac/generics/SilentUnchecked.java
+++ b/langtools/test/tools/javac/generics/SilentUnchecked.java
@@ -27,7 +27,7 @@
* @summary unchecked conversion from raw to reifiable generic requires no warning
* @author gafter
*
- * @compile -Xlint:unchecked -Werror -source 1.5 SilentUnchecked.java
+ * @compile -Xlint:unchecked -Werror SilentUnchecked.java
*/
package silent.unchecked;
diff --git a/langtools/test/tools/javac/generics/SuperTypeargs.java b/langtools/test/tools/javac/generics/SuperTypeargs.java
index 6605dbb..4c3d5f2 100644
--- a/langtools/test/tools/javac/generics/SuperTypeargs.java
+++ b/langtools/test/tools/javac/generics/SuperTypeargs.java
@@ -27,7 +27,7 @@
* @summary compilation error for super.<T,E>f() and ClassName.super.<T,E>f()
* @author gafter
*
- * @compile -source 1.5 SuperTypeargs.java
+ * @compile SuperTypeargs.java
*/
package superTypeargs;
diff --git a/langtools/test/tools/javac/generics/T4661029.java b/langtools/test/tools/javac/generics/T4661029.java
index 0d36191..4a67021 100644
--- a/langtools/test/tools/javac/generics/T4661029.java
+++ b/langtools/test/tools/javac/generics/T4661029.java
@@ -26,7 +26,7 @@
* @summary generics: assertion error using Arrays.fill
* @author gafter
*
- * @compile -source 1.5 T4661029.java
+ * @compile T4661029.java
*/
public class T4661029 {
diff --git a/langtools/test/tools/javac/generics/T4683314.java b/langtools/test/tools/javac/generics/T4683314.java
index 1b370f7..a77d37a 100644
--- a/langtools/test/tools/javac/generics/T4683314.java
+++ b/langtools/test/tools/javac/generics/T4683314.java
@@ -27,7 +27,7 @@
* @summary generics: overload resolution error in non-generic code
* @author gafter
*
- * @compile -source 1.5 T4683314.java
+ * @compile T4683314.java
*/
class T4683314a {
diff --git a/langtools/test/tools/javac/generics/T4684378.java b/langtools/test/tools/javac/generics/T4684378.java
index a6cbc61..2be870c 100644
--- a/langtools/test/tools/javac/generics/T4684378.java
+++ b/langtools/test/tools/javac/generics/T4684378.java
@@ -27,7 +27,7 @@
* @summary generics: verify error in generated bytecode
* @author gafter
*
- * @compile -source 1.5 T4684378.java
+ * @compile T4684378.java
* @run main T4684378
*/
diff --git a/langtools/test/tools/javac/generics/T4695348.java b/langtools/test/tools/javac/generics/T4695348.java
index b543226..ad99e8e 100644
--- a/langtools/test/tools/javac/generics/T4695348.java
+++ b/langtools/test/tools/javac/generics/T4695348.java
@@ -27,7 +27,7 @@
* @summary generics: compiler allows ref to type bounds in static members
* @author gafter
*
- * @compile/fail -source 1.5 T4695348.java
+ * @compile/fail T4695348.java
*/
class T4695348<T> {
diff --git a/langtools/test/tools/javac/generics/T4695415.java b/langtools/test/tools/javac/generics/T4695415.java
index aa17845..ef12dcd 100644
--- a/langtools/test/tools/javac/generics/T4695415.java
+++ b/langtools/test/tools/javac/generics/T4695415.java
@@ -27,7 +27,7 @@
* @summary generics: bug in type inference when method result used as an argument
* @author gafter
*
- * @compile -source 1.5 T4695415.java
+ * @compile T4695415.java
*/
class X<T extends Number> {
diff --git a/langtools/test/tools/javac/generics/T4695847.java b/langtools/test/tools/javac/generics/T4695847.java
index aa743fb..07b87c0 100644
--- a/langtools/test/tools/javac/generics/T4695847.java
+++ b/langtools/test/tools/javac/generics/T4695847.java
@@ -27,7 +27,7 @@
* @summary generics: problem with inference of primitive return values
* @author gafter
*
- * @compile -source 1.5 T4695847.java
+ * @compile T4695847.java
*/
public class T4695847<T> {
diff --git a/langtools/test/tools/javac/generics/T4711570.java b/langtools/test/tools/javac/generics/T4711570.java
index 35799e2..e39271b 100644
--- a/langtools/test/tools/javac/generics/T4711570.java
+++ b/langtools/test/tools/javac/generics/T4711570.java
@@ -27,7 +27,7 @@
* @summary generics: problem with methods when type parameter doesn't appear in signature
* @author gafter
*
- * @compile -source 1.5 T4711570.java
+ * @compile T4711570.java
*/
class T4711570 {
diff --git a/langtools/test/tools/javac/generics/T4711572.java b/langtools/test/tools/javac/generics/T4711572.java
index 008c25b..34f353b 100644
--- a/langtools/test/tools/javac/generics/T4711572.java
+++ b/langtools/test/tools/javac/generics/T4711572.java
@@ -27,7 +27,7 @@
* @summary generics: problem with type inference for recursive methods
* @author gafter
*
- * @compile -source 1.5 T4683314.java
+ * @compile T4683314.java
*/
class T4711572 {
diff --git a/langtools/test/tools/javac/generics/T4711694.java b/langtools/test/tools/javac/generics/T4711694.java
index d77eb44..5ea9622 100644
--- a/langtools/test/tools/javac/generics/T4711694.java
+++ b/langtools/test/tools/javac/generics/T4711694.java
@@ -27,7 +27,7 @@
* @summary generics: missing bridge method for inherited implementation
* @author gafter
*
- * @compile -source 1.5 T4711694.java
+ * @compile T4711694.java
* @run main T4711694
*/
diff --git a/langtools/test/tools/javac/generics/T4738171.java b/langtools/test/tools/javac/generics/T4738171.java
index 080b190..6187d5c0 100644
--- a/langtools/test/tools/javac/generics/T4738171.java
+++ b/langtools/test/tools/javac/generics/T4738171.java
@@ -27,7 +27,7 @@
* @summary generics: problem with equivalence of generic types
* @author gafter
*
- * @compile/fail -source 1.5 T4738171.java
+ * @compile/fail T4738171.java
*/
interface If<T> {
diff --git a/langtools/test/tools/javac/generics/T4739399.java b/langtools/test/tools/javac/generics/T4739399.java
index f32a9be..c4da2e7 100644
--- a/langtools/test/tools/javac/generics/T4739399.java
+++ b/langtools/test/tools/javac/generics/T4739399.java
@@ -27,7 +27,7 @@
* @summary generics: crash after error regarding bounds on type variable
* @author gafter
*
- * @compile/fail -source 1.5 T4739399.java
+ * @compile/fail T4739399.java
*/
class T4739399 {
diff --git a/langtools/test/tools/javac/generics/T4757416.java b/langtools/test/tools/javac/generics/T4757416.java
index b4ec9f3..74b0558 100644
--- a/langtools/test/tools/javac/generics/T4757416.java
+++ b/langtools/test/tools/javac/generics/T4757416.java
@@ -27,7 +27,7 @@
* @summary generics: erasure clash not detected
* @author gafter
*
- * @compile/fail -source 1.5 T4757416.java
+ * @compile/fail T4757416.java
*/
class T4756416 {
diff --git a/langtools/test/tools/javac/generics/T4784207a.java b/langtools/test/tools/javac/generics/T4784207a.java
index 8727298..0a4f9a6 100644
--- a/langtools/test/tools/javac/generics/T4784207a.java
+++ b/langtools/test/tools/javac/generics/T4784207a.java
@@ -27,8 +27,8 @@
* @summary generics: method overriding missed with separate compilation
* @author gafter
*
- * @compile -source 1.5 T4784207a.java
- * @compile -source 1.5 T4784207b.java
+ * @compile T4784207a.java
+ * @compile T4784207b.java
*/
interface T4784207a_i extends Comparable<T4784207a_i>{
diff --git a/langtools/test/tools/javac/generics/T4784219.java b/langtools/test/tools/javac/generics/T4784219.java
index bc83d01..3b65c55 100644
--- a/langtools/test/tools/javac/generics/T4784219.java
+++ b/langtools/test/tools/javac/generics/T4784219.java
@@ -27,7 +27,7 @@
* @summary generics: compiler crash after diagnostic
* @author gafter
*
- * @compile -source 1.5 T4683314.java
+ * @compile T4683314.java
*/
public class T4784219 {
diff --git a/langtools/test/tools/javac/generics/T5011073.java b/langtools/test/tools/javac/generics/T5011073.java
index 661bcaa..47adcba 100644
--- a/langtools/test/tools/javac/generics/T5011073.java
+++ b/langtools/test/tools/javac/generics/T5011073.java
@@ -27,7 +27,7 @@
* @summary javac should implement JLS3 three-pass overload resolution
* @author gafter
*
- * @compile/fail -source 1.5 T5011073.java
+ * @compile/fail T5011073.java
*/
import java.util.*;
diff --git a/langtools/test/tools/javac/generics/T5094318.java b/langtools/test/tools/javac/generics/T5094318.java
index 09a2205..f0f15ff 100644
--- a/langtools/test/tools/javac/generics/T5094318.java
+++ b/langtools/test/tools/javac/generics/T5094318.java
@@ -28,7 +28,7 @@
*
* @compile -source 1.4 T5094318.java
* @run main T5094318
- * @compile -source 1.5 T5094318.java
+ * @compile T5094318.java
* @run main/fail T5094318
*/
diff --git a/langtools/test/tools/javac/generics/TyparamLit.java b/langtools/test/tools/javac/generics/TyparamLit.java
index c173a5a..5652315 100644
--- a/langtools/test/tools/javac/generics/TyparamLit.java
+++ b/langtools/test/tools/javac/generics/TyparamLit.java
@@ -27,7 +27,7 @@
* @summary generics: compiler allows T.class for type variable T
* @author gafter
*
- * @compile/fail -source 1.5 TyparamLit.java
+ * @compile/fail TyparamLit.java
*/
class TyparamLit<T> {
diff --git a/langtools/test/tools/javac/generics/TyparamStaticScope.java b/langtools/test/tools/javac/generics/TyparamStaticScope.java
index f8a2416..51fd1c6 100644
--- a/langtools/test/tools/javac/generics/TyparamStaticScope.java
+++ b/langtools/test/tools/javac/generics/TyparamStaticScope.java
@@ -27,7 +27,7 @@
* @summary javac mistakenly reports static use error for enclosing type parameter
* @author gafter
*
- * @compile -source 1.5 TyparamStaticScope.java
+ * @compile TyparamStaticScope.java
*/
package typaram.static_.scope;
diff --git a/langtools/test/tools/javac/generics/TyparamStaticScope2.java b/langtools/test/tools/javac/generics/TyparamStaticScope2.java
index b5db4ba..8e3ceff 100644
--- a/langtools/test/tools/javac/generics/TyparamStaticScope2.java
+++ b/langtools/test/tools/javac/generics/TyparamStaticScope2.java
@@ -27,7 +27,7 @@
* @summary type parameter referenced in static inner class improperly allowed!
* @author gafter
*
- * @compile/fail -source 1.5 TyparamStaticScope2.java
+ * @compile/fail TyparamStaticScope2.java
*/
package typaram.static_.scope2;
diff --git a/langtools/test/tools/javac/generics/UncheckedArray.java b/langtools/test/tools/javac/generics/UncheckedArray.java
index 886f65b..0aa8b35 100644
--- a/langtools/test/tools/javac/generics/UncheckedArray.java
+++ b/langtools/test/tools/javac/generics/UncheckedArray.java
@@ -27,7 +27,7 @@
* @summary compiler allows new array of array of type parameter
* @author gafter
*
- * @compile/fail -source 1.5 UncheckedArray.java
+ * @compile/fail UncheckedArray.java
*/
package unchecked.array;
diff --git a/langtools/test/tools/javac/generics/UncheckedConstructor.java b/langtools/test/tools/javac/generics/UncheckedConstructor.java
index 0f3df7c..8c0338c 100644
--- a/langtools/test/tools/javac/generics/UncheckedConstructor.java
+++ b/langtools/test/tools/javac/generics/UncheckedConstructor.java
@@ -27,8 +27,8 @@
* @summary compiler disallows raw call to generic constructor
* @author gafter
*
- * @compile -source 1.5 -Werror UncheckedConstructor.java
- * @compile/fail -source 1.5 -Werror -Xlint:unchecked UncheckedConstructor.java
+ * @compile -Werror UncheckedConstructor.java
+ * @compile/fail -Werror -Xlint:unchecked UncheckedConstructor.java
*/
import java.util.*;
diff --git a/langtools/test/tools/javac/generics/UncheckedCovariance.java b/langtools/test/tools/javac/generics/UncheckedCovariance.java
index e396eb9..c78fe32 100644
--- a/langtools/test/tools/javac/generics/UncheckedCovariance.java
+++ b/langtools/test/tools/javac/generics/UncheckedCovariance.java
@@ -27,8 +27,8 @@
* @summary A method returning a raw type cannot override a method returning a generic type
* @author gafter
*
- * @compile -source 1.5 UncheckedCovariance.java
- * @compile/fail -Xlint:unchecked -Werror -source 1.5 UncheckedCovariance.java
+ * @compile UncheckedCovariance.java
+ * @compile/fail -Xlint:unchecked -Werror UncheckedCovariance.java
*/
class UncheckedCovariance {
diff --git a/langtools/test/tools/javac/generics/UnsoundInference.java b/langtools/test/tools/javac/generics/UnsoundInference.java
index 4f5d393..3ff2246 100644
--- a/langtools/test/tools/javac/generics/UnsoundInference.java
+++ b/langtools/test/tools/javac/generics/UnsoundInference.java
@@ -27,7 +27,7 @@
* @summary Generic method allowing passing of types that don't match collection types
* @author gafter
*
- * @compile/fail -source 1.5 UnsoundInference.java
+ * @compile/fail UnsoundInference.java
*/
import java.util.ArrayList;
diff --git a/langtools/test/tools/javac/generics/Varargs.java b/langtools/test/tools/javac/generics/Varargs.java
index 96427ca..b79753f 100644
--- a/langtools/test/tools/javac/generics/Varargs.java
+++ b/langtools/test/tools/javac/generics/Varargs.java
@@ -27,7 +27,7 @@
* @summary varargs doesn't work for generic methods
* @author gafter
*
- * @compile -source 1.5 Varargs.java
+ * @compile Varargs.java
*/
package varargs.versus.generics;
diff --git a/langtools/test/tools/javac/generics/Varargs2.java b/langtools/test/tools/javac/generics/Varargs2.java
index e3c940a..4fbc7f9 100644
--- a/langtools/test/tools/javac/generics/Varargs2.java
+++ b/langtools/test/tools/javac/generics/Varargs2.java
@@ -27,7 +27,7 @@
* @summary generics + varargs API changes
* @author gafter
*
- * @compile -source 1.5 Varargs2.java
+ * @compile Varargs2.java
* @run main Varargs2
*/
diff --git a/langtools/test/tools/javac/generics/WrongNew.java b/langtools/test/tools/javac/generics/WrongNew.java
index 0bc7ff7..4d882a3 100644
--- a/langtools/test/tools/javac/generics/WrongNew.java
+++ b/langtools/test/tools/javac/generics/WrongNew.java
@@ -27,7 +27,7 @@
* @summary generics: javac generares "new" of wrong class
* @author gafter
*
- * @compile -source 1.5 WrongNew.java
+ * @compile WrongNew.java
* @run main WrongNew
*/
diff --git a/langtools/test/tools/javac/generics/abstract/T4717181c.java b/langtools/test/tools/javac/generics/abstract/T4717181c.java
index d129ef7..de8367e 100644
--- a/langtools/test/tools/javac/generics/abstract/T4717181c.java
+++ b/langtools/test/tools/javac/generics/abstract/T4717181c.java
@@ -27,7 +27,7 @@
* @summary javac treats inherited abstract method as an overrider
* @author gafter
*
- * @compile/fail -source 1.5 T4717181c.java
+ * @compile/fail T4717181c.java
*/
class T4717181c {
diff --git a/langtools/test/tools/javac/generics/bridge1/D.java b/langtools/test/tools/javac/generics/bridge1/D.java
index c8c15f6..b2772e0 100644
--- a/langtools/test/tools/javac/generics/bridge1/D.java
+++ b/langtools/test/tools/javac/generics/bridge1/D.java
@@ -27,7 +27,7 @@
* @summary generics: missing bridge method
* @author gafter
*
- * @compile -source 1.5 A.java C.java D.java E.java
+ * @compile A.java C.java D.java E.java
* @run main D
*/
diff --git a/langtools/test/tools/javac/generics/classreader/HArrayMethod.java b/langtools/test/tools/javac/generics/classreader/HArrayMethod.java
index e61f54f..7302368 100644
--- a/langtools/test/tools/javac/generics/classreader/HArrayMethod.java
+++ b/langtools/test/tools/javac/generics/classreader/HArrayMethod.java
@@ -27,8 +27,8 @@
* @summary generics: override checks break when using separate compilation
* @author gafter
*
- * @compile -source 1.5 HArrayMethod.java HMember.java HMethod.java HMethodImpl.java
- * @compile -source 1.5 HArrayMethod.java
+ * @compile HArrayMethod.java HMember.java HMethod.java HMethodImpl.java
+ * @compile HArrayMethod.java
*/
class HArrayMethod extends HMethodImpl {
diff --git a/langtools/test/tools/javac/generics/compat/CovariantCompat1.java b/langtools/test/tools/javac/generics/compat/CovariantCompat1.java
index 9a9d1fc..6464816 100644
--- a/langtools/test/tools/javac/generics/compat/CovariantCompat1.java
+++ b/langtools/test/tools/javac/generics/compat/CovariantCompat1.java
@@ -27,7 +27,7 @@
* @summary generics: non-generic code should be able to call covariant method
* @author gafter
*
- * @compile -source 1.5 CovariantCompat1.java
+ * @compile CovariantCompat1.java
* @compile -source 1.4 CovariantCompat2.java
*/
diff --git a/langtools/test/tools/javac/generics/compat/OverrideBridge1.java b/langtools/test/tools/javac/generics/compat/OverrideBridge1.java
index 1ad2bb6..9ce1cac3 100644
--- a/langtools/test/tools/javac/generics/compat/OverrideBridge1.java
+++ b/langtools/test/tools/javac/generics/compat/OverrideBridge1.java
@@ -27,10 +27,10 @@
* @summary generics: compiler allows 1.4 code to override a bridge method
* @author gafter
*
- * @compile -source 1.5 OverrideBridge1.java
+ * @compile OverrideBridge1.java
* @compile/fail -Werror -source 1.4 OverrideBridge2.java
* @compile -source 1.4 OverrideBridge2.java
- * @compile -source 1.5 OverrideBridge3.java
+ * @compile OverrideBridge3.java
*/
// ALLOW users to override bridge methods.
diff --git a/langtools/test/tools/javac/generics/forwardSeparateBound/ForwardSeparateBound2.java b/langtools/test/tools/javac/generics/forwardSeparateBound/ForwardSeparateBound2.java
index 2ff4265..2ebc98a 100644
--- a/langtools/test/tools/javac/generics/forwardSeparateBound/ForwardSeparateBound2.java
+++ b/langtools/test/tools/javac/generics/forwardSeparateBound/ForwardSeparateBound2.java
@@ -27,8 +27,8 @@
* @summary generics: forward referenced bounds vs separate compilation
* @author gafter
*
- * @compile -source 1.5 ForwardSeparateBound1.java ForwardSeparateBound2.java
- * @compile -source 1.5 ForwardSeparateBound2.java
+ * @compile ForwardSeparateBound1.java ForwardSeparateBound2.java
+ * @compile ForwardSeparateBound2.java
*/
class Z {}
diff --git a/langtools/test/tools/javac/generics/genericAbstract/A.java b/langtools/test/tools/javac/generics/genericAbstract/A.java
index ddddc8c..a714593 100644
--- a/langtools/test/tools/javac/generics/genericAbstract/A.java
+++ b/langtools/test/tools/javac/generics/genericAbstract/A.java
@@ -27,7 +27,7 @@
* @summary generics: generic interface method not implemented in abstract class causes err
* @author gafter
*
- * @compile -source 1.5 A.java B.java
+ * @compile A.java B.java
*/
interface A {
diff --git a/langtools/test/tools/javac/generics/odersky/BadTest.java b/langtools/test/tools/javac/generics/odersky/BadTest.java
index 1a58e1d..5299f27 100644
--- a/langtools/test/tools/javac/generics/odersky/BadTest.java
+++ b/langtools/test/tools/javac/generics/odersky/BadTest.java
@@ -27,7 +27,7 @@
* @summary Negative regression test from odersky
* @author odersky
*
- * @compile/fail -source 1.5 BadTest.java
+ * @compile/fail BadTest.java
*/
class BadTest {
diff --git a/langtools/test/tools/javac/generics/odersky/BadTest2.java b/langtools/test/tools/javac/generics/odersky/BadTest2.java
index f80149b..8c5c548 100644
--- a/langtools/test/tools/javac/generics/odersky/BadTest2.java
+++ b/langtools/test/tools/javac/generics/odersky/BadTest2.java
@@ -27,7 +27,7 @@
* @summary Regression test from odersky
* @author odersky
*
- * @compile -source 1.5 BadTest2.java
+ * @compile BadTest2.java
*/
// this used to be a negative regression test, but when we
diff --git a/langtools/test/tools/javac/generics/odersky/BadTest3.java b/langtools/test/tools/javac/generics/odersky/BadTest3.java
index af25977..09efe26 100644
--- a/langtools/test/tools/javac/generics/odersky/BadTest3.java
+++ b/langtools/test/tools/javac/generics/odersky/BadTest3.java
@@ -27,7 +27,7 @@
* @summary Negative regression test from odersky
* @author odersky
*
- * @compile/fail -source 1.5 BadTest3.java
+ * @compile/fail BadTest3.java
*/
class BadTest3 {
diff --git a/langtools/test/tools/javac/generics/odersky/BadTest4.java b/langtools/test/tools/javac/generics/odersky/BadTest4.java
index 58d3946..ec72f23 100644
--- a/langtools/test/tools/javac/generics/odersky/BadTest4.java
+++ b/langtools/test/tools/javac/generics/odersky/BadTest4.java
@@ -27,7 +27,7 @@
* @summary Negative regression test from odersky
* @author odersky
*
- * @compile/fail -source 1.5 BadTest4.java
+ * @compile/fail BadTest4.java
*/
class BadTest4 {
diff --git a/langtools/test/tools/javac/generics/odersky/Test.java b/langtools/test/tools/javac/generics/odersky/Test.java
index 300df7c..0895426 100644
--- a/langtools/test/tools/javac/generics/odersky/Test.java
+++ b/langtools/test/tools/javac/generics/odersky/Test.java
@@ -27,7 +27,7 @@
* @summary Positive regression test from odersky
* @author odersky
*
- * @compile -source 1.5 Test.java
+ * @compile Test.java
*/
class Test {
diff --git a/langtools/test/tools/javac/generics/odersky/Test2.java b/langtools/test/tools/javac/generics/odersky/Test2.java
index c6ff3d8..64952e6 100644
--- a/langtools/test/tools/javac/generics/odersky/Test2.java
+++ b/langtools/test/tools/javac/generics/odersky/Test2.java
@@ -27,7 +27,7 @@
* @summary Positive regression test from odersky
* @author odersky
*
- * @compile -source 1.5 Test2.java
+ * @compile Test2.java
*/
class Test2 {
diff --git a/langtools/test/tools/javac/generics/odersky/Test3.java b/langtools/test/tools/javac/generics/odersky/Test3.java
index c70a2ce..3c8d771 100644
--- a/langtools/test/tools/javac/generics/odersky/Test3.java
+++ b/langtools/test/tools/javac/generics/odersky/Test3.java
@@ -27,7 +27,7 @@
* @summary Positive regression test from odersky
* @author odersky
*
- * @compile -source 1.5 Test3.java
+ * @compile Test3.java
*/
class Test3 {
diff --git a/langtools/test/tools/javac/generics/odersky/Test4.java b/langtools/test/tools/javac/generics/odersky/Test4.java
index d8211a1..65c30fa 100644
--- a/langtools/test/tools/javac/generics/odersky/Test4.java
+++ b/langtools/test/tools/javac/generics/odersky/Test4.java
@@ -27,7 +27,7 @@
* @summary Positive regression test from odersky
* @author odersky
*
- * @compile -source 1.5 Test4.java
+ * @compile Test4.java
*/
class Test4 {
diff --git a/langtools/test/tools/javac/generics/parametricException/J.java b/langtools/test/tools/javac/generics/parametricException/J.java
index 8f148eb..4ed8eb6 100644
--- a/langtools/test/tools/javac/generics/parametricException/J.java
+++ b/langtools/test/tools/javac/generics/parametricException/J.java
@@ -27,8 +27,8 @@
* @summary javac appears to omit throws portion of generic signature attribute
* @author gafter
*
- * @compile -source 1.5 J.java
- * @compile -source 1.5 K.java
+ * @compile J.java
+ * @compile K.java
*/
class J<T extends Exception> {
diff --git a/langtools/test/tools/javac/generics/rare/Rare1.java b/langtools/test/tools/javac/generics/rare/Rare1.java
index 889648c..d5c56e1 100644
--- a/langtools/test/tools/javac/generics/rare/Rare1.java
+++ b/langtools/test/tools/javac/generics/rare/Rare1.java
@@ -27,7 +27,7 @@
* @summary "rare" types
* @author gafter
*
- * @compile -source 1.5 Rare1.java
+ * @compile Rare1.java
*/
package rare1;
diff --git a/langtools/test/tools/javac/generics/rare/Rare10.java b/langtools/test/tools/javac/generics/rare/Rare10.java
index dc8d6be..210e730 100644
--- a/langtools/test/tools/javac/generics/rare/Rare10.java
+++ b/langtools/test/tools/javac/generics/rare/Rare10.java
@@ -27,7 +27,7 @@
* @summary "rare" types
* @author gafter
*
- * @compile -source 1.5 Rare10.java
+ * @compile Rare10.java
*/
package rare10;
diff --git a/langtools/test/tools/javac/generics/rare/Rare11.java b/langtools/test/tools/javac/generics/rare/Rare11.java
index 0919605..b8f3c05 100644
--- a/langtools/test/tools/javac/generics/rare/Rare11.java
+++ b/langtools/test/tools/javac/generics/rare/Rare11.java
@@ -27,7 +27,7 @@
* @summary "rare" types
* @author gafter
*
- * @compile -source 1.5 Rare11.java
+ * @compile Rare11.java
*/
package rare11;
diff --git a/langtools/test/tools/javac/generics/rare/Rare2.java b/langtools/test/tools/javac/generics/rare/Rare2.java
index c7e102a..6b62cea 100644
--- a/langtools/test/tools/javac/generics/rare/Rare2.java
+++ b/langtools/test/tools/javac/generics/rare/Rare2.java
@@ -27,7 +27,7 @@
* @summary "rare" types
* @author gafter
*
- * @compile/fail -source 1.5 Rare2.java
+ * @compile/fail Rare2.java
*/
package rare2;
diff --git a/langtools/test/tools/javac/generics/rare/Rare3.java b/langtools/test/tools/javac/generics/rare/Rare3.java
index c9614cb..fa8072f 100644
--- a/langtools/test/tools/javac/generics/rare/Rare3.java
+++ b/langtools/test/tools/javac/generics/rare/Rare3.java
@@ -27,7 +27,7 @@
* @summary "rare" types
* @author gafter
*
- * @compile/fail -source 1.5 Rare3.java
+ * @compile/fail Rare3.java
*/
package rare3;
diff --git a/langtools/test/tools/javac/generics/rare/Rare4.java b/langtools/test/tools/javac/generics/rare/Rare4.java
index 379fa0a..a32393e 100644
--- a/langtools/test/tools/javac/generics/rare/Rare4.java
+++ b/langtools/test/tools/javac/generics/rare/Rare4.java
@@ -27,7 +27,7 @@
* @summary "rare" types
* @author gafter
*
- * @compile/fail -source 1.5 Rare4.java
+ * @compile/fail Rare4.java
*/
package rare4;
diff --git a/langtools/test/tools/javac/generics/rare/Rare5.java b/langtools/test/tools/javac/generics/rare/Rare5.java
index c2c706e..66274ab 100644
--- a/langtools/test/tools/javac/generics/rare/Rare5.java
+++ b/langtools/test/tools/javac/generics/rare/Rare5.java
@@ -27,7 +27,7 @@
* @summary "rare" types
* @author gafter
*
- * @compile/fail -source 1.5 Rare5.java
+ * @compile/fail Rare5.java
*/
package rare5;
diff --git a/langtools/test/tools/javac/generics/rare/Rare6.java b/langtools/test/tools/javac/generics/rare/Rare6.java
index 8870c49..963e552 100644
--- a/langtools/test/tools/javac/generics/rare/Rare6.java
+++ b/langtools/test/tools/javac/generics/rare/Rare6.java
@@ -27,7 +27,7 @@
* @summary "rare" types
* @author gafter
*
- * @compile/fail -source 1.5 Rare6.java
+ * @compile/fail Rare6.java
*/
package rare6;
diff --git a/langtools/test/tools/javac/generics/rare/Rare7.java b/langtools/test/tools/javac/generics/rare/Rare7.java
index 02c20c8..a2dcd4e 100644
--- a/langtools/test/tools/javac/generics/rare/Rare7.java
+++ b/langtools/test/tools/javac/generics/rare/Rare7.java
@@ -27,7 +27,7 @@
* @summary "rare" types
* @author gafter
*
- * @compile/fail -source 1.5 Rare7.java
+ * @compile/fail Rare7.java
*/
package rare7;
diff --git a/langtools/test/tools/javac/generics/rare/Rare8.java b/langtools/test/tools/javac/generics/rare/Rare8.java
index 396334b..26ccd56 100644
--- a/langtools/test/tools/javac/generics/rare/Rare8.java
+++ b/langtools/test/tools/javac/generics/rare/Rare8.java
@@ -27,7 +27,7 @@
* @summary "rare" types
* @author gafter
*
- * @compile -source 1.5 Rare8.java
+ * @compile Rare8.java
*/
package rare8;
diff --git a/langtools/test/tools/javac/generics/rare/Rare9.java b/langtools/test/tools/javac/generics/rare/Rare9.java
index e85c459..3e9e5a5 100644
--- a/langtools/test/tools/javac/generics/rare/Rare9.java
+++ b/langtools/test/tools/javac/generics/rare/Rare9.java
@@ -27,7 +27,7 @@
* @summary "rare" types
* @author gafter
*
- * @compile -source 1.5 Rare9.java
+ * @compile Rare9.java
*/
package rare9;
diff --git a/langtools/test/tools/javac/generics/rawSeparate/RetroLexer.java b/langtools/test/tools/javac/generics/rawSeparate/RetroLexer.java
index 1b7b164..ce217d4 100644
--- a/langtools/test/tools/javac/generics/rawSeparate/RetroLexer.java
+++ b/langtools/test/tools/javac/generics/rawSeparate/RetroLexer.java
@@ -27,9 +27,9 @@
* @summary raw types versus separate compilation causes type error
* @author gafter
*
- * @compile -source 1.5 Hashtable.java
- * @compile -source 1.5 CharScanner.java
- * @compile -source 1.5 RetroLexer.java
+ * @compile Hashtable.java
+ * @compile CharScanner.java
+ * @compile RetroLexer.java
*/
package parser;
diff --git a/langtools/test/tools/javac/generics/typeargs/Basic.java b/langtools/test/tools/javac/generics/typeargs/Basic.java
index ad03c637..33cee6c 100644
--- a/langtools/test/tools/javac/generics/typeargs/Basic.java
+++ b/langtools/test/tools/javac/generics/typeargs/Basic.java
@@ -27,7 +27,7 @@
* @summary explicit type arguments
* @author gafter
*
- * @compile -source 1.5 Basic.java
+ * @compile Basic.java
*/
// Test all of the basic forms for explicit type arguments
diff --git a/langtools/test/tools/javac/generics/typeargs/Metharg1.java b/langtools/test/tools/javac/generics/typeargs/Metharg1.java
index ab1f77f..9d6ce38 100644
--- a/langtools/test/tools/javac/generics/typeargs/Metharg1.java
+++ b/langtools/test/tools/javac/generics/typeargs/Metharg1.java
@@ -27,7 +27,7 @@
* @summary explicit type arguments
* @author gafter
*
- * @compile/fail -source 1.5 Metharg1.java
+ * @compile/fail Metharg1.java
*/
// Test type mismatch on type argument for method call
diff --git a/langtools/test/tools/javac/generics/typeargs/Metharg2.java b/langtools/test/tools/javac/generics/typeargs/Metharg2.java
index cafa059..4fc5edc 100644
--- a/langtools/test/tools/javac/generics/typeargs/Metharg2.java
+++ b/langtools/test/tools/javac/generics/typeargs/Metharg2.java
@@ -27,7 +27,7 @@
* @summary explicit type arguments
* @author gafter
*
- * @compile/fail -source 1.5 Metharg2.java
+ * @compile/fail Metharg2.java
*/
// Test type mismatch on type argument for qualified method call
diff --git a/langtools/test/tools/javac/generics/typeargs/Newarg1.java b/langtools/test/tools/javac/generics/typeargs/Newarg1.java
index f435211..b0c0686 100644
--- a/langtools/test/tools/javac/generics/typeargs/Newarg1.java
+++ b/langtools/test/tools/javac/generics/typeargs/Newarg1.java
@@ -27,7 +27,7 @@
* @summary explicit type arguments
* @author gafter
*
- * @compile/fail -source 1.5 Newarg1.java
+ * @compile/fail Newarg1.java
*/
// Test type mismatch on type argument for constructor
diff --git a/langtools/test/tools/javac/generics/typeargs/Newarg2.java b/langtools/test/tools/javac/generics/typeargs/Newarg2.java
index d38a798..80b811e 100644
--- a/langtools/test/tools/javac/generics/typeargs/Newarg2.java
+++ b/langtools/test/tools/javac/generics/typeargs/Newarg2.java
@@ -27,7 +27,7 @@
* @summary explicit type arguments
* @author gafter
*
- * @compile/fail -source 1.5 Newarg2.java
+ * @compile/fail Newarg2.java
*/
// Test type mismatch on type argument for inner constructor
diff --git a/langtools/test/tools/javac/generics/typeargs/Superarg1.java b/langtools/test/tools/javac/generics/typeargs/Superarg1.java
index 5245457..a4c7f56 100644
--- a/langtools/test/tools/javac/generics/typeargs/Superarg1.java
+++ b/langtools/test/tools/javac/generics/typeargs/Superarg1.java
@@ -27,7 +27,7 @@
* @summary explicit type arguments
* @author gafter
*
- * @compile/fail -source 1.5 Superarg1.java
+ * @compile/fail Superarg1.java
*/
// Test type mismatch on type argument for super constructor
diff --git a/langtools/test/tools/javac/generics/typeargs/Superarg2.java b/langtools/test/tools/javac/generics/typeargs/Superarg2.java
index 373be2d..4efcdd9 100644
--- a/langtools/test/tools/javac/generics/typeargs/Superarg2.java
+++ b/langtools/test/tools/javac/generics/typeargs/Superarg2.java
@@ -27,7 +27,7 @@
* @summary explicit type arguments
* @author gafter
*
- * @compile/fail -source 1.5 Superarg2.java
+ * @compile/fail Superarg2.java
*/
// Test type mismatch on type argument for inner super constructor
diff --git a/langtools/test/tools/javac/generics/typeargs/ThisArg.java b/langtools/test/tools/javac/generics/typeargs/ThisArg.java
index 3b587f0..2218904 100644
--- a/langtools/test/tools/javac/generics/typeargs/ThisArg.java
+++ b/langtools/test/tools/javac/generics/typeargs/ThisArg.java
@@ -27,7 +27,7 @@
* @summary explicit type arguments
* @author gafter
*
- * @compile/fail -source 1.5 ThisArg.java
+ * @compile/fail ThisArg.java
*/
// Test type mismatch on type argument for this constructor
diff --git a/langtools/test/tools/javac/generics/typevars/4856983/T4856983.java b/langtools/test/tools/javac/generics/typevars/4856983/T4856983.java
index 9b0d4da..021b045 100644
--- a/langtools/test/tools/javac/generics/typevars/4856983/T4856983.java
+++ b/langtools/test/tools/javac/generics/typevars/4856983/T4856983.java
@@ -27,7 +27,7 @@
* @summary (crash) mutually f-bounded type vars with multiple bounds may crash javac
* @author Peter von der Ah\u00e9
*
- * @compile -source 5 T4856983.java
+ * @compile T4856983.java
*/
import java.lang.Comparable;
diff --git a/langtools/test/tools/javac/generics/typevars/4856983/T4856983a.java b/langtools/test/tools/javac/generics/typevars/4856983/T4856983a.java
index 9db8319..d03a570 100644
--- a/langtools/test/tools/javac/generics/typevars/4856983/T4856983a.java
+++ b/langtools/test/tools/javac/generics/typevars/4856983/T4856983a.java
@@ -26,7 +26,7 @@
* @bug 4856983
* @summary (crash) mutually f-bounded type vars with multiple bounds may crash javac
* @author Peter von der Ah\u00e9
- * @compile/fail -source 5 T4856983a.java
+ * @compile/fail T4856983a.java
*/
interface I1 { Number m(); }
diff --git a/langtools/test/tools/javac/generics/typevars/4856983/T4856983b.java b/langtools/test/tools/javac/generics/typevars/4856983/T4856983b.java
index cbfcda0..c70e793 100644
--- a/langtools/test/tools/javac/generics/typevars/4856983/T4856983b.java
+++ b/langtools/test/tools/javac/generics/typevars/4856983/T4856983b.java
@@ -26,7 +26,7 @@
* @bug 4856983
* @summary (crash) mutually f-bounded type vars with multiple bounds may crash javac
* @author Peter von der Ah\u00e9
- * @compile/fail -source 5 T4856983b.java
+ * @compile/fail T4856983b.java
*/
interface I1 { Number m(); }
diff --git a/langtools/test/tools/javac/generics/wildcards/AssignmentDifferentTypes1.java b/langtools/test/tools/javac/generics/wildcards/AssignmentDifferentTypes1.java
index bf5a6c9..977beea 100644
--- a/langtools/test/tools/javac/generics/wildcards/AssignmentDifferentTypes1.java
+++ b/langtools/test/tools/javac/generics/wildcards/AssignmentDifferentTypes1.java
@@ -25,7 +25,7 @@
* @test
* @summary Test subtyping for wildcards with related type bounds.
*
- * @compile -source 1.5 AssignmentDifferentTypes1.java
+ * @compile AssignmentDifferentTypes1.java
*/
public class AssignmentDifferentTypes1 {
diff --git a/langtools/test/tools/javac/generics/wildcards/AssignmentDifferentTypes2.java b/langtools/test/tools/javac/generics/wildcards/AssignmentDifferentTypes2.java
index 2d8ac1a..f32f5ff 100644
--- a/langtools/test/tools/javac/generics/wildcards/AssignmentDifferentTypes2.java
+++ b/langtools/test/tools/javac/generics/wildcards/AssignmentDifferentTypes2.java
@@ -25,7 +25,7 @@
* @test
* @summary Test subtyping for wildcards with related type bounds.
*
- * @compile/fail -source 1.5 AssignmentDifferentTypes2.java
+ * @compile/fail AssignmentDifferentTypes2.java
*/
public class AssignmentDifferentTypes2 {
diff --git a/langtools/test/tools/javac/generics/wildcards/AssignmentDifferentTypes3.java b/langtools/test/tools/javac/generics/wildcards/AssignmentDifferentTypes3.java
index 82f388d..1487660 100644
--- a/langtools/test/tools/javac/generics/wildcards/AssignmentDifferentTypes3.java
+++ b/langtools/test/tools/javac/generics/wildcards/AssignmentDifferentTypes3.java
@@ -25,7 +25,7 @@
* @test
* @summary Test subtyping for wildcards with related type bounds.
*
- * @compile/fail -source 1.5 AssignmentDifferentTypes3.java
+ * @compile/fail AssignmentDifferentTypes3.java
*/
public class AssignmentDifferentTypes3 {
diff --git a/langtools/test/tools/javac/generics/wildcards/AssignmentDifferentTypes4.java b/langtools/test/tools/javac/generics/wildcards/AssignmentDifferentTypes4.java
index ac3a4f5..6f6e745 100644
--- a/langtools/test/tools/javac/generics/wildcards/AssignmentDifferentTypes4.java
+++ b/langtools/test/tools/javac/generics/wildcards/AssignmentDifferentTypes4.java
@@ -25,7 +25,7 @@
* @test
* @summary Test subtyping for wildcards with related type bounds.
*
- * @compile/fail -source 1.5 AssignmentDifferentTypes4.java
+ * @compile/fail AssignmentDifferentTypes4.java
*/
public class AssignmentDifferentTypes4 {
diff --git a/langtools/test/tools/javac/generics/wildcards/AssignmentDifferentTypes5.java b/langtools/test/tools/javac/generics/wildcards/AssignmentDifferentTypes5.java
index c731bd8..07e47ab 100644
--- a/langtools/test/tools/javac/generics/wildcards/AssignmentDifferentTypes5.java
+++ b/langtools/test/tools/javac/generics/wildcards/AssignmentDifferentTypes5.java
@@ -25,7 +25,7 @@
* @test
* @summary Test subtyping for wildcards with related type bounds.
*
- * @compile/fail -source 1.5 AssignmentDifferentTypes5.java
+ * @compile/fail AssignmentDifferentTypes5.java
*/
public class AssignmentDifferentTypes5 {
diff --git a/langtools/test/tools/javac/generics/wildcards/AssignmentDifferentTypes6.java b/langtools/test/tools/javac/generics/wildcards/AssignmentDifferentTypes6.java
index fd5306d..a9e8389 100644
--- a/langtools/test/tools/javac/generics/wildcards/AssignmentDifferentTypes6.java
+++ b/langtools/test/tools/javac/generics/wildcards/AssignmentDifferentTypes6.java
@@ -25,7 +25,7 @@
* @test
* @summary Test subtyping for wildcards with related type bounds.
*
- * @compile/fail -source 1.5 AssignmentDifferentTypes6.java
+ * @compile/fail AssignmentDifferentTypes6.java
*/
public class AssignmentDifferentTypes6 {
diff --git a/langtools/test/tools/javac/generics/wildcards/AssignmentDifferentTypes7.java b/langtools/test/tools/javac/generics/wildcards/AssignmentDifferentTypes7.java
index 3d521f9..8dbfa00 100644
--- a/langtools/test/tools/javac/generics/wildcards/AssignmentDifferentTypes7.java
+++ b/langtools/test/tools/javac/generics/wildcards/AssignmentDifferentTypes7.java
@@ -25,7 +25,7 @@
* @test
* @summary Test subtyping for wildcards with related type bounds.
*
- * @compile/fail -source 1.5 AssignmentDifferentTypes7.java
+ * @compile/fail AssignmentDifferentTypes7.java
*/
public class AssignmentDifferentTypes7 {
diff --git a/langtools/test/tools/javac/generics/wildcards/AssignmentDifferentTypes8.java b/langtools/test/tools/javac/generics/wildcards/AssignmentDifferentTypes8.java
index b2f8c35..7c86674 100644
--- a/langtools/test/tools/javac/generics/wildcards/AssignmentDifferentTypes8.java
+++ b/langtools/test/tools/javac/generics/wildcards/AssignmentDifferentTypes8.java
@@ -25,7 +25,7 @@
* @test
* @summary Test subtyping for wildcards with related type bounds.
*
- * @compile/fail -source 1.5 AssignmentDifferentTypes8.java
+ * @compile/fail AssignmentDifferentTypes8.java
*/
public class AssignmentDifferentTypes8 {
diff --git a/langtools/test/tools/javac/generics/wildcards/AssignmentDifferentTypes9.java b/langtools/test/tools/javac/generics/wildcards/AssignmentDifferentTypes9.java
index c497b88..a8d0f3a 100644
--- a/langtools/test/tools/javac/generics/wildcards/AssignmentDifferentTypes9.java
+++ b/langtools/test/tools/javac/generics/wildcards/AssignmentDifferentTypes9.java
@@ -25,7 +25,7 @@
* @test
* @summary Test subtyping for wildcards with related type bounds.
*
- * @compile/fail -source 1.5 AssignmentDifferentTypes9.java
+ * @compile/fail AssignmentDifferentTypes9.java
*/
public class AssignmentDifferentTypes9 {
diff --git a/langtools/test/tools/javac/generics/wildcards/AssignmentSameType1.java b/langtools/test/tools/javac/generics/wildcards/AssignmentSameType1.java
index b7f5dec..32dffc3 100644
--- a/langtools/test/tools/javac/generics/wildcards/AssignmentSameType1.java
+++ b/langtools/test/tools/javac/generics/wildcards/AssignmentSameType1.java
@@ -25,7 +25,7 @@
* @test
* @summary Test subtyping for wildcards with the same type bound.
*
- * @compile -source 1.5 AssignmentSameType1.java
+ * @compile AssignmentSameType1.java
*/
public class AssignmentSameType1 {
diff --git a/langtools/test/tools/javac/generics/wildcards/AssignmentSameType2.java b/langtools/test/tools/javac/generics/wildcards/AssignmentSameType2.java
index b133537..0fadfce 100644
--- a/langtools/test/tools/javac/generics/wildcards/AssignmentSameType2.java
+++ b/langtools/test/tools/javac/generics/wildcards/AssignmentSameType2.java
@@ -25,7 +25,7 @@
* @test
* @summary Test subtyping for wildcards with the same type bound.
*
- * @compile/fail -source 1.5 AssignmentSameType2.java
+ * @compile/fail AssignmentSameType2.java
*/
public class AssignmentSameType2 {
diff --git a/langtools/test/tools/javac/generics/wildcards/AssignmentSameType3.java b/langtools/test/tools/javac/generics/wildcards/AssignmentSameType3.java
index af74114..099be0d 100644
--- a/langtools/test/tools/javac/generics/wildcards/AssignmentSameType3.java
+++ b/langtools/test/tools/javac/generics/wildcards/AssignmentSameType3.java
@@ -25,7 +25,7 @@
* @test
* @summary Test subtyping for wildcards with the same type bound.
*
- * @compile/fail -source 1.5 AssignmentSameType3.java
+ * @compile/fail AssignmentSameType3.java
*/
public class AssignmentSameType3 {
diff --git a/langtools/test/tools/javac/generics/wildcards/AssignmentSameType4.java b/langtools/test/tools/javac/generics/wildcards/AssignmentSameType4.java
index 91218ab..bddadca 100644
--- a/langtools/test/tools/javac/generics/wildcards/AssignmentSameType4.java
+++ b/langtools/test/tools/javac/generics/wildcards/AssignmentSameType4.java
@@ -25,7 +25,7 @@
* @test
* @summary Test subtyping for wildcards with the same type bound.
*
- * @compile/fail -source 1.5 AssignmentSameType4.java
+ * @compile/fail AssignmentSameType4.java
*/
public class AssignmentSameType4 {
diff --git a/langtools/test/tools/javac/generics/wildcards/AssignmentSameType5.java b/langtools/test/tools/javac/generics/wildcards/AssignmentSameType5.java
index b191043..89542a7 100644
--- a/langtools/test/tools/javac/generics/wildcards/AssignmentSameType5.java
+++ b/langtools/test/tools/javac/generics/wildcards/AssignmentSameType5.java
@@ -25,7 +25,7 @@
* @test
* @summary Test subtyping for wildcards with the same type bound.
*
- * @compile/fail -source 1.5 AssignmentSameType5.java
+ * @compile/fail AssignmentSameType5.java
*/
public class AssignmentSameType5 {
diff --git a/langtools/test/tools/javac/generics/wildcards/AssignmentSameType6.java b/langtools/test/tools/javac/generics/wildcards/AssignmentSameType6.java
index 248d4a5..bbad9fa 100644
--- a/langtools/test/tools/javac/generics/wildcards/AssignmentSameType6.java
+++ b/langtools/test/tools/javac/generics/wildcards/AssignmentSameType6.java
@@ -25,7 +25,7 @@
* @test
* @summary Test subtyping for wildcards with the same type bound.
*
- * @compile/fail -source 1.5 AssignmentSameType6.java
+ * @compile/fail AssignmentSameType6.java
*/
public class AssignmentSameType6 {
diff --git a/langtools/test/tools/javac/generics/wildcards/AssignmentSameType7.java b/langtools/test/tools/javac/generics/wildcards/AssignmentSameType7.java
index 9542b98..45dfeab 100644
--- a/langtools/test/tools/javac/generics/wildcards/AssignmentSameType7.java
+++ b/langtools/test/tools/javac/generics/wildcards/AssignmentSameType7.java
@@ -25,7 +25,7 @@
* @test
* @summary Test subtyping for wildcards with the same type bound.
*
- * @compile/fail -source 1.5 AssignmentSameType7.java
+ * @compile/fail AssignmentSameType7.java
*/
public class AssignmentSameType7 {
diff --git a/langtools/test/tools/javac/generics/wildcards/AssignmentSameType8.java b/langtools/test/tools/javac/generics/wildcards/AssignmentSameType8.java
index a4e7e0b..367f2dd 100644
--- a/langtools/test/tools/javac/generics/wildcards/AssignmentSameType8.java
+++ b/langtools/test/tools/javac/generics/wildcards/AssignmentSameType8.java
@@ -25,7 +25,7 @@
* @test
* @summary Test subtyping for wildcards with the same type bound.
*
- * @compile/fail -source 1.5 AssignmentSameType8.java
+ * @compile/fail AssignmentSameType8.java
*/
public class AssignmentSameType8 {
diff --git a/langtools/test/tools/javac/generics/wildcards/BoundBug.java b/langtools/test/tools/javac/generics/wildcards/BoundBug.java
index 727f2c7..136e324 100644
--- a/langtools/test/tools/javac/generics/wildcards/BoundBug.java
+++ b/langtools/test/tools/javac/generics/wildcards/BoundBug.java
@@ -27,7 +27,7 @@
* @summary generics: used of ? get bound error
* @author gafter
*
- * @compile -source 1.5 BoundBug.java
+ * @compile BoundBug.java
*/
class BoundBug {
diff --git a/langtools/test/tools/javac/generics/wildcards/ContraArg.java b/langtools/test/tools/javac/generics/wildcards/ContraArg.java
index 84bc3df..d3ce7ee 100644
--- a/langtools/test/tools/javac/generics/wildcards/ContraArg.java
+++ b/langtools/test/tools/javac/generics/wildcards/ContraArg.java
@@ -27,7 +27,7 @@
* @summary generics: incorrect ambiguity error with super-bouded wildcards
* @author gafter
*
- * @compile -source 1.5 ContraArg.java
+ * @compile ContraArg.java
*/
class ContraArg {
diff --git a/langtools/test/tools/javac/generics/wildcards/T5097548.java b/langtools/test/tools/javac/generics/wildcards/T5097548.java
index 24352f3..f192acc 100644
--- a/langtools/test/tools/javac/generics/wildcards/T5097548.java
+++ b/langtools/test/tools/javac/generics/wildcards/T5097548.java
@@ -26,7 +26,7 @@
* @bug 5097548
* @summary (crash) Stack overflow in capture conversion
* @author Peter von der Ah\u00e9
- * @compile -source 5 T5097548.java
+ * @compile T5097548.java
* @run main T5097548
*/
diff --git a/langtools/test/tools/javac/generics/wildcards/T5097548b.java b/langtools/test/tools/javac/generics/wildcards/T5097548b.java
index 09d2efc..70257ce 100644
--- a/langtools/test/tools/javac/generics/wildcards/T5097548b.java
+++ b/langtools/test/tools/javac/generics/wildcards/T5097548b.java
@@ -26,7 +26,7 @@
* @bug 5097548
* @summary Stack overflow in capture conversion
* @author Peter von der Ah\u00e9
- * @compile -source 5 T5097548b.java
+ * @compile T5097548b.java
*/
interface Edge<N extends Node<? extends Edge<N>>> {
diff --git a/langtools/test/tools/javac/generics/wildcards/UnboundArray.java b/langtools/test/tools/javac/generics/wildcards/UnboundArray.java
index 68e595d..e1634d2 100644
--- a/langtools/test/tools/javac/generics/wildcards/UnboundArray.java
+++ b/langtools/test/tools/javac/generics/wildcards/UnboundArray.java
@@ -27,7 +27,7 @@
* @summary generics: allow arrays of unbounded generic types
* @author gafter
*
- * @compile -source 1.5 UnboundArray.java
+ * @compile UnboundArray.java
*/
class C<E> {
diff --git a/langtools/test/tools/javac/generics/wildcards/neg/AmbiguousCast.java b/langtools/test/tools/javac/generics/wildcards/neg/AmbiguousCast.java
index 6ddc928..77719fa 100644
--- a/langtools/test/tools/javac/generics/wildcards/neg/AmbiguousCast.java
+++ b/langtools/test/tools/javac/generics/wildcards/neg/AmbiguousCast.java
@@ -27,7 +27,7 @@
* @summary cast to parameterized type is accepted although it should be rejected
* @author gafter
*
- * @compile/fail -source 1.5 -Werror -Xlint:unchecked AmbiguousCast.java
+ * @compile/fail -Werror -Xlint:unchecked AmbiguousCast.java
*/
class Test {
diff --git a/langtools/test/tools/javac/generics/wildcards/neg/Capture.java b/langtools/test/tools/javac/generics/wildcards/neg/Capture.java
index 3de9967..dbd4c98 100644
--- a/langtools/test/tools/javac/generics/wildcards/neg/Capture.java
+++ b/langtools/test/tools/javac/generics/wildcards/neg/Capture.java
@@ -27,7 +27,7 @@
* @summary Wildcard capture
* @author gafter
*
- * @compile/fail -source 1.5 Capture.java
+ * @compile/fail Capture.java
*/
class X<T> {}
diff --git a/langtools/test/tools/javac/generics/wildcards/neg/CastFail1.java b/langtools/test/tools/javac/generics/wildcards/neg/CastFail1.java
index 93f7dde..7176622 100644
--- a/langtools/test/tools/javac/generics/wildcards/neg/CastFail1.java
+++ b/langtools/test/tools/javac/generics/wildcards/neg/CastFail1.java
@@ -27,7 +27,7 @@
* @summary Test casts (legal, warning, and errors)
* @author gafter
*
- * @compile/fail -source 1.5 CastFail1.java
+ * @compile/fail CastFail1.java
*/
import java.util.*;
diff --git a/langtools/test/tools/javac/generics/wildcards/neg/CastFail10.java b/langtools/test/tools/javac/generics/wildcards/neg/CastFail10.java
index 2ee7303..f41500a 100644
--- a/langtools/test/tools/javac/generics/wildcards/neg/CastFail10.java
+++ b/langtools/test/tools/javac/generics/wildcards/neg/CastFail10.java
@@ -27,7 +27,7 @@
* @summary Test casts (legal, warning, and errors)
* @author gafter
*
- * @compile/fail -source 1.5 CastFail10.java
+ * @compile/fail CastFail10.java
*/
import java.util.*;
diff --git a/langtools/test/tools/javac/generics/wildcards/neg/CastFail11.java b/langtools/test/tools/javac/generics/wildcards/neg/CastFail11.java
index 71bba1b..5731f4d 100644
--- a/langtools/test/tools/javac/generics/wildcards/neg/CastFail11.java
+++ b/langtools/test/tools/javac/generics/wildcards/neg/CastFail11.java
@@ -27,7 +27,7 @@
* @summary Test casts (legal, warning, and errors)
* @author gafter
*
- * @compile/fail -source 1.5 CastFail11.java
+ * @compile/fail CastFail11.java
*/
import java.util.*;
diff --git a/langtools/test/tools/javac/generics/wildcards/neg/CastFail12.java b/langtools/test/tools/javac/generics/wildcards/neg/CastFail12.java
index 84e0968..8a0754e 100644
--- a/langtools/test/tools/javac/generics/wildcards/neg/CastFail12.java
+++ b/langtools/test/tools/javac/generics/wildcards/neg/CastFail12.java
@@ -27,7 +27,7 @@
* @summary Test casts (legal, warning, and errors)
* @author gafter
*
- * @compile/fail -source 1.5 CastFail12.java
+ * @compile/fail CastFail12.java
*/
import java.util.*;
diff --git a/langtools/test/tools/javac/generics/wildcards/neg/CastFail13.java b/langtools/test/tools/javac/generics/wildcards/neg/CastFail13.java
index 5750785..06d9964 100644
--- a/langtools/test/tools/javac/generics/wildcards/neg/CastFail13.java
+++ b/langtools/test/tools/javac/generics/wildcards/neg/CastFail13.java
@@ -27,7 +27,7 @@
* @summary Test casts (legal, warning, and errors)
* @author gafter
*
- * @compile/fail -source 1.5 CastFail13.java
+ * @compile/fail CastFail13.java
*/
import java.util.*;
diff --git a/langtools/test/tools/javac/generics/wildcards/neg/CastFail14.java b/langtools/test/tools/javac/generics/wildcards/neg/CastFail14.java
index f1e6859..d1c32e6 100644
--- a/langtools/test/tools/javac/generics/wildcards/neg/CastFail14.java
+++ b/langtools/test/tools/javac/generics/wildcards/neg/CastFail14.java
@@ -27,7 +27,7 @@
* @summary Test casts (legal, warning, and errors)
* @author gafter
*
- * @compile/fail -source 1.5 CastFail14.java
+ * @compile/fail CastFail14.java
*/
import java.util.*;
diff --git a/langtools/test/tools/javac/generics/wildcards/neg/CastFail15.java b/langtools/test/tools/javac/generics/wildcards/neg/CastFail15.java
index 8a5dfbe..d4a2cfc 100644
--- a/langtools/test/tools/javac/generics/wildcards/neg/CastFail15.java
+++ b/langtools/test/tools/javac/generics/wildcards/neg/CastFail15.java
@@ -27,7 +27,7 @@
* @summary Test casts (legal, warning, and errors)
* @author gafter
*
- * @compile/fail -source 1.5 CastFail15.java
+ * @compile/fail CastFail15.java
*/
import java.util.*;
diff --git a/langtools/test/tools/javac/generics/wildcards/neg/CastFail16.java b/langtools/test/tools/javac/generics/wildcards/neg/CastFail16.java
index 3c7bd2b..759fa5b 100644
--- a/langtools/test/tools/javac/generics/wildcards/neg/CastFail16.java
+++ b/langtools/test/tools/javac/generics/wildcards/neg/CastFail16.java
@@ -27,7 +27,7 @@
* @summary Test casts (legal, warning, and errors)
* @author gafter
*
- * @compile/fail -source 1.5 CastFail16.java
+ * @compile/fail CastFail16.java
*/
import java.util.*;
diff --git a/langtools/test/tools/javac/generics/wildcards/neg/CastFail17.java b/langtools/test/tools/javac/generics/wildcards/neg/CastFail17.java
index 715dadb..deb4f11 100644
--- a/langtools/test/tools/javac/generics/wildcards/neg/CastFail17.java
+++ b/langtools/test/tools/javac/generics/wildcards/neg/CastFail17.java
@@ -27,7 +27,7 @@
* @summary Test casts (legal, warning, and errors)
* @author gafter
*
- * @compile/fail -source 1.5 CastFail17.java
+ * @compile/fail CastFail17.java
*/
import java.util.*;
diff --git a/langtools/test/tools/javac/generics/wildcards/neg/CastFail18.java b/langtools/test/tools/javac/generics/wildcards/neg/CastFail18.java
index 6e0dd06..4f696ff 100644
--- a/langtools/test/tools/javac/generics/wildcards/neg/CastFail18.java
+++ b/langtools/test/tools/javac/generics/wildcards/neg/CastFail18.java
@@ -27,7 +27,7 @@
* @summary Test casts (legal, warning, and errors)
* @author gafter
*
- * @compile/fail -source 1.5 CastFail18.java
+ * @compile/fail CastFail18.java
*/
import java.util.*;
diff --git a/langtools/test/tools/javac/generics/wildcards/neg/CastFail19.java b/langtools/test/tools/javac/generics/wildcards/neg/CastFail19.java
index cf8c46b..a9c2318 100644
--- a/langtools/test/tools/javac/generics/wildcards/neg/CastFail19.java
+++ b/langtools/test/tools/javac/generics/wildcards/neg/CastFail19.java
@@ -27,7 +27,7 @@
* @summary Test casts (legal, warning, and errors)
* @author gafter
*
- * @compile/fail -source 1.5 CastFail19.java
+ * @compile/fail CastFail19.java
*/
import java.util.*;
diff --git a/langtools/test/tools/javac/generics/wildcards/neg/CastFail2.java b/langtools/test/tools/javac/generics/wildcards/neg/CastFail2.java
index 82ecb7d..4ea15ec 100644
--- a/langtools/test/tools/javac/generics/wildcards/neg/CastFail2.java
+++ b/langtools/test/tools/javac/generics/wildcards/neg/CastFail2.java
@@ -27,7 +27,7 @@
* @summary Test casts (legal, warning, and errors)
* @author gafter
*
- * @compile/fail -source 1.5 CastFail2.java
+ * @compile/fail CastFail2.java
*/
import java.util.*;
diff --git a/langtools/test/tools/javac/generics/wildcards/neg/CastFail20.java b/langtools/test/tools/javac/generics/wildcards/neg/CastFail20.java
index 4003638..ac7e4a2 100644
--- a/langtools/test/tools/javac/generics/wildcards/neg/CastFail20.java
+++ b/langtools/test/tools/javac/generics/wildcards/neg/CastFail20.java
@@ -27,7 +27,7 @@
* @summary Test casts (legal, warning, and errors)
* @author gafter
*
- * @compile/fail -source 1.5 CastFail20.java
+ * @compile/fail CastFail20.java
*/
import java.util.*;
diff --git a/langtools/test/tools/javac/generics/wildcards/neg/CastFail21.java b/langtools/test/tools/javac/generics/wildcards/neg/CastFail21.java
index 072293e..a2b0080 100644
--- a/langtools/test/tools/javac/generics/wildcards/neg/CastFail21.java
+++ b/langtools/test/tools/javac/generics/wildcards/neg/CastFail21.java
@@ -27,7 +27,7 @@
* @summary Test casts (legal, warning, and errors)
* @author gafter
*
- * @compile/fail -source 1.5 CastFail20.java
+ * @compile/fail CastFail20.java
*/
import java.util.*;
diff --git a/langtools/test/tools/javac/generics/wildcards/neg/CastFail3.java b/langtools/test/tools/javac/generics/wildcards/neg/CastFail3.java
index 94e59b8..0284d28 100644
--- a/langtools/test/tools/javac/generics/wildcards/neg/CastFail3.java
+++ b/langtools/test/tools/javac/generics/wildcards/neg/CastFail3.java
@@ -27,7 +27,7 @@
* @summary Test casts (legal, warning, and errors)
* @author gafter
*
- * @compile/fail -source 1.5 CastFail3.java
+ * @compile/fail CastFail3.java
*/
import java.util.*;
diff --git a/langtools/test/tools/javac/generics/wildcards/neg/CastFail4.java b/langtools/test/tools/javac/generics/wildcards/neg/CastFail4.java
index cecf3cf..a183fd7 100644
--- a/langtools/test/tools/javac/generics/wildcards/neg/CastFail4.java
+++ b/langtools/test/tools/javac/generics/wildcards/neg/CastFail4.java
@@ -27,7 +27,7 @@
* @summary Test casts (legal, warning, and errors)
* @author gafter
*
- * @compile/fail -source 1.5 CastFail4.java
+ * @compile/fail CastFail4.java
*/
import java.util.*;
diff --git a/langtools/test/tools/javac/generics/wildcards/neg/CastFail5.java b/langtools/test/tools/javac/generics/wildcards/neg/CastFail5.java
index c6d4172..e9e6de9 100644
--- a/langtools/test/tools/javac/generics/wildcards/neg/CastFail5.java
+++ b/langtools/test/tools/javac/generics/wildcards/neg/CastFail5.java
@@ -27,7 +27,7 @@
* @summary Test casts (legal, warning, and errors)
* @author gafter
*
- * @compile/fail -source 1.5 CastFail5.java
+ * @compile/fail CastFail5.java
*/
import java.util.*;
diff --git a/langtools/test/tools/javac/generics/wildcards/neg/CastFail6.java b/langtools/test/tools/javac/generics/wildcards/neg/CastFail6.java
index 081b243..4689fee 100644
--- a/langtools/test/tools/javac/generics/wildcards/neg/CastFail6.java
+++ b/langtools/test/tools/javac/generics/wildcards/neg/CastFail6.java
@@ -27,7 +27,7 @@
* @summary Test casts (legal, warning, and errors)
* @author gafter
*
- * @compile/fail -source 1.5 CastFail6.java
+ * @compile/fail CastFail6.java
*/
import java.util.*;
diff --git a/langtools/test/tools/javac/generics/wildcards/neg/CastFail7.java b/langtools/test/tools/javac/generics/wildcards/neg/CastFail7.java
index cb16b251..9665fea 100644
--- a/langtools/test/tools/javac/generics/wildcards/neg/CastFail7.java
+++ b/langtools/test/tools/javac/generics/wildcards/neg/CastFail7.java
@@ -27,7 +27,7 @@
* @summary Test casts (legal, warning, and errors)
* @author gafter
*
- * @compile/fail -source 1.5 CastFail7.java
+ * @compile/fail CastFail7.java
*/
import java.util.*;
diff --git a/langtools/test/tools/javac/generics/wildcards/neg/CastFail8.java b/langtools/test/tools/javac/generics/wildcards/neg/CastFail8.java
index b774852..ec2bced 100644
--- a/langtools/test/tools/javac/generics/wildcards/neg/CastFail8.java
+++ b/langtools/test/tools/javac/generics/wildcards/neg/CastFail8.java
@@ -27,7 +27,7 @@
* @summary Test casts (legal, warning, and errors)
* @author gafter
*
- * @compile/fail -source 1.5 CastFail8.java
+ * @compile/fail CastFail8.java
*/
import java.util.*;
diff --git a/langtools/test/tools/javac/generics/wildcards/neg/CastFail9.java b/langtools/test/tools/javac/generics/wildcards/neg/CastFail9.java
index 455ec11..97f6e5d 100644
--- a/langtools/test/tools/javac/generics/wildcards/neg/CastFail9.java
+++ b/langtools/test/tools/javac/generics/wildcards/neg/CastFail9.java
@@ -27,7 +27,7 @@
* @summary Test casts (legal, warning, and errors)
* @author gafter
*
- * @compile/fail -source 1.5 CastFail9.java
+ * @compile/fail CastFail9.java
*/
import java.util.*;
diff --git a/langtools/test/tools/javac/generics/wildcards/neg/CastWarn10.java b/langtools/test/tools/javac/generics/wildcards/neg/CastWarn10.java
index 4f5a674..0d94092 100644
--- a/langtools/test/tools/javac/generics/wildcards/neg/CastWarn10.java
+++ b/langtools/test/tools/javac/generics/wildcards/neg/CastWarn10.java
@@ -27,7 +27,7 @@
* @summary Test casts (legal, warning, and errors)
* @author gafter
*
- * @compile/fail -source 1.5 -Werror -Xlint:unchecked CastWarn10.java
+ * @compile/fail -Werror -Xlint:unchecked CastWarn10.java
*/
import java.util.*;
diff --git a/langtools/test/tools/javac/generics/wildcards/neg/CastWarn11.java b/langtools/test/tools/javac/generics/wildcards/neg/CastWarn11.java
index d00988a..e4a5856 100644
--- a/langtools/test/tools/javac/generics/wildcards/neg/CastWarn11.java
+++ b/langtools/test/tools/javac/generics/wildcards/neg/CastWarn11.java
@@ -27,7 +27,7 @@
* @summary Test casts (legal, warning, and errors)
* @author gafter
*
- * @compile/fail -source 1.5 -Werror -Xlint:unchecked CastWarn11.java
+ * @compile/fail -Werror -Xlint:unchecked CastWarn11.java
*/
import java.util.*;
diff --git a/langtools/test/tools/javac/generics/wildcards/neg/CastWarn12.java b/langtools/test/tools/javac/generics/wildcards/neg/CastWarn12.java
index ea5acb9..38717c0 100644
--- a/langtools/test/tools/javac/generics/wildcards/neg/CastWarn12.java
+++ b/langtools/test/tools/javac/generics/wildcards/neg/CastWarn12.java
@@ -27,7 +27,7 @@
* @summary Test casts (legal, warning, and errors)
* @author gafter
*
- * @compile/fail -source 1.5 -Werror -Xlint:unchecked CastWarn12.java
+ * @compile/fail -Werror -Xlint:unchecked CastWarn12.java
*/
import java.util.*;
diff --git a/langtools/test/tools/javac/generics/wildcards/neg/CastWarn13.java b/langtools/test/tools/javac/generics/wildcards/neg/CastWarn13.java
index cdedf2c..2e44ea8 100644
--- a/langtools/test/tools/javac/generics/wildcards/neg/CastWarn13.java
+++ b/langtools/test/tools/javac/generics/wildcards/neg/CastWarn13.java
@@ -27,7 +27,7 @@
* @summary Test casts (legal, warning, and errors)
* @author gafter
*
- * @compile/fail -source 1.5 -Werror -Xlint:unchecked CastWarn13.java
+ * @compile/fail -Werror -Xlint:unchecked CastWarn13.java
*/
import java.util.*;
diff --git a/langtools/test/tools/javac/generics/wildcards/neg/CastWarn14.java b/langtools/test/tools/javac/generics/wildcards/neg/CastWarn14.java
index 4e0cf92..e364562 100644
--- a/langtools/test/tools/javac/generics/wildcards/neg/CastWarn14.java
+++ b/langtools/test/tools/javac/generics/wildcards/neg/CastWarn14.java
@@ -27,7 +27,7 @@
* @summary Test casts (legal, warning, and errors)
* @author gafter
*
- * @compile/fail -source 1.5 -Werror -Xlint:unchecked CastWarn14.java
+ * @compile/fail -Werror -Xlint:unchecked CastWarn14.java
*/
import java.util.*;
diff --git a/langtools/test/tools/javac/generics/wildcards/neg/CastWarn2.java b/langtools/test/tools/javac/generics/wildcards/neg/CastWarn2.java
index 605363d..92df94c 100644
--- a/langtools/test/tools/javac/generics/wildcards/neg/CastWarn2.java
+++ b/langtools/test/tools/javac/generics/wildcards/neg/CastWarn2.java
@@ -27,7 +27,7 @@
* @summary Test casts (legal, warning, and errors)
* @author gafter
*
- * @compile/fail -source 1.5 -Werror -Xlint:unchecked CastWarn2.java
+ * @compile/fail -Werror -Xlint:unchecked CastWarn2.java
*/
import java.util.*;
diff --git a/langtools/test/tools/javac/generics/wildcards/neg/CastWarn3.java b/langtools/test/tools/javac/generics/wildcards/neg/CastWarn3.java
index f084386..71266d4 100644
--- a/langtools/test/tools/javac/generics/wildcards/neg/CastWarn3.java
+++ b/langtools/test/tools/javac/generics/wildcards/neg/CastWarn3.java
@@ -27,7 +27,7 @@
* @summary Test casts (legal, warning, and errors)
* @author gafter
*
- * @compile/fail -source 1.5 -Werror -Xlint:unchecked CastWarn3.java
+ * @compile/fail -Werror -Xlint:unchecked CastWarn3.java
*/
import java.util.*;
diff --git a/langtools/test/tools/javac/generics/wildcards/neg/CastWarn4.java b/langtools/test/tools/javac/generics/wildcards/neg/CastWarn4.java
index 96c2dba..c4a5f7d 100644
--- a/langtools/test/tools/javac/generics/wildcards/neg/CastWarn4.java
+++ b/langtools/test/tools/javac/generics/wildcards/neg/CastWarn4.java
@@ -27,7 +27,7 @@
* @summary Test casts (legal, warning, and errors)
* @author gafter
*
- * @compile/fail -source 1.5 -Werror -Xlint:unchecked CastWarn4.java
+ * @compile/fail -Werror -Xlint:unchecked CastWarn4.java
*/
import java.util.*;
diff --git a/langtools/test/tools/javac/generics/wildcards/neg/CastWarn5.java b/langtools/test/tools/javac/generics/wildcards/neg/CastWarn5.java
index e9400a7..b1eeeae 100644
--- a/langtools/test/tools/javac/generics/wildcards/neg/CastWarn5.java
+++ b/langtools/test/tools/javac/generics/wildcards/neg/CastWarn5.java
@@ -27,7 +27,7 @@
* @summary Test casts (legal, warning, and errors)
* @author gafter
*
- * @compile/fail -source 1.5 -Werror -Xlint:unchecked CastWarn5.java
+ * @compile/fail -Werror -Xlint:unchecked CastWarn5.java
*/
import java.util.*;
diff --git a/langtools/test/tools/javac/generics/wildcards/neg/CastWarn6.java b/langtools/test/tools/javac/generics/wildcards/neg/CastWarn6.java
index 43ca684..75ecf2e 100644
--- a/langtools/test/tools/javac/generics/wildcards/neg/CastWarn6.java
+++ b/langtools/test/tools/javac/generics/wildcards/neg/CastWarn6.java
@@ -27,7 +27,7 @@
* @summary Test casts (legal, warning, and errors)
* @author gafter
*
- * @compile/fail -source 1.5 -Werror -Xlint:unchecked CastWarn6.java
+ * @compile/fail -Werror -Xlint:unchecked CastWarn6.java
*/
import java.util.*;
diff --git a/langtools/test/tools/javac/generics/wildcards/neg/CastWarn7.java b/langtools/test/tools/javac/generics/wildcards/neg/CastWarn7.java
index 0b89cc7..27d6615 100644
--- a/langtools/test/tools/javac/generics/wildcards/neg/CastWarn7.java
+++ b/langtools/test/tools/javac/generics/wildcards/neg/CastWarn7.java
@@ -27,7 +27,7 @@
* @summary Test casts (legal, warning, and errors)
* @author gafter
*
- * @compile/fail -source 1.5 -Werror -Xlint:unchecked CastWarn7.java
+ * @compile/fail -Werror -Xlint:unchecked CastWarn7.java
*/
import java.util.*;
diff --git a/langtools/test/tools/javac/generics/wildcards/neg/CastWarn8.java b/langtools/test/tools/javac/generics/wildcards/neg/CastWarn8.java
index a3c6510..ae7b588 100644
--- a/langtools/test/tools/javac/generics/wildcards/neg/CastWarn8.java
+++ b/langtools/test/tools/javac/generics/wildcards/neg/CastWarn8.java
@@ -27,7 +27,7 @@
* @summary Test casts (legal, warning, and errors)
* @author gafter
*
- * @compile/fail -source 1.5 -Werror -Xlint:unchecked CastWarn8.java
+ * @compile/fail -Werror -Xlint:unchecked CastWarn8.java
*/
import java.util.*;
diff --git a/langtools/test/tools/javac/generics/wildcards/neg/CastWarn9.java b/langtools/test/tools/javac/generics/wildcards/neg/CastWarn9.java
index c6c1741..a1eb2d8 100644
--- a/langtools/test/tools/javac/generics/wildcards/neg/CastWarn9.java
+++ b/langtools/test/tools/javac/generics/wildcards/neg/CastWarn9.java
@@ -27,7 +27,7 @@
* @summary Test casts (legal, warning, and errors)
* @author gafter
*
- * @compile/fail -source 1.5 -Werror -Xlint:unchecked CastWarn9.java
+ * @compile/fail -Werror -Xlint:unchecked CastWarn9.java
*/
import java.util.*;
diff --git a/langtools/test/tools/javac/generics/wildcards/neg/ParamCast.java b/langtools/test/tools/javac/generics/wildcards/neg/ParamCast.java
index a7c75f0..92c2538 100644
--- a/langtools/test/tools/javac/generics/wildcards/neg/ParamCast.java
+++ b/langtools/test/tools/javac/generics/wildcards/neg/ParamCast.java
@@ -27,7 +27,7 @@
* @summary Description
* @author gafter
*
- * @compile/fail -source 1.5 ParamCast.java
+ * @compile/fail ParamCast.java
*/
class A<T> {}
diff --git a/langtools/test/tools/javac/generics/wildcards/neg/Readonly.java b/langtools/test/tools/javac/generics/wildcards/neg/Readonly.java
index a150484..2f75204 100644
--- a/langtools/test/tools/javac/generics/wildcards/neg/Readonly.java
+++ b/langtools/test/tools/javac/generics/wildcards/neg/Readonly.java
@@ -27,7 +27,7 @@
* @summary an extends-bound (covariant) wildcard is like readonly
* @author gafter
*
- * @compile/fail -source 1.5 Readonly.java
+ * @compile/fail Readonly.java
*/
class Err<T> {
diff --git a/langtools/test/tools/javac/generics/wildcards/neg/Unbounded.java b/langtools/test/tools/javac/generics/wildcards/neg/Unbounded.java
index b8145d6..a75fad9 100644
--- a/langtools/test/tools/javac/generics/wildcards/neg/Unbounded.java
+++ b/langtools/test/tools/javac/generics/wildcards/neg/Unbounded.java
@@ -27,7 +27,7 @@
* @summary an unbounded (bivariant) wildcard doesn't allow reading
* @author gafter
*
- * @compile/fail -source 1.5 Unbounded.java
+ * @compile/fail Unbounded.java
*/
import java.util.Stack;
diff --git a/langtools/test/tools/javac/generics/wildcards/pos/AmbiguousCast2.java b/langtools/test/tools/javac/generics/wildcards/pos/AmbiguousCast2.java
index 07e62aa..baebc07 100644
--- a/langtools/test/tools/javac/generics/wildcards/pos/AmbiguousCast2.java
+++ b/langtools/test/tools/javac/generics/wildcards/pos/AmbiguousCast2.java
@@ -27,7 +27,7 @@
* @summary generics: unable to cast between two convertible types
* @author gafter
*
- * @compile -source 1.5 AmbiguousCast2.java
+ * @compile AmbiguousCast2.java
*/
import java.lang.ref.*;
diff --git a/langtools/test/tools/javac/generics/wildcards/pos/BoundsCollision.java b/langtools/test/tools/javac/generics/wildcards/pos/BoundsCollision.java
index 3d03602..bab23c7 100644
--- a/langtools/test/tools/javac/generics/wildcards/pos/BoundsCollision.java
+++ b/langtools/test/tools/javac/generics/wildcards/pos/BoundsCollision.java
@@ -27,7 +27,7 @@
* @summary when upper bounds and lower bounds collide
* @author gafter
*
- * @compile -source 1.5 -Werror BoundsCollision.java
+ * @compile -Werror BoundsCollision.java
*/
class StreinBug {
diff --git a/langtools/test/tools/javac/generics/wildcards/pos/Capture.java b/langtools/test/tools/javac/generics/wildcards/pos/Capture.java
index f9aa15c..2941913 100644
--- a/langtools/test/tools/javac/generics/wildcards/pos/Capture.java
+++ b/langtools/test/tools/javac/generics/wildcards/pos/Capture.java
@@ -27,7 +27,7 @@
* @summary Wildcard capture
* @author gafter
*
- * @compile -source 1.5 -Werror Capture.java
+ * @compile -Werror Capture.java
*/
class X<T> {}
diff --git a/langtools/test/tools/javac/generics/wildcards/pos/CastTest.java b/langtools/test/tools/javac/generics/wildcards/pos/CastTest.java
index a88a301..fafb50e 100644
--- a/langtools/test/tools/javac/generics/wildcards/pos/CastTest.java
+++ b/langtools/test/tools/javac/generics/wildcards/pos/CastTest.java
@@ -27,7 +27,7 @@
* @summary Test casts (legal, warning, and errors)
* @author gafter
*
- * @compile -source 1.5 -Werror CastTest.java
+ * @compile -Werror CastTest.java
*/
import java.util.*;
diff --git a/langtools/test/tools/javac/generics/wildcards/pos/InstanceOf.java b/langtools/test/tools/javac/generics/wildcards/pos/InstanceOf.java
index 7d0cd55..bc2b3a2 100644
--- a/langtools/test/tools/javac/generics/wildcards/pos/InstanceOf.java
+++ b/langtools/test/tools/javac/generics/wildcards/pos/InstanceOf.java
@@ -27,7 +27,7 @@
* @summary generics: type cast with instance of
* @author gafter
*
- * @compile -source 1.5 -Werror InstanceOf.java
+ * @compile -Werror InstanceOf.java
*/
class InstanceOf<T> {
diff --git a/langtools/test/tools/javac/generics/wildcards/pos/ParamCast.java b/langtools/test/tools/javac/generics/wildcards/pos/ParamCast.java
index bc29339..86ae191 100644
--- a/langtools/test/tools/javac/generics/wildcards/pos/ParamCast.java
+++ b/langtools/test/tools/javac/generics/wildcards/pos/ParamCast.java
@@ -27,7 +27,7 @@
* @summary integrate improved wildcard substitution from CPH
* @author gafter
*
- * @compile -source 1.5 -Werror -Xlint:unchecked ParamCast.java
+ * @compile -Werror -Xlint:unchecked ParamCast.java
*/
class A<T> {}
diff --git a/langtools/test/tools/javac/generics/wildcards/pos/RvalConversion.java b/langtools/test/tools/javac/generics/wildcards/pos/RvalConversion.java
index 5457b32..a92172e 100644
--- a/langtools/test/tools/javac/generics/wildcards/pos/RvalConversion.java
+++ b/langtools/test/tools/javac/generics/wildcards/pos/RvalConversion.java
@@ -27,7 +27,7 @@
* @summary rvalue conversion changes "? extends X" to "X".
* @author gafter
*
- * @compile -source 1.5 RvalConversion.java
+ * @compile RvalConversion.java
*/
import java.util.*;
diff --git a/langtools/test/tools/javac/generics/wildcards/pos/UncheckedCast1.java b/langtools/test/tools/javac/generics/wildcards/pos/UncheckedCast1.java
index 4042715..8fd9caa 100644
--- a/langtools/test/tools/javac/generics/wildcards/pos/UncheckedCast1.java
+++ b/langtools/test/tools/javac/generics/wildcards/pos/UncheckedCast1.java
@@ -27,7 +27,7 @@
* @summary generics: failure of some unchecked casts
* @author gafter
*
- * @compile -source 1.5 UncheckedCast1.java
+ * @compile UncheckedCast1.java
*/
class Z {
diff --git a/langtools/test/tools/javac/importscope/A.java b/langtools/test/tools/javac/importscope/A.java
index 8052be5..2fd97f1 100644
--- a/langtools/test/tools/javac/importscope/A.java
+++ b/langtools/test/tools/javac/importscope/A.java
@@ -27,7 +27,7 @@
* @summary static import of private field crashes compiler
* @author gafter
*
- * @compile -source 1.5 A.java B.java
+ * @compile A.java B.java
*/
package p1;
diff --git a/langtools/test/tools/javac/limits/FinallyNesting.java b/langtools/test/tools/javac/limits/FinallyNesting.java
index 956ff46..f2c6a75 100644
--- a/langtools/test/tools/javac/limits/FinallyNesting.java
+++ b/langtools/test/tools/javac/limits/FinallyNesting.java
@@ -29,7 +29,7 @@
*
* @compile -source 1.4 -target 1.4 FinallyNesting.java
*/
-
+// Source and target 1.4 are needed for the test to pass with default memory sizes.
class FinallyNesting {
public static void main(String[] args) {
int x;
diff --git a/langtools/test/tools/javac/lint/Unchecked.java b/langtools/test/tools/javac/lint/Unchecked.java
index f558140..7c967cd 100644
--- a/langtools/test/tools/javac/lint/Unchecked.java
+++ b/langtools/test/tools/javac/lint/Unchecked.java
@@ -27,7 +27,7 @@
* @summary Add -Xlint flag
* @author gafter
*
- * @compile/fail -source 1.5 -Xlint:unchecked -Werror Unchecked.java
+ * @compile/fail -Xlint:unchecked -Werror Unchecked.java
*/
class Unchecked<T> {
diff --git a/langtools/test/tools/javac/miranda/T4711325.java b/langtools/test/tools/javac/miranda/T4711325.java
index 5cecf8e..7339b88 100644
--- a/langtools/test/tools/javac/miranda/T4711325.java
+++ b/langtools/test/tools/javac/miranda/T4711325.java
@@ -27,7 +27,7 @@
* @summary compiler allows unimplementable interfaces
* @author gafter
*
- * @compile -source 1.5 T4711325.java
+ * @compile T4711325.java
* @compile/fail -source 1.4 T4711325.java
*/
diff --git a/langtools/test/tools/javac/mixedTarget/CompatibleAbstracts1.java b/langtools/test/tools/javac/mixedTarget/CompatibleAbstracts1.java
index 6ea27da..6f1fd42 100644
--- a/langtools/test/tools/javac/mixedTarget/CompatibleAbstracts1.java
+++ b/langtools/test/tools/javac/mixedTarget/CompatibleAbstracts1.java
@@ -27,14 +27,14 @@
* @summary 1.4 javac should not accept the Covariant Return Type
* @author gafter
*
- * @compile -source 1.5 CompatibleAbstracts1.java
- * @compile -source 1.5 CompatibleAbstracts2.java
+ * @compile CompatibleAbstracts1.java
+ * @compile CompatibleAbstracts2.java
* @compile -source 1.4 CompatibleAbstracts2.java
- * @compile -source 1.5 CompatibleAbstracts3.java
+ * @compile CompatibleAbstracts3.java
* @compile/fail -source 1.4 CompatibleAbstracts3.java
- * @compile -source 1.5 CompatibleAbstracts4.java
+ * @compile CompatibleAbstracts4.java
* @compile/fail -source 1.4 CompatibleAbstracts4.java
- * @compile -source 1.5 CompatibleAbstracts5.java
+ * @compile CompatibleAbstracts5.java
* @compile/fail -source 1.4 CompatibleAbstracts5.java
*/
diff --git a/langtools/test/tools/javac/mixedTarget/ExtendCovariant2.java b/langtools/test/tools/javac/mixedTarget/ExtendCovariant2.java
index 7f32888..f6933e9 100644
--- a/langtools/test/tools/javac/mixedTarget/ExtendCovariant2.java
+++ b/langtools/test/tools/javac/mixedTarget/ExtendCovariant2.java
@@ -28,7 +28,7 @@
* @author gafter
*
* @compile/fail -source 1.4 ExtendCovariant2.java
- * @compile -source 1.5 ExtendCovariant2.java
+ * @compile ExtendCovariant2.java
*/
/**
diff --git a/langtools/test/tools/javac/overload/T5090220.java b/langtools/test/tools/javac/overload/T5090220.java
index 0a12c5e..c9bfb9d 100644
--- a/langtools/test/tools/javac/overload/T5090220.java
+++ b/langtools/test/tools/javac/overload/T5090220.java
@@ -25,7 +25,7 @@
* @test
* @bug 5090220
* @summary Autoboxing applied when calculating most-specific method
- * @compile/fail -source 5 T5090220.java
+ * @compile/fail T5090220.java
*/
class T5090220 {
diff --git a/langtools/test/tools/javac/processing/environment/TestSourceVersion.java b/langtools/test/tools/javac/processing/environment/TestSourceVersion.java
index a102ed8..f8cee81 100644
--- a/langtools/test/tools/javac/processing/environment/TestSourceVersion.java
+++ b/langtools/test/tools/javac/processing/environment/TestSourceVersion.java
@@ -34,6 +34,8 @@
* @compile -processor TestSourceVersion -proc:only -source 5 -AExpectedVersion=RELEASE_5 HelloWorld.java
* @compile -processor TestSourceVersion -proc:only -source 1.6 -AExpectedVersion=RELEASE_6 HelloWorld.java
* @compile -processor TestSourceVersion -proc:only -source 6 -AExpectedVersion=RELEASE_6 HelloWorld.java
+ * @compile -processor TestSourceVersion -proc:only -source 1.7 -AExpectedVersion=RELEASE_7 HelloWorld.java
+ * @compile -processor TestSourceVersion -proc:only -source 7 -AExpectedVersion=RELEASE_7 HelloWorld.java
*/
import java.util.Set;
diff --git a/langtools/test/tools/javac/stackmap/UninitThis.java b/langtools/test/tools/javac/stackmap/UninitThis.java
index 82512e6..fa5c21d 100644
--- a/langtools/test/tools/javac/stackmap/UninitThis.java
+++ b/langtools/test/tools/javac/stackmap/UninitThis.java
@@ -26,9 +26,6 @@
* @bug 4948063
* @summary Invalid java.io.FileInputStream with v49 generate by javac
* @author gafter
- *
- * @compile -source 1.5 -target 1.5 UninitThis.java
- * @run main UninitThis
*/
// may fail due to VM bug 4948729
diff --git a/langtools/test/tools/javac/staticImport/Ambig1.java b/langtools/test/tools/javac/staticImport/Ambig1.java
index 9b2735d..eb80852 100644
--- a/langtools/test/tools/javac/staticImport/Ambig1.java
+++ b/langtools/test/tools/javac/staticImport/Ambig1.java
@@ -27,7 +27,7 @@
* @summary Missing ambiguity error when two methods are equally specific
* @author gafter
*
- * @compile/fail -source 1.5 Ambig1.java
+ * @compile/fail Ambig1.java
*/
package ambig1;
diff --git a/langtools/test/tools/javac/staticImport/ImportInherit.java b/langtools/test/tools/javac/staticImport/ImportInherit.java
index c30caa7..80bbdd0 100644
--- a/langtools/test/tools/javac/staticImport/ImportInherit.java
+++ b/langtools/test/tools/javac/staticImport/ImportInherit.java
@@ -27,7 +27,7 @@
* @summary static import versus inherited members
* @author gafter
*
- * @compile -source 1.5 ImportInherit.java
+ * @compile ImportInherit.java
*/
package importInherit;
diff --git a/langtools/test/tools/javac/staticImport/ImportPrivate.java b/langtools/test/tools/javac/staticImport/ImportPrivate.java
index c8841a6..5ae17fd 100644
--- a/langtools/test/tools/javac/staticImport/ImportPrivate.java
+++ b/langtools/test/tools/javac/staticImport/ImportPrivate.java
@@ -27,7 +27,7 @@
* @summary NPE while compiling static import of inaccessible class member
* @author gafter
*
- * @compile/fail -source 1.5 ImportPrivate.java
+ * @compile/fail ImportPrivate.java
*/
package importPrivate;
diff --git a/langtools/test/tools/javac/staticImport/PrivateStaticImport.java b/langtools/test/tools/javac/staticImport/PrivateStaticImport.java
index 5ed0c71..81fef56 100644
--- a/langtools/test/tools/javac/staticImport/PrivateStaticImport.java
+++ b/langtools/test/tools/javac/staticImport/PrivateStaticImport.java
@@ -27,7 +27,7 @@
* @summary static import of private field crashes compiler
* @author gafter
*
- * @compile/fail -source 1.5 PrivateStaticImport.java
+ * @compile/fail PrivateStaticImport.java
*/
package psi;
diff --git a/langtools/test/tools/javac/staticImport/Shadow.java b/langtools/test/tools/javac/staticImport/Shadow.java
index 51531f5..1fd23c1 100644
--- a/langtools/test/tools/javac/staticImport/Shadow.java
+++ b/langtools/test/tools/javac/staticImport/Shadow.java
@@ -27,7 +27,7 @@
* @summary compiler fails to shadow inapplicable method with static import
* @author gafter
*
- * @compile/fail -source 1.5 Shadow.java
+ * @compile/fail Shadow.java
*/
package shadow;
diff --git a/langtools/test/tools/javac/staticImport/StaticImport.java b/langtools/test/tools/javac/staticImport/StaticImport.java
index 9ffdaae..e43905a 100644
--- a/langtools/test/tools/javac/staticImport/StaticImport.java
+++ b/langtools/test/tools/javac/staticImport/StaticImport.java
@@ -27,7 +27,7 @@
* @summary add support for JSR 201's static import facility
* @author gafter
*
- * @compile -source 1.5 StaticImport.java
+ * @compile StaticImport.java
* @run main StaticImport
*/
diff --git a/langtools/test/tools/javac/staticImport/StaticImport2.java b/langtools/test/tools/javac/staticImport/StaticImport2.java
index 93f5bdf..9a92994 100644
--- a/langtools/test/tools/javac/staticImport/StaticImport2.java
+++ b/langtools/test/tools/javac/staticImport/StaticImport2.java
@@ -27,7 +27,7 @@
* @summary add support for JSR 201's static import facility
* @author gafter
*
- * @compile/fail -source 1.5 StaticImport2.java
+ * @compile/fail StaticImport2.java
*/
package p;
diff --git a/langtools/test/tools/javac/unicode/Unmappable.java b/langtools/test/tools/javac/unicode/Unmappable.java
index 65e5c68..8a170dc 100644
--- a/langtools/test/tools/javac/unicode/Unmappable.java
+++ b/langtools/test/tools/javac/unicode/Unmappable.java
@@ -29,7 +29,7 @@
*
* @compile -encoding ascii -source 1.5 Unmappable.java
* @compile/fail -Werror -encoding ascii -source 1.5 Unmappable.java
- * @compile/fail -encoding ascii -source 6 Unmappable.java
+ * @compile/fail -encoding ascii Unmappable.java
*/
// example from 4766897
diff --git a/langtools/test/tools/javac/varargs/Anon.java b/langtools/test/tools/javac/varargs/Anon.java
index b4110c5..029c988 100644
--- a/langtools/test/tools/javac/varargs/Anon.java
+++ b/langtools/test/tools/javac/varargs/Anon.java
@@ -27,7 +27,7 @@
* @summary varargs versus anonymous constructors crashes javac
* @author gafter
*
- * @compile -source 1.5 Anon.java
+ * @compile Anon.java
*/
class Anon {
diff --git a/langtools/test/tools/javac/varargs/BadSyntax2.java b/langtools/test/tools/javac/varargs/BadSyntax2.java
index 73505d7..95d9859 100644
--- a/langtools/test/tools/javac/varargs/BadSyntax2.java
+++ b/langtools/test/tools/javac/varargs/BadSyntax2.java
@@ -27,7 +27,7 @@
* @summary generic class method with vararg gets "java.lang.AssertionError: arraycode T"
* @author gafter
*
- * @compile -source 1.5 BadSyntax2.java
+ * @compile BadSyntax2.java
*/
class Tclass<T> {
diff --git a/langtools/test/tools/javac/varargs/Varargs1.java b/langtools/test/tools/javac/varargs/Varargs1.java
index 50692fe..c7ab941 100644
--- a/langtools/test/tools/javac/varargs/Varargs1.java
+++ b/langtools/test/tools/javac/varargs/Varargs1.java
@@ -27,7 +27,7 @@
* @summary varags, auto boxing
* @author gafter
*
- * @compile -source 1.5 Varargs1.java
+ * @compile Varargs1.java
* @run main Varargs1
*/
diff --git a/langtools/test/tools/javac/varargs/VarargsOverride.java b/langtools/test/tools/javac/varargs/VarargsOverride.java
index 51eba9c..52c42b4 100644
--- a/langtools/test/tools/javac/varargs/VarargsOverride.java
+++ b/langtools/test/tools/javac/varargs/VarargsOverride.java
@@ -27,8 +27,8 @@
* @summary overriding with method of different arity is prohibited
* @author gafter
*
- * @compile -source 1.5 VarargsOverride.java
- * @compile/fail -source 1.5 -Werror -Xlint VarargsOverride.java
+ * @compile VarargsOverride.java
+ * @compile/fail -Werror -Xlint VarargsOverride.java
*/
package varargs.override;
diff --git a/langtools/test/tools/javac/varargs/Warn1.java b/langtools/test/tools/javac/varargs/Warn1.java
index fa55df6..44bdaa3 100644
--- a/langtools/test/tools/javac/varargs/Warn1.java
+++ b/langtools/test/tools/javac/varargs/Warn1.java
@@ -27,9 +27,9 @@
* @summary need warning if varargs argument isn't boxed
* @author gafter
*
- * @compile -source 1.5 Warn1.java
- * @compile/fail -source 1.5 -Werror Warn1.java
- * @compile -source 1.5 -Werror -Xlint:none Warn1.java
+ * @compile Warn1.java
+ * @compile/fail -Werror Warn1.java
+ * @compile -Werror -Xlint:none Warn1.java
*/
package varargs.warn1;
diff --git a/langtools/test/tools/javac/varargs/Warn2.java b/langtools/test/tools/javac/varargs/Warn2.java
index 395e57c..fcc7b75 100644
--- a/langtools/test/tools/javac/varargs/Warn2.java
+++ b/langtools/test/tools/javac/varargs/Warn2.java
@@ -27,9 +27,9 @@
* @summary need warning if varargs argument isn't boxed
* @author gafter
*
- * @compile -source 1.5 Warn2.java
- * @compile/fail -source 1.5 -Werror Warn2.java
- * @compile -source 1.5 -Werror -Xlint:none Warn2.java
+ * @compile Warn2.java
+ * @compile/fail -Werror Warn2.java
+ * @compile -Werror -Xlint:none Warn2.java
*/
package varargs.warn2;
diff --git a/langtools/test/tools/javac/varargs/warning/Warn2.java b/langtools/test/tools/javac/varargs/warning/Warn2.java
index 6625727..46fabd4 100644
--- a/langtools/test/tools/javac/varargs/warning/Warn2.java
+++ b/langtools/test/tools/javac/varargs/warning/Warn2.java
@@ -27,7 +27,7 @@
* @summary fixed-arity warning given too often
* @author gafter
*
- * @compile -Werror -source 1.5 Warn2.java
+ * @compile -Werror Warn2.java
*/
package varargs.warning.warn2;
diff --git a/langtools/test/tools/javac/varargs/warning/Warn3.java b/langtools/test/tools/javac/varargs/warning/Warn3.java
index 8f68aae..18af8ba 100644
--- a/langtools/test/tools/javac/varargs/warning/Warn3.java
+++ b/langtools/test/tools/javac/varargs/warning/Warn3.java
@@ -27,7 +27,7 @@
* @summary fixed-arity warning given too often
* @author gafter
*
- * @compile -Werror -source 1.5 Warn3.java
+ * @compile -Werror Warn3.java
*/
package varargs.warning.warn3;
diff --git a/langtools/test/tools/javadoc/LangVers.java b/langtools/test/tools/javadoc/LangVers.java
index 7c486ea..3439e51 100644
--- a/langtools/test/tools/javadoc/LangVers.java
+++ b/langtools/test/tools/javadoc/LangVers.java
@@ -26,8 +26,6 @@
* @bug 4909767
* @summary Verify that omitting Doclet.languageVersion() hides 1.5 language
* features from the doclet.
- * @compile -source 1.5 LangVers.java
- * @run main LangVers
*/
import java.util.List;
diff --git a/langtools/test/tools/javadoc/annotations/annotateMethodsFields/Main.java b/langtools/test/tools/javadoc/annotations/annotateMethodsFields/Main.java
index f99779b..49415e1 100644
--- a/langtools/test/tools/javadoc/annotations/annotateMethodsFields/Main.java
+++ b/langtools/test/tools/javadoc/annotations/annotateMethodsFields/Main.java
@@ -28,7 +28,7 @@
* annotation type elements.
* Test an annotation type with a type nested within.
* @library ../../lib
- * @compile -source 1.5 ../../lib/Tester.java Main.java
+ * @compile ../../lib/Tester.java Main.java
* @run main Main
*/
diff --git a/langtools/test/tools/javadoc/annotations/annotatePackage/Main.java b/langtools/test/tools/javadoc/annotations/annotatePackage/Main.java
index 1bdbc0f..abd302f 100644
--- a/langtools/test/tools/javadoc/annotations/annotatePackage/Main.java
+++ b/langtools/test/tools/javadoc/annotations/annotatePackage/Main.java
@@ -26,7 +26,7 @@
* @bug 5031168
* @summary Test package annotations and package-info.java package comments.
* @library ../../lib
- * @compile -source 1.5 ../../lib/Tester.java Main.java
+ * @compile ../../lib/Tester.java Main.java
* @run main Main
*/
diff --git a/langtools/test/tools/javadoc/annotations/annotateParams/Main.java b/langtools/test/tools/javadoc/annotations/annotateParams/Main.java
index 83a8503..af020fc 100644
--- a/langtools/test/tools/javadoc/annotations/annotateParams/Main.java
+++ b/langtools/test/tools/javadoc/annotations/annotateParams/Main.java
@@ -26,7 +26,7 @@
* @bug 5031171
* @summary Test parameter annotations.
* @library ../../lib
- * @compile -source 1.5 ../../lib/Tester.java Main.java
+ * @compile ../../lib/Tester.java Main.java
* @run main Main
*/
diff --git a/langtools/test/tools/javadoc/annotations/defaults/Main.java b/langtools/test/tools/javadoc/annotations/defaults/Main.java
index 9a94c6e..91d069d 100644
--- a/langtools/test/tools/javadoc/annotations/defaults/Main.java
+++ b/langtools/test/tools/javadoc/annotations/defaults/Main.java
@@ -27,7 +27,7 @@
* @summary Test an annotation type with default element values, and
* annotations that use them.
* @library ../../lib
- * @compile -source 1.5 ../../lib/Tester.java Main.java
+ * @compile ../../lib/Tester.java Main.java
* @run main Main
*/
diff --git a/langtools/test/tools/javadoc/annotations/elementTypes/Main.java b/langtools/test/tools/javadoc/annotations/elementTypes/Main.java
index e1c0467..1e521f3 100644
--- a/langtools/test/tools/javadoc/annotations/elementTypes/Main.java
+++ b/langtools/test/tools/javadoc/annotations/elementTypes/Main.java
@@ -27,7 +27,7 @@
* @summary Test an annotation type and annotations with elements of various
* types.
* @library ../../lib
- * @compile -source 1.5 ../../lib/Tester.java Main.java
+ * @compile ../../lib/Tester.java Main.java
* @run main Main
*/
diff --git a/langtools/test/tools/javadoc/annotations/shortcuts/Main.java b/langtools/test/tools/javadoc/annotations/shortcuts/Main.java
index 8d999b7..0236106 100644
--- a/langtools/test/tools/javadoc/annotations/shortcuts/Main.java
+++ b/langtools/test/tools/javadoc/annotations/shortcuts/Main.java
@@ -26,7 +26,7 @@
* @bug 4904495
* @summary Verify that "shortcuts" are used when printing annotations.
* @library ../../lib
- * @compile -source 1.5 ../../lib/Tester.java Main.java
+ * @compile ../../lib/Tester.java Main.java
* @run main Main
*/
diff --git a/langtools/test/tools/javadoc/enum/docComments/Main.java b/langtools/test/tools/javadoc/enum/docComments/Main.java
index 055ceac..8af7ee5 100644
--- a/langtools/test/tools/javadoc/enum/docComments/Main.java
+++ b/langtools/test/tools/javadoc/enum/docComments/Main.java
@@ -26,7 +26,7 @@
* @bug 4421066
* @summary Verify the comments in an enum type.
* @library ../../lib
- * @compile -source 1.5 ../../lib/Tester.java Main.java
+ * @compile ../../lib/Tester.java Main.java
* @run main Main
*/
diff --git a/langtools/test/tools/javadoc/enum/enumType/Main.java b/langtools/test/tools/javadoc/enum/enumType/Main.java
index 3b53330..8364875 100644
--- a/langtools/test/tools/javadoc/enum/enumType/Main.java
+++ b/langtools/test/tools/javadoc/enum/enumType/Main.java
@@ -26,7 +26,7 @@
* @bug 4421066
* @summary Verify the contents of an enum type.
* @library ../../lib
- * @compile -source 1.5 ../../lib/Tester.java Main.java
+ * @compile ../../lib/Tester.java Main.java
* @run main Main
*/
diff --git a/langtools/test/tools/javadoc/generics/genericClass/Main.java b/langtools/test/tools/javadoc/generics/genericClass/Main.java
index c74c55d..bd194bf 100644
--- a/langtools/test/tools/javadoc/generics/genericClass/Main.java
+++ b/langtools/test/tools/javadoc/generics/genericClass/Main.java
@@ -26,7 +26,7 @@
* @bug 4421066
* @summary Verify the contents of the ClassDoc of a generic class.
* @library ../../lib
- * @compile -source 1.5 ../../lib/Tester.java Main.java
+ * @compile ../../lib/Tester.java Main.java
* @run main Main
*/
diff --git a/langtools/test/tools/javadoc/generics/genericInnerAndOuter/Main.java b/langtools/test/tools/javadoc/generics/genericInnerAndOuter/Main.java
index d3e6557..28a4b74 100644
--- a/langtools/test/tools/javadoc/generics/genericInnerAndOuter/Main.java
+++ b/langtools/test/tools/javadoc/generics/genericInnerAndOuter/Main.java
@@ -27,7 +27,7 @@
* @summary Verify the contents of the ClassDoc of
* a generic class with a generic inner class.
* @library ../../lib
- * @compile -source 1.5 ../../lib/Tester.java Main.java
+ * @compile ../../lib/Tester.java Main.java
* @run main Main
*/
diff --git a/langtools/test/tools/javadoc/generics/genericInterface/Main.java b/langtools/test/tools/javadoc/generics/genericInterface/Main.java
index 6657ddb..f1087c3 100644
--- a/langtools/test/tools/javadoc/generics/genericInterface/Main.java
+++ b/langtools/test/tools/javadoc/generics/genericInterface/Main.java
@@ -26,7 +26,7 @@
* @bug 4421066
* @summary Verify the contents of the ClassDoc of a generic interface.
* @library ../../lib
- * @compile -source 1.5 ../../lib/Tester.java Main.java
+ * @compile ../../lib/Tester.java Main.java
* @run main Main
*/
diff --git a/langtools/test/tools/javadoc/generics/genericMethod/Main.java b/langtools/test/tools/javadoc/generics/genericMethod/Main.java
index ab398eb..b46db19 100644
--- a/langtools/test/tools/javadoc/generics/genericMethod/Main.java
+++ b/langtools/test/tools/javadoc/generics/genericMethod/Main.java
@@ -26,7 +26,7 @@
* @bug 4421066
* @summary Verify the reading of generic methods and constructors.
* @library ../../lib
- * @compile -source 1.5 ../../lib/Tester.java Main.java
+ * @compile ../../lib/Tester.java Main.java
* @run main Main
*/
diff --git a/langtools/test/tools/javadoc/generics/genericSuper/Main.java b/langtools/test/tools/javadoc/generics/genericSuper/Main.java
index 720e979..e5adbc0 100644
--- a/langtools/test/tools/javadoc/generics/genericSuper/Main.java
+++ b/langtools/test/tools/javadoc/generics/genericSuper/Main.java
@@ -26,7 +26,7 @@
* @bug 4421066
* @summary Verify the contents of the ClassDoc of a generic class.
* @library ../../lib
- * @compile -source 1.5 ../../lib/Tester.java Main.java
+ * @compile ../../lib/Tester.java Main.java
* @run main Main
*/
diff --git a/langtools/test/tools/javadoc/generics/supertypes/Main.java b/langtools/test/tools/javadoc/generics/supertypes/Main.java
index 222b06a..e97ee84 100644
--- a/langtools/test/tools/javadoc/generics/supertypes/Main.java
+++ b/langtools/test/tools/javadoc/generics/supertypes/Main.java
@@ -26,7 +26,7 @@
* @bug 4922918
* @summary Check supertypes and superinterfaces of parameterized types.
* @library ../../lib
- * @compile -source 1.5 ../../lib/Tester.java Main.java
+ * @compile ../../lib/Tester.java Main.java
* @run main Main
*/
diff --git a/langtools/test/tools/javadoc/generics/throwsGeneric/Main.java b/langtools/test/tools/javadoc/generics/throwsGeneric/Main.java
index cb6f56e..33762ba 100644
--- a/langtools/test/tools/javadoc/generics/throwsGeneric/Main.java
+++ b/langtools/test/tools/javadoc/generics/throwsGeneric/Main.java
@@ -26,7 +26,7 @@
* @bug 4421066
* @summary Verify the reading of generic methods and constructors.
* @library ../../lib
- * @compile -source 1.5 ../../lib/Tester.java Main.java
+ * @compile ../../lib/Tester.java Main.java
* @run main Main
*/
diff --git a/langtools/test/tools/javadoc/generics/tparamCycle/Main.java b/langtools/test/tools/javadoc/generics/tparamCycle/Main.java
index 8caccf1..8b8b977 100644
--- a/langtools/test/tools/javadoc/generics/tparamCycle/Main.java
+++ b/langtools/test/tools/javadoc/generics/tparamCycle/Main.java
@@ -26,7 +26,7 @@
* @bug 4421066
* @summary Check a type parameter whose bound cycles back on itself.
* @library ../../lib
- * @compile -source 1.5 ../../lib/Tester.java Main.java
+ * @compile ../../lib/Tester.java Main.java
* @run main Main
*/
diff --git a/langtools/test/tools/javadoc/generics/tparamTagOnMethod/Main.java b/langtools/test/tools/javadoc/generics/tparamTagOnMethod/Main.java
index cea4f0b..1c818c1 100644
--- a/langtools/test/tools/javadoc/generics/tparamTagOnMethod/Main.java
+++ b/langtools/test/tools/javadoc/generics/tparamTagOnMethod/Main.java
@@ -26,7 +26,7 @@
* @bug 4421066
* @summary Verify the reading of type parameter tags on methods.
* @library ../../lib
- * @compile -source 1.5 ../../lib/Tester.java Main.java
+ * @compile ../../lib/Tester.java Main.java
* @run main Main
*/
diff --git a/langtools/test/tools/javadoc/generics/tparamTagOnType/Main.java b/langtools/test/tools/javadoc/generics/tparamTagOnType/Main.java
index 2afe5be..cde0604 100644
--- a/langtools/test/tools/javadoc/generics/tparamTagOnType/Main.java
+++ b/langtools/test/tools/javadoc/generics/tparamTagOnType/Main.java
@@ -26,7 +26,7 @@
* @bug 4421066
* @summary Verify the reading of a type parameter tag on an interface.
* @library ../../lib
- * @compile -source 1.5 ../../lib/Tester.java Main.java
+ * @compile ../../lib/Tester.java Main.java
* @run main Main
*/
diff --git a/langtools/test/tools/javadoc/generics/wildcards/Main.java b/langtools/test/tools/javadoc/generics/wildcards/Main.java
index c74c55d..bd194bf 100644
--- a/langtools/test/tools/javadoc/generics/wildcards/Main.java
+++ b/langtools/test/tools/javadoc/generics/wildcards/Main.java
@@ -26,7 +26,7 @@
* @bug 4421066
* @summary Verify the contents of the ClassDoc of a generic class.
* @library ../../lib
- * @compile -source 1.5 ../../lib/Tester.java Main.java
+ * @compile ../../lib/Tester.java Main.java
* @run main Main
*/
diff --git a/langtools/test/tools/javadoc/lib/Tester.java b/langtools/test/tools/javadoc/lib/Tester.java
index 36bde79..3e02368 100644
--- a/langtools/test/tools/javadoc/lib/Tester.java
+++ b/langtools/test/tools/javadoc/lib/Tester.java
@@ -39,7 +39,6 @@
protected final String TEST_CLASSES = System.getProperty("test.classes",
".");
private final String DEFAULT_ARGS[] = {
- "-source", "1.5",
"-sourcepath", TEST_SRC,
};
diff --git a/langtools/test/tools/javadoc/varArgs/Main.java b/langtools/test/tools/javadoc/varArgs/Main.java
index 4e4cc66..f72c450 100644
--- a/langtools/test/tools/javadoc/varArgs/Main.java
+++ b/langtools/test/tools/javadoc/varArgs/Main.java
@@ -27,7 +27,7 @@
* @summary Verify the contents of a ClassDoc containing a varArgs method.
* Verify that see/link tags can use "..." notation.
* @library ../lib
- * @compile -source 1.5 ../lib/Tester.java Main.java
+ * @compile ../lib/Tester.java Main.java
* @run main Main
*/