update openjdk21-lts

不再支持X86
rhwong · Dec 31, 2023 · 6fd90bb · 6fd90bb
1 parent b72865f
commit 6fd90bb
Show file tree

Hide file tree

Showing 177 changed files with 4,095 additions and 2,633 deletions.
diff --git a/README.md b/README.md
@@ -13,7 +13,7 @@
 <img src="https://img.shields.io/github/downloads/rhwong/unidbg-fetch-qsign-onekey/total">
 
 
-<img src="https://img.shields.io/badge/Windows-x64-red?style=flat-square&logo=Windows"> <img src="https://img.shields.io/badge/Windows-x86-red?style=flat-square&logo=Windows"> 
+<img src="https://img.shields.io/badge/Windows-x64-red?style=flat-square&logo=Windows">
 
 </div>
 <!-- projectInfo end -->

diff --git a/jre/NOTICE b/jre/NOTICE
@@ -41,9 +41,8 @@ relevant to this content:
  * https://github.com/adoptium/jdk
  * https://github.com/adoptium/jdk8u
  * https://github.com/adoptium/jdk11u
- * https://github.com/adoptium/jdk16u
  * https://github.com/adoptium/jdk17u
- * https://github.com/adoptium/jdk18u
+ * https://github.com/adoptium/jdk20
  * and so on
 
 ## Third-party Content

diff --git a/jre/bin/API-MS-Win-core-xstate-l2-1-0.dll b/jre/bin/API-MS-Win-core-xstate-l2-1-0.dll
diff --git a/jre/bin/api-ms-win-core-console-l1-1-0.dll b/jre/bin/api-ms-win-core-console-l1-1-0.dll
diff --git a/jre/bin/api-ms-win-core-console-l1-2-0.dll b/jre/bin/api-ms-win-core-console-l1-2-0.dll
diff --git a/jre/bin/api-ms-win-core-datetime-l1-1-0.dll b/jre/bin/api-ms-win-core-datetime-l1-1-0.dll
diff --git a/jre/bin/api-ms-win-core-debug-l1-1-0.dll b/jre/bin/api-ms-win-core-debug-l1-1-0.dll
diff --git a/jre/bin/api-ms-win-core-errorhandling-l1-1-0.dll b/jre/bin/api-ms-win-core-errorhandling-l1-1-0.dll
diff --git a/jre/bin/api-ms-win-core-fibers-l1-1-0.dll b/jre/bin/api-ms-win-core-fibers-l1-1-0.dll
diff --git a/jre/bin/api-ms-win-core-file-l1-1-0.dll b/jre/bin/api-ms-win-core-file-l1-1-0.dll
diff --git a/jre/bin/api-ms-win-core-file-l1-2-0.dll b/jre/bin/api-ms-win-core-file-l1-2-0.dll
diff --git a/jre/bin/api-ms-win-core-file-l2-1-0.dll b/jre/bin/api-ms-win-core-file-l2-1-0.dll
diff --git a/jre/bin/api-ms-win-core-handle-l1-1-0.dll b/jre/bin/api-ms-win-core-handle-l1-1-0.dll
diff --git a/jre/bin/api-ms-win-core-heap-l1-1-0.dll b/jre/bin/api-ms-win-core-heap-l1-1-0.dll
diff --git a/jre/bin/api-ms-win-core-interlocked-l1-1-0.dll b/jre/bin/api-ms-win-core-interlocked-l1-1-0.dll
diff --git a/jre/bin/api-ms-win-core-libraryloader-l1-1-0.dll b/jre/bin/api-ms-win-core-libraryloader-l1-1-0.dll
diff --git a/jre/bin/api-ms-win-core-localization-l1-2-0.dll b/jre/bin/api-ms-win-core-localization-l1-2-0.dll
diff --git a/jre/bin/api-ms-win-core-memory-l1-1-0.dll b/jre/bin/api-ms-win-core-memory-l1-1-0.dll
diff --git a/jre/bin/api-ms-win-core-namedpipe-l1-1-0.dll b/jre/bin/api-ms-win-core-namedpipe-l1-1-0.dll
diff --git a/jre/bin/api-ms-win-core-processenvironment-l1-1-0.dll b/jre/bin/api-ms-win-core-processenvironment-l1-1-0.dll
diff --git a/jre/bin/api-ms-win-core-processthreads-l1-1-0.dll b/jre/bin/api-ms-win-core-processthreads-l1-1-0.dll
diff --git a/jre/bin/api-ms-win-core-processthreads-l1-1-1.dll b/jre/bin/api-ms-win-core-processthreads-l1-1-1.dll
diff --git a/jre/bin/api-ms-win-core-profile-l1-1-0.dll b/jre/bin/api-ms-win-core-profile-l1-1-0.dll
diff --git a/jre/bin/api-ms-win-core-rtlsupport-l1-1-0.dll b/jre/bin/api-ms-win-core-rtlsupport-l1-1-0.dll
diff --git a/jre/bin/api-ms-win-core-string-l1-1-0.dll b/jre/bin/api-ms-win-core-string-l1-1-0.dll
diff --git a/jre/bin/api-ms-win-core-synch-l1-1-0.dll b/jre/bin/api-ms-win-core-synch-l1-1-0.dll
diff --git a/jre/bin/api-ms-win-core-synch-l1-2-0.dll b/jre/bin/api-ms-win-core-synch-l1-2-0.dll
diff --git a/jre/bin/api-ms-win-core-sysinfo-l1-1-0.dll b/jre/bin/api-ms-win-core-sysinfo-l1-1-0.dll
diff --git a/jre/bin/api-ms-win-core-timezone-l1-1-0.dll b/jre/bin/api-ms-win-core-timezone-l1-1-0.dll
diff --git a/jre/bin/api-ms-win-core-util-l1-1-0.dll b/jre/bin/api-ms-win-core-util-l1-1-0.dll
diff --git a/jre/bin/api-ms-win-crt-conio-l1-1-0.dll b/jre/bin/api-ms-win-crt-conio-l1-1-0.dll
diff --git a/jre/bin/api-ms-win-crt-convert-l1-1-0.dll b/jre/bin/api-ms-win-crt-convert-l1-1-0.dll
diff --git a/jre/bin/api-ms-win-crt-environment-l1-1-0.dll b/jre/bin/api-ms-win-crt-environment-l1-1-0.dll
diff --git a/jre/bin/api-ms-win-crt-filesystem-l1-1-0.dll b/jre/bin/api-ms-win-crt-filesystem-l1-1-0.dll
diff --git a/jre/bin/api-ms-win-crt-heap-l1-1-0.dll b/jre/bin/api-ms-win-crt-heap-l1-1-0.dll
diff --git a/jre/bin/api-ms-win-crt-locale-l1-1-0.dll b/jre/bin/api-ms-win-crt-locale-l1-1-0.dll
diff --git a/jre/bin/api-ms-win-crt-math-l1-1-0.dll b/jre/bin/api-ms-win-crt-math-l1-1-0.dll
diff --git a/jre/bin/api-ms-win-crt-multibyte-l1-1-0.dll b/jre/bin/api-ms-win-crt-multibyte-l1-1-0.dll
diff --git a/jre/bin/api-ms-win-crt-private-l1-1-0.dll b/jre/bin/api-ms-win-crt-private-l1-1-0.dll
diff --git a/jre/bin/api-ms-win-crt-process-l1-1-0.dll b/jre/bin/api-ms-win-crt-process-l1-1-0.dll
diff --git a/jre/bin/api-ms-win-crt-runtime-l1-1-0.dll b/jre/bin/api-ms-win-crt-runtime-l1-1-0.dll
diff --git a/jre/bin/api-ms-win-crt-stdio-l1-1-0.dll b/jre/bin/api-ms-win-crt-stdio-l1-1-0.dll
diff --git a/jre/bin/api-ms-win-crt-string-l1-1-0.dll b/jre/bin/api-ms-win-crt-string-l1-1-0.dll
diff --git a/jre/bin/api-ms-win-crt-time-l1-1-0.dll b/jre/bin/api-ms-win-crt-time-l1-1-0.dll
diff --git a/jre/bin/api-ms-win-crt-utility-l1-1-0.dll b/jre/bin/api-ms-win-crt-utility-l1-1-0.dll
diff --git a/jre/bin/awt.dll b/jre/bin/awt.dll
diff --git a/jre/bin/client/jvm.dll b/jre/bin/client/jvm.dll
diff --git a/jre/bin/dt_socket.dll b/jre/bin/dt_socket.dll
diff --git a/jre/bin/extnet.dll b/jre/bin/extnet.dll
diff --git a/jre/bin/fontmanager.dll b/jre/bin/fontmanager.dll
diff --git a/jre/bin/freetype.dll b/jre/bin/freetype.dll
diff --git a/jre/bin/instrument.dll b/jre/bin/instrument.dll
diff --git a/jre/bin/j2gss.dll b/jre/bin/j2gss.dll
diff --git a/jre/bin/j2pcsc.dll b/jre/bin/j2pcsc.dll
diff --git a/jre/bin/j2pkcs11.dll b/jre/bin/j2pkcs11.dll
diff --git a/jre/bin/jaas.dll b/jre/bin/jaas.dll
diff --git a/jre/bin/jabswitch.exe b/jre/bin/jabswitch.exe
diff --git a/jre/bin/jabsysinfo.dll b/jre/bin/jabsysinfo.dll
diff --git a/jre/bin/jaccessinspector-32.exe b/jre/bin/jaccessinspector-32.exe
diff --git a/jre/bin/jaccessinspector.exe b/jre/bin/jaccessinspector.exe
diff --git a/jre/bin/jaccesswalker-32.exe b/jre/bin/jaccesswalker-32.exe
diff --git a/jre/bin/jaccesswalker.exe b/jre/bin/jaccesswalker.exe
diff --git a/jre/bin/java.dll b/jre/bin/java.dll
diff --git a/jre/bin/java.exe b/jre/bin/java.exe
diff --git a/jre/bin/javaaccessbridge-32.dll b/jre/bin/javaaccessbridge-32.dll
diff --git a/jre/bin/javaaccessbridge.dll b/jre/bin/javaaccessbridge.dll
diff --git a/jre/bin/javajpeg.dll b/jre/bin/javajpeg.dll
diff --git a/jre/bin/javaw.exe b/jre/bin/javaw.exe
diff --git a/jre/bin/jawt.dll b/jre/bin/jawt.dll
diff --git a/jre/bin/jdwp.dll b/jre/bin/jdwp.dll
diff --git a/jre/bin/jfr.exe b/jre/bin/jfr.exe
diff --git a/jre/bin/jimage.dll b/jre/bin/jimage.dll
diff --git a/jre/bin/jjs.exe b/jre/bin/jjs.exe
diff --git a/jre/bin/jli.dll b/jre/bin/jli.dll
diff --git a/jre/bin/jrunscript.exe b/jre/bin/jrunscript.exe
diff --git a/jre/bin/jsound.dll b/jre/bin/jsound.dll
diff --git a/jre/bin/jsvml.dll b/jre/bin/jsvml.dll
diff --git a/jre/bin/jwebserver.exe b/jre/bin/jwebserver.exe
diff --git a/jre/bin/keytool.exe b/jre/bin/keytool.exe
diff --git a/jre/bin/kinit.exe b/jre/bin/kinit.exe
diff --git a/jre/bin/klist.exe b/jre/bin/klist.exe
diff --git a/jre/bin/ktab.exe b/jre/bin/ktab.exe
diff --git a/jre/bin/lcms.dll b/jre/bin/lcms.dll
diff --git a/jre/bin/le.dll b/jre/bin/le.dll
diff --git a/jre/bin/management.dll b/jre/bin/management.dll
diff --git a/jre/bin/management_agent.dll b/jre/bin/management_agent.dll
diff --git a/jre/bin/management_ext.dll b/jre/bin/management_ext.dll
diff --git a/jre/bin/mlib_image.dll b/jre/bin/mlib_image.dll
diff --git a/jre/bin/msvcp140.dll b/jre/bin/msvcp140.dll
diff --git a/jre/bin/net.dll b/jre/bin/net.dll
diff --git a/jre/bin/nio.dll b/jre/bin/nio.dll
diff --git a/jre/bin/pack200.exe b/jre/bin/pack200.exe
diff --git a/jre/bin/prefs.dll b/jre/bin/prefs.dll
diff --git a/jre/bin/rmi.dll b/jre/bin/rmi.dll
diff --git a/jre/bin/rmid.exe b/jre/bin/rmid.exe
diff --git a/jre/bin/rmiregistry.exe b/jre/bin/rmiregistry.exe
diff --git a/jre/bin/server/classes.jsa b/jre/bin/server/classes.jsa
diff --git a/jre/bin/server/classes_nocoops.jsa b/jre/bin/server/classes_nocoops.jsa
diff --git a/jre/bin/server/jvm.dll b/jre/bin/server/jvm.dll
diff --git a/jre/bin/splashscreen.dll b/jre/bin/splashscreen.dll
diff --git a/jre/bin/sspi_bridge.dll b/jre/bin/sspi_bridge.dll
diff --git a/jre/bin/sunec.dll b/jre/bin/sunec.dll
diff --git a/jre/bin/sunmscapi.dll b/jre/bin/sunmscapi.dll
diff --git a/jre/bin/syslookup.dll b/jre/bin/syslookup.dll
diff --git a/jre/bin/ucrtbase.dll b/jre/bin/ucrtbase.dll
diff --git a/jre/bin/unpack.dll b/jre/bin/unpack.dll
diff --git a/jre/bin/unpack200.exe b/jre/bin/unpack200.exe
diff --git a/jre/bin/vcruntime140.dll b/jre/bin/vcruntime140.dll
diff --git a/jre/bin/vcruntime140_1.dll b/jre/bin/vcruntime140_1.dll
diff --git a/jre/bin/verify.dll b/jre/bin/verify.dll
diff --git a/jre/bin/w2k_lsa_auth.dll b/jre/bin/w2k_lsa_auth.dll
diff --git a/jre/bin/windowsaccessbridge-32.dll b/jre/bin/windowsaccessbridge-32.dll
diff --git a/jre/bin/windowsaccessbridge-64.dll b/jre/bin/windowsaccessbridge-64.dll
diff --git a/jre/bin/windowsaccessbridge.dll b/jre/bin/windowsaccessbridge.dll
diff --git a/jre/bin/zip.dll b/jre/bin/zip.dll
diff --git a/jre/conf/jaxp.properties b/jre/conf/jaxp.properties
@@ -0,0 +1,180 @@
+################################################################################
+#           JAXP Configuration File
+#
+# jaxp.properties (this file) is the default configuration file for JAXP, the API
+# defined in the java.xml module. It is in java.util.Properties format and typically
+# located in the {java.home}/conf directory. It may contain key/value pairs for
+# specifying the implementation classes of JAXP factories and/or properties
+# that have corresponding system properties.
+#
+# A user-specified configuration file can be set up using the system property
+# java.xml.config.file to override any or all of the entries in jaxp.properties.
+# The following statement provides myConfigurationFile as a custom configuration
+# file:
+#     java -Djava.xml.config.file=myConfigurationFile
+################################################################################
+
+# ---- JAXP Default Configuration ----
+#
+# The JAXP default configuration (jaxp.properties) contains entries for the
+# Factory Lookup Mechanism and properties with corresponding system properties.
+# The values are generally set to the default values of the properties.
+#
+#
+# JAXP Lookup Mechanism:
+#
+# The JAXP configuration file ranks 2nd to the System Property in the precedent
+# order of the JAXP Lookup Mechanism. When the System Property is not specified,
+# a JAXP factory reads the configuration file in order to locate an implementation
+# class. If found, the class specified will be used as the factory implementation
+# class.
+#
+# The format of an entry is key=value where the key is the fully qualified name
+# of the factory and value that of the implementation class. The following entry
+# set a DocumentBuilderFactory implementation class:
+#
+# javax.xml.parsers.DocumentBuilderFactory=com.sun.org.apache.xerces.internal.jaxp.DocumentBuilderFactoryImpl
+#
+#
+# Java SE and JDK Implementation Specific Properties:
+#
+# The JAXP configuration file ranks above the default settings in the Property
+# Precedence in that its entries will override the default values of the corresponding
+# properties.
+#
+# All properties that have System Properties defined in Java SE or supported
+# by the JDK Implementation can be placed in the configuration file to override
+# the default property values. The format is:
+#     system-property-name=value
+#
+# For example, the FILES property in CatalogFeatures has an associated system
+# property called javax.xml.catalog.files. An entry for the FILES property in the
+# configuration file would therefore use javax.xml.catalog.files as the key, that
+# is:
+#     javax.xml.catalog.files=strict
+#
+#
+# Extension Functions:
+#
+# This property determines whether XSLT and XPath extension functions are allowed.
+# The value type is boolean and the default value is true (allowing
+# extension functions). The following entry would override the default value and
+# disallow extension functions:
+#
+# jdk.xml.enableExtensionFunctions=false
+#
+#
+# Overriding the default parser:
+#
+# This property allows using a third party implementation to override the default
+# parser provided by the JDK. The value type is boolean and the default value is
+# false, disallowing overriding the default parser. The setting below reflects
+# the default property setting:
+#
+jdk.xml.overrideDefaultParser=false
+#
+#
+# External Access Properties:
+#
+# The External Access Properties are defined in javax.xml.XMLConstants. Their
+# system properties are javax.xml.accessExternalDTD, javax.xml.accessExternalSchema,
+# and javax.xml.accessExternalStylesheet. The values are a list of protocols separated
+# by comma, plus empty string ("") to represent no protocol allowed and the key
+# word "all" for all access. The default is "all", allowing all external resources
+# to be fetched. The followings are example of external access settings:
+#
+# allow local (file) DTDs to be retrieved
+# javax.xml.accessExternalDTD=file
+#
+# allow local (file) and remote (http) external schemas
+# javax.xml.accessExternalSchema=file, http
+#
+# reject any external stylesheets
+# javax.xml.accessExternalStylesheet=""
+#
+# allow all external stylesheets
+# javax.xml.accessExternalStylesheet="all"
+#
+#
+# Catalog Properties:
+#
+# The Catalog API defines four features: FILES, PREFER, DEFER and RESOLVE.
+# Except PREFER, all other properties can be placed in the configuration file
+# using the system properties defined for them.
+#
+# FILES: A semicolon-delimited list of URIs to locate the catalog files. The URIs
+# must be absolute and have a URL protocol handler for the URI scheme. The following
+# is an example of setting up a catalog file:
+#
+# javax.xml.catalog.files = file:///users/auser/catalog/catalog.xml
+#
+# DEFER: Indicates that the alternative catalogs including those specified in
+# delegate entries or nextCatalog are not read until they are needed. The value
+# is a boolean and the default value is true.
+#
+# javax.xml.catalog.defer=true
+#
+# RESOLVE: Determines the action if there is no matching entry found after all of
+# the specified catalogs are exhausted. The values are key words: strict, continue,
+# and ignore. The default is strict. The following setting reflects the default
+# setting.
+#
+# javax.xml.catalog.resolve=strict
+#
+#
+# useCatalog:
+# This property instructs XML processors to use XML Catalogs to resolve entity
+# references. The value is a boolean and the default value is true.
+#
+# javax.xml.useCatalog=true
+#
+#
+# Implementation Specific Properties - Limits
+#
+# Limits have a value type Integer. The values must be positive integers. Zero
+# means no limit.
+#
+# Limits the number of entity expansions. The default value is 64000
+# jdk.xml.entityExpansionLimit=64000
+#
+# Limits the total size of all entities that include general and parameter entities.
+# The size is calculated as an aggregation of all entities. The default value is 5x10^7.
+# jdk.xml.totalEntitySizeLimit=5E7
+#
+# Limits the maximum size of any general entities. The default value is 0.
+# jdk.xml.maxGeneralEntitySizeLimit=0
+#
+# Limits the maximum size of any parameter entities, including the result of
+# nesting multiple parameter entities. The default value is 10^6.
+# jdk.xml.maxParameterEntitySizeLimit=1E6
+#
+# Limits the total number of nodes in all entity references. The default value is 3x10^6.
+# jdk.xml.entityReplacementLimit=3E6
+#
+# Limits the number of attributes an element can have. The default value is 10000.
+# jdk.xml.elementAttributeLimit=10000
+#
+# Limits the number of content model nodes that may be created when building a
+# grammar for a W3C XML Schema that contains maxOccurs attributes with values
+# other than "unbounded". The default value is 5000.
+# jdk.xml.maxOccurLimit=5000
+#
+# Limits the maximum element depth. The default value is 0.
+# jdk.xml.maxElementDepth=0
+#
+# Limits the maximum size of XML names, including element name, attribute name
+# and namespace prefix and URI. The default value is 1000.
+jdk.xml.maxXMLNameLimit=1000
+#
+#
+# XPath Limits
+#
+# Limits the number of groups an XPath expression can contain. The default value is 10.
+jdk.xml.xpathExprGrpLimit=10
+#
+# Limits the number of operators an XPath expression can contain. The default value is 100.
+jdk.xml.xpathExprOpLimit=100
+#
+# Limits the total number of XPath operators in an XSL Stylesheet. The default value is 10000.
+jdk.xml.xpathTotalOpLimit=10000
+
diff --git a/jre/conf/logging.properties b/jre/conf/logging.properties
@@ -2,15 +2,15 @@
 #  	Default Logging Configuration File
 #
 # You can use a different file by specifying a filename
