--- a/jdk/test/demo/jvmti/hprof/CpuOldTest.java	Thu Dec 03 21:30:27 2009 +0000
+++ b/jdk/test/demo/jvmti/hprof/CpuOldTest.java	Thu Dec 03 18:19:10 2009 -0800
@@ -26,7 +26,7 @@
  * @bug 5012882 6299047
  * @summary Test jvmti hprof
  *
- * @compile -source 1.5 -g HelloWorld.java ../DemoRun.java
+ * @compile -g HelloWorld.java ../DemoRun.java
  * @build CpuOldTest
  * @run main CpuOldTest HelloWorld
  */

--- a/jdk/test/demo/jvmti/hprof/CpuSamplesTest.java	Thu Dec 03 21:30:27 2009 +0000
+++ b/jdk/test/demo/jvmti/hprof/CpuSamplesTest.java	Thu Dec 03 18:19:10 2009 -0800
@@ -26,7 +26,7 @@
  * @bug 5012882
  * @summary Test jvmti hprof
  *
- * @compile -source 1.5 -g:lines HelloWorld.java ../DemoRun.java
+ * @compile -g:lines HelloWorld.java ../DemoRun.java
  * @build CpuSamplesTest
  * @run main CpuSamplesTest HelloWorld
  */

--- a/jdk/test/demo/jvmti/hprof/CpuTimesDefineClassTest.java	Thu Dec 03 21:30:27 2009 +0000
+++ b/jdk/test/demo/jvmti/hprof/CpuTimesDefineClassTest.java	Thu Dec 03 18:19:10 2009 -0800
@@ -26,7 +26,7 @@
  * @bug 5097131 6299047
  * @summary Test jvmti hprof
  *
- * @compile -source 1.5 -g HelloWorld.java DefineClass.java ../DemoRun.java
+ * @compile -g HelloWorld.java DefineClass.java ../DemoRun.java
  * @build CpuTimesDefineClassTest
  * @run main CpuTimesDefineClassTest DefineClass
  *

--- a/jdk/test/demo/jvmti/hprof/CpuTimesTest.java	Thu Dec 03 21:30:27 2009 +0000
+++ b/jdk/test/demo/jvmti/hprof/CpuTimesTest.java	Thu Dec 03 18:19:10 2009 -0800
@@ -26,7 +26,7 @@
  * @bug 5012882 6299047
  * @summary Test jvmti hprof
  *
- * @compile -source 1.5 -g HelloWorld.java ../DemoRun.java
+ * @compile -g HelloWorld.java ../DemoRun.java
  * @build CpuTimesTest
  * @run main CpuTimesTest HelloWorld
  */

--- a/jdk/test/demo/jvmti/hprof/HeapAllTest.java	Thu Dec 03 21:30:27 2009 +0000
+++ b/jdk/test/demo/jvmti/hprof/HeapAllTest.java	Thu Dec 03 18:19:10 2009 -0800
@@ -26,7 +26,7 @@
  * @bug 5012882 6299047
  * @summary Test jvmti hprof
  *
- * @compile -source 1.5 -g HelloWorld.java ../DemoRun.java
+ * @compile -g HelloWorld.java ../DemoRun.java
  * @build HeapAllTest
  * @run main HeapAllTest HelloWorld
  */

--- a/jdk/test/demo/jvmti/hprof/HeapBinaryFormatTest.java	Thu Dec 03 21:30:27 2009 +0000
+++ b/jdk/test/demo/jvmti/hprof/HeapBinaryFormatTest.java	Thu Dec 03 18:19:10 2009 -0800
@@ -26,7 +26,7 @@
  * @bug 4965057 6313381
  * @summary Test jvmti hprof format=b
  *
- * @compile -source 1.5 -g:source HelloWorld.java ../DemoRun.java
+ * @compile -g:source HelloWorld.java ../DemoRun.java
  * @build HeapBinaryFormatTest
  * @run main HeapBinaryFormatTest HelloWorld
  */

--- a/jdk/test/demo/jvmti/hprof/HeapDumpTest.java	Thu Dec 03 21:30:27 2009 +0000
+++ b/jdk/test/demo/jvmti/hprof/HeapDumpTest.java	Thu Dec 03 18:19:10 2009 -0800
@@ -26,7 +26,7 @@
  * @bug 5012882 6299047
  * @summary Test jvmti hprof
  *
- * @compile -source 1.5 -g:source HelloWorld.java ../DemoRun.java
+ * @compile -g:source HelloWorld.java ../DemoRun.java
  * @build HeapDumpTest
  * @run main HeapDumpTest HelloWorld
  */

--- a/jdk/test/demo/jvmti/hprof/HeapSitesTest.java	Thu Dec 03 21:30:27 2009 +0000
+++ b/jdk/test/demo/jvmti/hprof/HeapSitesTest.java	Thu Dec 03 18:19:10 2009 -0800
@@ -26,7 +26,7 @@
  * @bug 5012882 6299047
  * @summary Test jvmti hprof
  *
- * @compile -source 1.5 -g:vars HelloWorld.java ../DemoRun.java
+ * @compile -g:vars HelloWorld.java ../DemoRun.java
  * @build HeapSitesTest
  * @run main HeapSitesTest HelloWorld
  */

--- a/jdk/test/demo/jvmti/hprof/OptionsTest.java	Thu Dec 03 21:30:27 2009 +0000
+++ b/jdk/test/demo/jvmti/hprof/OptionsTest.java	Thu Dec 03 18:19:10 2009 -0800
@@ -26,7 +26,7 @@
  * @bug 5083441 6299047
  * @summary Test jvmti hprof
  *
- * @compile -source 1.5 -g:lines HelloWorld.java ../DemoRun.java
+ * @compile -g:lines HelloWorld.java ../DemoRun.java
  * @build OptionsTest
  * @run main OptionsTest HelloWorld
  */

--- a/jdk/test/java/io/Serializable/enum/array/Test.java	Thu Dec 03 21:30:27 2009 +0000
+++ b/jdk/test/java/io/Serializable/enum/array/Test.java	Thu Dec 03 18:19:10 2009 -0800
@@ -25,9 +25,6 @@
  * @bug 4838379
  * @summary Verify that serialization of enum constant arrays functions
  *          properly.
- *
- * @compile -source 1.5 Test.java
- * @run main Test
  */
 
 import java.io.*;

--- a/jdk/test/java/io/Serializable/enum/badResolve/Write.java	Thu Dec 03 21:30:27 2009 +0000
+++ b/jdk/test/java/io/Serializable/enum/badResolve/Write.java	Thu Dec 03 18:19:10 2009 -0800
@@ -26,10 +26,10 @@
  * @summary Verify that enum classes present in a serialization stream cannot
  *          be resolved by the receiver to non-enum classes, and vice-versa.
  *
- * @compile -source 1.5 Write.java
+ * @compile Write.java
  * @run main Write
  * @clean Write
- * @compile -source 1.5 Read.java
+ * @compile Read.java
  * @run main Read
  * @clean Read
  */

