Add support for Java 12 and 13; fix reading deprecated signatures for Java 13+ (simplify JRT FS usage)

Author: uschindler

build.xml

@@ -60,6 +60,8 @@
       <equals arg1="${-cleaned.specification.version}" arg2="9"/>
       <equals arg1="${-cleaned.specification.version}" arg2="10"/>
       <equals arg1="${-cleaned.specification.version}" arg2="11"/>
+      <equals arg1="${-cleaned.specification.version}" arg2="12"/>
+      <equals arg1="${-cleaned.specification.version}" arg2="13"/>
     </or>
   </condition>
 
@@ -153,6 +155,8 @@
       <equals arg1="${build.java.runtime}" arg2="9"/>
       <equals arg1="${build.java.runtime}" arg2="10"/>
       <equals arg1="${build.java.runtime}" arg2="11"/>
+      <equals arg1="${build.java.runtime}" arg2="12"/>
+      <equals arg1="${build.java.runtime}" arg2="13"/>
     </or>
   </condition>
 

src/main/resources/de/thetaphi/forbiddenapis/signatures/jdk-deprecated-12.txt

@@ -0,0 +1,10 @@
+# This file contains API signatures that are marked as internal in Java.
+# It is provided here for reference, but can easily regenerated by executing from the source folder of forbidden-apis:
+# $ ant generate-internal
+
+# This file contains all internal packages listed in Security.getProperty("package.access") of Java version 12 (extracted from build 12).
+
+@defaultMessage non-public internal runtime class in Java 12
+
+sun.misc.**
+sun.reflect.**

src/main/resources/de/thetaphi/forbiddenapis/signatures/jdk-deprecated-13.txt

@@ -0,0 +1,10 @@
+# This file contains API signatures that are marked as internal in Java.
+# It is provided here for reference, but can easily regenerated by executing from the source folder of forbidden-apis:
+# $ ant generate-internal
+
+# This file contains all internal packages listed in Security.getProperty("package.access") of Java version 13 (extracted from build 13).
+
+@defaultMessage non-public internal runtime class in Java 13
+
+sun.misc.**
+sun.reflect.**

src/main/resources/de/thetaphi/forbiddenapis/signatures/jdk-internal-12.txt

@@ -0,0 +1,19 @@
+# (C) Copyright Uwe Schindler (Generics Policeman) and others.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# These methods and classes should not be used by server classes (unsafe, no charset, no locale,...):
+
+# We only include 11 for now.
+# TODO: Scan Java 12 API for additional locale/charset/... violations!
+@includeBundled jdk-unsafe-11

src/main/resources/de/thetaphi/forbiddenapis/signatures/jdk-internal-13.txt

@@ -0,0 +1,19 @@
+# (C) Copyright Uwe Schindler (Generics Policeman) and others.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# These methods and classes should not be used by server classes (unsafe, no charset, no locale,...):
+
+# We only include 12 for now.
+# TODO: Scan Java 13 API for additional locale/charset/... violations!
+@includeBundled jdk-unsafe-12

src/main/resources/de/thetaphi/forbiddenapis/signatures/jdk-unsafe-12.txt

@@ -24,15 +24,15 @@ import java.nio.file.PathMatcher;
 import java.nio.file.SimpleFileVisitor;
 import java.nio.file.attribute.BasicFileAttributes;
 
-new DeprecatedGen<URI>(properties['build.java.runtime'], URI.create("jrt:/modules/"), properties['deprecated.output.file'] as File) {
+new DeprecatedGen<URI>(properties['build.java.runtime'], URI.create("jrt:/"), properties['deprecated.output.file'] as File) {
   @Override
   protected void collectClasses(URI uri) throws IOException {
     Path modules = Paths.get(uri);
-    PathMatcher fileMatcher = modules.getFileSystem().getPathMatcher("glob:java.**/*.class");
+    PathMatcher fileMatcher = modules.getFileSystem().getPathMatcher("glob:/modules/java.**/*.class");
     Files.walkFileTree(modules, new SimpleFileVisitor<Path>() {
       @Override
       public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException {
-        if (fileMatcher.matches(modules.relativize(file))) {
+        if (fileMatcher.matches(file)) {
           // System.out.println(file);
           Files.newInputStream(file).withStream { parseClass(it) };
         }