make/common/Modules.gmk

@@ -81,13 +81,10 @@
 # Modules explicitly declared as not being upgradeable even though they require
 # an upgradeable module.
 NON_UPGRADEABLE_MODULES +=
 
 AGGREGATOR_MODULES += \
-    java.compact1 \
-    java.compact2 \
-    java.compact3 \
     java.se \
     java.se.ee \
     #
 
 PLATFORM_MODULES += \

@@ -105,11 +102,11 @@
     java.sql.rowset \
     java.xml.crypto \
     jdk.accessibility \
     jdk.charsets \
     jdk.crypto.ec \
-    jdk.crypto.pkcs11 \
+    jdk.crypto.token \
     jdk.desktop \
     jdk.dynalink \
     jdk.jsobject \
     jdk.localedata \
     jdk.naming.dns \

@@ -120,11 +117,11 @@
     jdk.zipfs \
     #
 
 JRE_TOOL_MODULES += \
     jdk.jdwp.agent \
-    jdk.pack200 \
+    jdk.pack \
     jdk.scripting.nashorn.shell \
     #
 
 ifeq ($(OPENJDK_TARGET_OS), windows)
   PLATFORM_MODULES += jdk.crypto.mscapi