-# with the java.util.logging.config.file system property.  
-# For example java -Djava.util.logging.config.file=myfile
+# with the java.util.logging.config.file system property.
+# For example, java -Djava.util.logging.config.file=myfile
 ############################################################
 
 ############################################################
 #  	Global properties
 ############################################################
 
-# "handlers" specifies a comma separated list of log Handler 
+# "handlers" specifies a comma-separated list of log Handler
 # classes.  These handlers will be installed during VM startup.
 # Note that these classes must be on the system classpath.
 # By default we only configure a ConsoleHandler, which will only
@@ -23,7 +23,7 @@ handlers= java.util.logging.ConsoleHandler
 # Default global logging level.
 # This specifies which kinds of events are logged across
 # all loggers.  For any given facility this global level
-# can be overriden by a facility specific level
+# can be overridden by a facility-specific level
 # Note that the ConsoleHandler also has a separate level
 # setting to limit messages printed to the console.
 .level= INFO
@@ -43,21 +43,21 @@ java.util.logging.FileHandler.count = 1
 java.util.logging.FileHandler.maxLocks = 100
 java.util.logging.FileHandler.formatter = java.util.logging.XMLFormatter
 
-# Limit the message that are printed on the console to INFO and above.
+# Limit the messages that are printed on the console to INFO and above.
 java.util.logging.ConsoleHandler.level = INFO
 java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter
 