--- a/jdk/test/java/io/Serializable/enum/basic/Test.java	Thu Dec 03 21:30:27 2009 +0000
+++ b/jdk/test/java/io/Serializable/enum/basic/Test.java	Thu Dec 03 18:19:10 2009 -0800
@@ -25,9 +25,6 @@
  * @bug 4838379
  * @summary Verify that basic serialization of non-specialized enum constants
  *          functions properly.
- *
- * @compile -source 1.5 Test.java
- * @run main Test
  */
 
 import java.io.*;

--- a/jdk/test/java/io/Serializable/enum/classObject/Test.java	Thu Dec 03 21:30:27 2009 +0000
+++ b/jdk/test/java/io/Serializable/enum/classObject/Test.java	Thu Dec 03 18:19:10 2009 -0800
@@ -25,9 +25,6 @@
  * @bug 4838379
  * @summary Verify that serialization of Class objects for enum types works
  *          properly.
- *
- * @compile -source 1.5 Test.java
- * @run main Test
  */
 
 import java.io.*;

--- a/jdk/test/java/io/Serializable/enum/constantSubclasses/Write.java	Thu Dec 03 21:30:27 2009 +0000
+++ b/jdk/test/java/io/Serializable/enum/constantSubclasses/Write.java	Thu Dec 03 18:19:10 2009 -0800
@@ -26,10 +26,10 @@
  * @summary Verify that serialization of enum constants that are instances of
  *          constant-specific subclasses functions properly.
  *
- * @compile -source 1.5 Write.java
+ * @compile Write.java
  * @run main Write
  * @clean Write
- * @compile -source 1.5 Read.java
+ * @compile Read.java
  * @run main Read
  * @clean Read
  */

--- a/jdk/test/java/io/Serializable/enum/ignoreSerializationFields/Test.java	Thu Dec 03 21:30:27 2009 +0000
+++ b/jdk/test/java/io/Serializable/enum/ignoreSerializationFields/Test.java	Thu Dec 03 18:19:10 2009 -0800
@@ -25,9 +25,6 @@
  * @bug 4838379
  * @summary Verify that serialVersionUID and serialPersistentFields
  *          declarations made by enum types and constants are ignored.
- *
- * @compile -source 1.5 Test.java
- * @run main Test
  */
 
 import java.io.*;

--- a/jdk/test/java/io/Serializable/enum/ignoreSerializationMethods/Test.java	Thu Dec 03 21:30:27 2009 +0000
+++ b/jdk/test/java/io/Serializable/enum/ignoreSerializationMethods/Test.java	Thu Dec 03 18:19:10 2009 -0800
@@ -25,9 +25,6 @@
  * @bug 4838379
  * @summary Verify that custom serialization methods defined by enum types are
  *          not invoked during serialization or deserialization.
- *
- * @compile -source 1.5 Test.java
- * @run main Test
  */
 
 import java.io.*;

--- a/jdk/test/java/io/Serializable/enum/mismatchedTypecode/Test.java	Thu Dec 03 21:30:27 2009 +0000
+++ b/jdk/test/java/io/Serializable/enum/mismatchedTypecode/Test.java	Thu Dec 03 18:19:10 2009 -0800
@@ -26,9 +26,6 @@
  * @summary Verify that TC_OBJECT followed by a class descriptor for an enum
  *          class results in an InvalidClassException, as does TC_ENUM followed
  *          by a class descriptor for a non-enum class.
- *
- * @compile -source 1.5 Test.java
- * @run main Test
  */
 
 import java.io.*;

--- a/jdk/test/java/io/Serializable/enum/missingConstant/Write.java	Thu Dec 03 21:30:27 2009 +0000
+++ b/jdk/test/java/io/Serializable/enum/missingConstant/Write.java	Thu Dec 03 18:19:10 2009 -0800
@@ -26,10 +26,10 @@
  * @summary Verify that deserialization of an enum constant that does not exist
  *          on the receiving side results in an InvalidObjectException.
  *
- * @compile -source 1.5 Write.java
+ * @compile Write.java
  * @run main Write
  * @clean Write
- * @compile -source 1.5 Read.java
+ * @compile Read.java
  * @run main Read
  * @clean Read
  */

--- a/jdk/test/java/io/Serializable/enum/unshared/Test.java	Thu Dec 03 21:30:27 2009 +0000
+++ b/jdk/test/java/io/Serializable/enum/unshared/Test.java	Thu Dec 03 18:19:10 2009 -0800
@@ -25,9 +25,6 @@
  * @bug 4838379
  * @summary Verify that unshared write and read operations work properly with
  *          enum constants.
- *
- * @compile -source 1.5 Test.java
- * @run main Test
  */
 
 import java.io.*;

--- a/jdk/test/java/lang/Boolean/MakeBooleanComparable.java	Thu Dec 03 21:30:27 2009 +0000
+++ b/jdk/test/java/lang/Boolean/MakeBooleanComparable.java	Thu Dec 03 18:19:10 2009 -0800
@@ -26,9 +26,6 @@
  * @bug     4329937
  * @summary Basic test for making Boolean implement Comparable
  * @author  Josh Bloch
- *
- * @compile -source 1.5 MakeBooleanComparable.java
- * @run main MakeBooleanComparable
  */
 
 import java.util.*;

--- a/jdk/test/java/lang/Class/Cast.java	Thu Dec 03 21:30:27 2009 +0000
+++ b/jdk/test/java/lang/Class/Cast.java	Thu Dec 03 18:19:10 2009 -0800
@@ -25,9 +25,6 @@
  * @test
  * @bug 4881275
  * @summary (reflect) Class.cast() - typesafe cast desired
- *
- * @compile -source 1.5 Cast.java
- * @run main Cast
  */
 
 public class Cast {

--- a/jdk/test/java/lang/Class/IsEnum.java	Thu Dec 03 21:30:27 2009 +0000
+++ b/jdk/test/java/lang/Class/IsEnum.java	Thu Dec 03 18:19:10 2009 -0800
@@ -26,8 +26,6 @@
  * @bug 4891872 4989735 4990789 5020490
  * @summary Check isEnum() method
  * @author Joseph D. Darcy
- * @compile -source 1.5 IsEnum.java
- * @run main IsEnum
  */
 
 import java.lang.annotation.*;

--- a/jdk/test/java/lang/Class/asSubclass/BasicUnit.java	Thu Dec 03 21:30:27 2009 +0000
+++ b/jdk/test/java/lang/Class/asSubclass/BasicUnit.java	Thu Dec 03 18:19:10 2009 -0800
@@ -27,7 +27,7 @@
  * @summary please add a typesafe cast for Class<?> types
  * @author gafter
  *
- * @compile -Xlint:unchecked -Werror -source 1.5 BasicUnit.java
+ * @compile -Xlint:unchecked -Werror BasicUnit.java
  * @run main BasicUnit
  */
 

--- a/jdk/test/java/lang/ClassLoader/Assert.sh	Thu Dec 03 21:30:27 2009 +0000
+++ b/jdk/test/java/lang/ClassLoader/Assert.sh	Thu Dec 03 18:19:10 2009 -0800
@@ -47,7 +47,7 @@
 cp -R ${TESTSRC}/package1 .
 cp -R ${TESTSRC}/package2 .
 
-${TESTJAVA}/bin/javac -source 1.4 Assert.java 
+${TESTJAVA}/bin/javac Assert.java 
 
 ${TESTJAVA}/bin/java Assert
 

--- a/jdk/test/java/lang/Integer/BitTwiddle.java	Thu Dec 03 21:30:27 2009 +0000
+++ b/jdk/test/java/lang/Integer/BitTwiddle.java	Thu Dec 03 18:19:10 2009 -0800
@@ -26,9 +26,6 @@
  * @bug     4495754
  * @summary Basic test for int bit twiddling
  * @author  Josh Bloch
- *
- * @compile -source 1.5 BitTwiddle.java
- * @run main BitTwiddle
  */
 
 import java.util.Random;

--- a/jdk/test/java/lang/Long/BitTwiddle.java	Thu Dec 03 21:30:27 2009 +0000
+++ b/jdk/test/java/lang/Long/BitTwiddle.java	Thu Dec 03 18:19:10 2009 -0800
@@ -26,9 +26,6 @@
  * @bug     4495754
  * @summary Basic test for long bit twiddling
  * @author  Josh Bloch
- *
- * @compile -source 1.5 BitTwiddle.java
- * @run main BitTwiddle
  */
 
 import java.util.Random;

--- a/jdk/test/java/lang/Math/Atan2Tests.java	Thu Dec 03 21:30:27 2009 +0000
+++ b/jdk/test/java/lang/Math/Atan2Tests.java	Thu Dec 03 18:19:10 2009 -0800
@@ -25,8 +25,6 @@
  * @test
  * @bug 4984407
  * @summary Tests for {Math, StrictMath}.atan2
- * @compile -source 1.5 Atan2Tests.java
- * @run main Atan2Tests
  * @author Joseph D. Darcy
  */
 

--- a/jdk/test/java/lang/Math/IeeeRecommendedTests.java	Thu Dec 03 21:30:27 2009 +0000
+++ b/jdk/test/java/lang/Math/IeeeRecommendedTests.java	Thu Dec 03 18:19:10 2009 -0800
@@ -26,8 +26,6 @@
  * @bug 4860891 4826732 4780454 4939441 4826652
  * @summary Tests for IEEE 754[R] recommended functions and similar methods
  * @author Joseph D. Darcy
- * @compile -source 1.5 IeeeRecommendedTests.java
- * @run main IeeeRecommendedTests
  */
 
 import sun.misc.FpUtils;

--- a/jdk/test/java/lang/Math/PowTests.java	Thu Dec 03 21:30:27 2009 +0000
+++ b/jdk/test/java/lang/Math/PowTests.java	Thu Dec 03 18:19:10 2009 -0800
@@ -25,8 +25,6 @@
  * @test
  * @bug 4984407 5033578
  * @summary Tests for {Math, StrictMath}.pow
- * @compile -source 1.5 PowTests.java
- * @run main PowTests
  * @author Joseph D. Darcy
  */
 

--- a/jdk/test/java/lang/Math/TanTests.java	Thu Dec 03 21:30:27 2009 +0000
+++ b/jdk/test/java/lang/Math/TanTests.java	Thu Dec 03 18:19:10 2009 -0800
@@ -25,8 +25,6 @@
  * @test
  * @bug 5033578
  * @summary Tests for {Math, StrictMath}.tan
- * @compile -source 1.5 TanTests.java
- * @run main TanTests
  * @author Joseph D. Darcy
  */
 

--- a/jdk/test/java/lang/Runtime/exec/WinCommand.java	Thu Dec 03 21:30:27 2009 +0000
+++ b/jdk/test/java/lang/Runtime/exec/WinCommand.java	Thu Dec 03 18:19:10 2009 -0800
@@ -25,9 +25,6 @@
  * @bug 5006520
  * @summary Check many different ways to run Windows programs
  * @author Martin Buchholz
- *
- * @compile -source 1.5 WinCommand.java
- * @run main WinCommand
  */
 
 import java.io.*;

--- a/jdk/test/java/lang/Thread/GenerifyStackTraces.java	Thu Dec 03 21:30:27 2009 +0000
+++ b/jdk/test/java/lang/Thread/GenerifyStackTraces.java	Thu Dec 03 18:19:10 2009 -0800
@@ -26,9 +26,6 @@
  * @bug     4919105
  * @summary Generified basic unit test of Thread.getAllStackTraces()
  * @author  Mandy Chung
- *
- * @compile -source 1.5 GenerifyStackTraces.java
- * @run main GenerifyStackTraces
  */
 
 import java.util.*;

--- a/jdk/test/java/lang/Thread/UncaughtExceptions.sh	Thu Dec 03 21:30:27 2009 +0000
+++ b/jdk/test/java/lang/Thread/UncaughtExceptions.sh	Thu Dec 03 18:19:10 2009 -0800
@@ -121,7 +121,7 @@
 }
 EOJAVA
 
-    Sys "$javac" "-source" "1.5" "Seppuku.java"
+    Sys "$javac" "Seppuku.java"
     CheckCommandResults "$expectedRC" "$expectedOut" "$expectedErr" \
 	"$java" "Seppuku"
     Cleanup

--- a/jdk/test/java/lang/annotation/UnitTest.java	Thu Dec 03 21:30:27 2009 +0000
+++ b/jdk/test/java/lang/annotation/UnitTest.java	Thu Dec 03 18:19:10 2009 -0800
@@ -26,8 +26,6 @@
  * @bug     4906359 4963461 4965058 4965039 4986770
  * @summary Unit test for annotation reading
  * @author  Josh Bloch
- * @compile -source 1.5 UnitTest.java
- * @run main UnitTest
  */
 
 import static java.lang.annotation.RetentionPolicy.RUNTIME;

--- a/jdk/test/java/lang/annotation/package-info.java	Thu Dec 03 21:30:27 2009 +0000
+++ b/jdk/test/java/lang/annotation/package-info.java	Thu Dec 03 18:19:10 2009 -0800
@@ -27,7 +27,7 @@
  * @summary Package annotations
  * @author gafter
  *
- * @compile -source 1.5 package-info.java PackageMain.java
+ * @compile package-info.java PackageMain.java
  * @run main PackageMain
  */
 

--- a/jdk/test/java/lang/management/CompositeData/MemoryNotifInfoCompositeData.java	Thu Dec 03 21:30:27 2009 +0000
+++ b/jdk/test/java/lang/management/CompositeData/MemoryNotifInfoCompositeData.java	Thu Dec 03 18:19:10 2009 -0800
@@ -29,7 +29,7 @@
  *          the input CompositeData is invalid.
  * @author  Mandy Chung
  *
- * @compile -source 1.5 OpenTypeConverter.java
+ * @compile OpenTypeConverter.java
  * @build MemoryNotifInfoCompositeData
  * @run main MemoryNotifInfoCompositeData
  */

--- a/jdk/test/java/lang/management/CompositeData/ThreadInfoCompositeData.java	Thu Dec 03 21:30:27 2009 +0000
+++ b/jdk/test/java/lang/management/CompositeData/ThreadInfoCompositeData.java	Thu Dec 03 18:19:10 2009 -0800
@@ -29,7 +29,7 @@
  *          the input CompositeData is invalid.
  * @author  Mandy Chung
  *
