--- a/src/java.base/share/classes/sun/launcher/resources/launcher.properties	Wed May 22 10:11:04 2019 +0200
+++ b/src/java.base/share/classes/sun/launcher/resources/launcher.properties	Wed May 29 08:21:33 2019 -0400
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 2019, 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
@@ -166,6 +166,8 @@
 \                      configuration and continue\n\
 \    -Xss<size>        set java thread stack size\n\
 \    -Xverify          sets the mode of the bytecode verifier\n\
+\                      Note that option -Xverify:none is deprecated and\n\
+\                      may be removed in a future release.\n\
 \    --add-reads <module>=<target-module>(,<target-module>)*\n\
 \                      updates <module> to read <target-module>, regardless\n\
 \                      of module declaration. \n\

--- a/src/java.base/share/man/java.1	Wed May 22 10:11:04 2019 +0200
+++ b/src/java.base/share/man/java.1	Wed May 29 08:21:33 2019 -0400
@@ -1,5 +1,5 @@
 '\" t
-.\" Copyright (c) 1994, 2018, Oracle and/or its affiliates. All rights reserved.
+.\" Copyright (c) 1994, 2019, 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
@@ -1162,6 +1162,8 @@
 none
 .RS 4
 Do not verify the bytecode\&. This reduces startup time and also reduces the protection provided by Java\&.
+.sp
+This option is deprecated and may be removed in a future release.
 .RE
 .PP
 remote

--- a/src/java.base/share/native/libjli/java.c	Wed May 22 10:11:04 2019 +0200
+++ b/src/java.base/share/native/libjli/java.c	Wed May 29 08:21:33 2019 -0400
@@ -1437,6 +1437,10 @@
         } else if (JLI_StrCmp(arg, "-verifyremote") == 0) {
             AddOption("-Xverify:remote", NULL);
         } else if (JLI_StrCmp(arg, "-noverify") == 0) {
+            /*
+             * Note that no 'deprecated' message is needed here because the VM
+             * issues 'deprecated' messages for -noverify and -Xverify:none.
+             */
             AddOption("-Xverify:none", NULL);
         } else if (JLI_StrCCmp(arg, "-ss") == 0 ||
                    JLI_StrCCmp(arg, "-oss") == 0 ||