8157847: Deprecate the java.security.acl API with forRemoval=true
Reviewed-by: weijun, mchung
--- a/jdk/src/java.base/share/classes/java/security/acl/Acl.java Fri Jul 01 11:42:26 2016 -0400
+++ b/jdk/src/java.base/share/classes/java/security/acl/Acl.java Fri Jul 01 14:29:18 2016 -0400
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2016, 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,9 +85,10 @@
*
* @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
+@Deprecated(since="9", forRemoval=true)
public interface Acl extends Owner {
/**
--- a/jdk/src/java.base/share/classes/java/security/acl/AclEntry.java Fri Jul 01 11:42:26 2016 -0400
+++ b/jdk/src/java.base/share/classes/java/security/acl/AclEntry.java Fri Jul 01 14:29:18 2016 -0400
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2016, 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,8 +53,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
+@Deprecated(since="9", forRemoval=true)
public interface AclEntry extends Cloneable {
/**
--- a/jdk/src/java.base/share/classes/java/security/acl/AclNotFoundException.java Fri Jul 01 11:42:26 2016 -0400
+++ b/jdk/src/java.base/share/classes/java/security/acl/AclNotFoundException.java Fri Jul 01 14:29:18 2016 -0400
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2016, 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,8 +33,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
+@Deprecated(since="9", forRemoval=true)
public class AclNotFoundException extends Exception {
private static final long serialVersionUID = 5684295034092681791L;
--- a/jdk/src/java.base/share/classes/java/security/acl/Group.java Fri Jul 01 11:42:26 2016 -0400
+++ b/jdk/src/java.base/share/classes/java/security/acl/Group.java Fri Jul 01 14:29:18 2016 -0400
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2016, 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,8 +42,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
+@Deprecated(since="9", forRemoval=true)
public interface Group extends Principal {
/**
--- a/jdk/src/java.base/share/classes/java/security/acl/LastOwnerException.java Fri Jul 01 11:42:26 2016 -0400
+++ b/jdk/src/java.base/share/classes/java/security/acl/LastOwnerException.java Fri Jul 01 14:29:18 2016 -0400
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2016, 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,8 +35,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
+@Deprecated(since="9", forRemoval=true)
public class LastOwnerException extends Exception {
private static final long serialVersionUID = -5141997548211140359L;
--- a/jdk/src/java.base/share/classes/java/security/acl/NotOwnerException.java Fri Jul 01 11:42:26 2016 -0400
+++ b/jdk/src/java.base/share/classes/java/security/acl/NotOwnerException.java Fri Jul 01 14:29:18 2016 -0400
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2016, 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,8 +34,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
+@Deprecated(since="9", forRemoval=true)
public class NotOwnerException extends Exception {
private static final long serialVersionUID = -5555597911163362399L;
--- a/jdk/src/java.base/share/classes/java/security/acl/Owner.java Fri Jul 01 11:42:26 2016 -0400
+++ b/jdk/src/java.base/share/classes/java/security/acl/Owner.java Fri Jul 01 14:29:18 2016 -0400
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2016, 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,8 +38,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
+@Deprecated(since="9", forRemoval=true)
public interface Owner {
/**
--- a/jdk/src/java.base/share/classes/java/security/acl/Permission.java Fri Jul 01 11:42:26 2016 -0400
+++ b/jdk/src/java.base/share/classes/java/security/acl/Permission.java Fri Jul 01 14:29:18 2016 -0400
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2016, 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,8 +34,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
+@Deprecated(since="9", forRemoval=true)
public interface Permission {
/**
--- a/jdk/src/java.base/share/classes/java/security/acl/package-info.java Fri Jul 01 11:42:26 2016 -0400
+++ b/jdk/src/java.base/share/classes/java/security/acl/package-info.java Fri Jul 01 14:29:18 2016 -0400
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2016, 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,7 +27,8 @@
* 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.
+ * and related classes for details. This package is subject to removal in a
+ * future version of Java SE.
*
* @since 1.1
*/