Cleanups as in 21

Author: GoeLin

test/jdk/tools/jlink/plugins/SystemModuleDescriptors/src/com.foo/com/foo/Main.java

@@ -38,12 +38,6 @@ public static void main(String... args) throws Exception {
 
         checkMainClass("com.foo", "com.foo.Main");
         checkMainClass("net.foo", "net.foo.Main");
-        /*
-        Stream.of("jdk.httpserver", "jdk.jfr").forEach(mn ->
-                ModuleFinder.ofSystem().find(mn).get().descriptor().mainClass()
-                            .orElseThrow(() -> new RuntimeException(mn + " no main class"))
-        );
-        */
     }
 
     static void checkMainClass(String mn, String mainClass) {

test/jdk/tools/jlink/plugins/SystemModuleDescriptors/src/com.foo/module-info.java

@@ -22,6 +22,5 @@
  */
 
 module com.foo {
-    requires jdk.httpserver;
     requires net.foo;
 }

test/jdk/tools/jlink/plugins/SystemModuleDescriptors/src/net.foo/module-info.java

@@ -22,5 +22,4 @@
  */
 
 module net.foo {
-    requires jdk.jfr;
 }

test/jdk/tools/jlink/plugins/SystemModuleDescriptors/src/net.foo/net/foo/Main.java

@@ -38,12 +38,6 @@ public static void main(String... args) throws Exception {
 
         checkMainClass("com.foo", "com.foo.Main");
         checkMainClass("net.foo", "net.foo.Main");
-        /*
-        Stream.of("jdk.httpserver", "jdk.jfr").forEach(mn ->
-                ModuleFinder.ofSystem().find(mn).get().descriptor().mainClass()
-                        .orElseThrow(() -> new RuntimeException(mn + " no main class"))
-        );
-        */
     }
 
     static void checkMainClass(String mn, String mainClass) {