- * @compile -source 1.5 OpenTypeConverter.java
+ * @compile OpenTypeConverter.java
  * @build ThreadInfoCompositeData
  * @run main ThreadInfoCompositeData
  */

--- a/jdk/test/java/lang/management/ManagementFactory/MXBeanProxyTest.java	Thu Dec 03 21:30:27 2009 +0000
+++ b/jdk/test/java/lang/management/ManagementFactory/MXBeanProxyTest.java	Thu Dec 03 18:19:10 2009 -0800
@@ -26,9 +26,6 @@
  * @bug     5024531
  * @summary Basic Test for ManagementFactory.newPlatformMXBean().
  * @author  Mandy Chung
- *
- * @compile -source 1.5 MXBeanProxyTest.java
- * @run main MXBeanProxyTest
  */
 import javax.management.*;
 import java.lang.management.ClassLoadingMXBean;

--- a/jdk/test/java/lang/management/ManagementFactory/PlatformMBeanServerTest.java	Thu Dec 03 21:30:27 2009 +0000
+++ b/jdk/test/java/lang/management/ManagementFactory/PlatformMBeanServerTest.java	Thu Dec 03 18:19:10 2009 -0800
@@ -26,9 +26,6 @@
  * @bug     4947536
  * @summary Basic unit test of ManagementFactory.getPlatformMBeanServer()
  * @author  Mandy Chung
- *
- * @compile -source 1.5 PlatformMBeanServerTest.java
- * @run main PlatformMBeanServerTest
  */
 
 import java.lang.management.*;

--- a/jdk/test/java/lang/management/ManagementFactory/ProxyExceptions.java	Thu Dec 03 21:30:27 2009 +0000
+++ b/jdk/test/java/lang/management/ManagementFactory/ProxyExceptions.java	Thu Dec 03 18:19:10 2009 -0800
@@ -27,9 +27,6 @@
  * @summary Test type mapping of the platform MXBean proxy
  *          returned from Management.newPlatformMXBeanProxy().
  * @author  Mandy Chung
- *
- * @compile -source 1.5 ProxyExceptions.java
- * @run main ProxyExceptions
  */
 import java.lang.management.*;
 import javax.management.*;

--- a/jdk/test/java/lang/management/ManagementFactory/ProxyTypeMapping.java	Thu Dec 03 21:30:27 2009 +0000
+++ b/jdk/test/java/lang/management/ManagementFactory/ProxyTypeMapping.java	Thu Dec 03 18:19:10 2009 -0800
@@ -28,7 +28,7 @@
  *          returned from Management.newPlatformMXBeanProxy().
  * @author  Mandy Chung
  *
- * @compile -source 1.5 ProxyTypeMapping.java
+ * @compile ProxyTypeMapping.java
  * @run main/othervm -verbose:gc ProxyTypeMapping
  */
 import java.lang.management.*;

--- a/jdk/test/java/lang/management/ManagementFactory/ValidateOpenTypes.java	Thu Dec 03 21:30:27 2009 +0000
+++ b/jdk/test/java/lang/management/ManagementFactory/ValidateOpenTypes.java	Thu Dec 03 18:19:10 2009 -0800
@@ -28,7 +28,7 @@
  *          MBeanServer.
  * @author  Mandy Chung
  *
- * @compile -source 1.5 ValidateOpenTypes.java
+ * @compile ValidateOpenTypes.java
  * @run main/othervm -verbose:gc ValidateOpenTypes
  */
 import java.lang.management.*;

--- a/jdk/test/java/lang/management/RuntimeMXBean/GetSystemProperties.java	Thu Dec 03 21:30:27 2009 +0000
+++ b/jdk/test/java/lang/management/RuntimeMXBean/GetSystemProperties.java	Thu Dec 03 18:19:10 2009 -0800
@@ -26,9 +26,6 @@
  * @bug     4990512
  * @summary Basic Test for RuntimeMXBean.getSystemProperties().
  * @author  Mandy Chung
- *
- * @compile -source 1.5 GetSystemProperties.java
- * @run main GetSystemProperties
  */
 
 import java.lang.management.ManagementFactory;

--- a/jdk/test/java/lang/management/RuntimeMXBean/TestInputArgument.sh	Thu Dec 03 21:30:27 2009 +0000
+++ b/jdk/test/java/lang/management/RuntimeMXBean/TestInputArgument.sh	Thu Dec 03 18:19:10 2009 -0800
@@ -27,7 +27,7 @@
 # @summary 
 # @author  Mandy Chung
 #
-# @run compile -source 1.5 InputArgument.java
+# @run compile InputArgument.java
 # @run shell TestInputArgument.sh
 #
 

--- a/jdk/test/java/lang/reflect/Constructor/GenericStringTest.java	Thu Dec 03 21:30:27 2009 +0000
+++ b/jdk/test/java/lang/reflect/Constructor/GenericStringTest.java	Thu Dec 03 18:19:10 2009 -0800
@@ -26,8 +26,6 @@
  * @bug 5033583 6316717 6470106
  * @summary Check toGenericString() and toString() methods
  * @author Joseph D. Darcy
- * @compile -source 1.5 GenericStringTest.java
- * @run main GenericStringTest
  */
 
 import java.lang.reflect.*;

--- a/jdk/test/java/lang/reflect/Field/GenericStringTest.java	Thu Dec 03 21:30:27 2009 +0000
+++ b/jdk/test/java/lang/reflect/Field/GenericStringTest.java	Thu Dec 03 18:19:10 2009 -0800
@@ -26,8 +26,6 @@
  * @bug 5033583
  * @summary Check toGenericString() method
  * @author Joseph D. Darcy
- * @compile -source 1.5 GenericStringTest.java
- * @run main GenericStringTest
  */
 
 import java.lang.reflect.*;

--- a/jdk/test/java/lang/reflect/Generics/StringsAndBounds.java	Thu Dec 03 21:30:27 2009 +0000
+++ b/jdk/test/java/lang/reflect/Generics/StringsAndBounds.java	Thu Dec 03 18:19:10 2009 -0800
@@ -26,8 +26,6 @@
  * @bug 5015676 4987888 4997464
  * @summary Testing upper bounds and availability of toString methods
  * @author Joseph D. Darcy
- * @compile -source 1.5 StringsAndBounds.java
- * @run main StringsAndBounds
  */
 
 import java.lang.reflect.*;

--- a/jdk/test/java/lang/reflect/Generics/TestC1.java	Thu Dec 03 21:30:27 2009 +0000
+++ b/jdk/test/java/lang/reflect/Generics/TestC1.java	Thu Dec 03 18:19:10 2009 -0800
@@ -26,7 +26,7 @@
 * @bug 4891872
 * @summary Some tests for the generic core reflection api.
 * @author Gilad Bracha
-* @compile -source 1.5 TestC1.java
+* @compile TestC1.java
 * @run main/othervm -ea TestC1
 */
 

