You are viewing a plain text version of this content. The canonical link for it is here.
Posted to derby-commits@db.apache.org by rh...@apache.org on 2021/06/18 18:10:01 UTC

svn commit: r1890895 [3/5] - in /db/derby/code/trunk: ./ java/org.apache.derby.client/org/apache/derby/client/ java/org.apache.derby.client/org/apache/derby/client/am/ java/org.apache.derby.client/org/apache/derby/client/net/ java/org.apache.derby.comm...

Modified: db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/JarUtil.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/JarUtil.java?rev=1890895&r1=1890894&r2=1890895&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/JarUtil.java (original)
+++ db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/impl/sql/execute/JarUtil.java Fri Jun 18 18:09:58 2021
@@ -357,6 +357,8 @@ public class JarUtil
      * to attempt the URL first and only attempt a file open if creating
      * the URL throws a MalformedURLException.
      */
+    // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
+    @SuppressWarnings("removal")
     private static InputStream openJarURL(final String externalPath)
         throws IOException
     {
@@ -386,6 +388,8 @@ public class JarUtil
      * @param add true to add, false to replace
      * @param currentGenerationId generation id of existing version, ignored when adding.
      */
+    // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
+    @SuppressWarnings("removal")
     private long setJar(final String jarExternalName,
             final InputStream contents,
             final boolean add,
@@ -506,6 +510,8 @@ public class JarUtil
      * Privileged lookup of a Context. Must be private so that user code
      * can't call this entry point.
      */
+    // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
+    @SuppressWarnings("removal")
     private  static  Context    getContextOrNull( final String contextID )
     {
         if ( System.getSecurityManager() == null )

Modified: db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/impl/store/access/PropertyConglomerate.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/impl/store/access/PropertyConglomerate.java?rev=1890895&r1=1890894&r2=1890895&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/impl/store/access/PropertyConglomerate.java (original)
+++ db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/impl/store/access/PropertyConglomerate.java Fri Jun 18 18:09:58 2021
@@ -788,6 +788,8 @@ class PropertyConglomerate
      * Privileged startup. Must be private so that user code
      * can't call this entry point.
      */
+    // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
+    @SuppressWarnings("removal")
     private  static  Object findServiceModule( final Object serviceModule, final String factoryInterface)
         throws StandardException
     {

Modified: db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/impl/store/access/RAMAccessManager.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/impl/store/access/RAMAccessManager.java?rev=1890895&r1=1890894&r2=1890895&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/impl/store/access/RAMAccessManager.java (original)
+++ db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/impl/store/access/RAMAccessManager.java Fri Jun 18 18:09:58 2021
@@ -1287,6 +1287,8 @@ public abstract class RAMAccessManager
      * Privileged lookup of the ContextService. Must be private so that user code
      * can't call this entry point.
      */
+    // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
+    @SuppressWarnings("removal")
     private static  ContextService    getContextService()
     {
         if ( System.getSecurityManager() == null )
@@ -1312,6 +1314,8 @@ public abstract class RAMAccessManager
      * Privileged lookup of a Context. Must be private so that user code
      * can't call this entry point.
      */
+    // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
+    @SuppressWarnings("removal")
     private  static  Context    getContext( final String contextID )
     {
         return AccessController.doPrivileged
@@ -1331,6 +1335,8 @@ public abstract class RAMAccessManager
      * Privileged Monitor lookup. Must be private so that user code
      * can't call this entry point.
      */
+    // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
+    @SuppressWarnings("removal")
     private  static  ModuleFactory  getMonitor()
     {
         return AccessController.doPrivileged
@@ -1350,6 +1356,8 @@ public abstract class RAMAccessManager
      * Privileged startup. Must be private so that user code
      * can't call this entry point.
      */
+    // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
+    @SuppressWarnings("removal")
     private  static  Object  startSystemModule( final String factoryInterface )
         throws StandardException
     {
@@ -1375,6 +1383,8 @@ public abstract class RAMAccessManager
      * Privileged startup. Must be private so that user code
      * can't call this entry point.
      */
+    // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
+    @SuppressWarnings("removal")
     private  static  Object bootServiceModule
         (
          final boolean create, final Object serviceModule,
@@ -1405,6 +1415,8 @@ public abstract class RAMAccessManager
      * Privileged startup. Must be private so that user code
      * can't call this entry point.
      */
+    // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
+    @SuppressWarnings("removal")
     private  static  Object bootServiceModule
         (
          final boolean create, final Object serviceModule,
@@ -1434,6 +1446,8 @@ public abstract class RAMAccessManager
      * Privileged startup. Must be private so that user code
      * can't call this entry point.
      */
+    // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
+    @SuppressWarnings("removal")
     private  static  Object findServiceModule( final Object serviceModule, final String factoryInterface)
         throws StandardException
     {

Modified: db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/impl/store/access/btree/index/B2IFactory.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/impl/store/access/btree/index/B2IFactory.java?rev=1890895&r1=1890894&r2=1890895&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/impl/store/access/btree/index/B2IFactory.java (original)
+++ db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/impl/store/access/btree/index/B2IFactory.java Fri Jun 18 18:09:58 2021
@@ -376,6 +376,8 @@ public class B2IFactory implements Congl
      * Privileged Monitor lookup. Must be private so that user code
      * can't call this entry point.
      */
+    // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
+    @SuppressWarnings("removal")
     private  static  ModuleFactory  getMonitor()
     {
         return AccessController.doPrivileged

Modified: db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/impl/store/access/heap/HeapConglomerateFactory.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/impl/store/access/heap/HeapConglomerateFactory.java?rev=1890895&r1=1890894&r2=1890895&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/impl/store/access/heap/HeapConglomerateFactory.java (original)
+++ db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/impl/store/access/heap/HeapConglomerateFactory.java Fri Jun 18 18:09:58 2021
@@ -375,6 +375,8 @@ public class HeapConglomerateFactory imp
      * Privileged Monitor lookup. Must be private so that user code
      * can't call this entry point.
      */
+    // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
+    @SuppressWarnings("removal")
     private  static  ModuleFactory  getMonitor()
     {
         return AccessController.doPrivileged

Modified: db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/impl/store/access/sort/ExternalSortFactory.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/impl/store/access/sort/ExternalSortFactory.java?rev=1890895&r1=1890894&r2=1890895&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/impl/store/access/sort/ExternalSortFactory.java (original)
+++ db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/impl/store/access/sort/ExternalSortFactory.java Fri Jun 18 18:09:58 2021
@@ -395,6 +395,8 @@ public class ExternalSortFactory impleme
      * Privileged Monitor lookup. Must be private so that user code
      * can't call this entry point.
      */
+    // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
+    @SuppressWarnings("removal")
     private  static  ModuleFactory  getMonitor()
     {
         return AccessController.doPrivileged

Modified: db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/RawStore.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/RawStore.java?rev=1890895&r1=1890894&r2=1890895&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/RawStore.java (original)
+++ db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/RawStore.java Fri Jun 18 18:09:58 2021
@@ -2347,6 +2347,8 @@ public final class RawStore implements R
         These methods require Priv Blocks when run under a security manager.
     */
 
+    // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
+    @SuppressWarnings("removal")
 	private synchronized OutputStreamWriter privFileWriter( StorageFile fileName, boolean append) throws IOException
 	{
         actionCode = FILE_WRITER_ACTION;
@@ -2364,6 +2366,8 @@ public final class RawStore implements R
         }
 	}
 
+    // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
+    @SuppressWarnings("removal")
 	private synchronized boolean privExists( File file)
     {
         actionCode = REGULAR_FILE_EXISTS_ACTION;
@@ -2381,6 +2385,8 @@ public final class RawStore implements R
         }
     }
 
+    // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
+    @SuppressWarnings("removal")
 	private synchronized boolean privExists(final StorageFile file)
     {
         actionCode = STORAGE_FILE_EXISTS_ACTION;
@@ -2398,6 +2404,8 @@ public final class RawStore implements R
         }
     }
 
+    // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
+    @SuppressWarnings("removal")
     private synchronized OutputStreamWriter privGetOutputStreamWriter(StorageFile file)
         throws IOException
     {
@@ -2413,6 +2421,8 @@ public final class RawStore implements R
         }
     }
 
+    // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
+    @SuppressWarnings("removal")
     private synchronized boolean privDelete( File file)
     {
         actionCode = REGULAR_FILE_DELETE_ACTION;
@@ -2430,6 +2440,8 @@ public final class RawStore implements R
         }
     }
 
+    // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
+    @SuppressWarnings("removal")
     private synchronized boolean privDelete(StorageFile file)
     {
         actionCode = STORAGE_FILE_DELETE_ACTION;
@@ -2449,6 +2461,8 @@ public final class RawStore implements R
 
 
 
+    // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
+    @SuppressWarnings("removal")
     private synchronized boolean privMkdirs(File file) throws IOException
     {
         actionCode = REGULAR_FILE_MKDIRS_ACTION;
@@ -2469,6 +2483,8 @@ public final class RawStore implements R
     }
 
 
+    // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
+    @SuppressWarnings("removal")
     private synchronized boolean privIsDirectory( File file)
     {
         actionCode = REGULAR_FILE_IS_DIRECTORY_ACTION;
@@ -2486,6 +2502,8 @@ public final class RawStore implements R
         }
     }
 
+    // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
+    @SuppressWarnings("removal")
     private synchronized boolean privRemoveDirectory( File file)
     {
         actionCode = REGULAR_FILE_REMOVE_DIRECTORY_ACTION;
@@ -2503,6 +2521,8 @@ public final class RawStore implements R
         }
     }
 
+    // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
+    @SuppressWarnings("removal")
     private synchronized boolean privRenameTo( File file1, File file2)
     {
         actionCode = REGULAR_FILE_RENAME_TO_ACTION;
@@ -2522,6 +2542,8 @@ public final class RawStore implements R
         }
     }
 
+    // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
+    @SuppressWarnings("removal")
     private synchronized boolean privCopyDirectory(StorageFile from, 
                                                    File to, 
                                                    byte[] buffer, 
@@ -2554,6 +2576,8 @@ public final class RawStore implements R
     }
 
 
+    // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
+    @SuppressWarnings("removal")
     private synchronized boolean privCopyDirectory( File from, StorageFile to, byte[] buffer, String[] filter)
     {
         actionCode = COPY_REGULAR_DIRECTORY_TO_STORAGE_ACTION;
@@ -2578,6 +2602,8 @@ public final class RawStore implements R
     }
 
 	
+    // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
+    @SuppressWarnings("removal")
     private synchronized boolean privCopyFile( File from, StorageFile to)
     {
         actionCode = COPY_REGULAR_FILE_TO_STORAGE_ACTION;
@@ -2597,6 +2623,8 @@ public final class RawStore implements R
         }
     }
 
+    // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
+    @SuppressWarnings("removal")
     private synchronized boolean privCopyFile( StorageFile from, File to)
             throws StandardException
     {
@@ -2621,6 +2649,8 @@ public final class RawStore implements R
 
 
     
+    // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
+    @SuppressWarnings("removal")
     private synchronized boolean privCopyFile( StorageFile from, StorageFile to)
     {
         actionCode = COPY_STORAGE_FILE_TO_STORAGE_ACTION;
@@ -2641,6 +2671,8 @@ public final class RawStore implements R
     }
 
 
+    // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
+    @SuppressWarnings("removal")
     private synchronized String[] privList(final StorageFile file)
     {
         actionCode = STORAGE_FILE_LIST_DIRECTORY_ACTION;
@@ -2658,6 +2690,8 @@ public final class RawStore implements R
     }
 
 
+    // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
+    @SuppressWarnings("removal")
     private synchronized String privGetCanonicalPath(final StorageFile file)
     {
         actionCode = STORAGE_FILE_GET_CANONICALPATH_ACTION;
@@ -2682,6 +2716,8 @@ public final class RawStore implements R
     }
 
 
+    // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
+    @SuppressWarnings("removal")
     private synchronized String privGetCanonicalPath(final File file)
     {
         actionCode = REGULAR_FILE_GET_CANONICALPATH_ACTION;
@@ -2843,6 +2879,8 @@ public final class RawStore implements R
      * Privileged lookup of the ContextService. Private so that user code
      * can't call this entry point.
      */
+    // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
+    @SuppressWarnings("removal")
     private static  ContextService    getContextService()
     {
         if ( System.getSecurityManager() == null )
@@ -2869,6 +2907,8 @@ public final class RawStore implements R
      * Privileged lookup of a Context. Must be private so that user code
      * can't call this entry point.
      */
+    // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
+    @SuppressWarnings("removal")
     private  static  Context    getContextOrNull( final String contextID )
     {
         return AccessController.doPrivileged
@@ -2888,6 +2928,8 @@ public final class RawStore implements R
      * Privileged Monitor lookup. Must be private so that user code
      * can't call this entry point.
      */
+    // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
+    @SuppressWarnings("removal")
     private  static  ModuleFactory  getMonitor()
     {
         return AccessController.doPrivileged
@@ -2907,6 +2949,8 @@ public final class RawStore implements R
      * Privileged service name lookup. Must be private so that user code
      * can't call this entry point.
      */
+    // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
+    @SuppressWarnings("removal")
     private  static  String getServiceName( final Object serviceModule )
     {
         return AccessController.doPrivileged
@@ -2925,6 +2969,8 @@ public final class RawStore implements R
      * Privileged startup. Must be private so that user code
      * can't call this entry point.
      */
+    // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
+    @SuppressWarnings("removal")
     private  static  Object  startSystemModule( final String factoryInterface )
         throws StandardException
     {
@@ -2950,6 +2996,8 @@ public final class RawStore implements R
      * Privileged startup. Must be private so that user code
      * can't call this entry point.
      */
+    // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
+    @SuppressWarnings("removal")
     private  static  Object bootServiceModule
         (
          final boolean create, final Object serviceModule,
@@ -2979,6 +3027,8 @@ public final class RawStore implements R
      * Privileged startup. Must be private so that user code
      * can't call this entry point.
      */
+    // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
+    @SuppressWarnings("removal")
     private  static  Object findServiceModule( final Object serviceModule, final String factoryInterface)
         throws StandardException
     {

Modified: db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/BaseDataFileFactory.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/BaseDataFileFactory.java?rev=1890895&r1=1890894&r2=1890895&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/BaseDataFileFactory.java (original)
+++ db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/BaseDataFileFactory.java Fri Jun 18 18:09:58 2021
@@ -262,6 +262,8 @@ public class BaseDataFileFactory
 		return true;
 	}
 
+    // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
+    @SuppressWarnings("removal")
 	public void	boot(boolean create, Properties startParams) 
         throws StandardException 
     {
@@ -1552,6 +1554,8 @@ public class BaseDataFileFactory
 		return loggableAllocActions;
 	}
 
+    // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
+    @SuppressWarnings("removal")
     private synchronized void removeTempDirectory()
     {
         if( storageFactory != null)
@@ -1608,6 +1612,8 @@ public class BaseDataFileFactory
         return getContainerPath(containerId, stub, GET_CONTAINER_PATH_ACTION);
     }
 
+    // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
+    @SuppressWarnings("removal")
     private synchronized StorageFile getContainerPath(
     ContainerKey    containerId, 
     boolean         stub,
@@ -1660,6 +1666,8 @@ public class BaseDataFileFactory
 	/**
 		Remove stubs in this database.  Stubs are committed deleted containers
 	*/
+    // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
+    @SuppressWarnings("removal")
 	private synchronized void removeStubs()
 	{
         if( storageFactory != null) 
@@ -1711,6 +1719,8 @@ public class BaseDataFileFactory
 	 * redoLWM in the check point record. We can be sure that the stub is not
 	 * required if the log instant when it was created is less than the redoLWM.
 	 */
+    // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
+    @SuppressWarnings("removal")
 	public void removeDroppedContainerFileStubs(
     LogInstant redoLWM) 
         throws StandardException
@@ -1780,6 +1790,8 @@ public class BaseDataFileFactory
      *
 	 * @return The largest containerid in seg0.
      **/
+    // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
+    @SuppressWarnings("removal")
 	private synchronized long findMaxContainerId()
 	{
         actionCode = FIND_MAX_CONTAINER_ID_ACTION;
@@ -1862,6 +1874,8 @@ public class BaseDataFileFactory
 		@exception StandardException another JBMS is already attached to the
 		database at this directory
 	*/
+    // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
+    @SuppressWarnings("removal")
 	private void getJBMSLockOnDB(
     UUID        myUUID, 
     UUIDFactory uuidFactory, 
@@ -2087,6 +2101,8 @@ public class BaseDataFileFactory
         }
     } // end of privGetJBMSLockOnDB
 
+    // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
+    @SuppressWarnings("removal")
 	private void releaseJBMSLockOnDB()
 	{
 		if (isReadOnly())
@@ -2207,6 +2223,8 @@ public class BaseDataFileFactory
      *
      * @return the ClassPath of a jar file
      **/
+    // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
+    @SuppressWarnings("removal")
     private static String jarClassPath(final Class cls)
     {
         return AccessController.doPrivileged( new PrivilegedAction<String>()
@@ -2237,6 +2255,8 @@ public class BaseDataFileFactory
      * @return the Java system property value for the OS or a string capturing a
      * security exception.
      */
+    // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
+    @SuppressWarnings("removal")
     private static String buildOSinfo () {
     	return AccessController.doPrivileged(new PrivilegedAction<String>(){
     		public String run() {
@@ -2264,6 +2284,8 @@ public class BaseDataFileFactory
      * @return the Java system property value from the JVM or a string capturing a
      * security exception.
      */
+    // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
+    @SuppressWarnings("removal")
     private static String buildJvmVersion () {
         return AccessController.doPrivileged( new PrivilegedAction<String>()
         {
@@ -2335,6 +2357,8 @@ public class BaseDataFileFactory
 	/**
 		Add a file to the list of files to be removed post recovery.
 	*/
+    // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
+    @SuppressWarnings("removal")
 	void fileToRemove( StorageFile file, boolean remove) 
     {
 		if (postRecoveryRemovedFiles == null)
@@ -2369,6 +2393,8 @@ public class BaseDataFileFactory
 
 		@exception StandardException Standard Derby Error Policy
 	*/
+    // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
+    @SuppressWarnings("removal")
 	public void postRecovery() throws StandardException 
     {
 
@@ -2583,6 +2609,8 @@ public class BaseDataFileFactory
      * with other privileged actions execution in this class.
      * @return An array of all the file names in seg0.
      **/
+    // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
+    @SuppressWarnings("removal")
     synchronized String[] getContainerNames()
 	{
         actionCode = GET_CONTAINER_NAMES_ACTION;
@@ -2610,6 +2638,8 @@ public class BaseDataFileFactory
 	 * In all the cases, data directory(seg*) is replaced by the data directory
 	 * directory from backup when this function is called.
 	 */
+    // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
+    @SuppressWarnings("removal")
 	private void restoreDataDirectory(String backupPath) 
         throws StandardException
 	{
@@ -2776,6 +2806,8 @@ public class BaseDataFileFactory
 	}
 
     /** Return true if the Lucene plugin is loaded */
+    // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
+    @SuppressWarnings("removal")
     public  boolean luceneLoaded()
         throws StandardException
     {
@@ -2995,6 +3027,8 @@ public class BaseDataFileFactory
      * Privileged Monitor lookup. Must be private so that user code
      * can't call this entry point.
      */
+    // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
+    @SuppressWarnings("removal")
     private  static  ModuleFactory  getMonitor()
     {
         return AccessController.doPrivileged
@@ -3014,6 +3048,8 @@ public class BaseDataFileFactory
      * Privileged startup. Must be private so that user code
      * can't call this entry point.
      */
+    // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
+    @SuppressWarnings("removal")
     private  static  Object  startSystemModule( final String factoryInterface )
         throws StandardException
     {
@@ -3039,6 +3075,8 @@ public class BaseDataFileFactory
      * Privileged startup. Must be private so that user code
      * can't call this entry point.
      */
+    // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
+    @SuppressWarnings("removal")
     private  static  Object bootServiceModule
         (
          final boolean create, final Object serviceModule,

Modified: db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/D_DiagnosticUtil.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/D_DiagnosticUtil.java?rev=1890895&r1=1890894&r2=1890895&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/D_DiagnosticUtil.java (original)
+++ db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/D_DiagnosticUtil.java Fri Jun 18 18:09:58 2021
@@ -444,6 +444,8 @@ public class D_DiagnosticUtil
      * Privileged startup. Must be private so that user code
      * can't call this entry point.
      */
+    // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
+    @SuppressWarnings("removal")
     private  static  Object findServiceModule( final Object serviceModule, final String factoryInterface)
         throws StandardException
     {
@@ -469,6 +471,8 @@ public class D_DiagnosticUtil
      * Privileged module lookup. Must be private so that user code
      * can't call this entry point.
      */
+    // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
+    @SuppressWarnings("removal")
     private static  Object getServiceModule( final Object serviceModule, final String factoryInterface )
     {
         return AccessController.doPrivileged
@@ -487,6 +491,8 @@ public class D_DiagnosticUtil
      * Privileged service lookup. Must be private so that user code
      * can't call this entry point.
      */
+    // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
+    @SuppressWarnings("removal")
     private static  Object findService( final String factoryInterface, final String serviceName )
     {
         return AccessController.doPrivileged

Modified: db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/EncryptOrDecryptData.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/EncryptOrDecryptData.java?rev=1890895&r1=1890894&r2=1890895&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/EncryptOrDecryptData.java (original)
+++ db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/EncryptOrDecryptData.java Fri Jun 18 18:09:58 2021
@@ -363,6 +363,8 @@ public class EncryptOrDecryptData implem
         }
     }
 
+    // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
+    @SuppressWarnings("removal")
     private synchronized boolean privExists(StorageFile file)
     {
         actionCode = STORAGE_FILE_EXISTS_ACTION;
@@ -374,6 +376,8 @@ public class EncryptOrDecryptData implem
     }
 
 
+    // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
+    @SuppressWarnings("removal")
     private synchronized boolean privDelete(StorageFile file)
     {
         actionCode = STORAGE_FILE_DELETE_ACTION;
@@ -384,6 +388,8 @@ public class EncryptOrDecryptData implem
 
     }
 
+    // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
+    @SuppressWarnings("removal")
     private synchronized boolean privRename(StorageFile fromFile,
                                             StorageFile destFile)
     {

Modified: db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/FileContainer.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/FileContainer.java?rev=1890895&r1=1890894&r2=1890895&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/FileContainer.java (original)
+++ db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/FileContainer.java Fri Jun 18 18:09:58 2021
@@ -3555,6 +3555,8 @@ abstract class FileContainer
      * package visibility so that user code
      * can't call this entry point.
      */
+    // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
+    @SuppressWarnings("removal")
     static  ContextService    getContextService()
     {
         return AccessController.doPrivileged
@@ -3572,6 +3574,8 @@ abstract class FileContainer
      * Privileged module lookup. Must be private so that user code
      * can't call this entry point.
      */
+    // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
+    @SuppressWarnings("removal")
     private static  Object getServiceModule( final Object serviceModule, final String factoryInterface )
     {
         return AccessController.doPrivileged

Modified: db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/RAFContainer.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/RAFContainer.java?rev=1890895&r1=1890894&r2=1890895&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/RAFContainer.java (original)
+++ db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/RAFContainer.java Fri Jun 18 18:09:58 2021
@@ -727,6 +727,8 @@ class RAFContainer extends FileContainer
 	}
 
 
+    // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
+    @SuppressWarnings("removal")
 	 synchronized StorageFile getFileName(ContainerKey identity, boolean stub,
 											 boolean errorOK, boolean tryAlternatePath)
 		 throws StandardException
@@ -804,6 +806,8 @@ class RAFContainer extends FileContainer
     } // end of privGetFileName
 
 
+    // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
+    @SuppressWarnings("removal")
 	synchronized void createContainer(ContainerKey newIdentity)
         throws StandardException
     {
@@ -830,6 +834,8 @@ class RAFContainer extends FileContainer
      * @param to the file to copy to
      * @throws StandardException if the copying failed
      */
+    // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
+    @SuppressWarnings("removal")
     private void copyFile(final StorageFile from, final File to)
             throws StandardException {
         PrivilegedAction<Boolean> pa = () ->
@@ -847,6 +853,8 @@ class RAFContainer extends FileContainer
      * @param file the file to remove
      * @throws StandardException if the file could not be removed
      */
+    // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
+    @SuppressWarnings("removal")
     private void removeFile(final File file) throws StandardException {
         PrivilegedAction<Boolean> pa = () -> !file.exists() || file.delete();
         boolean success = AccessController.doPrivileged(pa);
@@ -856,6 +864,8 @@ class RAFContainer extends FileContainer
         }
     }
 
+    // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
+    @SuppressWarnings("removal")
 	synchronized boolean removeFile(StorageFile file)
         throws SecurityException, StandardException
     {
@@ -889,6 +899,8 @@ class RAFContainer extends FileContainer
     } // end of privRemoveFile
 
 
+    // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
+    @SuppressWarnings("removal")
     synchronized boolean openContainer(ContainerKey newIdentity)
             throws StandardException {
         actionCode = OPEN_CONTAINER_ACTION;
@@ -918,6 +930,8 @@ class RAFContainer extends FileContainer
      * @param currentIdentity
      * @throws StandardException standard exception policy
      */
+    // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
+    @SuppressWarnings("removal")
     protected synchronized void reopenContainer(ContainerKey currentIdentity)
             throws StandardException {
 
@@ -937,6 +951,8 @@ class RAFContainer extends FileContainer
         }
     }
 
+    // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
+    @SuppressWarnings("removal")
 	private synchronized void stubbify(LogInstant instant)
         throws StandardException
 	{
@@ -1311,6 +1327,8 @@ class RAFContainer extends FileContainer
      * read-write mode
      * @throws IOException if some other I/O error happens
      */
+    // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
+    @SuppressWarnings("removal")
     private RandomAccessFile getRandomAccessFile(final File file)
             throws IOException {
         try {
@@ -1330,6 +1348,8 @@ class RAFContainer extends FileContainer
         }
     }
 
+    // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
+    @SuppressWarnings("removal")
     synchronized StorageRandomAccessFile getRandomAccessFile(StorageFile file)
         throws SecurityException, StandardException
     {

Modified: db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/RFResource.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/RFResource.java?rev=1890895&r1=1890894&r2=1890895&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/RFResource.java (original)
+++ db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/RFResource.java Fri Jun 18 18:09:58 2021
@@ -255,6 +255,8 @@ final class RemoveFile implements Servic
 		this.fileToGo = fileToGo;
 	}
 
+    // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
+    @SuppressWarnings("removal")
 	public int performWork(ContextManager context)
         throws StandardException
     {

Modified: db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/StreamFileContainer.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/StreamFileContainer.java?rev=1890895&r1=1890894&r2=1890895&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/StreamFileContainer.java (original)
+++ db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/data/StreamFileContainer.java Fri Jun 18 18:09:58 2021
@@ -1061,6 +1061,8 @@ class StreamFileContainer implements Typ
 
 
     
+    // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
+    @SuppressWarnings("removal")
     private synchronized boolean privExists(StorageFile file)
     {
         actionCode = STORAGE_FILE_EXISTS_ACTION;
@@ -1082,6 +1084,8 @@ class StreamFileContainer implements Typ
         }
     }
 
+    // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
+    @SuppressWarnings("removal")
     private synchronized boolean privMkdirs(StorageFile file)
             throws IOException
     {
@@ -1105,6 +1109,8 @@ class StreamFileContainer implements Typ
     }
 
     
+    // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
+    @SuppressWarnings("removal")
     private synchronized boolean privDelete(StorageFile file)
     {
         actionCode = STORAGE_FILE_DELETE_ACTION;
@@ -1126,6 +1132,8 @@ class StreamFileContainer implements Typ
         }
     }
 
+    // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
+    @SuppressWarnings("removal")
     private synchronized OutputStream privGetOutputStream(StorageFile file)
         throws FileNotFoundException
     {
@@ -1146,6 +1154,8 @@ class StreamFileContainer implements Typ
     }
 
 
+    // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
+    @SuppressWarnings("removal")
     private synchronized InputStream privGetInputStream(StorageFile file)
         throws FileNotFoundException
     {
@@ -1192,6 +1202,8 @@ class StreamFileContainer implements Typ
      * Privileged lookup of the ContextService. Must be private so that user code
      * can't call this entry point.
      */
+    // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
+    @SuppressWarnings("removal")
     private  static  ContextService    getContextService()
     {
         return AccessController.doPrivileged
@@ -1210,6 +1222,8 @@ class StreamFileContainer implements Typ
      * Privileged module lookup. Must be private so that user code
      * can't call this entry point.
      */
+    // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
+    @SuppressWarnings("removal")
     private static  Object getServiceModule( final Object serviceModule, final String factoryInterface )
     {
         return AccessController.doPrivileged

Modified: db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/log/LogToFile.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/log/LogToFile.java?rev=1890895&r1=1890894&r2=1890895&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/log/LogToFile.java (original)
+++ db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/log/LogToFile.java Fri Jun 18 18:09:58 2021
@@ -5687,6 +5687,8 @@ public final class LogToFile implements
 		return runBooleanAction(1, file);
     }
 
+    // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
+    @SuppressWarnings("removal")
     private synchronized StorageRandomAccessFile privRandomAccessFile(StorageFile file, String perms)
         throws IOException
     {
@@ -5703,6 +5705,8 @@ public final class LogToFile implements
         }
     }
 
+    // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
+    @SuppressWarnings("removal")
     private synchronized OutputStreamWriter privGetOutputStreamWriter(StorageFile file)
         throws IOException
     {
@@ -5723,6 +5727,8 @@ public final class LogToFile implements
 		return runBooleanAction(3, file);
     }
 
+    // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
+    @SuppressWarnings("removal")
     protected boolean privMkdirs(StorageFile file) throws IOException
     {
         this.action = 4;
@@ -5734,6 +5740,8 @@ public final class LogToFile implements
         }
     }
 
+    // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
+    @SuppressWarnings("removal")
 	private synchronized String[] privList(File file)
     {
 		action = 8;
@@ -5749,6 +5757,8 @@ public final class LogToFile implements
         }
 	}
     
+    // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
+    @SuppressWarnings("removal")
 	private synchronized String[] privList(StorageFile file)
     {
 		action = 5;
@@ -5765,6 +5775,8 @@ public final class LogToFile implements
 	}
 
 
+    // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
+    @SuppressWarnings("removal")
 	private synchronized boolean privCopyFile(StorageFile from, File to)
             throws StandardException
 	{
@@ -5785,6 +5797,8 @@ public final class LogToFile implements
         }
 	}
 
+    // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
+    @SuppressWarnings("removal")
 	private synchronized boolean privCopyFile(File from, StorageFile to)
 	{
 		action = 9;
@@ -5806,6 +5820,8 @@ public final class LogToFile implements
 	}
 
 
+    // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
+    @SuppressWarnings("removal")
 	private synchronized boolean runBooleanAction(int action, StorageFile file) {
 		this.action = action;
 		this.activeFile = file;
@@ -5959,6 +5975,8 @@ public final class LogToFile implements
      * Privileged lookup of the ContextService. Must be private so that user code
      * can't call this entry point.
      */
+    // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
+    @SuppressWarnings("removal")
     private  static  ContextService    getContextService()
     {
         return AccessController.doPrivileged
@@ -5978,6 +5996,8 @@ public final class LogToFile implements
      * Privileged Monitor lookup. Must be private so that user code
      * can't call this entry point.
      */
+    // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
+    @SuppressWarnings("removal")
     private  static  ModuleFactory  getMonitor()
     {
         return AccessController.doPrivileged
@@ -5996,6 +6016,8 @@ public final class LogToFile implements
      * Privileged startup. Must be private so that user code
      * can't call this entry point.
      */
+    // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
+    @SuppressWarnings("removal")
     private  static  Object findServiceModule( final Object serviceModule, final String factoryInterface)
         throws StandardException
     {
@@ -6021,6 +6043,8 @@ public final class LogToFile implements
      * Privileged module lookup. Must be private so that user code
      * can't call this entry point.
      */
+    // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
+    @SuppressWarnings("removal")
     private static  Object getServiceModule( final Object serviceModule, final String factoryInterface )
     {
         return AccessController.doPrivileged
@@ -6039,6 +6063,8 @@ public final class LogToFile implements
      * Privileged startup. Must be private so that user code
      * can't call this entry point.
      */
+    // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
+    @SuppressWarnings("removal")
     private  static  boolean isFullUpgrade( final Properties startParams, final String oldVersionInfo )
         throws StandardException
     {

Modified: db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/xact/XactFactory.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/xact/XactFactory.java?rev=1890895&r1=1890894&r2=1890895&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/xact/XactFactory.java (original)
+++ db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/impl/store/raw/xact/XactFactory.java Fri Jun 18 18:09:58 2021
@@ -1171,6 +1171,8 @@ public class XactFactory implements Tran
      * Privileged lookup of the ContextService. Private so that user code
      * can't call this entry point.
      */
+    // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
+    @SuppressWarnings("removal")
     private static  ContextService    getContextService()
     {
         return AccessController.doPrivileged
@@ -1190,6 +1192,8 @@ public class XactFactory implements Tran
      * Privileged Monitor lookup. Must be private so that user code
      * can't call this entry point.
      */
+    // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
+    @SuppressWarnings("removal")
     private  static  ModuleFactory  getMonitor()
     {
         return AccessController.doPrivileged
@@ -1208,6 +1212,8 @@ public class XactFactory implements Tran
      * Privileged startup. Must be private so that user code
      * can't call this entry point.
      */
+    // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
+    @SuppressWarnings("removal")
     private  static  Object bootServiceModule
         (
          final boolean create, final Object serviceModule,
@@ -1237,6 +1243,8 @@ public class XactFactory implements Tran
      * Privileged startup. Must be private so that user code
      * can't call this entry point.
      */
+    // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
+    @SuppressWarnings("removal")
     private  static  Object findServiceModule( final Object serviceModule, final String factoryInterface)
         throws StandardException
     {

Modified: db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/impl/store/replication/net/ReplicationMessageReceive.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/impl/store/replication/net/ReplicationMessageReceive.java?rev=1890895&r1=1890894&r2=1890895&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/impl/store/replication/net/ReplicationMessageReceive.java (original)
+++ db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/impl/store/replication/net/ReplicationMessageReceive.java Fri Jun 18 18:09:58 2021
@@ -141,6 +141,8 @@ public class ReplicationMessageReceive {
      * @throws StandardException if an incompatible database version is found.
      *
      */
+    // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
+    @SuppressWarnings("removal")
     public void initConnection(int timeout, long synchOnInstant, String dbname)
         throws
         IOException,
@@ -192,6 +194,8 @@ public class ReplicationMessageReceive {
      * @throws IOException if an exception occurs while trying
      *                                   to open a connection.
      */
+    // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
+    @SuppressWarnings("removal")
     private ServerSocket createServerSocket() throws IOException {
         //create a ServerSocket at the specified host name and the
         //port number.

Modified: db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/impl/store/replication/net/ReplicationMessageTransmit.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/impl/store/replication/net/ReplicationMessageTransmit.java?rev=1890895&r1=1890894&r2=1890895&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/impl/store/replication/net/ReplicationMessageTransmit.java (original)
+++ db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/impl/store/replication/net/ReplicationMessageTransmit.java Fri Jun 18 18:09:58 2021
@@ -110,6 +110,8 @@ public class ReplicationMessageTransmit
      * @throws ClassNotFoundException Class of a serialized object cannot
      *         be found.
      */
+    // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
+    @SuppressWarnings("removal")
     public void initConnection(int timeout, long synchOnInstant) throws
         IOException,
         StandardException,

Modified: db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/mbeans/Management.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/mbeans/Management.java?rev=1890895&r1=1890894&r2=1890895&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/mbeans/Management.java (original)
+++ db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/mbeans/Management.java Fri Jun 18 18:09:58 2021
@@ -92,6 +92,8 @@ public class Management implements Manag
      * Privileged module lookup. Must be private so that user code
      * can't call this entry point.
      */
+    // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
+    @SuppressWarnings("removal")
     private static  Object getSystemModule( final String factoryInterface )
     {
         return AccessController.doPrivileged

Modified: db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/mbeans/Version.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/mbeans/Version.java?rev=1890895&r1=1890894&r2=1890895&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/mbeans/Version.java (original)
+++ db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/mbeans/Version.java Fri Jun 18 18:09:58 2021
@@ -57,6 +57,8 @@ public class Version implements VersionM
     /**
      * Ensure caller has permission to monitor Derby.
      */
+    // AccessController, AccessControlException, and SecurityManager deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
+    @SuppressWarnings("removal")
     private void checkMonitor() {
 
         try {

Modified: db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/security/DatabasePermission.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/security/DatabasePermission.java?rev=1890895&r1=1890894&r2=1890895&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/security/DatabasePermission.java (original)
+++ db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/security/DatabasePermission.java Fri Jun 18 18:09:58 2021
@@ -260,6 +260,8 @@ final public class DatabasePermission ex
      * @throws IllegalArgumentException if the URL is not well-formed
      * @throws IOException if the location URL cannot be canonicalized
      */
+    // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
+    @SuppressWarnings("removal")
     protected void initLocation(String url)
         throws IOException {
         // analog to java.security.BasicPermission, we check that URL

Modified: db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/vti/XmlVTI.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/vti/XmlVTI.java?rev=1890895&r1=1890894&r2=1890895&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/vti/XmlVTI.java (original)
+++ db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/vti/XmlVTI.java Fri Jun 18 18:09:58 2021
@@ -268,6 +268,8 @@ public  class   XmlVTI  extends StringCo
      * @return a VTI to turn the XML text into rows
      * @throws Exception on error
      */
+    // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
+    @SuppressWarnings("removal")
     public  static  XmlVTI  xmlVTI
         ( final String fileName, String rowTag, ArrayList<String> parentTags, ArrayList<String> childTags )
         throws Exception
@@ -299,6 +301,8 @@ public  class   XmlVTI  extends StringCo
      * @return a VTI to turn the XML text into rows
      * @throws Exception on error
      */
+    // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
+    @SuppressWarnings("removal")
     public  static  XmlVTI  xmlVTIFromURL
         ( final String urlString, String rowTag, ArrayList<String> parentTags, ArrayList<String> childTags )
         throws Exception

Modified: db/derby/code/trunk/java/org.apache.derby.optionaltools/org/apache/derby/optional/api/SimpleJsonUtils.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.optionaltools/org/apache/derby/optional/api/SimpleJsonUtils.java?rev=1890895&r1=1890894&r2=1890895&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.optionaltools/org/apache/derby/optional/api/SimpleJsonUtils.java (original)
+++ db/derby/code/trunk/java/org.apache.derby.optionaltools/org/apache/derby/optional/api/SimpleJsonUtils.java Fri Jun 18 18:09:58 2021
@@ -221,6 +221,8 @@ public abstract class SimpleJsonUtils
      * @return a json array
      * @throws SQLException on error
      */
+    // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
+    @SuppressWarnings("removal")
     public static JSONArray readArrayFromFile
         ( String fileName, String characterSetName )
         throws SQLException
@@ -254,6 +256,8 @@ public abstract class SimpleJsonUtils
      * @return a json array
      * @throws SQLException on error
      */
+    // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
+    @SuppressWarnings("removal")
     public static JSONArray readArrayFromURL
         ( String urlString, String characterSetName )
         throws SQLException

Modified: db/derby/code/trunk/java/org.apache.derby.optionaltools/org/apache/derby/optional/dump/DataFileVTI.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.optionaltools/org/apache/derby/optional/dump/DataFileVTI.java?rev=1890895&r1=1890894&r2=1890895&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.optionaltools/org/apache/derby/optional/dump/DataFileVTI.java (original)
+++ db/derby/code/trunk/java/org.apache.derby.optionaltools/org/apache/derby/optional/dump/DataFileVTI.java Fri Jun 18 18:09:58 2021
@@ -553,6 +553,8 @@ public  class   DataFileVTI extends VTIT
     /**
      * Get system property.
      */
+    // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
+    @SuppressWarnings("removal")
     private static String getSystemProperty( final String name)
 	{
         return AccessController.doPrivileged

Modified: db/derby/code/trunk/java/org.apache.derby.optionaltools/org/apache/derby/optional/lucene/DerbyIndexInput.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.optionaltools/org/apache/derby/optional/lucene/DerbyIndexInput.java?rev=1890895&r1=1890894&r2=1890895&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.optionaltools/org/apache/derby/optional/lucene/DerbyIndexInput.java (original)
+++ db/derby/code/trunk/java/org.apache.derby.optionaltools/org/apache/derby/optional/lucene/DerbyIndexInput.java Fri Jun 18 18:09:58 2021
@@ -106,6 +106,8 @@ class DerbyIndexInput   extends IndexInp
     }
 
     /** Set the constructor fields */
+    // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
+    @SuppressWarnings("removal")
     private void    setConstructorFields( final StorageFile file )
         throws IOException
     {

Modified: db/derby/code/trunk/java/org.apache.derby.optionaltools/org/apache/derby/optional/lucene/DerbyLuceneDir.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.optionaltools/org/apache/derby/optional/lucene/DerbyLuceneDir.java?rev=1890895&r1=1890894&r2=1890895&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.optionaltools/org/apache/derby/optional/lucene/DerbyLuceneDir.java (original)
+++ db/derby/code/trunk/java/org.apache.derby.optionaltools/org/apache/derby/optional/lucene/DerbyLuceneDir.java Fri Jun 18 18:09:58 2021
@@ -375,6 +375,8 @@ class DerbyLuceneDir extends Directory
 	/**
 	 * Create the path if necessary.
 	 */
+    // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
+    @SuppressWarnings("removal")
     private static StorageFile createPathLeg
         ( final StorageFactory storageFactory, final StorageFile parentDir, final String fileName )
         throws SQLException

Modified: db/derby/code/trunk/java/org.apache.derby.optionaltools/org/apache/derby/optional/lucene/LuceneListIndexesVTI.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.optionaltools/org/apache/derby/optional/lucene/LuceneListIndexesVTI.java?rev=1890895&r1=1890894&r2=1890895&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.optionaltools/org/apache/derby/optional/lucene/LuceneListIndexesVTI.java (original)
+++ db/derby/code/trunk/java/org.apache.derby.optionaltools/org/apache/derby/optional/lucene/LuceneListIndexesVTI.java Fri Jun 18 18:09:58 2021
@@ -219,6 +219,8 @@ class LuceneListIndexesVTI extends Strin
     }
 
     /** List files */
+    // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
+    @SuppressWarnings("removal")
     private static  StorageFile[]  listDirectories( final StorageFactory storageFactory, final StorageFile dir )
     {
         return AccessController.doPrivileged
@@ -246,6 +248,8 @@ class LuceneListIndexesVTI extends Strin
     }
 
     /** Read the index properties file */
+    // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
+    @SuppressWarnings("removal")
     private static  Properties readIndexProperties( final StorageFile file )
         throws IOException
     {
@@ -265,4 +269,4 @@ class LuceneListIndexesVTI extends Strin
         }
     }
 
-}
\ No newline at end of file
+}

Modified: db/derby/code/trunk/java/org.apache.derby.optionaltools/org/apache/derby/optional/lucene/LuceneQueryVTI.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.optionaltools/org/apache/derby/optional/lucene/LuceneQueryVTI.java?rev=1890895&r1=1890894&r2=1890895&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.optionaltools/org/apache/derby/optional/lucene/LuceneQueryVTI.java (original)
+++ db/derby/code/trunk/java/org.apache.derby.optionaltools/org/apache/derby/optional/lucene/LuceneQueryVTI.java Fri Jun 18 18:09:58 2021
@@ -550,6 +550,8 @@ class LuceneQueryVTI extends StringColum
 	 * 
 	 * @param dir The directory holding the Lucene index.
 	 */
+    // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
+    @SuppressWarnings("removal")
 	private static IndexReader getIndexReader( final DerbyLuceneDir dir )
         throws IOException, PrivilegedActionException
     {
@@ -570,6 +572,8 @@ class LuceneQueryVTI extends StringColum
 	}
 	
     /** Read the index properties file */
+    // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
+    @SuppressWarnings("removal")
     private static  Properties readIndexProperties( final StorageFile file )
         throws IOException
     {
@@ -593,6 +597,8 @@ class LuceneQueryVTI extends StringColum
 	 * Invoke a static method (possibly supplied by the user) to instantiate an index descriptor.
      * The method has no arguments.
 	 */
+    // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
+    @SuppressWarnings("removal")
 	private static LuceneIndexDescriptor getIndexDescriptor( final String indexDescriptorMaker )
         throws PrivilegedActionException, SQLException
     {
@@ -612,6 +618,8 @@ class LuceneQueryVTI extends StringColum
 	}
 	
     /** Read the index properties file */
+    // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
+    @SuppressWarnings("removal")
     private void    searchAndScore( final Query luceneQuery, final TopScoreDocCollector tsdc )
         throws IOException
     {

Modified: db/derby/code/trunk/java/org.apache.derby.optionaltools/org/apache/derby/optional/lucene/LuceneSupport.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.optionaltools/org/apache/derby/optional/lucene/LuceneSupport.java?rev=1890895&r1=1890894&r2=1890895&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.optionaltools/org/apache/derby/optional/lucene/LuceneSupport.java (original)
+++ db/derby/code/trunk/java/org.apache.derby.optionaltools/org/apache/derby/optional/lucene/LuceneSupport.java Fri Jun 18 18:09:58 2021
@@ -1187,6 +1187,8 @@ public class LuceneSupport implements Op
     }
 
     /** Write the index properties file */
+    // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
+    @SuppressWarnings("removal")
     private static  void    writeIndexProperties( final StorageFile file, Properties properties )
         throws IOException
     {
@@ -1455,6 +1457,8 @@ public class LuceneSupport implements Op
     /////////////////////////////////////////////////////////////////////
 
     /** Return true if the directory is empty */
+    // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
+    @SuppressWarnings("removal")
     private static  boolean isEmpty( final StorageFile dir )
     {
         String[]  contents = AccessController.doPrivileged
@@ -1474,6 +1478,8 @@ public class LuceneSupport implements Op
     }
 
     /** Return true if the file exists */
+    // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
+    @SuppressWarnings("removal")
     private static  boolean exists( final StorageFile file )
     {
         return AccessController.doPrivileged
@@ -1489,6 +1495,8 @@ public class LuceneSupport implements Op
     }
 
     /** Really delete a file */
+    // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
+    @SuppressWarnings("removal")
     private static  boolean deleteFile( final StorageFile file )
         throws SQLException
     {
@@ -1532,6 +1540,8 @@ public class LuceneSupport implements Op
 	 * @param derbyLuceneDir location of the lucene directory
 	 * @return a Lucene IndexWriter
 	 */
+    // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
+    @SuppressWarnings("removal")
 	private static IndexWriter getIndexWriter
         (
          final Version  luceneVersion,
@@ -1563,6 +1573,8 @@ public class LuceneSupport implements Op
 	/**
 	 * Add a document to a Lucene index wrier.
 	 */
+    // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
+    @SuppressWarnings("removal")
     private static void addDocument
         (
          final IndexWriter  indexWriter,
@@ -1591,6 +1603,8 @@ public class LuceneSupport implements Op
 	/**
 	 * Close an IndexWriter.
 	 */
+    // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
+    @SuppressWarnings("removal")
     private static void close( final IndexWriter  indexWriter )
         throws IOException
     {
@@ -1616,6 +1630,8 @@ public class LuceneSupport implements Op
 	 * Invoke a static method (possibly supplied by the user) to instantiate an index descriptor.
      * The method has no arguments.
 	 */
+    // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
+    @SuppressWarnings("removal")
 	private static LuceneIndexDescriptor getIndexDescriptor( final String indexDescriptorMaker )
         throws PrivilegedActionException, SQLException
     {
@@ -1655,6 +1671,8 @@ public class LuceneSupport implements Op
 	/**
 	 * Add a document to a Lucene index wrier.
 	 */
+    // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
+    @SuppressWarnings("removal")
     private static void createLuceneDir( final Connection conn )
         throws SQLException
     {
@@ -1732,6 +1750,8 @@ public class LuceneSupport implements Op
      * Privileged startup. Must be private so that user code
      * can't call this entry point.
      */
+    // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
+    @SuppressWarnings("removal")
     private  static  Object findServiceModule( final Object serviceModule, final String factoryInterface)
         throws StandardException
     {
@@ -1757,6 +1777,8 @@ public class LuceneSupport implements Op
      * Privileged service lookup. Must be private so that user code
      * can't call this entry point.
      */
+    // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
+    @SuppressWarnings("removal")
     private static  Object findService( final String factoryInterface, final String serviceName )
     {
         return AccessController.doPrivileged

Modified: db/derby/code/trunk/java/org.apache.derby.server/org/apache/derby/drda/NetServlet.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.server/org/apache/derby/drda/NetServlet.java?rev=1890895&r1=1890894&r2=1890895&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.server/org/apache/derby/drda/NetServlet.java (original)
+++ db/derby/code/trunk/java/org.apache.derby.server/org/apache/derby/drda/NetServlet.java Fri Jun 18 18:09:58 2021
@@ -533,6 +533,8 @@ public class NetServlet extends HttpServ
      * @exception ServletException throws an exception if error in starting the 
      *      Network Server during initialization
      */
+    // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
+    @SuppressWarnings("removal")
     private void runServer
         ( LocalizedResource localUtil, String returnMessage, PrintWriter out )
         throws ServletException

Modified: db/derby/code/trunk/java/org.apache.derby.server/org/apache/derby/drda/NetworkServerControl.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.server/org/apache/derby/drda/NetworkServerControl.java?rev=1890895&r1=1890894&r2=1890895&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.server/org/apache/derby/drda/NetworkServerControl.java (original)
+++ db/derby/code/trunk/java/org.apache.derby.server/org/apache/derby/drda/NetworkServerControl.java Fri Jun 18 18:09:58 2021
@@ -300,6 +300,8 @@ public class NetworkServerControl{
      * @param args  array of arguments indicating command to be executed.
      * See class comments for more information
      */
+    // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
+    @SuppressWarnings("removal")
     public static void main(String args[]) {
         NetworkServerControlImpl server = null;
 
@@ -619,6 +621,8 @@ public class NetworkServerControl{
      * line.</li>
      * </ul>
      */
+    // SecurityManager deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
+    @SuppressWarnings("removal")
     private static  boolean needsSecurityManager( NetworkServerControlImpl server, int command )
         throws Exception
     {
@@ -648,6 +652,8 @@ public class NetworkServerControl{
     /**
      * Install a SecurityManager governed by the Basic startup policy. See DERBY-2196.
      */
+    // SecurityManager deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
+    @SuppressWarnings("removal")
     private static  void installSecurityManager( NetworkServerControlImpl server )
         throws Exception
     {

Modified: db/derby/code/trunk/java/org.apache.derby.server/org/apache/derby/impl/drda/ClientThread.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.server/org/apache/derby/impl/drda/ClientThread.java?rev=1890895&r1=1890894&r2=1890895&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.server/org/apache/derby/impl/drda/ClientThread.java (original)
+++ db/derby/code/trunk/java/org.apache.derby.server/org/apache/derby/impl/drda/ClientThread.java Fri Jun 18 18:09:58 2021
@@ -151,6 +151,8 @@ final class ClientThread extends Thread
      * @return client socket or null if accept failed.
      * 
      */
+    // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
+    @SuppressWarnings("removal")
     private Socket acceptClientWithRetry() {
         return AccessController.doPrivileged(
                 new PrivilegedAction<Socket>() {

Modified: db/derby/code/trunk/java/org.apache.derby.server/org/apache/derby/impl/drda/DRDAConnThread.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.server/org/apache/derby/impl/drda/DRDAConnThread.java?rev=1890895&r1=1890894&r2=1890895&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.server/org/apache/derby/impl/drda/DRDAConnThread.java (original)
+++ db/derby/code/trunk/java/org.apache.derby.server/org/apache/derby/impl/drda/DRDAConnThread.java Fri Jun 18 18:09:58 2021
@@ -9501,6 +9501,8 @@ class DRDAConnThread extends Thread {
      * Privileged Monitor lookup. Must be private so that user code
      * can't call this entry point.
      */
+    // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
+    @SuppressWarnings("removal")
     private  static  ModuleFactory  getMonitor()
     {
         return AccessController.doPrivileged
@@ -9519,6 +9521,8 @@ class DRDAConnThread extends Thread {
      * Privileged service lookup. Must be private so that user code
      * can't call this entry point.
      */
+    // AccessController deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
+    @SuppressWarnings("removal")
     private static  Object findService( final String factoryInterface, final String serviceName )
     {
         return AccessController.doPrivileged

Modified: db/derby/code/trunk/java/org.apache.derby.server/org/apache/derby/impl/drda/DssTrace.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.server/org/apache/derby/impl/drda/DssTrace.java?rev=1890895&r1=1890894&r2=1890895&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.server/org/apache/derby/impl/drda/DssTrace.java (original)
+++ db/derby/code/trunk/java/org.apache.derby.server/org/apache/derby/impl/drda/DssTrace.java Fri Jun 18 18:09:58 2021
@@ -169,6 +169,8 @@ public class DssTrace
   // Start the communications buffer trace.
   // The name of the file to place the trace is passed to this method.
   // After calling this method, calls to isComBufferTraceOn() will return true.
+    // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
+    @SuppressWarnings("removal")
   protected void startComBufferTrace (final String fileName) throws Exception 
   {
     synchronized (comBufferSync) {

Modified: db/derby/code/trunk/java/org.apache.derby.server/org/apache/derby/impl/drda/NetworkServerControlImpl.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.server/org/apache/derby/impl/drda/NetworkServerControlImpl.java?rev=1890895&r1=1890894&r2=1890895&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.server/org/apache/derby/impl/drda/NetworkServerControlImpl.java (original)
+++ db/derby/code/trunk/java/org.apache.derby.server/org/apache/derby/impl/drda/NetworkServerControlImpl.java Fri Jun 18 18:09:58 2021
@@ -816,6 +816,8 @@ public final class NetworkServerControlI
      *
      * @exception Exception throws an exception if an error occurs
      */
+    // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
+    @SuppressWarnings("removal")
     public void blockingStart(PrintWriter consoleWriter)
         throws Exception
     {
@@ -1263,6 +1265,8 @@ public final class NetworkServerControlI
     /**
      * @throws SQLException if authentication or privileges check fails
      */
+    // AccessControlException and SecurityManager deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
+    @SuppressWarnings("removal")
     public void checkShutdownPrivileges() throws SQLException {    
         // get the system's authentication service
         final AuthenticationService auth
@@ -2700,6 +2704,8 @@ public final class NetworkServerControlI
      *
      * @exception Exception thrown if exception encountered
      */
+    // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
+    @SuppressWarnings("removal")
     private void setUpSocket() throws Exception
     {
         
@@ -4271,6 +4277,8 @@ public final class NetworkServerControlI
      * and won't be readily available to ProductVersionHolder when running
      * under security manager.
      */
+    // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
+    @SuppressWarnings("removal")
     private ProductVersionHolder getNetProductVersionHolder() throws Exception
     {
         ProductVersionHolder myPVH= null;
@@ -4297,6 +4305,8 @@ public final class NetworkServerControlI
      * Privileged module lookup. Must be private so that user code
      * can't call this entry point.
      */
+    // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
+    @SuppressWarnings("removal")
     private static  Object getSystemModule( final String factoryInterface )
     {
         return AccessController.doPrivileged
@@ -4315,6 +4325,8 @@ public final class NetworkServerControlI
      * Privileged service lookup. Must be private so that user code
      * can't call this entry point.
      */
+    // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
+    @SuppressWarnings("removal")
     private static  Object findService( final String factoryInterface, final String serviceName )
     {
         return AccessController.doPrivileged

Modified: db/derby/code/trunk/java/org.apache.derby.server/org/apache/derby/impl/drda/NetworkServerMBeanImpl.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.server/org/apache/derby/impl/drda/NetworkServerMBeanImpl.java?rev=1890895&r1=1890894&r2=1890895&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.server/org/apache/derby/impl/drda/NetworkServerMBeanImpl.java (original)
+++ db/derby/code/trunk/java/org.apache.derby.server/org/apache/derby/impl/drda/NetworkServerMBeanImpl.java Fri Jun 18 18:09:58 2021
@@ -76,6 +76,8 @@ class NetworkServerMBeanImpl implements
         checkPermission(MONITOR);
     }
     
+    // AccessController, AccessControlException, and SecurityManager deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
+    @SuppressWarnings("removal")
     private static void checkPermission(SystemPermission permission)
     {
         try {

Modified: db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/FileCompare.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/FileCompare.java?rev=1890895&r1=1890894&r2=1890895&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/FileCompare.java (original)
+++ db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/FileCompare.java Fri Jun 18 18:09:58 2021
@@ -226,7 +226,7 @@ public class FileCompare
         // Define the input and output files
         outFile = new BufferedReader(new FileReader(outfile));
         masterFile = new BufferedReader(new InputStreamReader(is));
-        
+
         // Do the comparison (diff)
         if (usesysdiff == true)
             return doSysDiff(is, testBase, outfile, outDir, pwDiff);

Modified: db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/RunTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/RunTest.java?rev=1890895&r1=1890894&r2=1890895&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/RunTest.java (original)
+++ db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/RunTest.java Fri Jun 18 18:09:58 2021
@@ -2669,6 +2669,8 @@ clp.list(System.out);
         }
     }
     
+    // SecurityManager deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
+    @SuppressWarnings("removal")
     private static void execTestNoProcess(Properties sysProp,
         String systemHome, String propString, String scriptPath)
         throws Exception
@@ -2976,6 +2978,8 @@ clp.list(System.out);
      * @throws ClassNotFoundException
      * @throws IOException
      */
+    // SecurityManager deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
+    @SuppressWarnings("removal")
     private static boolean installSecurityManager() throws ClassNotFoundException, IOException
     {
     	// SecurityManager not currently work with older j9 and useProcess=false

Modified: db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/SimpleDiff.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/SimpleDiff.java?rev=1890895&r1=1890894&r2=1890895&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/SimpleDiff.java (original)
+++ db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/harness/SimpleDiff.java Fri Jun 18 18:09:58 2021
@@ -32,6 +32,13 @@ import java.io.FileReader;
 
 public class SimpleDiff
 {
+    // noise lines to ignore
+    private static final String[] NOISE = new String[]
+    {
+        // Noise line generated by JDK 17 onward. See https://openjdk.java.net/jeps/411
+        // and https://issues.apache.org/jira/browse/DERBY-7110
+        "WARNING: The Security Manager is deprecated and will be removed in a future release.",
+    };
 
     PrintWriter pw;
 
@@ -421,7 +428,16 @@ System.out.println("");
             {
                 for (int i = 0; i < offset - currentHighWater; i++)
                 {
-                    String aLine = readBuffer.readLine();
+                    // skip noise lines
+                    String aLine = null;
+                    while(true)
+                    {
+                        aLine = readBuffer.readLine();
+                        if (aLine == null) { break; }
+
+                        if (!ignoreLine(aLine)) { break; }
+                    }
+ 
                     addElement(aLine);
 /*
 System.out.println("aLine: " + aLine);
@@ -442,6 +458,18 @@ System.out.println("aLine: " + aLine);
             return (String) elementAt(offset);
         }
 
+        /**
+         * Return true if a line should be discarded and ignored.
+         */
+        public boolean ignoreLine(String line)
+        {
+            for (String noise : NOISE)
+            {
+                if (noise.equals(line)) { return true; }
+            }
+
+            return false;
+        }
 
         public final String EMPTY = null;
         protected BufferedReader readBuffer;

Modified: db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/compatibility/VersionCombinationConfigurator.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/compatibility/VersionCombinationConfigurator.java?rev=1890895&r1=1890894&r2=1890895&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/compatibility/VersionCombinationConfigurator.java (original)
+++ db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/compatibility/VersionCombinationConfigurator.java Fri Jun 18 18:09:58 2021
@@ -363,6 +363,8 @@ public class VersionCombinationConfigura
      * @return A {@code URI} pointing to the source, or {@code null} it cannot
      *      be obtained.
      */
+    // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
+    @SuppressWarnings("removal")
     static URI getClassURI(final Class cl) {
         return AccessController.doPrivileged(new PrivilegedAction<URI>() {
             public URI run() {

Modified: db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/demo/CheckToursDBTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/demo/CheckToursDBTest.java?rev=1890895&r1=1890894&r2=1890895&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/demo/CheckToursDBTest.java (original)
+++ db/derby/code/trunk/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/demo/CheckToursDBTest.java Fri Jun 18 18:09:58 2021
@@ -180,6 +180,8 @@ public class CheckToursDBTest extends Ba
  * Inserts rows in the Maps table. Calls insertMaps().
  * @throws Exception
  */
+    // AccessController.doPrivileged() deprecated for removal by JEP 411 https://openjdk.java.net/jeps/411
+    @SuppressWarnings("removal")
     public void insertMapsPrivileged() throws Exception {
         try {