test/jdk/java/beans/XMLDecoder/8028054/Task.java

*** 1,7 ****
  /*
!  * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
--- 1,7 ----
  /*
!  * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
*** 96,115 ****
          Predicate<String> startsWithJavaDataTransfer  = path -> path.toString().startsWith("java.datatransfer/java");
          Predicate<String> startsWithJavaRMI           = path -> path.toString().startsWith("java.rmi/java");
          Predicate<String> startsWithJavaSmartCardIO   = path -> path.toString().startsWith("java.smartcardio/java");
          Predicate<String> startsWithJavaManagement    = path -> path.toString().startsWith("java.management/java");
          Predicate<String> startsWithJavaXML           = path -> path.toString().startsWith("java.xml/java");
-         Predicate<String> startsWithJavaXMLBind       = path -> path.toString().startsWith("java.xml.bind/java");
          Predicate<String> startsWithJavaScripting     = path -> path.toString().startsWith("java.scripting/java");
          Predicate<String> startsWithJavaNaming        = path -> path.toString().startsWith("java.naming/java");
          Predicate<String> startsWithJavaSQL           = path -> path.toString().startsWith("java.sql/java");
-         Predicate<String> startsWithJavaActivation    = path -> path.toString().startsWith("java.activation/java");
          Predicate<String> startsWithJavaCompiler      = path -> path.toString().startsWith("java.compiler/java");
-         Predicate<String> startsWithJavaAnnotations   = path -> path.toString().startsWith("java.annotations/java");
-         Predicate<String> startsWithJavaTransaction   = path -> path.toString().startsWith("java.transaction/java");
          Predicate<String> startsWithJavaLogging       = path -> path.toString().startsWith("java.logging/java");
-         Predicate<String> startsWithJavaCorba         = path -> path.toString().startsWith("java.corba/java");
          Predicate<String> startsWithJavaPrefs         = path -> path.toString().startsWith("java.prefs/java");
  
          fileNames = Files.walk(modules)
                  .map(Path::toString)
                  .filter(path -> path.toString().contains("java"))
--- 96,110 ----
*** 119,138 ****
                      .or(startsWithJavaDataTransfer)
                      .or(startsWithJavaRMI)
                      .or(startsWithJavaSmartCardIO)
                      .or(startsWithJavaManagement)
                      .or(startsWithJavaXML)
-                     .or(startsWithJavaXMLBind)
                      .or(startsWithJavaScripting)
                      .or(startsWithJavaNaming)
                      .or(startsWithJavaSQL)
-                     .or(startsWithJavaActivation)
                      .or(startsWithJavaCompiler)
-                     .or(startsWithJavaAnnotations)
-                     .or(startsWithJavaTransaction)
                      .or(startsWithJavaLogging)
-                     .or(startsWithJavaCorba)
                      .or(startsWithJavaPrefs))
                  .map(s -> s.replace('/', '.'))
                  .filter(path -> path.toString().endsWith(".class"))
                  .map(s -> s.substring(0, s.length() - 6))  // drop .class
                  .map(s -> s.substring(s.indexOf(".")))
--- 114,128 ----