--- a/jdk/test/java/lang/reflect/Generics/TestC2.java	Thu Dec 03 21:30:27 2009 +0000
+++ b/jdk/test/java/lang/reflect/Generics/TestC2.java	Thu Dec 03 18:19:10 2009 -0800
@@ -26,7 +26,7 @@
 * @bug 4891872
 * @summary Some tests for the generic core reflection api.
 * @author Gilad Bracha
-* @compile -source 1.5 TestC2.java
+* @compile TestC2.java
 * @run main/othervm -ea TestC2
 */
 

--- a/jdk/test/java/lang/reflect/Generics/TestN1.java	Thu Dec 03 21:30:27 2009 +0000
+++ b/jdk/test/java/lang/reflect/Generics/TestN1.java	Thu Dec 03 18:19:10 2009 -0800
@@ -26,7 +26,7 @@
 * @bug 4891872
 * @summary Some tests for the generic core reflection api.
 * @author Gilad Bracha
-* @compile -source 1.5 TestN1.java
+* @compile TestN1.java
 * @run main/othervm -ea TestN1
 */
 

--- a/jdk/test/java/lang/reflect/Generics/exceptionCauseTest.java	Thu Dec 03 21:30:27 2009 +0000
+++ b/jdk/test/java/lang/reflect/Generics/exceptionCauseTest.java	Thu Dec 03 18:19:10 2009 -0800
@@ -26,8 +26,6 @@
  * @bug 4981727
  * @summary
  * @author Joseph D. Darcy
- * @compile -source 1.5 exceptionCauseTest.java
- * @run main exceptionCauseTest
  */
 
 import java.io.PrintStream;

--- a/jdk/test/java/lang/reflect/Generics/getAnnotationTest.java	Thu Dec 03 21:30:27 2009 +0000
+++ b/jdk/test/java/lang/reflect/Generics/getAnnotationTest.java	Thu Dec 03 18:19:10 2009 -0800
@@ -26,8 +26,6 @@
  * @bug 4979440
  * @summary Test for signature parsing corner case
  * @author Joseph D. Darcy
- * @compile -source 1.5 getAnnotationTest.java
- * @run main getAnnotationTest
  */
 
 import java.lang.reflect.*;

--- a/jdk/test/java/lang/reflect/Method/Equals.java	Thu Dec 03 21:30:27 2009 +0000
+++ b/jdk/test/java/lang/reflect/Method/Equals.java	Thu Dec 03 18:19:10 2009 -0800
@@ -27,7 +27,7 @@
  * @summary Generic framework to test Method.equals.
  *
  * @clean A
- * @compile -source 1.5 Equals.java
+ * @compile Equals.java
  * @run main Equals
  */
 

--- a/jdk/test/java/lang/reflect/Method/GenericStringTest.java	Thu Dec 03 21:30:27 2009 +0000
+++ b/jdk/test/java/lang/reflect/Method/GenericStringTest.java	Thu Dec 03 18:19:10 2009 -0800
@@ -26,8 +26,6 @@
  * @bug 5033583 6316717 6470106
  * @summary Check toGenericString() and toString() methods
  * @author Joseph D. Darcy
- * @compile -source 1.5 GenericStringTest.java
- * @run main GenericStringTest
  */
 
 import java.lang.reflect.*;

--- a/jdk/test/java/math/BigDecimal/DivideTests.java	Thu Dec 03 21:30:27 2009 +0000
+++ b/jdk/test/java/math/BigDecimal/DivideTests.java	Thu Dec 03 18:19:10 2009 -0800
@@ -26,8 +26,6 @@
  * @bug 4851776 4907265 6177836 6876282
  * @summary Some tests for the divide methods.
  * @author Joseph D. Darcy
- * @compile -source 1.5 DivideTests.java
- * @run main DivideTests
  */
 
 import java.math.*;

--- a/jdk/test/java/math/BigDecimal/IntegralDivisionTests.java	Thu Dec 03 21:30:27 2009 +0000
+++ b/jdk/test/java/math/BigDecimal/IntegralDivisionTests.java	Thu Dec 03 18:19:10 2009 -0800
@@ -25,8 +25,6 @@
  * @bug 4904082 4917089 6337226
  * @summary Tests that integral division and related methods return the proper result and scale.
  * @author Joseph D. Darcy