-# Example to customize the SimpleFormatter output format 
+# Example to customize the SimpleFormatter output format
 # to print one-line log message like this:
 #     <level>: <log message> [<date/time>]
 #
 # java.util.logging.SimpleFormatter.format=%4$s: %5$s [%1$tc]%n
 
 ############################################################
-# Facility specific properties.
+# Facility-specific properties.
 # Provides extra control for each logger.
 ############################################################
 
 # For example, set the com.xyz.foo logger to only log SEVERE
 # messages:
-com.xyz.foo.level = SEVERE
+# com.xyz.foo.level = SEVERE
diff --git a/jre/conf/management/management.properties b/jre/conf/management/management.properties
@@ -25,6 +25,8 @@
 # For setting the JMX RMI agent port use the following line
 # com.sun.management.jmxremote.port=<port-number>
 #
+# For setting the JMX local server port use the following line
+# com.sun.management.jmxremote.local.port=<port-number>
 
 #####################################################################
 #                   Optional Instrumentation
@@ -39,7 +41,7 @@
 #
 #      This option enables thread contention monitoring if the
 #      Java virtual machine supports such instrumentation.
-#      Refer to the specification for the java.lang.management.ThreadMBean
+#      Refer to the specification for the java.lang.management.ThreadMXBean
 #      interface - see isThreadContentionMonitoringSupported() method.
 #
 
