diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/java15api/Java15APIUsageInspectionBase.java b/java/java-analysis-impl/src/com/intellij/codeInspection/java15api/Java15APIUsageInspectionBase.java
index 23d06e180dec..8040714ab67a 100644
--- a/java/java-analysis-impl/src/com/intellij/codeInspection/java15api/Java15APIUsageInspectionBase.java
+++ b/java/java-analysis-impl/src/com/intellij/codeInspection/java15api/Java15APIUsageInspectionBase.java
@@ -78,6 +78,7 @@ public class Java15APIUsageInspectionBase extends BaseJavaBatchLocalInspectionTo
     ourPresentableShortMessage.put(LanguageLevel.JDK_1_5, "1.6");
     ourPresentableShortMessage.put(LanguageLevel.JDK_1_6, "1.7");
     ourPresentableShortMessage.put(LanguageLevel.JDK_1_7, "1.8");
+    ourPresentableShortMessage.put(LanguageLevel.JDK_1_9, "1.9");
 
     loadForbiddenApi("ignore16List.txt", ourIgnored16ClassesAPI);
   }
diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/java15api/api1.9.txt b/java/java-analysis-impl/src/com/intellij/codeInspection/java15api/api1.9.txt
new file mode 100644
index 000000000000..ea9cd303a9b6
--- /dev/null
+++ b/java/java-analysis-impl/src/com/intellij/codeInspection/java15api/api1.9.txt
@@ -0,0 +1,296 @@
+com.sun.source.tree.Tree.Kind#PACKAGE
+com.sun.source.tree.PackageTree
+com.sun.source.tree.CompilationUnitTree#getPackage()
+com.sun.source.util.DocTrees#getBreakIterator()
+com.sun.source.util.DocTrees#getDocCommentTree(javax.lang.model.element.Element;)
+com.sun.source.util.DocTrees#getDocCommentTree(javax.tools.FileObject;)
+com.sun.source.util.DocTrees#getDocCommentTree(javax.lang.model.element.Element;java.lang.String;)
+com.sun.source.util.DocTrees#getFirstSentence(java.util.List<? extends com.sun.source.doctree.DocTree>;)
+com.sun.source.util.DocTrees#setBreakIterator(java.text.BreakIterator;)
+com.sun.source.util.TaskEvent.Kind#COMPILATION
+com.sun.source.doctree.DocCommentTree#getFullBody()
+com.sun.security.jgss.InquireType#KRB5_GET_SESSION_KEY_EX
+com.sun.security.jgss.InquireType#KRB5_GET_KRB_CRED
+java.io.InputStream#readAllBytes()
+java.io.InputStream#readNBytes(byte[];int;int;)
+java.io.InputStream#transferTo(java.io.OutputStream;)
+java.awt.font.NumericShaper.Range#SINHALA
+java.awt.font.NumericShaper.Range#MYANMAR_TAI_LAING
+java.awt.image.MultiResolutionImage#getResolutionVariant(double;double;)
+java.awt.image.MultiResolutionImage#getResolutionVariants()
+java.awt.image.MultiResolutionImage
+java.awt.image.BaseMultiResolutionImage#BaseMultiResolutionImage(java.awt.Image[];)
+java.awt.image.BaseMultiResolutionImage#BaseMultiResolutionImage(int;java.awt.Image[];)
+java.awt.image.BaseMultiResolutionImage
+java.awt.image.AbstractMultiResolutionImage#getBaseImage()
+java.awt.image.AbstractMultiResolutionImage
+java.awt.RenderingHints#KEY_RESOLUTION_VARIANT
+java.awt.RenderingHints#VALUE_RESOLUTION_VARIANT_DEFAULT
+java.awt.RenderingHints#VALUE_RESOLUTION_VARIANT_BASE
+java.awt.RenderingHints#VALUE_RESOLUTION_VARIANT_SIZE_FIT
+java.awt.RenderingHints#VALUE_RESOLUTION_VARIANT_DPI_FIT
+java.net.spi.URLStreamHandlerProvider
+java.net.Socket#setOption(java.net.SocketOption<T>;T;)
+java.net.Socket#getOption(java.net.SocketOption<T>;)
+java.net.Socket#supportedOptions()
+java.net.SocketImpl#setOption(java.net.SocketOption<T>;T;)
+java.net.SocketImpl#getOption(java.net.SocketOption<T>;)
+java.net.ServerSocket#setOption(java.net.SocketOption<T>;T;)
+java.net.ServerSocket#getOption(java.net.SocketOption<T>;)
+java.net.ServerSocket#supportedOptions()
+java.net.DatagramSocket#setOption(java.net.SocketOption<T>;T;)
+java.net.DatagramSocket#getOption(java.net.SocketOption<T>;)
+java.net.DatagramSocket#supportedOptions()
+java.net.NetworkInterface#inetAddresses()
+java.net.NetworkInterface#subInterfaces()
+java.net.NetworkInterface#networkInterfaces()
+java.net.DatagramSocketImpl#setOption(java.net.SocketOption<T>;T;)
+java.net.DatagramSocketImpl#getOption(java.net.SocketOption<T>;)
+java.nio.IntBuffer#position(int;)
+java.nio.IntBuffer#limit(int;)
+java.nio.IntBuffer#mark()
+java.nio.IntBuffer#reset()
+java.nio.IntBuffer#clear()
+java.nio.IntBuffer#flip()
+java.nio.IntBuffer#rewind()
+java.nio.ByteBuffer#position(int;)
+java.nio.ByteBuffer#limit(int;)
+java.nio.ByteBuffer#mark()
+java.nio.ByteBuffer#reset()
+java.nio.ByteBuffer#clear()
+java.nio.ByteBuffer#flip()
+java.nio.ByteBuffer#rewind()
+java.nio.CharBuffer#position(int;)
+java.nio.CharBuffer#limit(int;)
+java.nio.CharBuffer#mark()
+java.nio.CharBuffer#reset()
+java.nio.CharBuffer#clear()
+java.nio.CharBuffer#flip()
+java.nio.CharBuffer#rewind()
+java.nio.LongBuffer#position(int;)
+java.nio.LongBuffer#limit(int;)
+java.nio.LongBuffer#mark()
+java.nio.LongBuffer#reset()
+java.nio.LongBuffer#clear()
+java.nio.LongBuffer#flip()
+java.nio.LongBuffer#rewind()
+java.nio.FloatBuffer#position(int;)
+java.nio.FloatBuffer#limit(int;)
+java.nio.FloatBuffer#mark()
+java.nio.FloatBuffer#reset()
+java.nio.FloatBuffer#clear()
+java.nio.FloatBuffer#flip()
+java.nio.FloatBuffer#rewind()
+java.nio.ShortBuffer#position(int;)
+java.nio.ShortBuffer#limit(int;)
+java.nio.ShortBuffer#mark()
+java.nio.ShortBuffer#reset()
+java.nio.ShortBuffer#clear()
+java.nio.ShortBuffer#flip()
+java.nio.ShortBuffer#rewind()
+java.nio.DoubleBuffer#position(int;)
+java.nio.DoubleBuffer#limit(int;)
+java.nio.DoubleBuffer#mark()
+java.nio.DoubleBuffer#reset()
+java.nio.DoubleBuffer#clear()
+java.nio.DoubleBuffer#flip()
+java.nio.DoubleBuffer#rewind()
+java.nio.MappedByteBuffer#position(int;)
+java.nio.MappedByteBuffer#limit(int;)
+java.nio.MappedByteBuffer#mark()
+java.nio.MappedByteBuffer#reset()
+java.nio.MappedByteBuffer#clear()
+java.nio.MappedByteBuffer#flip()
+java.nio.MappedByteBuffer#rewind()
+java.sql.Connection#beginRequest()
+java.sql.Connection#endRequest()
+java.sql.DriverManager#drivers()
+java.lang.Long#parseLong(java.lang.CharSequence;int;int;int;)
+java.lang.Long#parseUnsignedLong(java.lang.CharSequence;int;int;int;)
+java.lang.management.ThreadInfo#isDaemon()
+java.lang.management.ThreadInfo#getPriority()
+java.lang.String#chars()
+java.lang.String#codePoints()
+java.lang.Integer#parseInt(java.lang.CharSequence;int;int;int;)
+java.lang.Integer#parseUnsignedInt(java.lang.CharSequence;int;int;int;)
+java.lang.Process#supportsNormalTermination()
+java.lang.Process#getPid()
+java.lang.Process#onExit()
+java.lang.Process#toHandle()
+java.lang.Process#info()
+java.lang.Process#children()
+java.lang.Process#descendants()
+java.lang.Character#DIRECTIONALITY_LEFT_TO_RIGHT_ISOLATE
+java.lang.Character#DIRECTIONALITY_RIGHT_TO_LEFT_ISOLATE
+java.lang.Character#DIRECTIONALITY_FIRST_STRONG_ISOLATE
+java.lang.Character#DIRECTIONALITY_POP_DIRECTIONAL_ISOLATE
+java.lang.Character.UnicodeBlock#COMBINING_DIACRITICAL_MARKS_EXTENDED
+java.lang.Character.UnicodeBlock#MYANMAR_EXTENDED_B
+java.lang.Character.UnicodeBlock#LATIN_EXTENDED_E
+java.lang.Character.UnicodeBlock#COPTIC_EPACT_NUMBERS
+java.lang.Character.UnicodeBlock#OLD_PERMIC
+java.lang.Character.UnicodeBlock#ELBASAN
+java.lang.Character.UnicodeBlock#CAUCASIAN_ALBANIAN
+java.lang.Character.UnicodeBlock#LINEAR_A
+java.lang.Character.UnicodeBlock#PALMYRENE
+java.lang.Character.UnicodeBlock#NABATAEAN
+java.lang.Character.UnicodeBlock#OLD_NORTH_ARABIAN
+java.lang.Character.UnicodeBlock#MANICHAEAN
+java.lang.Character.UnicodeBlock#PSALTER_PAHLAVI
+java.lang.Character.UnicodeBlock#MAHAJANI
+java.lang.Character.UnicodeBlock#SINHALA_ARCHAIC_NUMBERS
+java.lang.Character.UnicodeBlock#KHOJKI
+java.lang.Character.UnicodeBlock#KHUDAWADI
+java.lang.Character.UnicodeBlock#GRANTHA
+java.lang.Character.UnicodeBlock#TIRHUTA
+java.lang.Character.UnicodeBlock#SIDDHAM
+java.lang.Character.UnicodeBlock#MODI
+java.lang.Character.UnicodeBlock#WARANG_CITI
+java.lang.Character.UnicodeBlock#PAU_CIN_HAU
+java.lang.Character.UnicodeBlock#MRO
+java.lang.Character.UnicodeBlock#BASSA_VAH
+java.lang.Character.UnicodeBlock#PAHAWH_HMONG
+java.lang.Character.UnicodeBlock#DUPLOYAN
+java.lang.Character.UnicodeBlock#SHORTHAND_FORMAT_CONTROLS
+java.lang.Character.UnicodeBlock#MENDE_KIKAKUI
+java.lang.Character.UnicodeBlock#ORNAMENTAL_DINGBATS
+java.lang.Character.UnicodeBlock#GEOMETRIC_SHAPES_EXTENDED
+java.lang.Character.UnicodeBlock#SUPPLEMENTAL_ARROWS_C
+java.lang.Character.UnicodeBlock#CHEROKEE_SUPPLEMENT
+java.lang.Character.UnicodeBlock#HATRAN
+java.lang.Character.UnicodeBlock#OLD_HUNGARIAN
+java.lang.Character.UnicodeBlock#MULTANI
+java.lang.Character.UnicodeBlock#AHOM
+java.lang.Character.UnicodeBlock#EARLY_DYNASTIC_CUNEIFORM
+java.lang.Character.UnicodeBlock#ANATOLIAN_HIEROGLYPHS
+java.lang.Character.UnicodeBlock#SUTTON_SIGNWRITING
+java.lang.Character.UnicodeBlock#SUPPLEMENTAL_SYMBOLS_AND_PICTOGRAPHS
+java.lang.Character.UnicodeBlock#CJK_UNIFIED_IDEOGRAPHS_EXTENSION_E
+java.lang.Character.UnicodeScript#CAUCASIAN_ALBANIAN
+java.lang.Character.UnicodeScript#BASSA_VAH
+java.lang.Character.UnicodeScript#DUPLOYAN
+java.lang.Character.UnicodeScript#ELBASAN
+java.lang.Character.UnicodeScript#GRANTHA
+java.lang.Character.UnicodeScript#PAHAWH_HMONG
+java.lang.Character.UnicodeScript#KHOJKI
+java.lang.Character.UnicodeScript#LINEAR_A
+java.lang.Character.UnicodeScript#MAHAJANI
+java.lang.Character.UnicodeScript#MANICHAEAN
+java.lang.Character.UnicodeScript#MENDE_KIKAKUI
+java.lang.Character.UnicodeScript#MODI
+java.lang.Character.UnicodeScript#MRO
+java.lang.Character.UnicodeScript#OLD_NORTH_ARABIAN
+java.lang.Character.UnicodeScript#NABATAEAN
+java.lang.Character.UnicodeScript#PALMYRENE
+java.lang.Character.UnicodeScript#PAU_CIN_HAU
+java.lang.Character.UnicodeScript#OLD_PERMIC
+java.lang.Character.UnicodeScript#PSALTER_PAHLAVI
+java.lang.Character.UnicodeScript#SIDDHAM
+java.lang.Character.UnicodeScript#KHUDAWADI
+java.lang.Character.UnicodeScript#TIRHUTA
+java.lang.Character.UnicodeScript#WARANG_CITI
+java.lang.Character.UnicodeScript#AHOM
+java.lang.Character.UnicodeScript#ANATOLIAN_HIEROGLYPHS
+java.lang.Character.UnicodeScript#HATRAN
+java.lang.Character.UnicodeScript#MULTANI
+java.lang.Character.UnicodeScript#OLD_HUNGARIAN
+java.lang.Character.UnicodeScript#SIGNWRITING
+java.lang.ProcessHandle.Info
+java.lang.ProcessHandle
+java.lang.ProcessHandleImpl#isAlive()
+java.lang.ProcessHandleImpl
+java.lang.AbstractStringBuilder#chars()
+java.lang.AbstractStringBuilder#codePoints()
+java.math.BigInteger#BigInteger(byte[];int;int;)
+java.math.BigInteger#BigInteger(int;byte[];int;int;)
+java.util.zip.CRC32C
+java.util.zip.Checksum#update(byte[];)
+java.util.zip.Checksum#update(java.nio.ByteBuffer;)
+java.util.zip.ZipEntry#setTimeLocal(java.time.LocalDateTime;)
+java.util.zip.ZipEntry#getTimeLocal()
+java.util.regex.Matcher#appendReplacement(java.lang.StringBuilder;java.lang.String;)
+java.util.regex.Matcher#appendTail(java.lang.StringBuilder;)
+java.util.regex.Matcher#replaceAll(java.util.function.Function<java.util.regex.MatchResult,java.lang.String>;)
+java.util.regex.Matcher#results()
+java.util.regex.Matcher#replaceFirst(java.util.function.Function<java.util.regex.MatchResult,java.lang.String>;)
+java.util.stream.Stream#takeWhile(java.util.function.Predicate<? super T>;)
+java.util.stream.Stream#dropWhile(java.util.function.Predicate<? super T>;)
+java.util.stream.Stream#ofNullable(T;)
+java.util.stream.WhileOps
+java.util.stream.IntStream#takeWhile(java.util.function.IntPredicate;)
+java.util.stream.IntStream#dropWhile(java.util.function.IntPredicate;)
+java.util.stream.Collectors#flatMapping(java.util.function.Function<? super T,? extends java.util.stream.Stream<? extends U>>;java.util.stream.Collector<? super U,A,R>;)
+java.util.stream.LongStream#takeWhile(java.util.function.LongPredicate;)
+java.util.stream.LongStream#dropWhile(java.util.function.LongPredicate;)
+java.util.stream.DoubleStream#takeWhile(java.util.function.DoublePredicate;)
+java.util.stream.DoubleStream#dropWhile(java.util.function.DoublePredicate;)
+java.util.logging.LogRecord#instant
+java.util.logging.LogRecord#getInstant()
+java.util.logging.LogRecord#setInstant(java.time.Instant;)
+java.util.logging.LogManager#addConfigurationListener(java.lang.Runnable;)
+java.util.logging.LogManager#removeConfigurationListener(java.lang.Runnable;)
+java.util.logging.FileHandler#FileHandler(java.lang.String;long;int;boolean;)
+java.util.concurrent.Flow
+java.util.concurrent.ForkJoinTask#pollSubmission()
+java.util.concurrent.CompletableFuture#newIncompleteFuture()
+java.util.concurrent.CompletableFuture#defaultExecutor()
+java.util.concurrent.CompletableFuture#copy()
+java.util.concurrent.CompletableFuture#minimalCompletionStage()
+java.util.concurrent.CompletableFuture#completeAsync(java.util.function.Supplier<? extends T>;java.util.concurrent.Executor;)
+java.util.concurrent.CompletableFuture#completeAsync(java.util.function.Supplier<? extends T>;)
+java.util.concurrent.CompletableFuture#orTimeout(long;java.util.concurrent.TimeUnit;)
+java.util.concurrent.CompletableFuture#completeOnTimeout(T;long;java.util.concurrent.TimeUnit;)
+java.util.concurrent.CompletableFuture#delayedExecutor(long;java.util.concurrent.TimeUnit;java.util.concurrent.Executor;)
+java.util.concurrent.CompletableFuture#delayedExecutor(long;java.util.concurrent.TimeUnit;)
+java.util.concurrent.CompletableFuture#completedStage(U;)
+java.util.concurrent.CompletableFuture#failedFuture(java.lang.Throwable;)
+java.util.concurrent.CompletableFuture#failedStage(java.lang.Throwable;)
+java.util.concurrent.SubmissionPublisher
+java.util.Scanner#tokens()
+java.util.Scanner#findAll(java.util.regex.Pattern;)
+java.util.Scanner#findAll(java.lang.String;)
+java.util.Enumeration#asIterator()
+java.beans.JavaBean
+java.beans.BeanProperty
+java.beans.PropertyDescriptor#PropertyDescriptor(java.util.Map.Entry<java.lang.String,com.sun.beans.introspect.PropertyInfo>;boolean;)
+java.beans.IndexedPropertyDescriptor#IndexedPropertyDescriptor(java.util.Map.Entry<java.lang.String,com.sun.beans.introspect.PropertyInfo>;boolean;)
+java.security.cert.URICertStoreParameters
+java.security.spec.EncodedKeySpec#EncodedKeySpec(byte[];java.lang.String;)
+java.security.spec.EncodedKeySpec#getAlgorithm()
+java.security.spec.X509EncodedKeySpec#X509EncodedKeySpec(byte[];java.lang.String;)
+java.security.spec.PKCS8EncodedKeySpec#PKCS8EncodedKeySpec(byte[];java.lang.String;)
+java.security.KeyStore#getInstance(java.io.File;char[];)
+java.security.KeyStore#getInstance(java.io.File;java.security.KeyStore.LoadStoreParameter;)
+java.security.KeyStore.Builder#newInstance(java.io.File;java.security.KeyStore.ProtectionParameter;)
+java.security.PermissionCollection#elementsAsStream()
+javax.xml.xpath.XPath#evaluateExpression(java.lang.String;java.lang.Object;java.lang.Class<T>;)
+javax.xml.xpath.XPath#evaluateExpression(java.lang.String;java.lang.Object;)
+javax.xml.xpath.XPath#evaluateExpression(java.lang.String;org.xml.sax.InputSource;java.lang.Class<T>;)
+javax.xml.xpath.XPath#evaluateExpression(java.lang.String;org.xml.sax.InputSource;)
+javax.xml.xpath.XPathNodes
+javax.xml.xpath.XPathExpression#evaluateExpression(java.lang.Object;java.lang.Class<T>;)
+javax.xml.xpath.XPathExpression#evaluateExpression(java.lang.Object;)
+javax.xml.xpath.XPathExpression#evaluateExpression(org.xml.sax.InputSource;java.lang.Class<T>;)
+javax.xml.xpath.XPathExpression#evaluateExpression(org.xml.sax.InputSource;)
+javax.xml.xpath.XPathEvaluationResult
+javax.lang.model.util.ElementScanner9
+javax.lang.model.util.TypeKindVisitor9
+javax.lang.model.util.ElementKindVisitor9
+javax.lang.model.util.AbstractTypeVisitor9
+javax.lang.model.util.SimpleElementVisitor9
+javax.lang.model.util.AbstractElementVisitor9
+javax.lang.model.util.SimpleAnnotationValueVisitor9
+javax.lang.model.util.AbstractAnnotationValueVisitor9
+javax.lang.model.SourceVersion#RELEASE_9
+javax.swing.JComponent#getUI()
+javax.swing.SwingContainer
+javax.tools.FileManagerUtils
+javax.tools.StandardJavaFileManager#getJavaFileObjectsFromPaths(java.lang.Iterable<? extends java.nio.file.Path>;)
+javax.tools.StandardJavaFileManager#getJavaFileObjects(java.nio.file.Path[];)
+javax.tools.StandardJavaFileManager#setLocationFromPaths(javax.tools.JavaFileManager.Location;java.lang.Iterable<? extends java.nio.file.Path>;)
+javax.tools.StandardJavaFileManager#getLocationAsPaths(javax.tools.JavaFileManager.Location;)
+javax.tools.StandardJavaFileManager#asPath(javax.tools.FileObject;)
+javax.security.auth.kerberos.EncryptionKey
+javax.security.auth.kerberos.KerberosCredMessage
+javax.management.ConstructorParameters
+javax.accessibility.AccessibilityProvider
\ No newline at end of file