changeset 16641:93005a285d67

8173827: Remove forRemoval=true from several deprecated security APIs Reviewed-by: redestad, xuelei
author mullan
date Mon, 06 Feb 2017 08:59:00 -0500
parents 2719a1f55cd8
children d571f86c2762
files src/java.base/share/classes/com/sun/net/ssl/HostnameVerifier.java src/java.base/share/classes/com/sun/net/ssl/HttpsURLConnection.java src/java.base/share/classes/com/sun/net/ssl/KeyManager.java src/java.base/share/classes/com/sun/net/ssl/KeyManagerFactory.java src/java.base/share/classes/com/sun/net/ssl/KeyManagerFactorySpi.java src/java.base/share/classes/com/sun/net/ssl/SSLContext.java src/java.base/share/classes/com/sun/net/ssl/SSLContextSpi.java src/java.base/share/classes/com/sun/net/ssl/SSLPermission.java src/java.base/share/classes/com/sun/net/ssl/TrustManager.java src/java.base/share/classes/com/sun/net/ssl/TrustManagerFactory.java src/java.base/share/classes/com/sun/net/ssl/TrustManagerFactorySpi.java src/java.base/share/classes/com/sun/net/ssl/X509KeyManager.java src/java.base/share/classes/com/sun/net/ssl/X509TrustManager.java src/java.base/share/classes/com/sun/net/ssl/internal/ssl/Provider.java src/java.base/share/classes/com/sun/net/ssl/internal/ssl/X509ExtendedTrustManager.java src/java.base/share/classes/com/sun/net/ssl/internal/www/protocol/https/DelegateHttpsURLConnection.java src/java.base/share/classes/com/sun/net/ssl/internal/www/protocol/https/Handler.java src/java.base/share/classes/com/sun/net/ssl/internal/www/protocol/https/HttpsURLConnectionOldImpl.java src/java.base/share/classes/java/security/Certificate.java src/java.base/share/classes/java/security/Identity.java src/java.base/share/classes/java/security/IdentityScope.java src/java.base/share/classes/java/security/Signer.java src/java.base/share/classes/java/security/acl/Acl.java src/java.base/share/classes/java/security/acl/AclEntry.java src/java.base/share/classes/java/security/acl/AclNotFoundException.java src/java.base/share/classes/java/security/acl/Group.java src/java.base/share/classes/java/security/acl/LastOwnerException.java src/java.base/share/classes/java/security/acl/NotOwnerException.java src/java.base/share/classes/java/security/acl/Owner.java src/java.base/share/classes/java/security/acl/Permission.java src/java.base/share/classes/java/security/acl/package-info.java src/java.base/share/classes/javax/net/ssl/HandshakeCompletedEvent.java src/java.base/share/classes/javax/net/ssl/SSLSession.java src/java.base/share/classes/javax/security/auth/Policy.java src/java.base/share/classes/javax/security/cert/Certificate.java src/java.base/share/classes/javax/security/cert/CertificateEncodingException.java src/java.base/share/classes/javax/security/cert/CertificateException.java src/java.base/share/classes/javax/security/cert/CertificateExpiredException.java src/java.base/share/classes/javax/security/cert/CertificateNotYetValidException.java src/java.base/share/classes/javax/security/cert/CertificateParsingException.java src/java.base/share/classes/javax/security/cert/X509Certificate.java
diffstat 41 files changed, 95 insertions(+), 140 deletions(-) [+]
line wrap: on
line diff
--- a/src/java.base/share/classes/com/sun/net/ssl/HostnameVerifier.java	Mon Feb 06 11:07:09 2017 +0100
+++ b/src/java.base/share/classes/com/sun/net/ssl/HostnameVerifier.java	Mon Feb 06 08:59:00 2017 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2017, 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
@@ -38,9 +38,8 @@
  * @deprecated As of JDK 1.4, this implementation-specific class was
  *      replaced by {@link javax.net.ssl.HostnameVerifier} and
  *      {@link javax.net.ssl.CertificateHostnameVerifier}.
- *      This class is subject to removal in a future version of JDK.
  */