@@ -226,7 +228,7 @@
 # com.sun.management.jmxremote.password.toHashes = true|false
 #      Default for this property is true.
 #      Specifies if passwords in the password file should be hashed or not.
-#      If this property is true, and if the password file is writable, and if the 
+#      If this property is true, and if the password file is writable, and if the
 #      system security policy allows writing into the password file,
 #      all the clear passwords in the password file will be replaced by
 #      their SHA3-512 hash when the file is read by the server
@@ -265,7 +267,7 @@
 # ################ Filter for ObjectInputStream #############################
 # com.sun.management.jmxremote.serial.filter.pattern=<filter-string>
 #   A filter, if configured, is used by java.io.ObjectInputStream during
-#   deserialization of parameters sent to the JMX default agent to validate the 
+#   deserialization of parameters sent to the JMX default agent to validate the
 #   contents of the stream.
 #   A filter is configured as a sequence of patterns, each pattern is either
 #   matched against the name of a class in the stream or defines a limit.
@@ -300,3 +302,26 @@
 #   If the pattern ends with "*", it matches any class with the pattern as a prefix.
 #   If the pattern is equal to the class name, it matches.
 #   Otherwise, the status is UNDECIDED.
+#
+#   Ending with !* ensures we reject classes which are otherwise unmatched.
+com.sun.management.jmxremote.serial.filter.pattern=\
+java.lang.*;\
+java.lang.reflect.Proxy;\
+java.math.BigInteger;\
+java.math.BigDecimal;\
+java.util.*;\
+javax.management.*;\
+javax.management.modelmbean.*;\
+javax.management.monitor.*;\
+javax.management.openmbean.*;\
+javax.management.relation.*;\
+javax.management.remote.*;\
+javax.management.remote.rmi.*;\
+javax.management.timer.*;\
+javax.rmi.ssl.*;\
+java.rmi.MarshalledObject;\
+java.rmi.dgc.*;\
+java.rmi.server.*;\
+javax.security.auth.Subject;\
+!*
+
diff --git a/jre/conf/net.properties b/jre/conf/net.properties
@@ -51,13 +51,6 @@ http.nonProxyHosts=localhost|127.*|[::1]
 # ftp.proxyPort=80
 ftp.nonProxyHosts=localhost|127.*|[::1]
 #
