diff --git a/jdk/test/demo/jvmti/hprof/CpuOldTest.java b/jdk/test/demo/jvmti/hprof/CpuOldTest.java index 378083a2561ec70939619b21b8ba4c4ad9beedae..252aa05be1688b7d07fe59d2a52e3d9713634692 100644 --- a/jdk/test/demo/jvmti/hprof/CpuOldTest.java +++ b/jdk/test/demo/jvmti/hprof/CpuOldTest.java @@ -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 */ diff --git a/jdk/test/demo/jvmti/hprof/CpuSamplesTest.java b/jdk/test/demo/jvmti/hprof/CpuSamplesTest.java index 0c5317184ec42b2b9ac1f3716da0f25e8e9d1b09..d06d4cff3321d44dedfd80e0f80ce8caab8e08b5 100644 --- a/jdk/test/demo/jvmti/hprof/CpuSamplesTest.java +++ b/jdk/test/demo/jvmti/hprof/CpuSamplesTest.java @@ -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 */ diff --git a/jdk/test/demo/jvmti/hprof/CpuTimesDefineClassTest.java b/jdk/test/demo/jvmti/hprof/CpuTimesDefineClassTest.java index 5a1b7d08b37c195cf6ec2a4b7945646acfc21e7c..63cfcb3e5c45c0eae865941ecef7a4e3cffeffdc 100644 --- a/jdk/test/demo/jvmti/hprof/CpuTimesDefineClassTest.java +++ b/jdk/test/demo/jvmti/hprof/CpuTimesDefineClassTest.java @@ -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 * diff --git a/jdk/test/demo/jvmti/hprof/CpuTimesTest.java b/jdk/test/demo/jvmti/hprof/CpuTimesTest.java index 7a9d10e8159e1c246a01ac043d96ae0111ef878f..a99d384494b7ed9ec24a75ed6bc50fbf14d9e9be 100644 --- a/jdk/test/demo/jvmti/hprof/CpuTimesTest.java +++ b/jdk/test/demo/jvmti/hprof/CpuTimesTest.java @@ -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 */ diff --git a/jdk/test/demo/jvmti/hprof/HeapAllTest.java b/jdk/test/demo/jvmti/hprof/HeapAllTest.java index ce4431f5032da4cc72ddbf0157d8f874a1b09f8d..8de8714a02cea3db94fdafb127b579a2f9d64ca9 100644 --- a/jdk/test/demo/jvmti/hprof/HeapAllTest.java +++ b/jdk/test/demo/jvmti/hprof/HeapAllTest.java @@ -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 */ diff --git a/jdk/test/demo/jvmti/hprof/HeapBinaryFormatTest.java b/jdk/test/demo/jvmti/hprof/HeapBinaryFormatTest.java index 5f4f7b92b33c35cc4be13fa7105790a11c2f43e6..1d3366cfd9f4e30dd8a974bfab9a2fce030c4abe 100644 --- a/jdk/test/demo/jvmti/hprof/HeapBinaryFormatTest.java +++ b/jdk/test/demo/jvmti/hprof/HeapBinaryFormatTest.java @@ -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 */ diff --git a/jdk/test/demo/jvmti/hprof/HeapDumpTest.java b/jdk/test/demo/jvmti/hprof/HeapDumpTest.java index 1faca7ee6a949df6c8846f49f256b193a4e826a0..01cce6083130437c7b02910f1cd7663d80c157a0 100644 --- a/jdk/test/demo/jvmti/hprof/HeapDumpTest.java +++ b/jdk/test/demo/jvmti/hprof/HeapDumpTest.java @@ -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 */ diff --git a/jdk/test/demo/jvmti/hprof/HeapSitesTest.java b/jdk/test/demo/jvmti/hprof/HeapSitesTest.java index 31a3d7ef02dfd751a73972e01c9acaa041d60bb0..c0205e237769e954cc89878ef7b54402242fe05f 100644 --- a/jdk/test/demo/jvmti/hprof/HeapSitesTest.java +++ b/jdk/test/demo/jvmti/hprof/HeapSitesTest.java @@ -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 */ diff --git a/jdk/test/demo/jvmti/hprof/OptionsTest.java b/jdk/test/demo/jvmti/hprof/OptionsTest.java index eae8276fcf5ef6efbf84fb37a1d155e3ac616ff5..e1cac9ccd56113607f9e01b1d8f2b007e002b979 100644 --- a/jdk/test/demo/jvmti/hprof/OptionsTest.java +++ b/jdk/test/demo/jvmti/hprof/OptionsTest.java @@ -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 */ diff --git a/jdk/test/java/io/Serializable/enum/array/Test.java b/jdk/test/java/io/Serializable/enum/array/Test.java index 705de3a44df068575e45ceeb4f0e74bd3108c871..95d9cac890d7a25158ad43958aa4c727f71b7ba0 100644 --- a/jdk/test/java/io/Serializable/enum/array/Test.java +++ b/jdk/test/java/io/Serializable/enum/array/Test.java @@ -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.*; diff --git a/jdk/test/java/io/Serializable/enum/badResolve/Write.java b/jdk/test/java/io/Serializable/enum/badResolve/Write.java index 24e0242d5fa4080fe4ef34a8b6ebd98662b36ab9..dcdd5fa5aa64752d20c2d1e7e9746879d1b9a59a 100644 --- a/jdk/test/java/io/Serializable/enum/badResolve/Write.java +++ b/jdk/test/java/io/Serializable/enum/badResolve/Write.java @@ -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 */ diff --git a/jdk/test/java/io/Serializable/enum/basic/Test.java b/jdk/test/java/io/Serializable/enum/basic/Test.java index b8677750bb9305eb9b510b7e01c08b7d81ba9f99..5e8e8679c5ace1919113eb75f245af8e7b2406e7 100644 --- a/jdk/test/java/io/Serializable/enum/basic/Test.java +++ b/jdk/test/java/io/Serializable/enum/basic/Test.java @@ -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.*; diff --git a/jdk/test/java/io/Serializable/enum/classObject/Test.java b/jdk/test/java/io/Serializable/enum/classObject/Test.java index e0f6ea2bd966176dae5288f5e1bbab8d633089c4..8d341c0447001af0f8439e4c044c7fed24c47925 100644 --- a/jdk/test/java/io/Serializable/enum/classObject/Test.java +++ b/jdk/test/java/io/Serializable/enum/classObject/Test.java @@ -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.*; diff --git a/jdk/test/java/io/Serializable/enum/constantSubclasses/Write.java b/jdk/test/java/io/Serializable/enum/constantSubclasses/Write.java index 18dcfb56854e675f3e94301997fc96f41b1b3028..349125cc9e5d0b3d4520226d5223c1ddac6637f8 100644 --- a/jdk/test/java/io/Serializable/enum/constantSubclasses/Write.java +++ b/jdk/test/java/io/Serializable/enum/constantSubclasses/Write.java @@ -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 */ diff --git a/jdk/test/java/io/Serializable/enum/ignoreSerializationFields/Test.java b/jdk/test/java/io/Serializable/enum/ignoreSerializationFields/Test.java index 2780a283e57d6c41ccacfdb29b365aaed9b68836..d5326af0d2e83baf061bf69a499cb8268865135b 100644 --- a/jdk/test/java/io/Serializable/enum/ignoreSerializationFields/Test.java +++ b/jdk/test/java/io/Serializable/enum/ignoreSerializationFields/Test.java @@ -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.*; diff --git a/jdk/test/java/io/Serializable/enum/ignoreSerializationMethods/Test.java b/jdk/test/java/io/Serializable/enum/ignoreSerializationMethods/Test.java index 39bde6e255bc40ad23e0d530b25fba1cf16512db..a1f9bbc6c746f86697987ceb68f36c5239cba0a2 100644 --- a/jdk/test/java/io/Serializable/enum/ignoreSerializationMethods/Test.java +++ b/jdk/test/java/io/Serializable/enum/ignoreSerializationMethods/Test.java @@ -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.*; diff --git a/jdk/test/java/io/Serializable/enum/mismatchedTypecode/Test.java b/jdk/test/java/io/Serializable/enum/mismatchedTypecode/Test.java index f050cd964de1a9e39c6072b7147971ad566ef0b8..7197581700be91db4be7d946ba781b675cd68074 100644 --- a/jdk/test/java/io/Serializable/enum/mismatchedTypecode/Test.java +++ b/jdk/test/java/io/Serializable/enum/mismatchedTypecode/Test.java @@ -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.*; diff --git a/jdk/test/java/io/Serializable/enum/missingConstant/Write.java b/jdk/test/java/io/Serializable/enum/missingConstant/Write.java index 2939520636a79ba205e19b6ac86d182e5d8845f9..fb66b4ce4da726da1836974e784a7a892ad87087 100644 --- a/jdk/test/java/io/Serializable/enum/missingConstant/Write.java +++ b/jdk/test/java/io/Serializable/enum/missingConstant/Write.java @@ -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 */ diff --git a/jdk/test/java/io/Serializable/enum/unshared/Test.java b/jdk/test/java/io/Serializable/enum/unshared/Test.java index c4bdde9bc015c78071ba64949308d9069e0f814f..036e6e8b8ac75b7741213d6884f29442801ba1c0 100644 --- a/jdk/test/java/io/Serializable/enum/unshared/Test.java +++ b/jdk/test/java/io/Serializable/enum/unshared/Test.java @@ -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.*; diff --git a/jdk/test/java/lang/Boolean/MakeBooleanComparable.java b/jdk/test/java/lang/Boolean/MakeBooleanComparable.java index b84a4a27f59a4bbbc3e239c955d966e0d717b3c2..21840de3924654b3fcb01fb9dd58b8401680b630 100644 --- a/jdk/test/java/lang/Boolean/MakeBooleanComparable.java +++ b/jdk/test/java/lang/Boolean/MakeBooleanComparable.java @@ -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.*; diff --git a/jdk/test/java/lang/Class/Cast.java b/jdk/test/java/lang/Class/Cast.java index 0f57c221c46a24924c0166ffa66171afd1cc7a4b..ec413f044e567d498c3931b4fb30accbeb08f5c1 100644 --- a/jdk/test/java/lang/Class/Cast.java +++ b/jdk/test/java/lang/Class/Cast.java @@ -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 { diff --git a/jdk/test/java/lang/Class/IsEnum.java b/jdk/test/java/lang/Class/IsEnum.java index 1b4ccb705116c06acda3e5d84ab2a42c44411b57..08d1e58d78b9907ffff8c6e65abf94efde232244 100644 --- a/jdk/test/java/lang/Class/IsEnum.java +++ b/jdk/test/java/lang/Class/IsEnum.java @@ -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.*; diff --git a/jdk/test/java/lang/Class/asSubclass/BasicUnit.java b/jdk/test/java/lang/Class/asSubclass/BasicUnit.java index 68cf1c36bfd2cc0423289809d3e59f18f7edb321..e9e8b68e8539e20257878111920047b77001cb90 100644 --- a/jdk/test/java/lang/Class/asSubclass/BasicUnit.java +++ b/jdk/test/java/lang/Class/asSubclass/BasicUnit.java @@ -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 */ diff --git a/jdk/test/java/lang/ClassLoader/Assert.sh b/jdk/test/java/lang/ClassLoader/Assert.sh index 4744defce37b42580ad9619ae3704a893bf751c5..95dd51f1465accde373d45487f6dbb3662d879ad 100644 --- a/jdk/test/java/lang/ClassLoader/Assert.sh +++ b/jdk/test/java/lang/ClassLoader/Assert.sh @@ -47,7 +47,7 @@ cp ${TESTSRC}/Assert.java . 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 diff --git a/jdk/test/java/lang/Integer/BitTwiddle.java b/jdk/test/java/lang/Integer/BitTwiddle.java index 4904ea5aa3db5c6a5032cc22e1193dc5dbbb310e..35d61efd3a533817411a826b22b52fb94f21ee71 100644 --- a/jdk/test/java/lang/Integer/BitTwiddle.java +++ b/jdk/test/java/lang/Integer/BitTwiddle.java @@ -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; diff --git a/jdk/test/java/lang/Long/BitTwiddle.java b/jdk/test/java/lang/Long/BitTwiddle.java index fb1affd41ddcbe6e4d97202f60bf027ac1653948..eefa9e83282dae685664cea1c49c9231cedeaecb 100644 --- a/jdk/test/java/lang/Long/BitTwiddle.java +++ b/jdk/test/java/lang/Long/BitTwiddle.java @@ -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; diff --git a/jdk/test/java/lang/Math/Atan2Tests.java b/jdk/test/java/lang/Math/Atan2Tests.java index 0660ff3744ced5d9c345f829d2fe2dfed0c59445..ed81283b36d829d5146b81bfef885e7faa7a473e 100644 --- a/jdk/test/java/lang/Math/Atan2Tests.java +++ b/jdk/test/java/lang/Math/Atan2Tests.java @@ -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 */ diff --git a/jdk/test/java/lang/Math/IeeeRecommendedTests.java b/jdk/test/java/lang/Math/IeeeRecommendedTests.java index 4123451ed5dc75be8b0bd0926f2f748fa907bec2..f35d76ef3b8e410168fac983ad42a91b88e25fb7 100644 --- a/jdk/test/java/lang/Math/IeeeRecommendedTests.java +++ b/jdk/test/java/lang/Math/IeeeRecommendedTests.java @@ -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; diff --git a/jdk/test/java/lang/Math/PowTests.java b/jdk/test/java/lang/Math/PowTests.java index 79764765e33793d283b5453c739cb8ee4d5aa302..872de407d139a4a50c3fd6d44307b311c18a3395 100644 --- a/jdk/test/java/lang/Math/PowTests.java +++ b/jdk/test/java/lang/Math/PowTests.java @@ -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 */ diff --git a/jdk/test/java/lang/Math/TanTests.java b/jdk/test/java/lang/Math/TanTests.java index f603fb872a0f4a1f73baff1681a7a4e9ee7d080d..75d44631cd251cdd0e33fed8c7f45f42f0ad88dc 100644 --- a/jdk/test/java/lang/Math/TanTests.java +++ b/jdk/test/java/lang/Math/TanTests.java @@ -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 */ diff --git a/jdk/test/java/lang/Runtime/exec/WinCommand.java b/jdk/test/java/lang/Runtime/exec/WinCommand.java index 37e17a1f31644cb9eaa082e91fab448cb90c96ad..b51489b76adb2ae1c37fe2debfb8696f2fc9f9ab 100644 --- a/jdk/test/java/lang/Runtime/exec/WinCommand.java +++ b/jdk/test/java/lang/Runtime/exec/WinCommand.java @@ -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.*; diff --git a/jdk/test/java/lang/Thread/GenerifyStackTraces.java b/jdk/test/java/lang/Thread/GenerifyStackTraces.java index e10080c004f71c87648ebdf55c97c54a38bd32cb..632228cf82c4b4b2c82a4f28cd770808bd087364 100644 --- a/jdk/test/java/lang/Thread/GenerifyStackTraces.java +++ b/jdk/test/java/lang/Thread/GenerifyStackTraces.java @@ -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.*; diff --git a/jdk/test/java/lang/Thread/UncaughtExceptions.sh b/jdk/test/java/lang/Thread/UncaughtExceptions.sh index 43b56c8e6fe3a7891750f0d3c926ed22f1f166f9..51aa0c58935c5332d22c32df3112e058e8fcff88 100644 --- a/jdk/test/java/lang/Thread/UncaughtExceptions.sh +++ b/jdk/test/java/lang/Thread/UncaughtExceptions.sh @@ -121,7 +121,7 @@ public class Seppuku extends Thread implements Runnable { } EOJAVA - Sys "$javac" "-source" "1.5" "Seppuku.java" + Sys "$javac" "Seppuku.java" CheckCommandResults "$expectedRC" "$expectedOut" "$expectedErr" \ "$java" "Seppuku" Cleanup diff --git a/jdk/test/java/lang/annotation/UnitTest.java b/jdk/test/java/lang/annotation/UnitTest.java index ed8b05c3cc0a05ae6032c15b53779ba8b09110e4..160ebe683a75d622bb983f9cef48d065e695a9dd 100644 --- a/jdk/test/java/lang/annotation/UnitTest.java +++ b/jdk/test/java/lang/annotation/UnitTest.java @@ -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; diff --git a/jdk/test/java/lang/annotation/package-info.java b/jdk/test/java/lang/annotation/package-info.java index 78afb3f6c0a0455ace6e7b3785ec6fb98980b70b..d2bef02dde067aa465755c6a4195529c583d4166 100644 --- a/jdk/test/java/lang/annotation/package-info.java +++ b/jdk/test/java/lang/annotation/package-info.java @@ -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 */ diff --git a/jdk/test/java/lang/management/CompositeData/MemoryNotifInfoCompositeData.java b/jdk/test/java/lang/management/CompositeData/MemoryNotifInfoCompositeData.java index d833e5eb9aba5f4026134fe2edc3dac8af60f52c..8002188024ad788f06431bbe43a848960914d4fe 100644 --- a/jdk/test/java/lang/management/CompositeData/MemoryNotifInfoCompositeData.java +++ b/jdk/test/java/lang/management/CompositeData/MemoryNotifInfoCompositeData.java @@ -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 */ diff --git a/jdk/test/java/lang/management/CompositeData/ThreadInfoCompositeData.java b/jdk/test/java/lang/management/CompositeData/ThreadInfoCompositeData.java index 6c3cb0d044ad980d7b7c71218efaee6c7c892ba6..31be3a1596aa7e41426724f9a5ae421c88cd304b 100644 --- a/jdk/test/java/lang/management/CompositeData/ThreadInfoCompositeData.java +++ b/jdk/test/java/lang/management/CompositeData/ThreadInfoCompositeData.java @@ -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 */ diff --git a/jdk/test/java/lang/management/ManagementFactory/MXBeanProxyTest.java b/jdk/test/java/lang/management/ManagementFactory/MXBeanProxyTest.java index afd6618e62aece0628df0627ff53e7adfe0b6165..4a829fe76debf1bfa7036f8540da2768a8498fbc 100644 --- a/jdk/test/java/lang/management/ManagementFactory/MXBeanProxyTest.java +++ b/jdk/test/java/lang/management/ManagementFactory/MXBeanProxyTest.java @@ -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; diff --git a/jdk/test/java/lang/management/ManagementFactory/PlatformMBeanServerTest.java b/jdk/test/java/lang/management/ManagementFactory/PlatformMBeanServerTest.java index 7deb892569a77e69877f5bc9a9600c940c4da545..939ac86a764bf5f60f50bc72b92cde11a2d01519 100644 --- a/jdk/test/java/lang/management/ManagementFactory/PlatformMBeanServerTest.java +++ b/jdk/test/java/lang/management/ManagementFactory/PlatformMBeanServerTest.java @@ -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.*; diff --git a/jdk/test/java/lang/management/ManagementFactory/ProxyExceptions.java b/jdk/test/java/lang/management/ManagementFactory/ProxyExceptions.java index 5be25106827eff80b70304031fc41175903cd6ac..1feba9e13f68323dce431f5a0206017713d97635 100644 --- a/jdk/test/java/lang/management/ManagementFactory/ProxyExceptions.java +++ b/jdk/test/java/lang/management/ManagementFactory/ProxyExceptions.java @@ -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.*; diff --git a/jdk/test/java/lang/management/ManagementFactory/ProxyTypeMapping.java b/jdk/test/java/lang/management/ManagementFactory/ProxyTypeMapping.java index eb48825736c4270311192fa04c04f285801056ba..a4111b2e6ef9edfafd89650bfe17561372843d88 100644 --- a/jdk/test/java/lang/management/ManagementFactory/ProxyTypeMapping.java +++ b/jdk/test/java/lang/management/ManagementFactory/ProxyTypeMapping.java @@ -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.*; diff --git a/jdk/test/java/lang/management/ManagementFactory/ValidateOpenTypes.java b/jdk/test/java/lang/management/ManagementFactory/ValidateOpenTypes.java index 68d5304b91c72d0ce6957b50aafa718156ed6b56..d4fd4ea4a9410aa2fa5cceee98d34de0c170b89a 100644 --- a/jdk/test/java/lang/management/ManagementFactory/ValidateOpenTypes.java +++ b/jdk/test/java/lang/management/ManagementFactory/ValidateOpenTypes.java @@ -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.*; diff --git a/jdk/test/java/lang/management/RuntimeMXBean/GetSystemProperties.java b/jdk/test/java/lang/management/RuntimeMXBean/GetSystemProperties.java index 5a655378462943edd3fbae7bdc555765d999713c..c411192f080665fa7d1bdb57e9e99f9c1e4b5328 100644 --- a/jdk/test/java/lang/management/RuntimeMXBean/GetSystemProperties.java +++ b/jdk/test/java/lang/management/RuntimeMXBean/GetSystemProperties.java @@ -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; diff --git a/jdk/test/java/lang/management/RuntimeMXBean/TestInputArgument.sh b/jdk/test/java/lang/management/RuntimeMXBean/TestInputArgument.sh index f1fb705f3770fa459c2f24860bc50693e66dd571..e38817ec3fcbea0ce46f94618ebea21991267410 100644 --- a/jdk/test/java/lang/management/RuntimeMXBean/TestInputArgument.sh +++ b/jdk/test/java/lang/management/RuntimeMXBean/TestInputArgument.sh @@ -27,7 +27,7 @@ # @summary # @author Mandy Chung # -# @run compile -source 1.5 InputArgument.java +# @run compile InputArgument.java # @run shell TestInputArgument.sh # diff --git a/jdk/test/java/lang/reflect/Constructor/GenericStringTest.java b/jdk/test/java/lang/reflect/Constructor/GenericStringTest.java index 49709884f5605c9e359786a07f15b67085c432a0..59ed2dbfa95f2a8aea67d8238619c1f8529e4f3e 100644 --- a/jdk/test/java/lang/reflect/Constructor/GenericStringTest.java +++ b/jdk/test/java/lang/reflect/Constructor/GenericStringTest.java @@ -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.*; diff --git a/jdk/test/java/lang/reflect/Field/GenericStringTest.java b/jdk/test/java/lang/reflect/Field/GenericStringTest.java index f25a6ca36f2d65afcdc0e4a0d691c164af0a0d3c..148e69a70680e59202472e702c5b549bf5ffd442 100644 --- a/jdk/test/java/lang/reflect/Field/GenericStringTest.java +++ b/jdk/test/java/lang/reflect/Field/GenericStringTest.java @@ -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.*; diff --git a/jdk/test/java/lang/reflect/Generics/StringsAndBounds.java b/jdk/test/java/lang/reflect/Generics/StringsAndBounds.java index d49a5ea628e8403edf8faa22641a1d17de1f34a8..dac18fb7cb2330e7e3d8caa3a0d4491f20f26a7d 100644 --- a/jdk/test/java/lang/reflect/Generics/StringsAndBounds.java +++ b/jdk/test/java/lang/reflect/Generics/StringsAndBounds.java @@ -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.*; diff --git a/jdk/test/java/lang/reflect/Generics/TestC1.java b/jdk/test/java/lang/reflect/Generics/TestC1.java index 756a4c63ec20f5edf2c19581f097cf8ff5d8c564..8a9fbe37031284a9fe6766c3148ecb4667efff40 100644 --- a/jdk/test/java/lang/reflect/Generics/TestC1.java +++ b/jdk/test/java/lang/reflect/Generics/TestC1.java @@ -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 */ diff --git a/jdk/test/java/lang/reflect/Generics/TestC2.java b/jdk/test/java/lang/reflect/Generics/TestC2.java index d42671b3d3d8266e95b5e89438684a50ee7e8cfe..c2e574a2fa51d8f9fc55e6f37fdb9e25729c7977 100644 --- a/jdk/test/java/lang/reflect/Generics/TestC2.java +++ b/jdk/test/java/lang/reflect/Generics/TestC2.java @@ -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 */ diff --git a/jdk/test/java/lang/reflect/Generics/TestN1.java b/jdk/test/java/lang/reflect/Generics/TestN1.java index d2dc8b253f7309321a6a65f3643d86c4872db611..014a09f956d2a4135585e2b181a4a16e88107309 100644 --- a/jdk/test/java/lang/reflect/Generics/TestN1.java +++ b/jdk/test/java/lang/reflect/Generics/TestN1.java @@ -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 */ diff --git a/jdk/test/java/lang/reflect/Generics/exceptionCauseTest.java b/jdk/test/java/lang/reflect/Generics/exceptionCauseTest.java index 1427563f85e825426e27a452d9b309bbcedb2a62..77a71013fbf62a038138c4d6f7c0befec9985bc9 100644 --- a/jdk/test/java/lang/reflect/Generics/exceptionCauseTest.java +++ b/jdk/test/java/lang/reflect/Generics/exceptionCauseTest.java @@ -26,8 +26,6 @@ * @bug 4981727 * @summary * @author Joseph D. Darcy - * @compile -source 1.5 exceptionCauseTest.java - * @run main exceptionCauseTest */ import java.io.PrintStream; diff --git a/jdk/test/java/lang/reflect/Generics/getAnnotationTest.java b/jdk/test/java/lang/reflect/Generics/getAnnotationTest.java index d7f5d6de7da6d1d10335153a3c5cd4a5587229b2..f7a60f26d692eaf7e6bbb5eb46888e2555710b75 100644 --- a/jdk/test/java/lang/reflect/Generics/getAnnotationTest.java +++ b/jdk/test/java/lang/reflect/Generics/getAnnotationTest.java @@ -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.*; diff --git a/jdk/test/java/lang/reflect/Method/Equals.java b/jdk/test/java/lang/reflect/Method/Equals.java index 2bcb4ecf4e3c647d8d52f8e931aa8395e83bcd36..7f7bd70f32f449d10b94fc848f8580ae82470832 100644 --- a/jdk/test/java/lang/reflect/Method/Equals.java +++ b/jdk/test/java/lang/reflect/Method/Equals.java @@ -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 */ diff --git a/jdk/test/java/lang/reflect/Method/GenericStringTest.java b/jdk/test/java/lang/reflect/Method/GenericStringTest.java index 361e3db8c7a4e79f1c2405f9982bcdf167b1bac7..3894252a52f5b56ce1985f21f2031631c8839be6 100644 --- a/jdk/test/java/lang/reflect/Method/GenericStringTest.java +++ b/jdk/test/java/lang/reflect/Method/GenericStringTest.java @@ -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.*; diff --git a/jdk/test/java/math/BigDecimal/DivideTests.java b/jdk/test/java/math/BigDecimal/DivideTests.java index 7d04a60ca4b85e068b111804a606743f1076ea2b..5265f6d32f88a30c04d751f12f951aa7397f19df 100644 --- a/jdk/test/java/math/BigDecimal/DivideTests.java +++ b/jdk/test/java/math/BigDecimal/DivideTests.java @@ -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.*; diff --git a/jdk/test/java/math/BigDecimal/IntegralDivisionTests.java b/jdk/test/java/math/BigDecimal/IntegralDivisionTests.java index 100eca40cce547e479f2afaa43f9dc02cff887bd..6ce5a900453d0c160abfe19b4b09f48a9b1461ba 100644 --- a/jdk/test/java/math/BigDecimal/IntegralDivisionTests.java +++ b/jdk/test/java/math/BigDecimal/IntegralDivisionTests.java @@ -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 { diff --git a/jdk/test/java/math/BigDecimal/PowTests.java b/jdk/test/java/math/BigDecimal/PowTests.java index 9623b70bc117f1ff455b7fcd217c9e6162b2fd2f..78b3b6a570229960f09e253f5adf0deb94969305 100644 --- a/jdk/test/java/math/BigDecimal/PowTests.java +++ b/jdk/test/java/math/BigDecimal/PowTests.java @@ -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.*; diff --git a/jdk/test/java/math/BigDecimal/ToPlainStringTests.java b/jdk/test/java/math/BigDecimal/ToPlainStringTests.java index aca745b7e4b943458a64f0fdc2c2e4b5516d7177..9343b0dbab112db0ecc9db19f6ff2280dd695338 100644 --- a/jdk/test/java/math/BigDecimal/ToPlainStringTests.java +++ b/jdk/test/java/math/BigDecimal/ToPlainStringTests.java @@ -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.*; diff --git a/jdk/test/java/math/BigDecimal/ZeroScalingTests.java b/jdk/test/java/math/BigDecimal/ZeroScalingTests.java index a48e005a4b151f820b66ca011e7226480b2c5b18..abd5451e0681ae35d7366a598f5ca6b39eca19a0 100644 --- a/jdk/test/java/math/BigDecimal/ZeroScalingTests.java +++ b/jdk/test/java/math/BigDecimal/ZeroScalingTests.java @@ -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.*; diff --git a/jdk/test/java/math/RoundingMode/RoundingModeTests.java b/jdk/test/java/math/RoundingMode/RoundingModeTests.java index 03fd5e7ac806e601b6544093766680eb3bfe43ce..8a7cd1aa0c9dfd2b295b614d6b49a236f1fc1bec 100644 --- a/jdk/test/java/math/RoundingMode/RoundingModeTests.java +++ b/jdk/test/java/math/RoundingMode/RoundingModeTests.java @@ -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; diff --git a/jdk/test/java/net/ProxySelector/ProxyTest.java b/jdk/test/java/net/ProxySelector/ProxyTest.java index 869eb3fab277e7e82186ad79696278e499867916..18be010f619c61a40d26fd0be67e699355f38830 100644 --- a/jdk/test/java/net/ProxySelector/ProxyTest.java +++ b/jdk/test/java/net/ProxySelector/ProxyTest.java @@ -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 */ diff --git a/jdk/test/java/net/URL/PerConnectionProxy.java b/jdk/test/java/net/URL/PerConnectionProxy.java index 0640ec4bb87de061e51509ca8aa5899a93b12946..9a8cdf2616f83e2127b19e46e76ce511146140f3 100644 --- a/jdk/test/java/net/URL/PerConnectionProxy.java +++ b/jdk/test/java/net/URL/PerConnectionProxy.java @@ -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 */ diff --git a/jdk/test/java/security/cert/PKIXBuilderParameters/InvalidParameters.java b/jdk/test/java/security/cert/PKIXBuilderParameters/InvalidParameters.java index 14b8b0698ebefdaded070cd478960a9d32daeccf..b9f172fb2f6201c945016f4a644288f95ce78aea 100644 --- a/jdk/test/java/security/cert/PKIXBuilderParameters/InvalidParameters.java +++ b/jdk/test/java/security/cert/PKIXBuilderParameters/InvalidParameters.java @@ -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 diff --git a/jdk/test/java/security/cert/PKIXParameters/InvalidParameters.java b/jdk/test/java/security/cert/PKIXParameters/InvalidParameters.java index d3e3c5ab786d8c04aa6e060fbb5f075ef4befbf8..01946d6e2e07132992e2919a9d3f354af236e035 100644 --- a/jdk/test/java/security/cert/PKIXParameters/InvalidParameters.java +++ b/jdk/test/java/security/cert/PKIXParameters/InvalidParameters.java @@ -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 diff --git a/jdk/test/java/util/AbstractList/CheckForComodification.java b/jdk/test/java/util/AbstractList/CheckForComodification.java index 156c78982703a1a9ddb9ba24a62fd9cb594e95ad..790a4bb6c4e18d9e9506a2a646731646df49e9a8 100644 --- a/jdk/test/java/util/AbstractList/CheckForComodification.java +++ b/jdk/test/java/util/AbstractList/CheckForComodification.java @@ -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.*; diff --git a/jdk/test/java/util/Collections/AddAll.java b/jdk/test/java/util/Collections/AddAll.java index ef66b007591b35ca6dad549b62eb403437bb83f2..48bbc799a5d5f5702b7b54b138b707edae2db615 100644 --- a/jdk/test/java/util/Collections/AddAll.java +++ b/jdk/test/java/util/Collections/AddAll.java @@ -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.*; diff --git a/jdk/test/java/util/Collections/Disjoint.java b/jdk/test/java/util/Collections/Disjoint.java index 8d820f10015ff69e9b1b0dd6699766b6172ebec8..ada965efa6a7a535966f2092df11185f4200666a 100644 --- a/jdk/test/java/util/Collections/Disjoint.java +++ b/jdk/test/java/util/Collections/Disjoint.java @@ -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.*; diff --git a/jdk/test/java/util/Collections/Frequency.java b/jdk/test/java/util/Collections/Frequency.java index a21265720f3b5057400f87c051844c2318611bf2..71938c561cf755b29d56e2bf2341cb4283878f73 100644 --- a/jdk/test/java/util/Collections/Frequency.java +++ b/jdk/test/java/util/Collections/Frequency.java @@ -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.*; diff --git a/jdk/test/java/util/EnumMap/EnumMapBash.java b/jdk/test/java/util/EnumMap/EnumMapBash.java index 4dd51b1332761737301fb3efd8bfc16f2a7916ae..1182bf6c446e61cb735ee3c697c6cf0b65d7ec33 100644 --- a/jdk/test/java/util/EnumMap/EnumMapBash.java +++ b/jdk/test/java/util/EnumMap/EnumMapBash.java @@ -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.*; diff --git a/jdk/test/java/util/EnumSet/AllOf.java b/jdk/test/java/util/EnumSet/AllOf.java index 712fbc377190603adb737c1f2dc2bdffd96e58b5..28e471b0bfe26948d3e7d6f2e79b598db8ddb1ee 100644 --- a/jdk/test/java/util/EnumSet/AllOf.java +++ b/jdk/test/java/util/EnumSet/AllOf.java @@ -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.*; diff --git a/jdk/test/java/util/EnumSet/ComplementOf.java b/jdk/test/java/util/EnumSet/ComplementOf.java index 35251792eeda467e0fa0c8367336731c606bb58d..3a9fe377a4eadd1b4ea861620043cb355ab83657 100644 --- a/jdk/test/java/util/EnumSet/ComplementOf.java +++ b/jdk/test/java/util/EnumSet/ComplementOf.java @@ -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.*; diff --git a/jdk/test/java/util/EnumSet/EnumSetBash.java b/jdk/test/java/util/EnumSet/EnumSetBash.java index fd61f119755e750d4bb2cbf6d21cde4a4d8078ac..51dd8cbfef6257dc3a865f1f3d1aaa1d699c1ffc 100644 --- a/jdk/test/java/util/EnumSet/EnumSetBash.java +++ b/jdk/test/java/util/EnumSet/EnumSetBash.java @@ -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.*; diff --git a/jdk/test/java/util/EnumSet/JumboRange.java b/jdk/test/java/util/EnumSet/JumboRange.java index eec956572344c11908d0076c99ccec20782b8aab..55be9784dc649fc38d86b808964f8c09f98a9859 100644 --- a/jdk/test/java/util/EnumSet/JumboRange.java +++ b/jdk/test/java/util/EnumSet/JumboRange.java @@ -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.*; diff --git a/jdk/test/java/util/EnumSet/Range.java b/jdk/test/java/util/EnumSet/Range.java index 2a0301b68bc00308a8cea0e87186f984269f05af..ad4ab959c3f02441108e6b121f3fc376132b368a 100644 --- a/jdk/test/java/util/EnumSet/Range.java +++ b/jdk/test/java/util/EnumSet/Range.java @@ -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.*; diff --git a/jdk/test/java/util/Formattable/StockName.java b/jdk/test/java/util/Formattable/StockName.java index 30a06da82171567b289c8f7e96d908bcb9629ed5..d4b092e802ab7180a92446977dafbfff608af6b8 100644 --- a/jdk/test/java/util/Formattable/StockName.java +++ b/jdk/test/java/util/Formattable/StockName.java @@ -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; diff --git a/jdk/test/java/util/IdentityHashMap/ToString.java b/jdk/test/java/util/IdentityHashMap/ToString.java index 794ccb9982b43dfde29eaa9a03bb1b05b28d748c..8b22e3013f369d15da39f87bd1f5f0883854edce 100644 --- a/jdk/test/java/util/IdentityHashMap/ToString.java +++ b/jdk/test/java/util/IdentityHashMap/ToString.java @@ -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 */ diff --git a/jdk/test/java/util/Locale/Bug4175998Test.java b/jdk/test/java/util/Locale/Bug4175998Test.java index 96335255d0f4da4911a0d6ac1593b14e95652ba8..37ebee4860e5021934138f10da3cb008918768f9 100644 --- a/jdk/test/java/util/Locale/Bug4175998Test.java +++ b/jdk/test/java/util/Locale/Bug4175998Test.java @@ -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 */ diff --git a/jdk/test/java/util/UUID/UUIDTest.java b/jdk/test/java/util/UUID/UUIDTest.java index c71f6a410620c3f0a72b8e93b4bb6fbce862da26..2dde63c655cbf2a9f6e5b61d917d93d5e892023c 100644 --- a/jdk/test/java/util/UUID/UUIDTest.java +++ b/jdk/test/java/util/UUID/UUIDTest.java @@ -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 */ diff --git a/jdk/test/java/util/concurrent/BlockingQueue/CancelledProducerConsumerLoops.java b/jdk/test/java/util/concurrent/BlockingQueue/CancelledProducerConsumerLoops.java index 98ac5d744e2101628993c6b383d1ff632c3f8305..b704bb12c35fef5e45ed3e58c9d788d379b1bf99 100644 --- a/jdk/test/java/util/concurrent/BlockingQueue/CancelledProducerConsumerLoops.java +++ b/jdk/test/java/util/concurrent/BlockingQueue/CancelledProducerConsumerLoops.java @@ -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 diff --git a/jdk/test/java/util/concurrent/BlockingQueue/MultipleProducersSingleConsumerLoops.java b/jdk/test/java/util/concurrent/BlockingQueue/MultipleProducersSingleConsumerLoops.java index 8b7db5a945d706885b50b6e4051e8ae0f51bc6da..31db3a1dde13fa3b1a5813ecc31d3cc450067151 100644 --- a/jdk/test/java/util/concurrent/BlockingQueue/MultipleProducersSingleConsumerLoops.java +++ b/jdk/test/java/util/concurrent/BlockingQueue/MultipleProducersSingleConsumerLoops.java @@ -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 */ diff --git a/jdk/test/java/util/concurrent/BlockingQueue/ProducerConsumerLoops.java b/jdk/test/java/util/concurrent/BlockingQueue/ProducerConsumerLoops.java index 761990d3a925c8b16e6472bb7d18a6310180ca52..c6ca42e9ffcf2bb4d745a9e336f8f1ede345683b 100644 --- a/jdk/test/java/util/concurrent/BlockingQueue/ProducerConsumerLoops.java +++ b/jdk/test/java/util/concurrent/BlockingQueue/ProducerConsumerLoops.java @@ -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 */ diff --git a/jdk/test/java/util/concurrent/BlockingQueue/SingleProducerMultipleConsumerLoops.java b/jdk/test/java/util/concurrent/BlockingQueue/SingleProducerMultipleConsumerLoops.java index c99a664b7878deeea4e9cec0c8db76da115819e1..f365dea71a6d4c88d93ca3c43fa09fb179709f2b 100644 --- a/jdk/test/java/util/concurrent/BlockingQueue/SingleProducerMultipleConsumerLoops.java +++ b/jdk/test/java/util/concurrent/BlockingQueue/SingleProducerMultipleConsumerLoops.java @@ -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 */ diff --git a/jdk/test/java/util/concurrent/ConcurrentHashMap/MapCheck.java b/jdk/test/java/util/concurrent/ConcurrentHashMap/MapCheck.java index 1c77f5bb16679060bc2f5590a0b6e7beeee63557..9a4761943623f350eebe253b7c669f3f366cf7a1 100644 --- a/jdk/test/java/util/concurrent/ConcurrentHashMap/MapCheck.java +++ b/jdk/test/java/util/concurrent/ConcurrentHashMap/MapCheck.java @@ -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 */ diff --git a/jdk/test/java/util/concurrent/ConcurrentHashMap/MapLoops.java b/jdk/test/java/util/concurrent/ConcurrentHashMap/MapLoops.java index e6c310ff157b8515fd8311a573da129fff3f988c..f7aeab10f810feb8aeb60065bd0d23909d41f8c2 100644 --- a/jdk/test/java/util/concurrent/ConcurrentHashMap/MapLoops.java +++ b/jdk/test/java/util/concurrent/ConcurrentHashMap/MapLoops.java @@ -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 diff --git a/jdk/test/java/util/concurrent/Exchanger/ExchangeLoops.java b/jdk/test/java/util/concurrent/Exchanger/ExchangeLoops.java index 53f987381cc8c53250eef2d79e7c7fa7872d4ff3..43763426a0aa420a1cc5feeba008a1b736b31cf2 100644 --- a/jdk/test/java/util/concurrent/Exchanger/ExchangeLoops.java +++ b/jdk/test/java/util/concurrent/Exchanger/ExchangeLoops.java @@ -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. */ diff --git a/jdk/test/java/util/concurrent/ExecutorCompletionService/ExecutorCompletionServiceLoops.java b/jdk/test/java/util/concurrent/ExecutorCompletionService/ExecutorCompletionServiceLoops.java index fe713fe0791004197204ef2bc55a3756b39e08e0..35e183395aaea3d48ab581e2f870d13aadce1294 100644 --- a/jdk/test/java/util/concurrent/ExecutorCompletionService/ExecutorCompletionServiceLoops.java +++ b/jdk/test/java/util/concurrent/ExecutorCompletionService/ExecutorCompletionServiceLoops.java @@ -34,7 +34,7 @@ /* * @test * @bug 4965960 - * @compile -source 1.5 ExecutorCompletionServiceLoops.java + * @compile ExecutorCompletionServiceLoops.java * @run main/timeout=3600 ExecutorCompletionServiceLoops * @summary Exercise ExecutorCompletionServiceLoops */ diff --git a/jdk/test/java/util/concurrent/FutureTask/CancelledFutureLoops.java b/jdk/test/java/util/concurrent/FutureTask/CancelledFutureLoops.java index a3d1536d11d0deafa06d1a5ee65d598c7051b07e..c05dd0bcda020ec7a98fd04f15b2836d8dc107af 100644 --- a/jdk/test/java/util/concurrent/FutureTask/CancelledFutureLoops.java +++ b/jdk/test/java/util/concurrent/FutureTask/CancelledFutureLoops.java @@ -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 diff --git a/jdk/test/java/util/concurrent/atomic/VMSupportsCS8.java b/jdk/test/java/util/concurrent/atomic/VMSupportsCS8.java index 42a7587dbe2b46c88a05a3b31fc9af6c59d56ca4..055d0259dc3636a51f75ac83c0eb5d60d6b868fe 100644 --- a/jdk/test/java/util/concurrent/atomic/VMSupportsCS8.java +++ b/jdk/test/java/util/concurrent/atomic/VMSupportsCS8.java @@ -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. */ diff --git a/jdk/test/java/util/concurrent/locks/ReentrantLock/CancelledLockLoops.java b/jdk/test/java/util/concurrent/locks/ReentrantLock/CancelledLockLoops.java index fb1c7b5b5caec284828930db36959fd90fe8e81d..fc98478117b61b4f51c9ce60a3d6b0d1e9b7fb7d 100644 --- a/jdk/test/java/util/concurrent/locks/ReentrantLock/CancelledLockLoops.java +++ b/jdk/test/java/util/concurrent/locks/ReentrantLock/CancelledLockLoops.java @@ -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 diff --git a/jdk/test/java/util/concurrent/locks/ReentrantLock/LockOncePerThreadLoops.java b/jdk/test/java/util/concurrent/locks/ReentrantLock/LockOncePerThreadLoops.java index 444c55e82f8fe1c2fb09b0af655c5181287214b5..361ea1a372de936fe4f7a8c8c8198d170bb40534 100644 --- a/jdk/test/java/util/concurrent/locks/ReentrantLock/LockOncePerThreadLoops.java +++ b/jdk/test/java/util/concurrent/locks/ReentrantLock/LockOncePerThreadLoops.java @@ -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 */ diff --git a/jdk/test/java/util/concurrent/locks/ReentrantLock/SimpleReentrantLockLoops.java b/jdk/test/java/util/concurrent/locks/ReentrantLock/SimpleReentrantLockLoops.java index ead5c960f15690594bca9bb7d39cc3322b463b10..37641686ef0a8d0a24642e4ddf69a3af018f0ccc 100644 --- a/jdk/test/java/util/concurrent/locks/ReentrantLock/SimpleReentrantLockLoops.java +++ b/jdk/test/java/util/concurrent/locks/ReentrantLock/SimpleReentrantLockLoops.java @@ -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 */ diff --git a/jdk/test/java/util/concurrent/locks/ReentrantLock/TimeoutLockLoops.java b/jdk/test/java/util/concurrent/locks/ReentrantLock/TimeoutLockLoops.java index d1edcc911d03ace6b9eeba7d7e843e6fa8d307f0..d0df653fb8fe7734a82c4f05dae910542ed6f75b 100644 --- a/jdk/test/java/util/concurrent/locks/ReentrantLock/TimeoutLockLoops.java +++ b/jdk/test/java/util/concurrent/locks/ReentrantLock/TimeoutLockLoops.java @@ -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 diff --git a/jdk/test/java/util/concurrent/locks/ReentrantReadWriteLock/MapLoops.java b/jdk/test/java/util/concurrent/locks/ReentrantReadWriteLock/MapLoops.java index a6e710b0b289e52b4d9b75db234d7419e0befbe5..6596ed5a7dc49f610c2c295958b764da87ecbddb 100644 --- a/jdk/test/java/util/concurrent/locks/ReentrantReadWriteLock/MapLoops.java +++ b/jdk/test/java/util/concurrent/locks/ReentrantReadWriteLock/MapLoops.java @@ -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 diff --git a/jdk/test/sun/management/AgentCheckTest.java b/jdk/test/sun/management/AgentCheckTest.java index 8d3f17edd9a4410d0be22ba80937b2a2b6dd20a1..d480f5b0226db58801750d1761078b5248fd9754 100644 --- a/jdk/test/sun/management/AgentCheckTest.java +++ b/jdk/test/sun/management/AgentCheckTest.java @@ -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; diff --git a/jdk/test/sun/security/util/Oid/S11N.sh b/jdk/test/sun/security/util/Oid/S11N.sh index 77341e8a91bb60fafb76f5aa4cd6c67b428a0840..081cd52298fc315e08e358b5c4994fc456b9c3d2 100644 --- a/jdk/test/sun/security/util/Oid/S11N.sh +++ b/jdk/test/sun/security/util/Oid/S11N.sh @@ -99,7 +99,7 @@ esac # 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} diff --git a/jdk/test/sun/tools/jconsole/ResourceCheckTest.sh b/jdk/test/sun/tools/jconsole/ResourceCheckTest.sh index d2a34bb2a89cbafc11dd6b5f38d4efef674b12db..a5d211d5141bf359e37e462de4cf28021fc12c4a 100644 --- a/jdk/test/sun/tools/jconsole/ResourceCheckTest.sh +++ b/jdk/test/sun/tools/jconsole/ResourceCheckTest.sh @@ -98,7 +98,7 @@ env 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: