changeset 16493:7515d03dd907

8171380: Remove all exports from jdk.jlink Reviewed-by: alanb, mchung, sundar
author chegar
date Wed, 18 Jan 2017 09:36:24 +0000
parents ea03f697cf00
children c8db4f1737c4
files src/jdk.jlink/share/classes/module-info.java test/ProblemList.txt test/TEST.ROOT test/tools/jlink/DefaultProviderTest.java test/tools/jlink/ImageFileCreatorTest.java test/tools/jlink/ImageFilePoolTest.java test/tools/jlink/IntegrationTest.java test/tools/jlink/JLink2Test.java test/tools/jlink/JLinkOptionsTest.java test/tools/jlink/JLinkPostProcessingTest.java test/tools/jlink/JLinkTest.java test/tools/jlink/ResourcePoolTest.java test/tools/jlink/plugins/CompressorPluginTest.java test/tools/jlink/plugins/ExcludeFilesPluginTest.java test/tools/jlink/plugins/ExcludePluginTest.java test/tools/jlink/plugins/ExcludeVMPluginTest.java test/tools/jlink/plugins/IncludeLocalesPluginTest.java test/tools/jlink/plugins/LastSorterTest.java test/tools/jlink/plugins/PluginsNegativeTest.java test/tools/jlink/plugins/PrevisitorTest.java test/tools/jlink/plugins/StringSharingPluginTest.java test/tools/jlink/plugins/StripDebugPluginTest.java test/tools/pack200/Utils.java
diffstat 23 files changed, 30 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/src/jdk.jlink/share/classes/module-info.java	Wed Jan 18 10:24:47 2017 +0100
+++ b/src/jdk.jlink/share/classes/module-info.java	Wed Jan 18 09:36:24 2017 +0000
@@ -24,8 +24,6 @@
  */
 
 module jdk.jlink {
-    exports jdk.tools.jlink.plugin;
-
     requires jdk.internal.opt;
     requires jdk.jdeps;
 
--- a/test/ProblemList.txt	Wed Jan 18 10:24:47 2017 +0100
+++ b/test/ProblemList.txt	Wed Jan 18 09:36:24 2017 +0000
@@ -258,6 +258,8 @@
 
 tools/jlink/multireleasejar/JLinkMultiReleaseJarTest.java       8169971 windows-x64
 
+tools/jlink/CustomPluginTest.java                               8172864 generic-all
+
 ############################################################################
 
 # jdk_jdi
--- a/test/TEST.ROOT	Wed Jan 18 10:24:47 2017 +0100
+++ b/test/TEST.ROOT	Wed Jan 18 09:36:24 2017 +0000
@@ -26,8 +26,8 @@
 # Allow querying of various System properties in @requires clauses
 requires.properties=sun.arch.data.model java.runtime.name
 
-# Tests using jtreg 4.2 b04 features
-requiredVersion=4.2 b04
+# Tests using jtreg 4.2 b05 features
+requiredVersion=4.2 b05
 
 # Path to libraries in the topmost test directory. This is needed so @library
 # does not need ../../ notation to reach them
--- a/test/tools/jlink/DefaultProviderTest.java	Wed Jan 18 10:24:47 2017 +0100
+++ b/test/tools/jlink/DefaultProviderTest.java	Wed Jan 18 09:36:24 2017 +0000
@@ -44,6 +44,7 @@
  * @modules java.base/jdk.internal.jimage
  *          jdk.jdeps/com.sun.tools.classfile
  *          jdk.jlink/jdk.tools.jlink.internal
+ *          jdk.jlink/jdk.tools.jlink.plugin
  *          jdk.jlink/jdk.tools.jmod
  *          jdk.jlink/jdk.tools.jimage
  *          jdk.compiler
--- a/test/tools/jlink/ImageFileCreatorTest.java	Wed Jan 18 10:24:47 2017 +0100
+++ b/test/tools/jlink/ImageFileCreatorTest.java	Wed Jan 18 09:36:24 2017 +0000
@@ -48,6 +48,7 @@
  * @author Jean-Francois Denise
  * @modules jdk.jlink/jdk.tools.jlink.internal
  *          jdk.jlink/jdk.tools.jlink.builder
+ *          jdk.jlink/jdk.tools.jlink.plugin
  *          java.base/jdk.internal.jimage
  * @run main/othervm -verbose:gc -Xmx1g ImageFileCreatorTest
  */
--- a/test/tools/jlink/ImageFilePoolTest.java	Wed Jan 18 10:24:47 2017 +0100
+++ b/test/tools/jlink/ImageFilePoolTest.java	Wed Jan 18 09:36:24 2017 +0000
@@ -26,6 +26,7 @@
  * @summary Test a pool containing external files.
  * @author Andrei Eremeev
  * @modules jdk.jlink/jdk.tools.jlink.internal
+ *          jdk.jlink/jdk.tools.jlink.plugin
  * @run build ImageFilePoolTest
  * @run main ImageFilePoolTest
  */
--- a/test/tools/jlink/IntegrationTest.java	Wed Jan 18 10:24:47 2017 +0100
+++ b/test/tools/jlink/IntegrationTest.java	Wed Jan 18 09:36:24 2017 +0000
@@ -62,6 +62,7 @@
  *          jdk.jlink/jdk.tools.jlink.builder
  *          jdk.jlink/jdk.tools.jlink.internal
  *          jdk.jlink/jdk.tools.jlink.internal.plugins
+ *          jdk.jlink/jdk.tools.jlink.plugin
  *          jdk.jlink/jdk.tools.jmod
  *          jdk.jlink/jdk.tools.jimage
  *          jdk.compiler
--- a/test/tools/jlink/JLink2Test.java	Wed Jan 18 10:24:47 2017 +0100
+++ b/test/tools/jlink/JLink2Test.java	Wed Jan 18 09:36:24 2017 +0000
@@ -29,6 +29,7 @@
  * @modules java.base/jdk.internal.jimage
  *          jdk.jdeps/com.sun.tools.classfile
  *          jdk.jlink/jdk.tools.jlink.internal
+ *          jdk.jlink/jdk.tools.jlink.plugin
  *          jdk.jlink/jdk.tools.jmod
  *          jdk.jlink/jdk.tools.jimage
  *          jdk.compiler
--- a/test/tools/jlink/JLinkOptionsTest.java	Wed Jan 18 10:24:47 2017 +0100
+++ b/test/tools/jlink/JLinkOptionsTest.java	Wed Jan 18 09:36:24 2017 +0000
@@ -39,6 +39,7 @@
  * @modules java.base/jdk.internal.jimage
  *          jdk.jdeps/com.sun.tools.classfile
  *          jdk.jlink/jdk.tools.jlink.internal
+ *          jdk.jlink/jdk.tools.jlink.plugin
  *          jdk.jlink/jdk.tools.jmod
  *          jdk.jlink/jdk.tools.jimage
  *          jdk.compiler
--- a/test/tools/jlink/JLinkPostProcessingTest.java	Wed Jan 18 10:24:47 2017 +0100
+++ b/test/tools/jlink/JLinkPostProcessingTest.java	Wed Jan 18 09:36:24 2017 +0000
@@ -46,6 +46,7 @@
  * @modules java.base/jdk.internal.jimage
  *          jdk.jdeps/com.sun.tools.classfile
  *          jdk.jlink/jdk.tools.jlink.internal
+ *          jdk.jlink/jdk.tools.jlink.plugin
  *          jdk.jlink/jdk.tools.jmod
  *          jdk.jlink/jdk.tools.jimage
  *          jdk.compiler
--- a/test/tools/jlink/JLinkTest.java	Wed Jan 18 10:24:47 2017 +0100
+++ b/test/tools/jlink/JLinkTest.java	Wed Jan 18 09:36:24 2017 +0000
@@ -48,6 +48,7 @@
  * @modules java.base/jdk.internal.jimage
  *          jdk.jdeps/com.sun.tools.classfile
  *          jdk.jlink/jdk.tools.jlink.internal
+ *          jdk.jlink/jdk.tools.jlink.plugin
  *          jdk.jlink/jdk.tools.jimage
  *          jdk.compiler
  * @build tests.*
--- a/test/tools/jlink/ResourcePoolTest.java	Wed Jan 18 10:24:47 2017 +0100
+++ b/test/tools/jlink/ResourcePoolTest.java	Wed Jan 18 09:36:24 2017 +0000
@@ -26,6 +26,7 @@
  * @summary Test a pool containing jimage resources and classes.
  * @author Jean-Francois Denise
  * @modules jdk.jlink/jdk.tools.jlink.internal
+ *          jdk.jlink/jdk.tools.jlink.plugin
  * @run build ResourcePoolTest
  * @run main ResourcePoolTest
  */
--- a/test/tools/jlink/plugins/CompressorPluginTest.java	Wed Jan 18 10:24:47 2017 +0100
+++ b/test/tools/jlink/plugins/CompressorPluginTest.java	Wed Jan 18 09:36:24 2017 +0000
@@ -28,6 +28,7 @@
  * @modules java.base/jdk.internal.jimage.decompressor
  *          jdk.jlink/jdk.tools.jlink.internal
  *          jdk.jlink/jdk.tools.jlink.internal.plugins
+ *          jdk.jlink/jdk.tools.jlink.plugin
  * @run main CompressorPluginTest
  */
 import java.net.URI;
--- a/test/tools/jlink/plugins/ExcludeFilesPluginTest.java	Wed Jan 18 10:24:47 2017 +0100
+++ b/test/tools/jlink/plugins/ExcludeFilesPluginTest.java	Wed Jan 18 09:36:24 2017 +0000
@@ -27,6 +27,7 @@
  * @author Jean-Francois Denise
  * @modules jdk.jlink/jdk.tools.jlink.internal
  *          jdk.jlink/jdk.tools.jlink.internal.plugins
+ *          jdk.jlink/jdk.tools.jlink.plugin
  * @run main ExcludeFilesPluginTest
  */
 
--- a/test/tools/jlink/plugins/ExcludePluginTest.java	Wed Jan 18 10:24:47 2017 +0100
+++ b/test/tools/jlink/plugins/ExcludePluginTest.java	Wed Jan 18 09:36:24 2017 +0000
@@ -27,6 +27,7 @@
  * @author Jean-Francois Denise
  * @modules jdk.jlink/jdk.tools.jlink.internal
  *          jdk.jlink/jdk.tools.jlink.internal.plugins
+ *          jdk.jlink/jdk.tools.jlink.plugin
  * @run main ExcludePluginTest
  */
 
--- a/test/tools/jlink/plugins/ExcludeVMPluginTest.java	Wed Jan 18 10:24:47 2017 +0100
+++ b/test/tools/jlink/plugins/ExcludeVMPluginTest.java	Wed Jan 18 09:36:24 2017 +0000
@@ -27,6 +27,7 @@
  * @author Jean-Francois Denise
  * @modules jdk.jlink/jdk.tools.jlink.internal
  *          jdk.jlink/jdk.tools.jlink.internal.plugins
+ *          jdk.jlink/jdk.tools.jlink.plugin
  * @run main ExcludeVMPluginTest
  */
 import java.io.ByteArrayInputStream;
--- a/test/tools/jlink/plugins/IncludeLocalesPluginTest.java	Wed Jan 18 10:24:47 2017 +0100
+++ b/test/tools/jlink/plugins/IncludeLocalesPluginTest.java	Wed Jan 18 09:36:24 2017 +0000
@@ -48,6 +48,7 @@
  *          jdk.jdeps/com.sun.tools.classfile
  *          jdk.jlink/jdk.tools.jlink.internal
  *          jdk.jlink/jdk.tools.jlink.internal.plugins
+ *          jdk.jlink/jdk.tools.jlink.plugin
  *          jdk.jlink/jdk.tools.jmod
  *          jdk.jlink/jdk.tools.jimage
  *          jdk.compiler
--- a/test/tools/jlink/plugins/LastSorterTest.java	Wed Jan 18 10:24:47 2017 +0100
+++ b/test/tools/jlink/plugins/LastSorterTest.java	Wed Jan 18 09:36:24 2017 +0000
@@ -25,8 +25,9 @@
  * @test
  * @summary Test last sorter property
  * @author Jean-Francois Denise
- * @modules jdk.jlink/jdk.tools.jlink.internal
- *          jdk.jlink/jdk.tools.jlink
+ * @modules jdk.jlink/jdk.tools.jlink
+ *          jdk.jlink/jdk.tools.jlink.internal
+ *          jdk.jlink/jdk.tools.jlink.plugin
  * @run main/othervm LastSorterTest
  */
 
--- a/test/tools/jlink/plugins/PluginsNegativeTest.java	Wed Jan 18 10:24:47 2017 +0100
+++ b/test/tools/jlink/plugins/PluginsNegativeTest.java	Wed Jan 18 09:36:24 2017 +0000
@@ -25,8 +25,9 @@
  * @test
  * @summary Negative test for ImagePluginStack.
  * @author Andrei Eremeev
- * @modules jdk.jlink/jdk.tools.jlink.internal
- *          jdk.jlink/jdk.tools.jlink
+ * @modules jdk.jlink/jdk.tools.jlink
+ *          jdk.jlink/jdk.tools.jlink.internal
+ *          jdk.jlink/jdk.tools.jlink.plugin
  * @run main/othervm PluginsNegativeTest
  */
 import java.lang.reflect.Layer;
--- a/test/tools/jlink/plugins/PrevisitorTest.java	Wed Jan 18 10:24:47 2017 +0100
+++ b/test/tools/jlink/plugins/PrevisitorTest.java	Wed Jan 18 09:36:24 2017 +0000
@@ -25,8 +25,9 @@
  * @test
  * @summary Test previsitor
  * @author Andrei Eremeev
- * @modules jdk.jlink/jdk.tools.jlink.internal
- *          jdk.jlink/jdk.tools.jlink
+ * @modules jdk.jlink/jdk.tools.jlink
+ *          jdk.jlink/jdk.tools.jlink.internal
+ *          jdk.jlink/jdk.tools.jlink.plugin
  * @run main/othervm PrevisitorTest
  */
 import java.nio.ByteOrder;
--- a/test/tools/jlink/plugins/StringSharingPluginTest.java	Wed Jan 18 10:24:47 2017 +0100
+++ b/test/tools/jlink/plugins/StringSharingPluginTest.java	Wed Jan 18 09:36:24 2017 +0000
@@ -30,6 +30,7 @@
  *          java.base/jdk.internal.jimage.decompressor
  *          jdk.jlink/jdk.tools.jlink.internal
  *          jdk.jlink/jdk.tools.jlink.internal.plugins
+ *          jdk.jlink/jdk.tools.jlink.plugin
  *          jdk.jlink/jdk.tools.jmod
  *          jdk.jlink/jdk.tools.jimage
  *          jdk.jdeps/com.sun.tools.classfile
--- a/test/tools/jlink/plugins/StripDebugPluginTest.java	Wed Jan 18 10:24:47 2017 +0100
+++ b/test/tools/jlink/plugins/StripDebugPluginTest.java	Wed Jan 18 09:36:24 2017 +0000
@@ -30,6 +30,7 @@
  * @modules java.base/jdk.internal.jimage
  *          jdk.jlink/jdk.tools.jlink.internal
  *          jdk.jlink/jdk.tools.jlink.internal.plugins
+ *          jdk.jlink/jdk.tools.jlink.plugin
  *          jdk.jlink/jdk.tools.jimage
  *          jdk.jlink/jdk.tools.jmod
  *          jdk.jdeps/com.sun.tools.classfile
--- a/test/tools/pack200/Utils.java	Wed Jan 18 10:24:47 2017 +0100
+++ b/test/tools/pack200/Utils.java	Wed Jan 18 09:36:24 2017 +0000
@@ -111,6 +111,7 @@
 
         compiler("-d",
                 XCLASSES.getName(),
+                "--add-modules=jdk.jdeps",
                 "--add-exports=jdk.jdeps/com.sun.tools.classfile=ALL-UNNAMED",
                 "@" + tmpFile.getAbsolutePath());