-@Deprecated(since="1.4", forRemoval=true)
+@Deprecated(since="1.4")
 public interface HostnameVerifier {
     /**
      * Verify that the hostname from the URL is an acceptable
--- a/src/java.base/share/classes/com/sun/net/ssl/HttpsURLConnection.java	Mon Feb 06 11:07:09 2017 +0100
+++ b/src/java.base/share/classes/com/sun/net/ssl/HttpsURLConnection.java	Mon Feb 06 08:59:00 2017 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2017, 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
@@ -44,9 +44,8 @@
  *
  * @deprecated As of JDK 1.4, this implementation-specific class was
  *      replaced by {@link javax.net.ssl.HttpsURLConnection}.
- *      This class is subject to removal in a future version of JDK.
  */
-@Deprecated(since="1.4", forRemoval=true)
+@Deprecated(since="1.4")
 public abstract
 class HttpsURLConnection extends HttpURLConnection
 {
--- a/src/java.base/share/classes/com/sun/net/ssl/KeyManager.java	Mon Feb 06 11:07:09 2017 +0100
+++ b/src/java.base/share/classes/com/sun/net/ssl/KeyManager.java	Mon Feb 06 08:59:00 2017 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2017, 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
@@ -36,8 +36,7 @@
  *
  * @deprecated As of JDK 1.4, this implementation-specific class was
  *      replaced by {@link javax.net.ssl.KeyManager}.
- *      This class is subject to removal in a future version of JDK.
  */
-@Deprecated(since="1.4", forRemoval=true)
+@Deprecated(since="1.4")
 public interface KeyManager {
 }
--- a/src/java.base/share/classes/com/sun/net/ssl/KeyManagerFactory.java	Mon Feb 06 11:07:09 2017 +0100
+++ b/src/java.base/share/classes/com/sun/net/ssl/KeyManagerFactory.java	Mon Feb 06 08:59:00 2017 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2017, 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
@@ -39,9 +39,8 @@
  *
  * @deprecated As of JDK 1.4, this implementation-specific class was
  *      replaced by {@link javax.net.ssl.KeyManagerFactory}.
- *      This class is subject to removal in a future version of JDK.
  */
-@Deprecated(since="1.4", forRemoval=true)
+@Deprecated(since="1.4")
 public class KeyManagerFactory {
     // The provider
     private Provider provider;
--- a/src/java.base/share/classes/com/sun/net/ssl/KeyManagerFactorySpi.java	Mon Feb 06 11:07:09 2017 +0100
+++ b/src/java.base/share/classes/com/sun/net/ssl/KeyManagerFactorySpi.java	Mon Feb 06 08:59:00 2017 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2017, 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
@@ -41,9 +41,8 @@
  *
  * @deprecated As of JDK 1.4, this implementation-specific class was
  *      replaced by {@link javax.net.ssl.KeyManagerFactorySpi}.
- *      This class is subject to removal in a future version of JDK.
  */
-@Deprecated(since="1.4", forRemoval=true)
+@Deprecated(since="1.4")
 public abstract class KeyManagerFactorySpi {
     /**
      * Initializes this factory with a source of key material. The
--- a/src/java.base/share/classes/com/sun/net/ssl/SSLContext.java	Mon Feb 06 11:07:09 2017 +0100
+++ b/src/java.base/share/classes/com/sun/net/ssl/SSLContext.java	Mon Feb 06 08:59:00 2017 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2017, 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
@@ -44,9 +44,8 @@
  *
  * @deprecated As of JDK 1.4, this implementation-specific class was
  *      replaced by {@link javax.net.ssl.SSLContext}.
- *      This class is subject to removal in a future version of JDK.
  */
-@Deprecated(since="1.4", forRemoval=true)
+@Deprecated(since="1.4")
 public class SSLContext {
     private Provider provider;
 
--- a/src/java.base/share/classes/com/sun/net/ssl/SSLContextSpi.java	Mon Feb 06 11:07:09 2017 +0100
+++ b/src/java.base/share/classes/com/sun/net/ssl/SSLContextSpi.java	Mon Feb 06 08:59:00 2017 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2017, 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
@@ -43,9 +43,8 @@
  *
  * @deprecated As of JDK 1.4, this implementation-specific class was
  *      replaced by {@link javax.net.ssl.SSLContextSpi}.
- *      This class is subject to removal in a future version of JDK.
  */
-@Deprecated(since="1.4", forRemoval=true)
+@Deprecated(since="1.4")
 public abstract class SSLContextSpi {
     /**
      * Initializes this context.
--- a/src/java.base/share/classes/com/sun/net/ssl/SSLPermission.java	Mon Feb 06 11:07:09 2017 +0100
+++ b/src/java.base/share/classes/com/sun/net/ssl/SSLPermission.java	Mon Feb 06 08:59:00 2017 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2017, 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
@@ -97,9 +97,8 @@
  *
  * @deprecated As of JDK 1.4, this implementation-specific class was
  *      replaced by {@link javax.net.ssl.SSLPermission}.
- *      This class is subject to removal in a future version of JDK.
  */
-@Deprecated(since="1.4", forRemoval=true)
+@Deprecated(since="1.4")
 public final class SSLPermission extends BasicPermission {
 
     private static final long serialVersionUID = -2583684302506167542L;
--- a/src/java.base/share/classes/com/sun/net/ssl/TrustManager.java	Mon Feb 06 11:07:09 2017 +0100
+++ b/src/java.base/share/classes/com/sun/net/ssl/TrustManager.java	Mon Feb 06 08:59:00 2017 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2017, 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
@@ -36,8 +36,7 @@
  *
  * @deprecated As of JDK 1.4, this implementation-specific class was
  *      replaced by {@link javax.net.ssl.TrustManager}.
- *      This class is subject to removal in a future version of JDK.
  */
-@Deprecated(since="1.4", forRemoval=true)
+@Deprecated(since="1.4")
 public interface TrustManager {
 }
--- a/src/java.base/share/classes/com/sun/net/ssl/TrustManagerFactory.java	Mon Feb 06 11:07:09 2017 +0100
+++ b/src/java.base/share/classes/com/sun/net/ssl/TrustManagerFactory.java	Mon Feb 06 08:59:00 2017 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2017, 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
@@ -39,9 +39,8 @@
  *
  * @deprecated As of JDK 1.4, this implementation-specific class was
  *      replaced by {@link javax.net.ssl.TrustManagerFactory}.
- *      This class is subject to removal in a future version of JDK.
  */
-@Deprecated(since="1.4", forRemoval=true)
+@Deprecated(since="1.4")
 public class TrustManagerFactory {
     // The provider
     private Provider provider;
--- a/src/java.base/share/classes/com/sun/net/ssl/TrustManagerFactorySpi.java	Mon Feb 06 11:07:09 2017 +0100
+++ b/src/java.base/share/classes/com/sun/net/ssl/TrustManagerFactorySpi.java	Mon Feb 06 08:59:00 2017 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2017, 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
@@ -41,9 +41,8 @@
  *
  * @deprecated As of JDK 1.4, this implementation-specific class was
  *      replaced by {@link javax.net.ssl.TrustManagerFactorySpi}.
- *      This class is subject to removal in a future version of JDK.
  */
-@Deprecated(since="1.4", forRemoval=true)
+@Deprecated(since="1.4")
 public abstract class TrustManagerFactorySpi {
     /**
      * Initializes this factory with a source of certificate
--- a/src/java.base/share/classes/com/sun/net/ssl/X509KeyManager.java	Mon Feb 06 11:07:09 2017 +0100
+++ b/src/java.base/share/classes/com/sun/net/ssl/X509KeyManager.java	Mon Feb 06 08:59:00 2017 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2017, 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
@@ -41,9 +41,8 @@
  *
  * @deprecated As of JDK 1.4, this implementation-specific class was
  *      replaced by {@link javax.net.ssl.X509KeyManager}.
- *      This class is subject to removal in a future version of JDK.
  */
-@Deprecated(since="1.4", forRemoval=true)
+@Deprecated(since="1.4")
 public interface X509KeyManager extends KeyManager {
     /**
      * Get the matching aliases for authenticating the client side of a secure
--- a/src/java.base/share/classes/com/sun/net/ssl/X509TrustManager.java	Mon Feb 06 11:07:09 2017 +0100
+++ b/src/java.base/share/classes/com/sun/net/ssl/X509TrustManager.java	Mon Feb 06 08:59:00 2017 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2017, 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
@@ -40,9 +40,8 @@
  *
  * @deprecated As of JDK 1.4, this implementation-specific class was
  *      replaced by {@link javax.net.ssl.X509TrustManager}.
- *      This class is subject to removal in a future version of JDK.
  */
-@Deprecated(since="1.4", forRemoval=true)
+@Deprecated(since="1.4")
 public interface X509TrustManager extends TrustManager {
     /**
      * Given the partial or complete certificate chain
--- a/src/java.base/share/classes/com/sun/net/ssl/internal/ssl/Provider.java	Mon Feb 06 11:07:09 2017 +0100
+++ b/src/java.base/share/classes/com/sun/net/ssl/internal/ssl/Provider.java	Mon Feb 06 08:59:00 2017 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2017, 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
@@ -31,10 +31,8 @@
  * Main class for the SunJSSE provider. The actual code was moved to the
  * class sun.security.ssl.SunJSSE, but for backward compatibility we
  * continue to use this class as the main Provider class.
- *
- * @deprecated This class is subject to removal in a future version of JDK.
  */
-@Deprecated(since="9", forRemoval=true)
+@Deprecated(since="9")
 public final class Provider extends SunJSSE {
 
     private static final long serialVersionUID = 3231825739635378733L;
--- a/src/java.base/share/classes/com/sun/net/ssl/internal/ssl/X509ExtendedTrustManager.java	Mon Feb 06 11:07:09 2017 +0100
+++ b/src/java.base/share/classes/com/sun/net/ssl/internal/ssl/X509ExtendedTrustManager.java	Mon Feb 06 08:59:00 2017 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2017, 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
@@ -54,9 +54,8 @@
  *
  * @since 1.6
  * @author Xuelei Fan
- * @deprecated This class is subject to removal in a future version of JDK.
  */
-@Deprecated(since="9", forRemoval=true)
+@Deprecated(since="9")
 public abstract class X509ExtendedTrustManager implements X509TrustManager {
     /**
      * Constructor used by subclasses only.
--- a/src/java.base/share/classes/com/sun/net/ssl/internal/www/protocol/https/DelegateHttpsURLConnection.java	Mon Feb 06 11:07:09 2017 +0100
+++ b/src/java.base/share/classes/com/sun/net/ssl/internal/www/protocol/https/DelegateHttpsURLConnection.java	Mon Feb 06 08:59:00 2017 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2017, 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
@@ -52,9 +52,8 @@
  * of protocol implementation (this one)
  * com.sun.net.ssl.HttpURLConnection is used in the com.sun version.
  *
- * @deprecated This class is subject to removal in a future version of JDK.
  */
-@Deprecated(since="9", forRemoval=true)
+@Deprecated(since="9")
 @SuppressWarnings("deprecation") // HttpsURLConnection is deprecated
 public class DelegateHttpsURLConnection extends AbstractDelegateHttpsURLConnection {
 
--- a/src/java.base/share/classes/com/sun/net/ssl/internal/www/protocol/https/Handler.java	Mon Feb 06 11:07:09 2017 +0100
+++ b/src/java.base/share/classes/com/sun/net/ssl/internal/www/protocol/https/Handler.java	Mon Feb 06 08:59:00 2017 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2017, 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
@@ -34,9 +34,8 @@
  * only. The HTTPS implementation can now be found in
  * sun.net.www.protocol.https.
  *
- * @deprecated This class is subject to removal in a future version of JDK.
  */
-@Deprecated(since="9", forRemoval=true)
+@Deprecated(since="9")
 public class Handler extends sun.net.www.protocol.https.Handler {
 
     public Handler() {
--- a/src/java.base/share/classes/com/sun/net/ssl/internal/www/protocol/https/HttpsURLConnectionOldImpl.java	Mon Feb 06 11:07:09 2017 +0100
+++ b/src/java.base/share/classes/com/sun/net/ssl/internal/www/protocol/https/HttpsURLConnectionOldImpl.java	Mon Feb 06 08:59:00 2017 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2017, 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
@@ -60,13 +60,12 @@
  * needs to implement all public methods in it's super class and all
  * the way to Object.
  *
- * @deprecated This class is subject to removal in a future version of JDK.
  */
 
 // For both copies of the file, uncomment one line and comment the other
 // public class HttpsURLConnectionImpl
 //      extends javax.net.ssl.HttpsURLConnection {
-@Deprecated(since="9", forRemoval=true)
+@Deprecated(since="9")
 @SuppressWarnings("deprecation") // HttpsURLConnection is deprecated
 public class HttpsURLConnectionOldImpl
         extends com.sun.net.ssl.HttpsURLConnection {
--- a/src/java.base/share/classes/java/security/Certificate.java	Mon Feb 06 11:07:09 2017 +0100
+++ b/src/java.base/share/classes/java/security/Certificate.java	Mon Feb 06 08:59:00 2017 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2017, 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
@@ -60,10 +60,9 @@
  *             This Certificate interface is entirely deprecated and
  *             is here to allow for a smooth transition to the new
  *             package.
- *             This class is subject to removal in a future version of Java SE.
  * @see java.security.cert.Certificate
  */
-@Deprecated(since="1.2", forRemoval=true)
+@Deprecated(since="1.2")
 public interface Certificate {
 
     /**
--- a/src/java.base/share/classes/java/security/Identity.java	Mon Feb 06 11:07:09 2017 +0100
+++ b/src/java.base/share/classes/java/security/Identity.java	Mon Feb 06 08:59:00 2017 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2017, 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
@@ -52,12 +52,11 @@
  *
  * @author Benjamin Renaud
  * @deprecated This class is no longer used. Its functionality has been
- * replaced by {@link java.security.KeyStore}, the
- * {@link java.security.cert} package, and
- * {@link java.security.Principal}.
- * This class is subject to removal in a future version of Java SE.
+ * replaced by {@code java.security.KeyStore}, the
+ * {@code java.security.cert} package, and
+ * {@code java.security.Principal}.
  */
-@Deprecated(since="1.2", forRemoval=true)
+@Deprecated(since="1.2")
 public abstract class Identity implements Principal, Serializable {
 
     /** use serialVersionUID from JDK 1.1.x for interoperability */
--- a/src/java.base/share/classes/java/security/IdentityScope.java	Mon Feb 06 11:07:09 2017 +0100
+++ b/src/java.base/share/classes/java/security/IdentityScope.java	Mon Feb 06 08:59:00 2017 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2017, 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
@@ -57,15 +57,11 @@
  * @author Benjamin Renaud
  *
  * @deprecated This class is no longer used. Its functionality has been
- * replaced by {@link java.security.KeyStore}, the
- * {@link java.security.cert} package, and
- * {@link java.security.Principal}.
- * This class is subject to removal in a future version of Java SE.
- *
- * Note that the security property {@code policy.ignoreIdentityScope}
- * is only applicable to these APIs and is also a candidate for removal.
+ * replaced by {@code java.security.KeyStore}, the
+ * {@code java.security.cert} package, and
+ * {@code java.security.Principal}.
  */
-@Deprecated(since="1.2", forRemoval=true)
+@Deprecated(since="1.2")
 public abstract
 class IdentityScope extends Identity {
 
--- a/src/java.base/share/classes/java/security/Signer.java	Mon Feb 06 11:07:09 2017 +0100
+++ b/src/java.base/share/classes/java/security/Signer.java	Mon Feb 06 08:59:00 2017 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2017, 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
@@ -40,12 +40,11 @@
  * @author Benjamin Renaud
  *
  * @deprecated This class is no longer used. Its functionality has been
- * replaced by {@link java.security.KeyStore}, the
- * {@link java.security.cert} package, and
- * {@link java.security.Principal}.
- * This class is subject to removal in a future version of Java SE.
+ * replaced by {@code java.security.KeyStore}, the
+ * {@code java.security.cert} package, and
+ * {@code java.security.Principal}.
  */
-@Deprecated(since="1.2", forRemoval=true)
+@Deprecated(since="1.2")
 public abstract class Signer extends Identity {
 
     private static final long serialVersionUID = -1763464102261361480L;
--- a/src/java.base/share/classes/java/security/acl/Acl.java	Mon Feb 06 11:07:09 2017 +0100
+++ b/src/java.base/share/classes/java/security/acl/Acl.java	Mon Feb 06 08:59:00 2017 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2017, 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
@@ -85,10 +85,9 @@
  *
  * @deprecated This package has been replaced by {@code java.security.Policy}
  *      and related classes since 1.2.
- *      This class is subject to removal in a future version of Java SE.
  */
 
-@Deprecated(since="9", forRemoval=true)
+@Deprecated(since="9")
 public interface Acl extends Owner {
 
     /**
--- a/src/java.base/share/classes/java/security/acl/AclEntry.java	Mon Feb 06 11:07:09 2017 +0100
+++ b/src/java.base/share/classes/java/security/acl/AclEntry.java	Mon Feb 06 08:59:00 2017 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2017, 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
@@ -53,9 +53,8 @@
  *
  * @deprecated This package has been replaced by {@code java.security.Policy}
  *      and related classes since 1.2.
- *      This class is subject to removal in a future version of Java SE.
  */
-@Deprecated(since="9", forRemoval=true)
+@Deprecated(since="9")
 public interface AclEntry extends Cloneable {
 
     /**
--- a/src/java.base/share/classes/java/security/acl/AclNotFoundException.java	Mon Feb 06 11:07:09 2017 +0100
+++ b/src/java.base/share/classes/java/security/acl/AclNotFoundException.java	Mon Feb 06 08:59:00 2017 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2017, 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
@@ -33,9 +33,8 @@
  *
  * @deprecated This package has been replaced by {@code java.security.Policy}
  *      and related classes since 1.2.
- *      This class is subject to removal in a future version of Java SE.
  */
-@Deprecated(since="9", forRemoval=true)
+@Deprecated(since="9")
 public class AclNotFoundException extends Exception {
 
     private static final long serialVersionUID = 5684295034092681791L;
--- a/src/java.base/share/classes/java/security/acl/Group.java	Mon Feb 06 11:07:09 2017 +0100
+++ b/src/java.base/share/classes/java/security/acl/Group.java	Mon Feb 06 08:59:00 2017 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2017, 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
@@ -42,9 +42,8 @@
  *
  * @deprecated This package has been replaced by {@code java.security.Policy}
  *      and related classes since 1.2.
- *      This class is subject to removal in a future version of Java SE.
  */
-@Deprecated(since="9", forRemoval=true)
+@Deprecated(since="9")
 public interface Group extends Principal {
 
     /**
--- a/src/java.base/share/classes/java/security/acl/LastOwnerException.java	Mon Feb 06 11:07:09 2017 +0100
+++ b/src/java.base/share/classes/java/security/acl/LastOwnerException.java	Mon Feb 06 08:59:00 2017 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2017, 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
@@ -35,9 +35,8 @@
  *
  * @deprecated This package has been replaced by {@code java.security.Policy}
  *      and related classes since 1.2.
- *      This class is subject to removal in a future version of Java SE.
  */
-@Deprecated(since="9", forRemoval=true)
+@Deprecated(since="9")
 public class LastOwnerException extends Exception {
 
     private static final long serialVersionUID = -5141997548211140359L;
--- a/src/java.base/share/classes/java/security/acl/NotOwnerException.java	Mon Feb 06 11:07:09 2017 +0100
+++ b/src/java.base/share/classes/java/security/acl/NotOwnerException.java	Mon Feb 06 08:59:00 2017 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2017, 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
@@ -34,9 +34,8 @@
  *
  * @deprecated This package has been replaced by {@code java.security.Policy}
  *      and related classes since 1.2.
- *      This class is subject to removal in a future version of Java SE.
  */
-@Deprecated(since="9", forRemoval=true)
+@Deprecated(since="9")
 public class NotOwnerException extends Exception {
 
     private static final long serialVersionUID = -5555597911163362399L;
--- a/src/java.base/share/classes/java/security/acl/Owner.java	Mon Feb 06 11:07:09 2017 +0100
+++ b/src/java.base/share/classes/java/security/acl/Owner.java	Mon Feb 06 08:59:00 2017 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2017, 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
@@ -38,9 +38,8 @@
  *
  * @deprecated This package has been replaced by {@code java.security.Policy}
  *      and related classes since 1.2.
- *      This class is subject to removal in a future version of Java SE.
  */
-@Deprecated(since="9", forRemoval=true)
+@Deprecated(since="9")
 public interface Owner {
 
     /**
--- a/src/java.base/share/classes/java/security/acl/Permission.java	Mon Feb 06 11:07:09 2017 +0100
+++ b/src/java.base/share/classes/java/security/acl/Permission.java	Mon Feb 06 08:59:00 2017 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2017, 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
@@ -34,9 +34,8 @@
  *
  * @deprecated This package has been replaced by {@code java.security.Policy}
  *      and related classes since 1.2.
- *      This class is subject to removal in a future version of Java SE.
  */
-@Deprecated(since="9", forRemoval=true)
+@Deprecated(since="9")
 public interface Permission {
 
     /**
--- a/src/java.base/share/classes/java/security/acl/package-info.java	Mon Feb 06 11:07:09 2017 +0100
+++ b/src/java.base/share/classes/java/security/acl/package-info.java	Mon Feb 06 08:59:00 2017 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2017, 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
@@ -27,8 +27,7 @@
  * The classes and interfaces in this package have been deprecated. New
  * classes should not be added to this package. The {@code java.security}
  * package contains suitable replacements. See {@link java.security.Policy}
- * and related classes for details. This package is subject to removal in a
- * future version of Java SE.
+ * and related classes for details.
  *
  * @since 1.1
  */
--- a/src/java.base/share/classes/javax/net/ssl/HandshakeCompletedEvent.java	Mon Feb 06 11:07:09 2017 +0100
+++ b/src/java.base/share/classes/javax/net/ssl/HandshakeCompletedEvent.java	Mon Feb 06 08:59:00 2017 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2017, 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
@@ -159,11 +159,10 @@
      * @exception SSLPeerUnverifiedException if the peer is not verified.
      * @see #getPeerPrincipal()
      * @deprecated The {@link #getPeerCertificates()} method that returns an
-     *          array of {@code java.security.cert.Certificate} should
-     *          be used instead.  This method is subject to removal in
-     *          a future version of Java SE.
+     *               array of {@code java.security.cert.Certificate} should
+     *               be used instead.
      */
-    @Deprecated(since="9", forRemoval=true)
+    @Deprecated(since="9")
     public javax.security.cert.X509Certificate [] getPeerCertificateChain()
             throws SSLPeerUnverifiedException
     {
--- a/src/java.base/share/classes/javax/net/ssl/SSLSession.java	Mon Feb 06 11:07:09 2017 +0100
+++ b/src/java.base/share/classes/javax/net/ssl/SSLSession.java	Mon Feb 06 08:59:00 2017 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2017, 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
@@ -279,11 +279,10 @@
      *          has not been verified
      * @see #getPeerPrincipal()
      * @deprecated The {@link #getPeerCertificates()} method that returns an
-     *          array of {@code java.security.cert.Certificate} should
-     *          be used instead.  This method is subject to removal in
-     *          a future version of Java SE.
+     *               array of {@code java.security.cert.Certificate} should
+     *               be used instead.
      */
-    @Deprecated(since="9", forRemoval=true)
+    @Deprecated(since="9")
     public javax.security.cert.X509Certificate [] getPeerCertificateChain()
             throws SSLPeerUnverifiedException;
 
--- a/src/java.base/share/classes/javax/security/auth/Policy.java	Mon Feb 06 11:07:09 2017 +0100
+++ b/src/java.base/share/classes/javax/security/auth/Policy.java	Mon Feb 06 08:59:00 2017 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2017, 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
@@ -152,11 +152,10 @@
  *
  * These two APIs provide callers the means to query the
  * Policy for Principal-based Permission entries.
- * This class is subject to removal in a future version of Java SE.
  *
  * @see java.security.Security security properties
  */
-@Deprecated(since="1.4", forRemoval=true)
+@Deprecated(since="1.4")
 public abstract class Policy {
 
     private static Policy policy;
--- a/src/java.base/share/classes/javax/security/cert/Certificate.java	Mon Feb 06 11:07:09 2017 +0100
+++ b/src/java.base/share/classes/javax/security/cert/Certificate.java	Mon Feb 06 08:59:00 2017 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2017, 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
@@ -58,11 +58,10 @@
  * @since 1.4
  * @see X509Certificate
  * @deprecated Use the classes in {@code java.security.cert} instead.
- *      This class is subject to removal in a future version of Java SE.
  *
  * @author Hemma Prafullchandra
  */
-@Deprecated(since="9", forRemoval=true)
+@Deprecated(since="9")
 public abstract class Certificate {
 
     /**
--- a/src/java.base/share/classes/javax/security/cert/CertificateEncodingException.java	Mon Feb 06 11:07:09 2017 +0100
+++ b/src/java.base/share/classes/javax/security/cert/CertificateEncodingException.java	Mon Feb 06 08:59:00 2017 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2017, 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
@@ -39,9 +39,8 @@
  * @since 1.4
  * @author Hemma Prafullchandra
  * @deprecated Use the classes in {@code java.security.cert} instead.
- *      This class is subject to removal in a future version of Java SE.
  */
-@Deprecated(since="9", forRemoval=true)
+@Deprecated(since="9")
 public class CertificateEncodingException extends CertificateException {
 
     private static final long serialVersionUID = -8187642723048403470L;
--- a/src/java.base/share/classes/javax/security/cert/CertificateException.java	Mon Feb 06 11:07:09 2017 +0100
+++ b/src/java.base/share/classes/javax/security/cert/CertificateException.java	Mon Feb 06 08:59:00 2017 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2017, 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
@@ -39,9 +39,8 @@
  * @since 1.4
  * @see Certificate
  * @deprecated Use the classes in {@code java.security.cert} instead.
- *      This class is subject to removal in a future version of Java SE.
  */
-@Deprecated(since="9", forRemoval=true)
+@Deprecated(since="9")
 public class CertificateException extends Exception {
 
     private static final long serialVersionUID = -5757213374030785290L;
--- a/src/java.base/share/classes/javax/security/cert/CertificateExpiredException.java	Mon Feb 06 11:07:09 2017 +0100
+++ b/src/java.base/share/classes/javax/security/cert/CertificateExpiredException.java	Mon Feb 06 08:59:00 2017 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2017, 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
@@ -41,9 +41,8 @@
  * @since 1.4
  * @author Hemma Prafullchandra
  * @deprecated Use the classes in {@code java.security.cert} instead.
- *      This class is subject to removal in a future version of Java SE.
  */
-@Deprecated(since="9", forRemoval=true)
+@Deprecated(since="9")
 public class CertificateExpiredException extends CertificateException {
 
     private static final long serialVersionUID = 5091601212177261883L;
--- a/src/java.base/share/classes/javax/security/cert/CertificateNotYetValidException.java	Mon Feb 06 11:07:09 2017 +0100
+++ b/src/java.base/share/classes/javax/security/cert/CertificateNotYetValidException.java	Mon Feb 06 08:59:00 2017 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2017, 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
@@ -41,9 +41,8 @@
  * @since 1.4
  * @author Hemma Prafullchandra
  * @deprecated Use the classes in {@code java.security.cert} instead.
- *      This class is subject to removal in a future version of Java SE.
  */
-@Deprecated(since="9", forRemoval=true)
+@Deprecated(since="9")
 public class CertificateNotYetValidException extends CertificateException {
 
     private static final long serialVersionUID = -8976172474266822818L;
--- a/src/java.base/share/classes/javax/security/cert/CertificateParsingException.java	Mon Feb 06 11:07:09 2017 +0100
+++ b/src/java.base/share/classes/javax/security/cert/CertificateParsingException.java	Mon Feb 06 08:59:00 2017 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2017, 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
@@ -40,9 +40,8 @@
  * @since 1.4
  * @author Hemma Prafullchandra
  * @deprecated Use the classes in {@code java.security.cert} instead.
- *      This class is subject to removal in a future version of Java SE.
  */
-@Deprecated(since="9", forRemoval=true)
+@Deprecated(since="9")
 public class CertificateParsingException extends CertificateException {
 
     private static final long serialVersionUID = -8449352422951136229L;
--- a/src/java.base/share/classes/javax/security/cert/X509Certificate.java	Mon Feb 06 11:07:09 2017 +0100
+++ b/src/java.base/share/classes/javax/security/cert/X509Certificate.java	Mon Feb 06 08:59:00 2017 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2017, 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
@@ -125,9 +125,8 @@
  * @see java.security.cert.X509Extension
  * @see java.security.Security security properties
  * @deprecated Use the classes in {@code java.security.cert} instead.
- *      This class is subject to removal in a future version of Java SE.
  */
-@Deprecated(since="9", forRemoval=true)
+@Deprecated(since="9")
 public abstract class X509Certificate extends Certificate {
 
     /*