# HG changeset patch
# Parent  dd3af3fa27866f64c3fd6747ad6bd33ee1e2f325
8211122 rejects

diff -r dd3af3fa2786 -r e2099975fe18 src/java.base/share/classes/java/io/ObjectStreamClass.java.rej
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/java.base/share/classes/java/io/ObjectStreamClass.java.rej	Wed Jun 26 14:56:30 2019 +0100
@@ -0,0 +1,9 @@
+--- ObjectStreamClass.java
++++ ObjectStreamClass.java
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1996, 2017, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 1996, 2018, 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
diff -r dd3af3fa2786 -r e2099975fe18 src/java.base/share/classes/java/lang/reflect/Proxy.java.rej
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/java.base/share/classes/java/lang/reflect/Proxy.java.rej	Wed Jun 26 14:56:30 2019 +0100
@@ -0,0 +1,14 @@
+--- Proxy.java
++++ Proxy.java
+@@ -40,9 +40,9 @@
+ import java.util.concurrent.atomic.AtomicInteger;
+ import java.util.concurrent.atomic.AtomicLong;
+ 
++import jdk.internal.access.JavaLangAccess;
++import jdk.internal.access.SharedSecrets;
+ import jdk.internal.loader.BootLoader;
+-import jdk.internal.misc.JavaLangAccess;
+-import jdk.internal.misc.SharedSecrets;
+ import jdk.internal.module.Modules;
+ import jdk.internal.misc.VM;
+ import jdk.internal.reflect.CallerSensitive;
diff -r dd3af3fa2786 -r e2099975fe18 src/java.base/share/classes/java/lang/reflect/UndeclaredThrowableException.java.rej
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/java.base/share/classes/java/lang/reflect/UndeclaredThrowableException.java.rej	Wed Jun 26 14:56:30 2019 +0100
@@ -0,0 +1,11 @@
+--- UndeclaredThrowableException.java
++++ UndeclaredThrowableException.java
+@@ -29,7 +29,7 @@
+ import java.io.ObjectInputStream;
+ import java.io.ObjectOutputStream;
+ import java.io.ObjectStreamField;
+-import jdk.internal.misc.SharedSecrets;
++import jdk.internal.access.SharedSecrets;
+ 
+ /**
+  * Thrown by a method invocation on a proxy instance if its invocation
diff -r dd3af3fa2786 -r e2099975fe18 src/java.base/share/classes/java/security/PrivilegedActionException.java.rej
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/java.base/share/classes/java/security/PrivilegedActionException.java.rej	Wed Jun 26 14:56:30 2019 +0100
@@ -0,0 +1,11 @@
+--- PrivilegedActionException.java
++++ PrivilegedActionException.java
+@@ -29,7 +29,7 @@
+ import java.io.ObjectInputStream;
+ import java.io.ObjectOutputStream;
+ import java.io.ObjectStreamField;
+-import jdk.internal.misc.SharedSecrets;
++import jdk.internal.access.SharedSecrets;
+ 
+ /**
+  * This exception is thrown by
diff -r dd3af3fa2786 -r e2099975fe18 src/java.base/share/classes/java/security/Security.java.rej
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/java.base/share/classes/java/security/Security.java.rej	Wed Jun 26 14:56:30 2019 +0100
@@ -0,0 +1,11 @@
+--- Security.java
++++ Security.java
+@@ -30,7 +30,7 @@
+ import java.io.*;
+ import java.net.URL;
+ 
+-import jdk.internal.misc.SharedSecrets;
++import jdk.internal.access.SharedSecrets;
+ import jdk.internal.util.StaticProperty;
+ import sun.security.util.Debug;
+ import sun.security.util.PropertyExpander;
diff -r dd3af3fa2786 -r e2099975fe18 src/java.base/share/classes/java/util/ImmutableCollections.java.rej
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/java.base/share/classes/java/util/ImmutableCollections.java.rej	Wed Jun 26 14:56:30 2019 +0100
@@ -0,0 +1,11 @@
+--- ImmutableCollections.java
++++ ImmutableCollections.java
+@@ -35,7 +35,7 @@
+ import java.util.function.Function;
+ import java.util.function.Predicate;
+ import java.util.function.UnaryOperator;
+-import jdk.internal.misc.SharedSecrets;
++import jdk.internal.access.SharedSecrets;
+ import jdk.internal.misc.VM;
+ import jdk.internal.vm.annotation.Stable;
+ 
diff -r dd3af3fa2786 -r e2099975fe18 src/java.base/share/classes/jdk/internal/misc/Unsafe.java.rej
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/java.base/share/classes/jdk/internal/misc/Unsafe.java.rej	Wed Jun 26 14:56:30 2019 +0100
@@ -0,0 +1,39 @@
+--- Unsafe.java
++++ Unsafe.java
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2000, 2018, 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
+@@ -3718,6 +3720,29 @@
+     private native boolean isBigEndian0();
+ 
+ 
++    /**
++     * Invokes the given direct byte buffer's cleaner, if any.
++     *
++     * @param directBuffer a direct byte buffer
++     * @throws NullPointerException     if {@code directBuffer} is null
++     * @throws IllegalArgumentException if {@code directBuffer} is non-direct,
++     *                                  or is a {@link java.nio.Buffer#slice slice}, or is a
++     *                                  {@link java.nio.Buffer#duplicate duplicate}
++     */
++    public void invokeCleaner(java.nio.ByteBuffer directBuffer) {
++        if (!directBuffer.isDirect())
++            throw new IllegalArgumentException("buffer is non-direct");
++
++        DirectBuffer db = (DirectBuffer) directBuffer;
++        if (db.attachment() != null)
++            throw new IllegalArgumentException("duplicate or slice");
++
++        Cleaner cleaner = db.cleaner();
++        if (cleaner != null) {
++            cleaner.clean();
++        }
++    }
++
+     // The following deprecated methods are used by JSR 166.
+ 
+     @Deprecated(since="12", forRemoval=true)
diff -r dd3af3fa2786 -r e2099975fe18 src/java.base/share/classes/jdk/internal/module/ModuleBootstrap.java.rej
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/java.base/share/classes/jdk/internal/module/ModuleBootstrap.java.rej	Wed Jun 26 14:56:30 2019 +0100
@@ -0,0 +1,16 @@
+--- ModuleBootstrap.java
++++ ModuleBootstrap.java
+@@ -51,10 +51,9 @@
+ 
+ import jdk.internal.loader.BootLoader;
+ import jdk.internal.loader.BuiltinClassLoader;
+-import jdk.internal.misc.JavaLangAccess;
+-import jdk.internal.misc.JavaLangModuleAccess;
+-import jdk.internal.misc.SharedSecrets;
+-import jdk.internal.misc.VM;
++import jdk.internal.access.JavaLangAccess;
++import jdk.internal.access.JavaLangModuleAccess;
++import jdk.internal.access.SharedSecrets;
+ import jdk.internal.perf.PerfCounter;
+ 
+ /**
diff -r dd3af3fa2786 -r e2099975fe18 src/java.base/share/classes/jdk/internal/reflect/ClassDefiner.java.rej
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/java.base/share/classes/jdk/internal/reflect/ClassDefiner.java.rej	Wed Jun 26 14:56:30 2019 +0100
@@ -0,0 +1,13 @@
+--- ClassDefiner.java
++++ ClassDefiner.java
+@@ -28,8 +28,8 @@
+ import java.security.AccessController;
+ import java.security.PrivilegedAction;
+ 
+-import jdk.internal.misc.JavaLangAccess;
+-import jdk.internal.misc.SharedSecrets;
++import jdk.internal.access.JavaLangAccess;
++import jdk.internal.access.SharedSecrets;
+ 
+ /** Utility class which assists in calling defineClass() by
+     creating a new class loader which delegates to the one needed in
diff -r dd3af3fa2786 -r e2099975fe18 test/hotspot/jtreg/applications/ctw/modules/generate.bash.rej
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/hotspot/jtreg/applications/ctw/modules/generate.bash.rej	Wed Jun 26 14:56:30 2019 +0100
@@ -0,0 +1,19 @@
+--- generate.bash
++++ generate.bash
+@@ -1,6 +1,6 @@
+ #!/bin/bash
+ #
+-#  Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
++#  Copyright (c) 2017, 2018, 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
+@@ -30,7 +30,7 @@
+     echo creating $file for $module...
+     cat > $file <<EOF
+ /*
+- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2017, 2018, 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
diff -r dd3af3fa2786 -r e2099975fe18 test/hotspot/jtreg/applications/ctw/modules/java_compiler.java.rej
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/hotspot/jtreg/applications/ctw/modules/java_compiler.java.rej	Wed Jun 26 14:56:30 2019 +0100
@@ -0,0 +1,9 @@
+--- java_compiler.java
++++ java_compiler.java
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2017, 2018, 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
diff -r dd3af3fa2786 -r e2099975fe18 test/hotspot/jtreg/applications/ctw/modules/java_datatransfer.java.rej
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/hotspot/jtreg/applications/ctw/modules/java_datatransfer.java.rej	Wed Jun 26 14:56:30 2019 +0100
@@ -0,0 +1,9 @@
+--- java_datatransfer.java
++++ java_datatransfer.java
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2017, 2018, 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
diff -r dd3af3fa2786 -r e2099975fe18 test/hotspot/jtreg/applications/ctw/modules/java_instrument.java.rej
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/hotspot/jtreg/applications/ctw/modules/java_instrument.java.rej	Wed Jun 26 14:56:30 2019 +0100
@@ -0,0 +1,9 @@
+--- java_instrument.java
++++ java_instrument.java
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2017, 2018, 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
diff -r dd3af3fa2786 -r e2099975fe18 test/hotspot/jtreg/applications/ctw/modules/java_logging.java.rej
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/hotspot/jtreg/applications/ctw/modules/java_logging.java.rej	Wed Jun 26 14:56:30 2019 +0100
@@ -0,0 +1,9 @@
+--- java_logging.java
++++ java_logging.java
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2017, 2018, 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
diff -r dd3af3fa2786 -r e2099975fe18 test/hotspot/jtreg/applications/ctw/modules/java_management.java.rej
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/hotspot/jtreg/applications/ctw/modules/java_management.java.rej	Wed Jun 26 14:56:30 2019 +0100
@@ -0,0 +1,9 @@
+--- java_management.java
++++ java_management.java
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2017, 2018, 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
diff -r dd3af3fa2786 -r e2099975fe18 test/hotspot/jtreg/applications/ctw/modules/java_management_rmi.java.rej
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/hotspot/jtreg/applications/ctw/modules/java_management_rmi.java.rej	Wed Jun 26 14:56:30 2019 +0100
@@ -0,0 +1,9 @@
+--- java_management_rmi.java
++++ java_management_rmi.java
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2017, 2018, 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
diff -r dd3af3fa2786 -r e2099975fe18 test/hotspot/jtreg/applications/ctw/modules/java_naming.java.rej
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/hotspot/jtreg/applications/ctw/modules/java_naming.java.rej	Wed Jun 26 14:56:30 2019 +0100
@@ -0,0 +1,9 @@
+--- java_naming.java
++++ java_naming.java
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2017, 2018, 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
diff -r dd3af3fa2786 -r e2099975fe18 test/hotspot/jtreg/applications/ctw/modules/java_prefs.java.rej
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/hotspot/jtreg/applications/ctw/modules/java_prefs.java.rej	Wed Jun 26 14:56:30 2019 +0100
@@ -0,0 +1,9 @@
+--- java_prefs.java
++++ java_prefs.java
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2017, 2018, 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
diff -r dd3af3fa2786 -r e2099975fe18 test/hotspot/jtreg/applications/ctw/modules/java_rmi.java.rej
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/hotspot/jtreg/applications/ctw/modules/java_rmi.java.rej	Wed Jun 26 14:56:30 2019 +0100
@@ -0,0 +1,9 @@
+--- java_rmi.java
++++ java_rmi.java
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2017, 2018, 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
diff -r dd3af3fa2786 -r e2099975fe18 test/hotspot/jtreg/applications/ctw/modules/java_scripting.java.rej
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/hotspot/jtreg/applications/ctw/modules/java_scripting.java.rej	Wed Jun 26 14:56:30 2019 +0100
@@ -0,0 +1,9 @@
+--- java_scripting.java
++++ java_scripting.java
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2017, 2018, 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
diff -r dd3af3fa2786 -r e2099975fe18 test/hotspot/jtreg/applications/ctw/modules/java_security_jgss.java.rej
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/hotspot/jtreg/applications/ctw/modules/java_security_jgss.java.rej	Wed Jun 26 14:56:30 2019 +0100
@@ -0,0 +1,9 @@
+--- java_security_jgss.java
++++ java_security_jgss.java
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2017, 2018, 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
diff -r dd3af3fa2786 -r e2099975fe18 test/hotspot/jtreg/applications/ctw/modules/java_security_sasl.java.rej
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/hotspot/jtreg/applications/ctw/modules/java_security_sasl.java.rej	Wed Jun 26 14:56:30 2019 +0100
@@ -0,0 +1,9 @@
+--- java_security_sasl.java
++++ java_security_sasl.java
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2017, 2018, 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
diff -r dd3af3fa2786 -r e2099975fe18 test/hotspot/jtreg/applications/ctw/modules/java_smartcardio.java.rej
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/hotspot/jtreg/applications/ctw/modules/java_smartcardio.java.rej	Wed Jun 26 14:56:30 2019 +0100
@@ -0,0 +1,9 @@
+--- java_smartcardio.java
++++ java_smartcardio.java
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2017, 2018, 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
diff -r dd3af3fa2786 -r e2099975fe18 test/hotspot/jtreg/applications/ctw/modules/java_sql.java.rej
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/hotspot/jtreg/applications/ctw/modules/java_sql.java.rej	Wed Jun 26 14:56:30 2019 +0100
@@ -0,0 +1,9 @@
+--- java_sql.java
++++ java_sql.java
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2017, 2018, 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
diff -r dd3af3fa2786 -r e2099975fe18 test/hotspot/jtreg/applications/ctw/modules/java_sql_rowset.java.rej
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/hotspot/jtreg/applications/ctw/modules/java_sql_rowset.java.rej	Wed Jun 26 14:56:30 2019 +0100
@@ -0,0 +1,9 @@
+--- java_sql_rowset.java
++++ java_sql_rowset.java
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2017, 2018, 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
diff -r dd3af3fa2786 -r e2099975fe18 test/hotspot/jtreg/applications/ctw/modules/java_xml.java.rej
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/hotspot/jtreg/applications/ctw/modules/java_xml.java.rej	Wed Jun 26 14:56:30 2019 +0100
@@ -0,0 +1,9 @@
+--- java_xml.java
++++ java_xml.java
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2017, 2018, 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
diff -r dd3af3fa2786 -r e2099975fe18 test/hotspot/jtreg/applications/ctw/modules/java_xml_crypto.java.rej
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/hotspot/jtreg/applications/ctw/modules/java_xml_crypto.java.rej	Wed Jun 26 14:56:30 2019 +0100
@@ -0,0 +1,9 @@
+--- java_xml_crypto.java
++++ java_xml_crypto.java
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2017, 2018, 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
diff -r dd3af3fa2786 -r e2099975fe18 test/hotspot/jtreg/applications/ctw/modules/jdk_accessibility.java.rej
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/hotspot/jtreg/applications/ctw/modules/jdk_accessibility.java.rej	Wed Jun 26 14:56:30 2019 +0100
@@ -0,0 +1,9 @@
+--- jdk_accessibility.java
++++ jdk_accessibility.java
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2017, 2018, 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
diff -r dd3af3fa2786 -r e2099975fe18 test/hotspot/jtreg/applications/ctw/modules/jdk_aot.java.rej
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/hotspot/jtreg/applications/ctw/modules/jdk_aot.java.rej	Wed Jun 26 14:56:30 2019 +0100
@@ -0,0 +1,9 @@
+--- jdk_aot.java
++++ jdk_aot.java
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2017, 2018, 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
diff -r dd3af3fa2786 -r e2099975fe18 test/hotspot/jtreg/applications/ctw/modules/jdk_attach.java.rej
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/hotspot/jtreg/applications/ctw/modules/jdk_attach.java.rej	Wed Jun 26 14:56:30 2019 +0100
@@ -0,0 +1,9 @@
+--- jdk_attach.java
++++ jdk_attach.java
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2017, 2018, 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
diff -r dd3af3fa2786 -r e2099975fe18 test/hotspot/jtreg/applications/ctw/modules/jdk_charsets.java.rej
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/hotspot/jtreg/applications/ctw/modules/jdk_charsets.java.rej	Wed Jun 26 14:56:30 2019 +0100
@@ -0,0 +1,9 @@
+--- jdk_charsets.java
++++ jdk_charsets.java
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2017, 2018, 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
diff -r dd3af3fa2786 -r e2099975fe18 test/hotspot/jtreg/applications/ctw/modules/jdk_compiler.java.rej
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/hotspot/jtreg/applications/ctw/modules/jdk_compiler.java.rej	Wed Jun 26 14:56:30 2019 +0100
@@ -0,0 +1,9 @@
+--- jdk_compiler.java
++++ jdk_compiler.java
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2017, 2018, 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
diff -r dd3af3fa2786 -r e2099975fe18 test/hotspot/jtreg/applications/ctw/modules/jdk_crypto_cryptoki.java.rej
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/hotspot/jtreg/applications/ctw/modules/jdk_crypto_cryptoki.java.rej	Wed Jun 26 14:56:30 2019 +0100
@@ -0,0 +1,9 @@
+--- jdk_crypto_cryptoki.java
++++ jdk_crypto_cryptoki.java
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2017, 2018, 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
diff -r dd3af3fa2786 -r e2099975fe18 test/hotspot/jtreg/applications/ctw/modules/jdk_crypto_ec.java.rej
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/hotspot/jtreg/applications/ctw/modules/jdk_crypto_ec.java.rej	Wed Jun 26 14:56:30 2019 +0100
@@ -0,0 +1,9 @@
+--- jdk_crypto_ec.java
++++ jdk_crypto_ec.java
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2017, 2018, 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
diff -r dd3af3fa2786 -r e2099975fe18 test/hotspot/jtreg/applications/ctw/modules/jdk_crypto_mscapi.java.rej
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/hotspot/jtreg/applications/ctw/modules/jdk_crypto_mscapi.java.rej	Wed Jun 26 14:56:30 2019 +0100
@@ -0,0 +1,9 @@
+--- jdk_crypto_mscapi.java
++++ jdk_crypto_mscapi.java
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2017, 2018, 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
diff -r dd3af3fa2786 -r e2099975fe18 test/hotspot/jtreg/applications/ctw/modules/jdk_crypto_ucrypto.java.rej
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/hotspot/jtreg/applications/ctw/modules/jdk_crypto_ucrypto.java.rej	Wed Jun 26 14:56:30 2019 +0100
@@ -0,0 +1,9 @@
+--- jdk_crypto_ucrypto.java
++++ jdk_crypto_ucrypto.java
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2017, 2018, 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
diff -r dd3af3fa2786 -r e2099975fe18 test/hotspot/jtreg/applications/ctw/modules/jdk_dynalink.java.rej
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/hotspot/jtreg/applications/ctw/modules/jdk_dynalink.java.rej	Wed Jun 26 14:56:30 2019 +0100
@@ -0,0 +1,9 @@
+--- jdk_dynalink.java
++++ jdk_dynalink.java
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2017, 2018, 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
diff -r dd3af3fa2786 -r e2099975fe18 test/hotspot/jtreg/applications/ctw/modules/jdk_editpad.java.rej
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/hotspot/jtreg/applications/ctw/modules/jdk_editpad.java.rej	Wed Jun 26 14:56:30 2019 +0100
@@ -0,0 +1,9 @@
+--- jdk_editpad.java
++++ jdk_editpad.java
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2017, 2018, 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
diff -r dd3af3fa2786 -r e2099975fe18 test/hotspot/jtreg/applications/ctw/modules/jdk_hotspot_agent.java.rej
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/hotspot/jtreg/applications/ctw/modules/jdk_hotspot_agent.java.rej	Wed Jun 26 14:56:30 2019 +0100
@@ -0,0 +1,9 @@
+--- jdk_hotspot_agent.java
++++ jdk_hotspot_agent.java
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2017, 2018, 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
diff -r dd3af3fa2786 -r e2099975fe18 test/hotspot/jtreg/applications/ctw/modules/jdk_httpserver.java.rej
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/hotspot/jtreg/applications/ctw/modules/jdk_httpserver.java.rej	Wed Jun 26 14:56:30 2019 +0100
@@ -0,0 +1,9 @@
+--- jdk_httpserver.java
++++ jdk_httpserver.java
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2017, 2018, 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
diff -r dd3af3fa2786 -r e2099975fe18 test/hotspot/jtreg/applications/ctw/modules/jdk_incubator_httpclient.java.rej
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/hotspot/jtreg/applications/ctw/modules/jdk_incubator_httpclient.java.rej	Wed Jun 26 14:56:30 2019 +0100
@@ -0,0 +1,19 @@
+--- jdk_incubator_httpclient.java
++++ jdk_incubator_httpclient.java
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2017, 2018, 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
+@@ -26,7 +26,8 @@
+  * @summary run CTW for all classes from jdk.incubator.httpclient module
+  *
+  * @library /test/lib / /testlibrary/ctw/src
+- * @modules java.base/jdk.internal.jimage
++ * @modules java.base/jdk.internal.access
++ *          java.base/jdk.internal.jimage
+  *          java.base/jdk.internal.misc
+  *          java.base/jdk.internal.reflect
+  * @modules jdk.incubator.httpclient
diff -r dd3af3fa2786 -r e2099975fe18 test/hotspot/jtreg/applications/ctw/modules/jdk_internal_ed.java.rej
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/hotspot/jtreg/applications/ctw/modules/jdk_internal_ed.java.rej	Wed Jun 26 14:56:30 2019 +0100
@@ -0,0 +1,9 @@
+--- jdk_internal_ed.java
++++ jdk_internal_ed.java
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2017, 2018, 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
diff -r dd3af3fa2786 -r e2099975fe18 test/hotspot/jtreg/applications/ctw/modules/jdk_internal_jvmstat.java.rej
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/hotspot/jtreg/applications/ctw/modules/jdk_internal_jvmstat.java.rej	Wed Jun 26 14:56:30 2019 +0100
@@ -0,0 +1,9 @@
+--- jdk_internal_jvmstat.java
++++ jdk_internal_jvmstat.java
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2017, 2018, 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
diff -r dd3af3fa2786 -r e2099975fe18 test/hotspot/jtreg/applications/ctw/modules/jdk_internal_le.java.rej
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/hotspot/jtreg/applications/ctw/modules/jdk_internal_le.java.rej	Wed Jun 26 14:56:30 2019 +0100
@@ -0,0 +1,9 @@
+--- jdk_internal_le.java
++++ jdk_internal_le.java
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2017, 2018, 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
diff -r dd3af3fa2786 -r e2099975fe18 test/hotspot/jtreg/applications/ctw/modules/jdk_internal_opt.java.rej
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/hotspot/jtreg/applications/ctw/modules/jdk_internal_opt.java.rej	Wed Jun 26 14:56:30 2019 +0100
@@ -0,0 +1,9 @@
+--- jdk_internal_opt.java
++++ jdk_internal_opt.java
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2017, 2018, 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
diff -r dd3af3fa2786 -r e2099975fe18 test/hotspot/jtreg/applications/ctw/modules/jdk_internal_vm_ci.java.rej
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/hotspot/jtreg/applications/ctw/modules/jdk_internal_vm_ci.java.rej	Wed Jun 26 14:56:30 2019 +0100
@@ -0,0 +1,9 @@
+--- jdk_internal_vm_ci.java
++++ jdk_internal_vm_ci.java
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2017, 2018, 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
diff -r dd3af3fa2786 -r e2099975fe18 test/hotspot/jtreg/applications/ctw/modules/jdk_internal_vm_compiler.java.rej
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/hotspot/jtreg/applications/ctw/modules/jdk_internal_vm_compiler.java.rej	Wed Jun 26 14:56:30 2019 +0100
@@ -0,0 +1,9 @@
+--- jdk_internal_vm_compiler.java
++++ jdk_internal_vm_compiler.java
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2017, 2018, 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
diff -r dd3af3fa2786 -r e2099975fe18 test/hotspot/jtreg/applications/ctw/modules/jdk_internal_vm_compiler_management.java.rej
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/hotspot/jtreg/applications/ctw/modules/jdk_internal_vm_compiler_management.java.rej	Wed Jun 26 14:56:30 2019 +0100
@@ -0,0 +1,9 @@
+--- jdk_internal_vm_compiler_management.java
++++ jdk_internal_vm_compiler_management.java
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2017, 2018, 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
diff -r dd3af3fa2786 -r e2099975fe18 test/hotspot/jtreg/applications/ctw/modules/jdk_jartool.java.rej
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/hotspot/jtreg/applications/ctw/modules/jdk_jartool.java.rej	Wed Jun 26 14:56:30 2019 +0100
@@ -0,0 +1,9 @@
+--- jdk_jartool.java
++++ jdk_jartool.java
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2017, 2018, 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
diff -r dd3af3fa2786 -r e2099975fe18 test/hotspot/jtreg/applications/ctw/modules/jdk_javadoc.java.rej
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/hotspot/jtreg/applications/ctw/modules/jdk_javadoc.java.rej	Wed Jun 26 14:56:30 2019 +0100
@@ -0,0 +1,9 @@
+--- jdk_javadoc.java
++++ jdk_javadoc.java
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2017, 2018, 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
diff -r dd3af3fa2786 -r e2099975fe18 test/hotspot/jtreg/applications/ctw/modules/jdk_jcmd.java.rej
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/hotspot/jtreg/applications/ctw/modules/jdk_jcmd.java.rej	Wed Jun 26 14:56:30 2019 +0100
@@ -0,0 +1,9 @@
+--- jdk_jcmd.java
++++ jdk_jcmd.java
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2017, 2018, 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
diff -r dd3af3fa2786 -r e2099975fe18 test/hotspot/jtreg/applications/ctw/modules/jdk_jconsole.java.rej
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/hotspot/jtreg/applications/ctw/modules/jdk_jconsole.java.rej	Wed Jun 26 14:56:30 2019 +0100
@@ -0,0 +1,9 @@
+--- jdk_jconsole.java
++++ jdk_jconsole.java
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2017, 2018, 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
diff -r dd3af3fa2786 -r e2099975fe18 test/hotspot/jtreg/applications/ctw/modules/jdk_jdeps.java.rej
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/hotspot/jtreg/applications/ctw/modules/jdk_jdeps.java.rej	Wed Jun 26 14:56:30 2019 +0100
@@ -0,0 +1,9 @@
+--- jdk_jdeps.java
++++ jdk_jdeps.java
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2017, 2018, 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
diff -r dd3af3fa2786 -r e2099975fe18 test/hotspot/jtreg/applications/ctw/modules/jdk_jdi.java.rej
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/hotspot/jtreg/applications/ctw/modules/jdk_jdi.java.rej	Wed Jun 26 14:56:30 2019 +0100
@@ -0,0 +1,9 @@
+--- jdk_jdi.java
++++ jdk_jdi.java
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2017, 2018, 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
diff -r dd3af3fa2786 -r e2099975fe18 test/hotspot/jtreg/applications/ctw/modules/jdk_jlink.java.rej
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/hotspot/jtreg/applications/ctw/modules/jdk_jlink.java.rej	Wed Jun 26 14:56:30 2019 +0100
@@ -0,0 +1,9 @@
+--- jdk_jlink.java
++++ jdk_jlink.java
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2017, 2018, 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
diff -r dd3af3fa2786 -r e2099975fe18 test/hotspot/jtreg/applications/ctw/modules/jdk_jshell.java.rej
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/hotspot/jtreg/applications/ctw/modules/jdk_jshell.java.rej	Wed Jun 26 14:56:30 2019 +0100
@@ -0,0 +1,9 @@
+--- jdk_jshell.java
++++ jdk_jshell.java
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2017, 2018, 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
diff -r dd3af3fa2786 -r e2099975fe18 test/hotspot/jtreg/applications/ctw/modules/jdk_jsobject.java.rej
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/hotspot/jtreg/applications/ctw/modules/jdk_jsobject.java.rej	Wed Jun 26 14:56:30 2019 +0100
@@ -0,0 +1,9 @@
+--- jdk_jsobject.java
++++ jdk_jsobject.java
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2017, 2018, 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
diff -r dd3af3fa2786 -r e2099975fe18 test/hotspot/jtreg/applications/ctw/modules/jdk_jstatd.java.rej
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/hotspot/jtreg/applications/ctw/modules/jdk_jstatd.java.rej	Wed Jun 26 14:56:30 2019 +0100
@@ -0,0 +1,9 @@
+--- jdk_jstatd.java
++++ jdk_jstatd.java
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2017, 2018, 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
diff -r dd3af3fa2786 -r e2099975fe18 test/hotspot/jtreg/applications/ctw/modules/jdk_localedata.java.rej
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/hotspot/jtreg/applications/ctw/modules/jdk_localedata.java.rej	Wed Jun 26 14:56:30 2019 +0100
@@ -0,0 +1,9 @@
+--- jdk_localedata.java
++++ jdk_localedata.java
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2017, 2018, 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
diff -r dd3af3fa2786 -r e2099975fe18 test/hotspot/jtreg/applications/ctw/modules/jdk_management.java.rej
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/hotspot/jtreg/applications/ctw/modules/jdk_management.java.rej	Wed Jun 26 14:56:30 2019 +0100
@@ -0,0 +1,9 @@
+--- jdk_management.java
++++ jdk_management.java
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2017, 2018, 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
diff -r dd3af3fa2786 -r e2099975fe18 test/hotspot/jtreg/applications/ctw/modules/jdk_management_agent.java.rej
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/hotspot/jtreg/applications/ctw/modules/jdk_management_agent.java.rej	Wed Jun 26 14:56:30 2019 +0100
@@ -0,0 +1,9 @@
+--- jdk_management_agent.java
++++ jdk_management_agent.java
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2017, 2018, 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
diff -r dd3af3fa2786 -r e2099975fe18 test/hotspot/jtreg/applications/ctw/modules/jdk_naming_dns.java.rej
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/hotspot/jtreg/applications/ctw/modules/jdk_naming_dns.java.rej	Wed Jun 26 14:56:30 2019 +0100
@@ -0,0 +1,9 @@
+--- jdk_naming_dns.java
++++ jdk_naming_dns.java
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2017, 2018, 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
diff -r dd3af3fa2786 -r e2099975fe18 test/hotspot/jtreg/applications/ctw/modules/jdk_naming_rmi.java.rej
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/hotspot/jtreg/applications/ctw/modules/jdk_naming_rmi.java.rej	Wed Jun 26 14:56:30 2019 +0100
@@ -0,0 +1,9 @@
+--- jdk_naming_rmi.java
++++ jdk_naming_rmi.java
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2017, 2018, 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
diff -r dd3af3fa2786 -r e2099975fe18 test/hotspot/jtreg/applications/ctw/modules/jdk_net.java.rej
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/hotspot/jtreg/applications/ctw/modules/jdk_net.java.rej	Wed Jun 26 14:56:30 2019 +0100
@@ -0,0 +1,9 @@
+--- jdk_net.java
++++ jdk_net.java
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2017, 2018, 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
diff -r dd3af3fa2786 -r e2099975fe18 test/hotspot/jtreg/applications/ctw/modules/jdk_packager.java.rej
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/hotspot/jtreg/applications/ctw/modules/jdk_packager.java.rej	Wed Jun 26 14:56:30 2019 +0100
@@ -0,0 +1,19 @@
+--- jdk_packager.java
++++ jdk_packager.java
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2017, 2018, 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
+@@ -26,7 +26,8 @@
+  * @summary run CTW for all classes from jdk.packager module
+  *
+  * @library /test/lib / /testlibrary/ctw/src
+- * @modules java.base/jdk.internal.jimage
++ * @modules java.base/jdk.internal.access
++ *          java.base/jdk.internal.jimage
+  *          java.base/jdk.internal.misc
+  *          java.base/jdk.internal.reflect
+  * @modules jdk.packager
diff -r dd3af3fa2786 -r e2099975fe18 test/hotspot/jtreg/applications/ctw/modules/jdk_packager_services.java.rej
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/hotspot/jtreg/applications/ctw/modules/jdk_packager_services.java.rej	Wed Jun 26 14:56:30 2019 +0100
@@ -0,0 +1,19 @@
+--- jdk_packager_services.java
++++ jdk_packager_services.java
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2017, 2018, 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
+@@ -26,7 +26,8 @@
+  * @summary run CTW for all classes from jdk.packager.services module
+  *
+  * @library /test/lib / /testlibrary/ctw/src
+- * @modules java.base/jdk.internal.jimage
++ * @modules java.base/jdk.internal.access
++ *          java.base/jdk.internal.jimage
+  *          java.base/jdk.internal.misc
+  *          java.base/jdk.internal.reflect
+  * @modules jdk.packager.services
diff -r dd3af3fa2786 -r e2099975fe18 test/hotspot/jtreg/applications/ctw/modules/jdk_rmic.java.rej
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/hotspot/jtreg/applications/ctw/modules/jdk_rmic.java.rej	Wed Jun 26 14:56:30 2019 +0100
@@ -0,0 +1,9 @@
+--- jdk_rmic.java
++++ jdk_rmic.java
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2017, 2018, 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
diff -r dd3af3fa2786 -r e2099975fe18 test/hotspot/jtreg/applications/ctw/modules/jdk_scripting_nashorn.java.rej
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/hotspot/jtreg/applications/ctw/modules/jdk_scripting_nashorn.java.rej	Wed Jun 26 14:56:30 2019 +0100
@@ -0,0 +1,9 @@
+--- jdk_scripting_nashorn.java
++++ jdk_scripting_nashorn.java
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2017, 2018, 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
diff -r dd3af3fa2786 -r e2099975fe18 test/hotspot/jtreg/applications/ctw/modules/jdk_scripting_nashorn_shell.java.rej
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/hotspot/jtreg/applications/ctw/modules/jdk_scripting_nashorn_shell.java.rej	Wed Jun 26 14:56:30 2019 +0100
@@ -0,0 +1,9 @@
+--- jdk_scripting_nashorn_shell.java
++++ jdk_scripting_nashorn_shell.java
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2017, 2018, 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
diff -r dd3af3fa2786 -r e2099975fe18 test/hotspot/jtreg/applications/ctw/modules/jdk_sctp.java.rej
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/hotspot/jtreg/applications/ctw/modules/jdk_sctp.java.rej	Wed Jun 26 14:56:30 2019 +0100
@@ -0,0 +1,9 @@
+--- jdk_sctp.java
++++ jdk_sctp.java
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2017, 2018, 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
diff -r dd3af3fa2786 -r e2099975fe18 test/hotspot/jtreg/applications/ctw/modules/jdk_security_auth.java.rej
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/hotspot/jtreg/applications/ctw/modules/jdk_security_auth.java.rej	Wed Jun 26 14:56:30 2019 +0100
@@ -0,0 +1,9 @@
+--- jdk_security_auth.java
++++ jdk_security_auth.java
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2017, 2018, 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
diff -r dd3af3fa2786 -r e2099975fe18 test/hotspot/jtreg/applications/ctw/modules/jdk_security_jgss.java.rej
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/hotspot/jtreg/applications/ctw/modules/jdk_security_jgss.java.rej	Wed Jun 26 14:56:30 2019 +0100
@@ -0,0 +1,9 @@
+--- jdk_security_jgss.java
++++ jdk_security_jgss.java
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2017, 2018, 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
diff -r dd3af3fa2786 -r e2099975fe18 test/hotspot/jtreg/applications/ctw/modules/jdk_unsupported.java.rej
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/hotspot/jtreg/applications/ctw/modules/jdk_unsupported.java.rej	Wed Jun 26 14:56:30 2019 +0100
@@ -0,0 +1,9 @@
+--- jdk_unsupported.java
++++ jdk_unsupported.java
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2017, 2018, 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
diff -r dd3af3fa2786 -r e2099975fe18 test/hotspot/jtreg/applications/ctw/modules/jdk_xml_dom.java.rej
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/hotspot/jtreg/applications/ctw/modules/jdk_xml_dom.java.rej	Wed Jun 26 14:56:30 2019 +0100
@@ -0,0 +1,9 @@
+--- jdk_xml_dom.java
++++ jdk_xml_dom.java
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2017, 2018, 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
diff -r dd3af3fa2786 -r e2099975fe18 test/hotspot/jtreg/applications/ctw/modules/jdk_zipfs.java.rej
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/hotspot/jtreg/applications/ctw/modules/jdk_zipfs.java.rej	Wed Jun 26 14:56:30 2019 +0100
@@ -0,0 +1,9 @@
+--- jdk_zipfs.java
++++ jdk_zipfs.java
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2017, 2018, 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
diff -r dd3af3fa2786 -r e2099975fe18 test/jdk/java/lang/ModuleLayer/BasicLayerTest.java.rej
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/jdk/java/lang/ModuleLayer/BasicLayerTest.java.rej	Wed Jun 26 14:56:30 2019 +0100
@@ -0,0 +1,26 @@
+--- BasicLayerTest.java
++++ BasicLayerTest.java
+@@ -24,7 +24,7 @@
+ /**
+  * @test
+  * @library /test/lib
+- * @modules java.base/jdk.internal.misc
++ * @modules java.base/jdk.internal.access
+  * @build BasicLayerTest
+  *        jdk.test.lib.util.ModuleUtils
+  * @compile layertest/Test.java
+@@ -38,13 +38,12 @@
+ import java.lang.module.ModuleFinder;
+ import java.util.HashMap;
+ import java.util.Map;
+-import java.util.Optional;
+ import java.util.Set;
+ import java.util.stream.Collectors;
+ 
+ import jdk.test.lib.util.ModuleUtils;
+ 
+-import jdk.internal.misc.SharedSecrets;
++import jdk.internal.access.SharedSecrets;
+ 
+ import org.testng.annotations.DataProvider;
+ import org.testng.annotations.Test;
diff -r dd3af3fa2786 -r e2099975fe18 test/jdk/java/lang/module/ConfigurationTest.java.rej
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/jdk/java/lang/module/ConfigurationTest.java.rej	Wed Jun 26 14:56:30 2019 +0100
@@ -0,0 +1,25 @@
+--- ConfigurationTest.java
++++ ConfigurationTest.java
+@@ -24,7 +24,7 @@
+ /**
+  * @test
+  * @library /test/lib
+- * @modules java.base/jdk.internal.misc
++ * @modules java.base/jdk.internal.access
+  *          java.base/jdk.internal.module
+  * @build ConfigurationTest
+  *        jdk.test.lib.util.ModuleUtils
+@@ -45,12 +45,11 @@
+ import java.nio.file.Path;
+ import java.nio.file.Paths;
+ import java.util.List;
+-import java.util.Optional;
+ import java.util.Set;
+ 
+ import jdk.test.lib.util.ModuleUtils;
+ 
+-import jdk.internal.misc.SharedSecrets;
++import jdk.internal.access.SharedSecrets;
+ import jdk.internal.module.ModuleInfoWriter;
+ import jdk.internal.module.ModuleTarget;
+ import org.testng.annotations.DataProvider;
diff -r dd3af3fa2786 -r e2099975fe18 test/jdk/jdk/internal/reflect/constantPool/ConstantPoolTest.java.rej
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/jdk/jdk/internal/reflect/constantPool/ConstantPoolTest.java.rej	Wed Jun 26 14:56:30 2019 +0100
@@ -0,0 +1,14 @@
+--- ConstantPoolTest.java
++++ ConstantPoolTest.java
+@@ -36,9 +36,9 @@
+ 
+ import java.util.HashMap;
+ import java.util.Map;
+-import jdk.internal.misc.SharedSecrets;
++import jdk.internal.access.SharedSecrets;
++import jdk.internal.reflect.ConstantPool;
+ import jdk.test.lib.Asserts;
+-import jdk.internal.reflect.ConstantPool;
+ 
+ public class ConstantPoolTest {
+ 
diff -r dd3af3fa2786 -r e2099975fe18 test/jdk/tools/jlink/plugins/SystemModuleDescriptors/SystemModulesTest.java.rej
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/jdk/tools/jlink/plugins/SystemModuleDescriptors/SystemModulesTest.java.rej	Wed Jun 26 14:56:30 2019 +0100
@@ -0,0 +1,21 @@
+--- SystemModulesTest.java
++++ SystemModulesTest.java
+@@ -34,15 +34,15 @@
+ import java.util.Map;
+ import java.util.Set;
+ 
+-import jdk.internal.misc.JavaLangModuleAccess;
+-import jdk.internal.misc.SharedSecrets;
++import jdk.internal.access.JavaLangModuleAccess;
++import jdk.internal.access.SharedSecrets;
+ import org.testng.annotations.Test;
+ import static org.testng.Assert.*;
+ 
+ /**
+  * @test
+  * @bug 8142968 8173381
+- * @modules java.base/jdk.internal.misc
++ * @modules java.base/jdk.internal.access
+  * @modules java.base/jdk.internal.module
+  * @modules java.base/jdk.internal.org.objectweb.asm
+  * @build ModuleTargetHelper