- * @compile -source 1.5 IntegralDivisionTests.java
- * @run main IntegralDivisionTests
  */
 import java.math.*;
 public class IntegralDivisionTests {

--- a/jdk/test/java/math/BigDecimal/PowTests.java	Thu Dec 03 21:30:27 2009 +0000
+++ b/jdk/test/java/math/BigDecimal/PowTests.java	Thu Dec 03 18:19:10 2009 -0800
@@ -26,8 +26,6 @@
  * @bug 4916097
  * @summary Some exponent over/undeflow tests for the pow method
  * @author Joseph D. Darcy
- * @compile -source 1.5 PowTests.java
- * @run main PowTests
  */
 
 import java.math.*;

--- a/jdk/test/java/math/BigDecimal/ToPlainStringTests.java	Thu Dec 03 21:30:27 2009 +0000
+++ b/jdk/test/java/math/BigDecimal/ToPlainStringTests.java	Thu Dec 03 18:19:10 2009 -0800
@@ -26,8 +26,6 @@
  * @bug 4984872
  * @summary Basic tests of toPlainString method
  * @author Joseph D. Darcy
- * @compile -source 1.5 ToPlainStringTests.java
- * @run main ToPlainStringTests
  */
 
 import java.math.*;

--- a/jdk/test/java/math/BigDecimal/ZeroScalingTests.java	Thu Dec 03 21:30:27 2009 +0000
+++ b/jdk/test/java/math/BigDecimal/ZeroScalingTests.java	Thu Dec 03 18:19:10 2009 -0800
@@ -26,8 +26,6 @@
  * @bug 4902952 4905407 4916149
  * @summary Tests that the scale of zero is propagated properly and has the proper effect.
  * @author Joseph D. Darcy
- * @compile -source 1.5 ZeroScalingTests.java
- * @run main ZeroScalingTests
  */
 
 import java.math.*;

--- a/jdk/test/java/math/RoundingMode/RoundingModeTests.java	Thu Dec 03 21:30:27 2009 +0000
+++ b/jdk/test/java/math/RoundingMode/RoundingModeTests.java	Thu Dec 03 18:19:10 2009 -0800
@@ -26,8 +26,6 @@
  * @bug 4851776 4891522 4905335
  * @summary Basic tests for the RoundingMode class.
  * @author Joseph D. Darcy
- * @compile -source 1.5 RoundingModeTests.java
- * @run main RoundingModeTests
  */
 
 import java.math.RoundingMode;

--- a/jdk/test/java/net/ProxySelector/ProxyTest.java	Thu Dec 03 21:30:27 2009 +0000
+++ b/jdk/test/java/net/ProxySelector/ProxyTest.java	Thu Dec 03 18:19:10 2009 -0800
@@ -27,7 +27,7 @@
  * @summary HTTP client: Improve proxy server configuration and selection
  * @library ../../../sun/net/www/httptest/
  * @build ClosedChannelList HttpServer HttpTransaction HttpCallback
- * @compile -source 1.5 ProxyTest.java
+ * @compile ProxyTest.java
  * @run main/othervm -Dhttp.proxyHost=inexistant -Dhttp.proxyPort=8080 ProxyTest
  */
 

--- a/jdk/test/java/net/URL/PerConnectionProxy.java	Thu Dec 03 21:30:27 2009 +0000
+++ b/jdk/test/java/net/URL/PerConnectionProxy.java	Thu Dec 03 18:19:10 2009 -0800
@@ -26,7 +26,7 @@
  * @summary Needs per connection proxy support for URLs
  * @library ../../../sun/net/www/httptest/
  * @build ClosedChannelList HttpServer HttpTransaction HttpCallback
- * @compile -source 1.5 PerConnectionProxy.java
+ * @compile PerConnectionProxy.java
  * @run main/othervm -Dhttp.proxyHost=inexistant -Dhttp.proxyPort=8080 PerConnectionProxy
  */
 

--- a/jdk/test/java/security/cert/PKIXBuilderParameters/InvalidParameters.java	Thu Dec 03 21:30:27 2009 +0000
+++ b/jdk/test/java/security/cert/PKIXBuilderParameters/InvalidParameters.java	Thu Dec 03 18:19:10 2009 -0800
@@ -24,7 +24,7 @@
 /**
  * @test
  * @test 4422738
- * @compile -source 1.4 -target 1.4 InvalidParameters.java
+ * @compile -source 1.4 InvalidParameters.java
  * @run main InvalidParameters
  * @summary Make sure PKIXBuilderParameters(Set) detects invalid
  *          parameters and throws correct exceptions

--- a/jdk/test/java/security/cert/PKIXParameters/InvalidParameters.java	Thu Dec 03 21:30:27 2009 +0000
+++ b/jdk/test/java/security/cert/PKIXParameters/InvalidParameters.java	Thu Dec 03 18:19:10 2009 -0800
@@ -24,7 +24,7 @@
 /**
  * @test
  * @test 4422738
- * @compile -source 1.4 -target 1.4 InvalidParameters.java
+ * @compile -source 1.4 InvalidParameters.java
  * @run main InvalidParameters
  * @summary Make sure PKIXParameters(Set) and setTrustAnchors() detects invalid
  *          parameters and throws correct exceptions

--- a/jdk/test/java/util/AbstractList/CheckForComodification.java	Thu Dec 03 21:30:27 2009 +0000
+++ b/jdk/test/java/util/AbstractList/CheckForComodification.java	Thu Dec 03 18:19:10 2009 -0800
@@ -28,8 +28,6 @@
  * @author  Josh Bloch
  *
  * @ignore Bug fix temporarily removed as it uncovered other bugs (4992226)
- * @compile -source 1.5 CheckForComodification.java
- * @run main CheckForComodification
  */
 
 import java.util.*;

--- a/jdk/test/java/util/Collections/AddAll.java	Thu Dec 03 21:30:27 2009 +0000
+++ b/jdk/test/java/util/Collections/AddAll.java	Thu Dec 03 18:19:10 2009 -0800
@@ -26,9 +26,6 @@
  * @bug     4822887
  * @summary Basic test for Collections.addAll
  * @author  Josh Bloch
- *
- * @compile -source 1.5 AddAll.java
- * @run main AddAll
  */
 
 import java.util.*;

--- a/jdk/test/java/util/Collections/Disjoint.java	Thu Dec 03 21:30:27 2009 +0000
+++ b/jdk/test/java/util/Collections/Disjoint.java	Thu Dec 03 18:19:10 2009 -0800
@@ -26,9 +26,6 @@
  * @bug     4339792
  * @summary Basic test for Collections.disjoint
  * @author  Josh Bloch
- *
- * @compile -source 1.5 Disjoint.java
- * @run main Disjoint
  */
 
 import java.util.*;

--- a/jdk/test/java/util/Collections/Frequency.java	Thu Dec 03 21:30:27 2009 +0000
+++ b/jdk/test/java/util/Collections/Frequency.java	Thu Dec 03 18:19:10 2009 -0800
@@ -26,9 +26,6 @@
  * @bug     4193200
  * @summary Basic test for Collections.frequency
  * @author  Josh Bloch
- *
- * @compile -source 1.5 Frequency.java
- * @run main Frequency
  */
 
 import java.util.*;

--- a/jdk/test/java/util/EnumMap/EnumMapBash.java	Thu Dec 03 21:30:27 2009 +0000
+++ b/jdk/test/java/util/EnumMap/EnumMapBash.java	Thu Dec 03 18:19:10 2009 -0800
@@ -27,9 +27,6 @@
  * @summary Unit test for EnumMap
  * @author  Josh Bloch
  * @author  Yo Yo Ma
- *
- * @compile -source 1.5 EnumMapBash.java
- * @run main EnumMapBash
  */
 
 import java.util.*;

--- a/jdk/test/java/util/EnumSet/AllOf.java	Thu Dec 03 21:30:27 2009 +0000
+++ b/jdk/test/java/util/EnumSet/AllOf.java	Thu Dec 03 18:19:10 2009 -0800
@@ -26,9 +26,6 @@
  * @bug     4946090
  * @summary AllOf static factory is broken in Regular and Jumbo enum set
  * @author  Josh Bloch
- *
- * @compile -source 1.5 AllOf.java
- * @run main AllOf
  */
 
 import java.util.*;

--- a/jdk/test/java/util/EnumSet/ComplementOf.java	Thu Dec 03 21:30:27 2009 +0000
+++ b/jdk/test/java/util/EnumSet/ComplementOf.java	Thu Dec 03 18:19:10 2009 -0800
@@ -26,9 +26,6 @@
  * @bug     4946096
  * @summary ComplementOf static factory is broken in Regular and Jumbo enum set
  * @author  Josh Bloch
- *
- * @compile -source 1.5 ComplementOf.java
- * @run main ComplementOf
  */
 
 import java.util.*;

--- a/jdk/test/java/util/EnumSet/EnumSetBash.java	Thu Dec 03 21:30:27 2009 +0000
+++ b/jdk/test/java/util/EnumSet/EnumSetBash.java	Thu Dec 03 18:19:10 2009 -0800
@@ -28,9 +28,6 @@
  * @author  Josh Bloch
  * @author  Neal Gafter
  * @author  Yo Ma Ma
- *
- * @compile -source 1.5 EnumSetBash.java
- * @run main EnumSetBash
  */
 
 import java.util.*;

--- a/jdk/test/java/util/EnumSet/JumboRange.java	Thu Dec 03 21:30:27 2009 +0000
+++ b/jdk/test/java/util/EnumSet/JumboRange.java	Thu Dec 03 18:19:10 2009 -0800
@@ -26,9 +26,6 @@
  * @bug     4958003
  * @summary Range static factory fails to compute size in Jumbo enum set
  * @author  Josh Bloch
- *
- * @compile -source 1.5 JumboRange.java
- * @run main JumboRange
  */
 
 import java.util.*;

--- a/jdk/test/java/util/EnumSet/Range.java	Thu Dec 03 21:30:27 2009 +0000
+++ b/jdk/test/java/util/EnumSet/Range.java	Thu Dec 03 18:19:10 2009 -0800
@@ -26,9 +26,6 @@
  * @bug     4952736
  * @summary Range static factory is broken in Regular and Jumbo enum set
  * @author  Josh Bloch
- *
- * @compile -source 1.5 Range.java
- * @run main Range
  */
 
 import java.util.*;

--- a/jdk/test/java/util/Formattable/StockName.java	Thu Dec 03 21:30:27 2009 +0000
+++ b/jdk/test/java/util/Formattable/StockName.java	Thu Dec 03 18:19:10 2009 -0800
@@ -21,11 +21,9 @@
  * have any questions.
  */
 
-/**
+/*
  * @test
  * @bug 4965770 4992540 5030716
- * @compile -source 1.5 StockName.java
- * @run main StockName
  */
 
 import java.nio.CharBuffer;

--- a/jdk/test/java/util/IdentityHashMap/ToString.java	Thu Dec 03 21:30:27 2009 +0000
+++ b/jdk/test/java/util/IdentityHashMap/ToString.java	Thu Dec 03 18:19:10 2009 -0800
@@ -26,9 +26,6 @@
  * @bug     4973432
  * @summary Test that toString on entrySet Iterator/Entry behaves reasonably
  * @author  Josh Bloch
- *
- * @compile -source 1.5 ToString.java
- * @run main ToString
  */
 
 

--- a/jdk/test/java/util/Locale/Bug4175998Test.java	Thu Dec 03 21:30:27 2009 +0000
+++ b/jdk/test/java/util/Locale/Bug4175998Test.java	Thu Dec 03 18:19:10 2009 -0800
@@ -23,7 +23,7 @@
 /*
     @test
     @summary test ISO639-2 language codes
-    @compile -encoding ascii -source 1.4 -target 1.4 Bug4175998Test.java
+    @compile -encoding ascii -source 5 Bug4175998Test.java
     @run main Bug4175998Test
     @bug 4175998
 */

--- a/jdk/test/java/util/UUID/UUIDTest.java	Thu Dec 03 21:30:27 2009 +0000
+++ b/jdk/test/java/util/UUID/UUIDTest.java	Thu Dec 03 18:19:10 2009 -0800
@@ -23,8 +23,6 @@
 
 /* @test
  * @bug 4173528 5068772
- * @compile -source 1.4 -target 1.4 UUIDTest.java
- * @run main UUIDTest
  * @summary Unit tests for java.util.UUID
  */
 

--- a/jdk/test/java/util/concurrent/BlockingQueue/CancelledProducerConsumerLoops.java	Thu Dec 03 21:30:27 2009 +0000
+++ b/jdk/test/java/util/concurrent/BlockingQueue/CancelledProducerConsumerLoops.java	Thu Dec 03 18:19:10 2009 -0800
@@ -34,7 +34,7 @@
 /*
  * @test
  * @bug 4486658
- * @compile -source 1.5 CancelledProducerConsumerLoops.java
+ * @compile CancelledProducerConsumerLoops.java
  * @run main/timeout=7000 CancelledProducerConsumerLoops
  * @summary Checks for responsiveness of blocking queues to cancellation.
  * Runs under the assumption that ITERS computations require more than

--- a/jdk/test/java/util/concurrent/BlockingQueue/MultipleProducersSingleConsumerLoops.java	Thu Dec 03 21:30:27 2009 +0000
+++ b/jdk/test/java/util/concurrent/BlockingQueue/MultipleProducersSingleConsumerLoops.java	Thu Dec 03 18:19:10 2009 -0800
@@ -34,7 +34,7 @@
 /*
  * @test
  * @bug 4486658
- * @compile -source 1.5 MultipleProducersSingleConsumerLoops.java
+ * @compile MultipleProducersSingleConsumerLoops.java
  * @run main/timeout=3600 MultipleProducersSingleConsumerLoops
  * @summary  multiple producers and single consumer using blocking queues
  */

--- a/jdk/test/java/util/concurrent/BlockingQueue/ProducerConsumerLoops.java	Thu Dec 03 21:30:27 2009 +0000
+++ b/jdk/test/java/util/concurrent/BlockingQueue/ProducerConsumerLoops.java	Thu Dec 03 18:19:10 2009 -0800
@@ -34,7 +34,7 @@
 /*
  * @test
  * @bug 4486658
- * @compile -source 1.5 ProducerConsumerLoops.java
+ * @compile ProducerConsumerLoops.java
  * @run main/timeout=3600 ProducerConsumerLoops
  * @summary  multiple producers and consumers using blocking queues
  */

--- a/jdk/test/java/util/concurrent/BlockingQueue/SingleProducerMultipleConsumerLoops.java	Thu Dec 03 21:30:27 2009 +0000
+++ b/jdk/test/java/util/concurrent/BlockingQueue/SingleProducerMultipleConsumerLoops.java	Thu Dec 03 18:19:10 2009 -0800
@@ -34,7 +34,7 @@
 /*
  * @test
  * @bug 4486658
- * @compile -source 1.5 SingleProducerMultipleConsumerLoops.java
+ * @compile SingleProducerMultipleConsumerLoops.java
  * @run main/timeout=600 SingleProducerMultipleConsumerLoops
  * @summary  check ordering for blocking queues with 1 producer and multiple consumers
  */

--- a/jdk/test/java/util/concurrent/ConcurrentHashMap/MapCheck.java	Thu Dec 03 21:30:27 2009 +0000
+++ b/jdk/test/java/util/concurrent/ConcurrentHashMap/MapCheck.java	Thu Dec 03 18:19:10 2009 -0800
@@ -34,7 +34,7 @@
 /*
  * @test
  * @bug 4486658
- * @compile -source 1.5 MapCheck.java
+ * @compile MapCheck.java
  * @run main/timeout=240 MapCheck
  * @summary Times and checks basic map operations
  */

--- a/jdk/test/java/util/concurrent/ConcurrentHashMap/MapLoops.java	Thu Dec 03 21:30:27 2009 +0000
+++ b/jdk/test/java/util/concurrent/ConcurrentHashMap/MapLoops.java	Thu Dec 03 18:19:10 2009 -0800
@@ -34,7 +34,7 @@
 /*
  * @test
  * @bug 4486658
- * @compile -source 1.5 MapLoops.java
+ * @compile MapLoops.java
  * @run main/timeout=1600 MapLoops
  * @summary Exercise multithreaded maps, by default ConcurrentHashMap.
  * Multithreaded hash table test.  Each thread does a random walk

--- a/jdk/test/java/util/concurrent/Exchanger/ExchangeLoops.java	Thu Dec 03 21:30:27 2009 +0000
+++ b/jdk/test/java/util/concurrent/Exchanger/ExchangeLoops.java	Thu Dec 03 18:19:10 2009 -0800
@@ -34,7 +34,7 @@
 /*
  * @test
  * @bug 4486658
- * @compile -source 1.5 ExchangeLoops.java
+ * @compile ExchangeLoops.java
  * @run main/timeout=720 ExchangeLoops
  * @summary checks to make sure a pipeline of exchangers passes data.
  */

--- a/jdk/test/java/util/concurrent/ExecutorCompletionService/ExecutorCompletionServiceLoops.java	Thu Dec 03 21:30:27 2009 +0000
+++ b/jdk/test/java/util/concurrent/ExecutorCompletionService/ExecutorCompletionServiceLoops.java	Thu Dec 03 18:19:10 2009 -0800
@@ -34,7 +34,7 @@
 /*
  * @test
  * @bug 4965960
- * @compile -source 1.5 ExecutorCompletionServiceLoops.java
+ * @compile ExecutorCompletionServiceLoops.java
  * @run main/timeout=3600 ExecutorCompletionServiceLoops
  * @summary  Exercise ExecutorCompletionServiceLoops
  */

--- a/jdk/test/java/util/concurrent/FutureTask/CancelledFutureLoops.java	Thu Dec 03 21:30:27 2009 +0000
+++ b/jdk/test/java/util/concurrent/FutureTask/CancelledFutureLoops.java	Thu Dec 03 18:19:10 2009 -0800
@@ -34,7 +34,7 @@
 /*
  * @test
  * @bug 4486658
- * @compile -source 1.5 CancelledFutureLoops.java
+ * @compile CancelledFutureLoops.java
  * @run main/timeout=2000 CancelledFutureLoops
  * @summary Checks for responsiveness of futures to cancellation.
  * Runs under the assumption that ITERS computations require more than

--- a/jdk/test/java/util/concurrent/atomic/VMSupportsCS8.java	Thu Dec 03 21:30:27 2009 +0000
+++ b/jdk/test/java/util/concurrent/atomic/VMSupportsCS8.java	Thu Dec 03 18:19:10 2009 -0800
@@ -24,8 +24,6 @@
 /*
  * @test
  * @bug 4992443 4994819
- * @compile -source 1.5 VMSupportsCS8.java
- * @run main VMSupportsCS8
  * @summary Checks that the value of VMSupportsCS8 matches system properties.
  */
 

--- a/jdk/test/java/util/concurrent/locks/ReentrantLock/CancelledLockLoops.java	Thu Dec 03 21:30:27 2009 +0000
+++ b/jdk/test/java/util/concurrent/locks/ReentrantLock/CancelledLockLoops.java	Thu Dec 03 18:19:10 2009 -0800
@@ -34,7 +34,7 @@
 /*
  * @test
  * @bug 4486658
- * @compile -source 1.5 CancelledLockLoops.java
+ * @compile CancelledLockLoops.java
  * @run main/timeout=2800 CancelledLockLoops
  * @summary tests lockInterruptibly.
  * Checks for responsiveness of locks to interrupts. Runs under that

--- a/jdk/test/java/util/concurrent/locks/ReentrantLock/LockOncePerThreadLoops.java	Thu Dec 03 21:30:27 2009 +0000
+++ b/jdk/test/java/util/concurrent/locks/ReentrantLock/LockOncePerThreadLoops.java	Thu Dec 03 18:19:10 2009 -0800
@@ -34,7 +34,7 @@
 /*
  * @test
  * @bug 4486658
- * @compile -source 1.5 LockOncePerThreadLoops.java
+ * @compile LockOncePerThreadLoops.java
  * @run main/timeout=15000 LockOncePerThreadLoops
  * @summary Checks for missed signals by locking and unlocking each of an array of locks once per thread
  */

--- a/jdk/test/java/util/concurrent/locks/ReentrantLock/SimpleReentrantLockLoops.java	Thu Dec 03 21:30:27 2009 +0000
+++ b/jdk/test/java/util/concurrent/locks/ReentrantLock/SimpleReentrantLockLoops.java	Thu Dec 03 18:19:10 2009 -0800
@@ -34,7 +34,7 @@
 /*
  * @test
  * @bug 4486658
- * @compile -source 1.5 SimpleReentrantLockLoops.java
+ * @compile SimpleReentrantLockLoops.java
  * @run main/timeout=4500 SimpleReentrantLockLoops
  * @summary multiple threads using a single lock
  */

--- a/jdk/test/java/util/concurrent/locks/ReentrantLock/TimeoutLockLoops.java	Thu Dec 03 21:30:27 2009 +0000
+++ b/jdk/test/java/util/concurrent/locks/ReentrantLock/TimeoutLockLoops.java	Thu Dec 03 18:19:10 2009 -0800
@@ -34,8 +34,6 @@
 /*
  * @test
  * @bug 4486658 5031862
- * @compile -source 1.5 TimeoutLockLoops.java
- * @run main TimeoutLockLoops
  * @summary Checks for responsiveness of locks to timeouts.
  * Runs under the assumption that ITERS computations require more than
  * TIMEOUT msecs to complete, which seems to be a safe assumption for

--- a/jdk/test/java/util/concurrent/locks/ReentrantReadWriteLock/MapLoops.java	Thu Dec 03 21:30:27 2009 +0000
+++ b/jdk/test/java/util/concurrent/locks/ReentrantReadWriteLock/MapLoops.java	Thu Dec 03 18:19:10 2009 -0800
@@ -34,7 +34,7 @@
 /*
  * @test
  * @bug 4486658
- * @compile -source 1.5 MapLoops.java
+ * @compile MapLoops.java
  * @run main/timeout=4700 MapLoops
  * @summary Exercise multithreaded maps, by default ConcurrentHashMap.
  * Multithreaded hash table test.  Each thread does a random walk

--- a/jdk/test/sun/management/AgentCheckTest.java	Thu Dec 03 21:30:27 2009 +0000
+++ b/jdk/test/sun/management/AgentCheckTest.java	Thu Dec 03 18:19:10 2009 -0800
@@ -27,9 +27,6 @@
  *  @summary Localize log messages from the management agents
  *
  *  @author Tim Bell
- *
- *  @run compile -source 1.5 -g AgentCheckTest.java
- *  @run main AgentCheckTest
  */
 import sun.management.Agent;
 

--- a/jdk/test/sun/security/util/Oid/S11N.sh	Thu Dec 03 21:30:27 2009 +0000
+++ b/jdk/test/sun/security/util/Oid/S11N.sh	Thu Dec 03 18:19:10 2009 -0800
@@ -99,7 +99,7 @@
 
 # the test code
 
-${TESTJAVA}${FS}bin${FS}javac -source 1.3 -target 1.3 -d . ${TESTSRC}${FS}SerialTest.java || exit 10
+${TESTJAVA}${FS}bin${FS}javac -d . ${TESTSRC}${FS}SerialTest.java || exit 10
 
 OLDJAVA="
     /java/re/j2se/1.6.0/latest/binaries/${PF}

--- a/jdk/test/sun/tools/jconsole/ResourceCheckTest.sh	Thu Dec 03 21:30:27 2009 +0000
+++ b/jdk/test/sun/tools/jconsole/ResourceCheckTest.sh	Thu Dec 03 18:19:10 2009 -0800
@@ -98,7 +98,7 @@
 set -vx
 #
 #Compile.  jconsole.jar is required on the classpath.
-${TESTJAVA}/bin/javac -source 1.5 -d "${TESTCLASSES}" ${CP} -g \
+${TESTJAVA}/bin/javac -d "${TESTCLASSES}" ${CP} -g \
                          "${TESTSRC}"/"${TARGETCLASS}".java
 #
 #Run the test class, again with the classpath we need: