--- old/src/jdk.jdeps/share/classes/com/sun/tools/jdeprscan/Main.java	2018-06-27 14:20:40.442003999 -0700
+++ new/src/jdk.jdeps/share/classes/com/sun/tools/jdeprscan/Main.java	2018-06-27 14:20:40.306003999 -0700
@@ -106,7 +106,7 @@
     // Keep these updated manually until there's a compiler API
     // that allows querying of supported releases.
     final Set<String> releasesWithoutForRemoval = Set.of("6", "7", "8");
-    final Set<String> releasesWithForRemoval = Set.of("9", "10", "11");
+    final Set<String> releasesWithForRemoval = Set.of("9", "10", "11", "12");
 
     final Set<String> validReleases;
     {
@@ -496,7 +496,7 @@
         String dir = null;
         String jar = null;
         String jdkHome = null;
-        String release = "11";
+        String release = Integer.toString(Runtime.version().feature());
         List<String> loadClasses = new ArrayList<>();
         String csvFile = null;