-# Gopher Proxy settings. proxyHost is the name of the proxy server
-# (e.g. proxy.mydomain.com), proxyPort is the port number to use (default
-# value is 80)
-#
-# gopher.proxyHost=
-# gopher.proxyPort=80
-#
 # Socks proxy settings. socksProxyHost is the name of the proxy server
 # (e.g. socks.domain.com), socksProxyPort is the port number to use
 # (default value is 1080)
@@ -137,3 +130,22 @@ jdk.http.auth.tunneling.disabledSchemes=Basic
 #jdk.http.ntlm.transparentAuth=trustedHosts
 #
 jdk.http.ntlm.transparentAuth=disabled
+#
+# Default directory where automatically bound Unix domain server
+# sockets are stored. Sockets are automatically bound when bound
+# with a null address.
+#
+# The search order for the directory on Windows is:
+#
+# 1. System property "jdk.net.unixdomain.tmpdir"
+#
+# 2. Networking property "jdk.net.unixdomain.tmpdir" specified
+#    in this file (not set by default)
+#
+# 3. The TEMP environment variable (the effective default)
+#
+# 4. The java.io.tmpdir system property
+#
+#jdk.net.unixdomain.tmpdir=
+#
+
diff --git a/jre/conf/security/java.policy b/jre/conf/security/java.policy
@@ -17,7 +17,7 @@ grant {
     // allows anyone to listen on dynamic ports
     permission java.net.SocketPermission "localhost:0", "listen";
 
-    // "standard" properies that can be read by anyone
+    // "standard" properties that can be read by anyone
     permission java.util.PropertyPermission "java.version", "read";
     permission java.util.PropertyPermission "java.vendor", "read";
     permission java.util.PropertyPermission "java.vendor.url", "read";
@@ -30,6 +30,8 @@ grant {
     permission java.util.PropertyPermission "line.separator", "read";
     permission java.util.PropertyPermission
                    "java.specification.version", "read";
+    permission java.util.PropertyPermission
+                   "java.specification.maintenance.version", "read";
     permission java.util.PropertyPermission "java.specification.vendor", "read";
     permission java.util.PropertyPermission "java.specification.name", "read";
     permission java.util.PropertyPermission