--- a/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/PolicyFile.java	Fri Jun 17 09:46:27 2016 +0800
+++ b/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/PolicyFile.java	Fri Jun 17 09:46:34 2016 +0800
@@ -209,13 +209,14 @@
  * @deprecated As of JDK 1.4, replaced by
  *             {@code sun.security.provider.PolicyFile}.
  *             This class is entirely deprecated.
+ * This class is subject to removal in a future version of Java SE.
  *
  * @see java.security.CodeSource
  * @see java.security.Permissions
  * @see java.security.ProtectionDomain
  * @see java.security.Security security properties
  */
-@Deprecated
+@Deprecated(since="1.4", forRemoval=true)
 public class PolicyFile extends javax.security.auth.Policy {
 
     private final sun.security.provider.AuthPolicyFile apf;

--- a/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/SolarisNumericGroupPrincipal.java	Fri Jun 17 09:46:27 2016 +0800
+++ b/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/SolarisNumericGroupPrincipal.java	Fri Jun 17 09:46:34 2016 +0800
@@ -41,11 +41,12 @@
  * @deprecated As of JDK 1.4, replaced by
  *             {@link UnixNumericGroupPrincipal}.
  *             This class is entirely deprecated.
+ * This class is subject to removal in a future version of Java SE.
  *
  * @see java.security.Principal
  * @see javax.security.auth.Subject
  */
-@Deprecated
+@Deprecated(since="1.4", forRemoval=true)
 public class SolarisNumericGroupPrincipal implements
                                         Principal,
                                         java.io.Serializable {

--- a/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/SolarisNumericUserPrincipal.java	Fri Jun 17 09:46:27 2016 +0800
+++ b/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/SolarisNumericUserPrincipal.java	Fri Jun 17 09:46:34 2016 +0800
@@ -40,11 +40,12 @@
  * @deprecated As of JDK 1.4, replaced by
  *             {@link UnixNumericUserPrincipal}.
  *             This class is entirely deprecated.
+ * This class is subject to removal in a future version of Java SE.
  *
  * @see java.security.Principal
  * @see javax.security.auth.Subject
  */
-@Deprecated
+@Deprecated(since="1.4", forRemoval=true)
 public class SolarisNumericUserPrincipal implements
                                         Principal,
                                         java.io.Serializable {

--- a/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/SolarisPrincipal.java	Fri Jun 17 09:46:27 2016 +0800
+++ b/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/SolarisPrincipal.java	Fri Jun 17 09:46:34 2016 +0800
@@ -41,10 +41,11 @@
  * @deprecated As of JDK 1.4, replaced by
  *             {@link UnixPrincipal}.
  *             This class is entirely deprecated.
+ * This class is subject to removal in a future version of Java SE.
  * @see java.security.Principal
  * @see javax.security.auth.Subject
  */
-@Deprecated
+@Deprecated(since="1.4", forRemoval=true)
 public class SolarisPrincipal implements Principal, java.io.Serializable {
 
     private static final long serialVersionUID = -7840670002439379038L;

--- a/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/X500Principal.java	Fri Jun 17 09:46:27 2016 +0800
+++ b/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/X500Principal.java	Fri Jun 17 09:46:34 2016 +0800
@@ -47,9 +47,10 @@
  *             This X500Principal classs is entirely deprecated and
  *             is here to allow for a smooth transition to the new
  *             class.
+ * This class is subject to removal in a future version of Java SE.
  * @see javax.security.auth.x500.X500Principal
 */
-@Deprecated
+@Deprecated(since="1.4", forRemoval=true)
 public class X500Principal implements Principal, java.io.Serializable {
 
     private static final long serialVersionUID = -8222422609431628648L;

--- a/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/module/SolarisLoginModule.java	Fri Jun 17 09:46:27 2016 +0800
+++ b/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/module/SolarisLoginModule.java	Fri Jun 17 09:46:34 2016 +0800
@@ -50,9 +50,10 @@
  *             This LoginModule is entirely deprecated and
  *             is here to allow for a smooth transition to the new
  *             UnixLoginModule.
+ * This class is subject to removal in a future version of Java SE.
  *
  */
-@Deprecated
+@Deprecated(since="1.4", forRemoval=true)
 public class SolarisLoginModule implements LoginModule {
 
     // initial state

--- a/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/module/SolarisSystem.java	Fri Jun 17 09:46:27 2016 +0800
+++ b/jdk/src/jdk.security.auth/share/classes/com/sun/security/auth/module/SolarisSystem.java	Fri Jun 17 09:46:34 2016 +0800
@@ -30,8 +30,9 @@
  * UID/GID/groups information for the current user.
  *
  * @deprecated replaced by {@link UnixSystem}.
+ * This class is subject to removal in a future version of Java SE.
  */
-@Deprecated
+@Deprecated(since="1.4", forRemoval=true)
 public class SolarisSystem {
 
     private native void getSolarisInfo();