diff --git a/README b/README index 2edd174f391..18247ac5180 100644 --- a/README +++ b/README @@ -2,11 +2,11 @@ Welcome to the JDK! =================== -For information about building the JDK, including how to retrieve all -of the source code, please see either of these files: +For build instructions, please see either of these files: * doc/building.html (html version) * doc/building.md (markdown version) -See http://openjdk.java.net/ for more information about the OpenJDK -Community and the JDK. +See https://openjdk.java.net/ for more information about +the OpenJDK Community and the JDK. + diff --git a/make/common/modules/LauncherCommon.gmk b/make/common/modules/LauncherCommon.gmk index c33a16a2004..c3bd0443d74 100644 --- a/make/common/modules/LauncherCommon.gmk +++ b/make/common/modules/LauncherCommon.gmk @@ -102,12 +102,22 @@ define SetupBuildLauncherBody ifeq ($(call isTargetOs, macosx), true) ifeq ($$($1_MACOSX_PRIVILEGED), true) - $1_PLIST_FILE := Info-privileged.plist + $1_PLIST_SRC_FILE := Info-privileged.plist else - $1_PLIST_FILE := Info-cmdline.plist + $1_PLIST_SRC_FILE := Info-cmdline.plist endif - $1_LDFLAGS += -sectcreate __TEXT __info_plist $(MACOSX_PLIST_DIR)/$$($1_PLIST_FILE) + $1_PLIST_FILE := $$(SUPPORT_OUTPUTDIR)/native/$$(MODULE)/$1/Info.plist + + $$(eval $$(call SetupTextFileProcessing, BUILD_PLIST_$1, \ + SOURCE_FILES := $$(TOPDIR)/src/java.base/macosx/native/launcher/$$($1_PLIST_SRC_FILE), \ + OUTPUT_FILE := $$($1_PLIST_FILE), \ + REPLACEMENTS := \ + @@ID@@ => $(MACOSX_BUNDLE_ID_BASE).$(VERSION_SHORT).$1 ; \ + @@VERSION@@ => $(VERSION_NUMBER) ; \ + )) + + $1_LDFLAGS += -sectcreate __TEXT __info_plist $$($1_PLIST_FILE) ifeq ($(STATIC_BUILD), true) $1_LDFLAGS += -exported_symbols_list \ @@ -167,6 +177,8 @@ define SetupBuildLauncherBody $1 += $$(BUILD_LAUNCHER_$1) TARGETS += $$($1) + $$(BUILD_LAUNCHER_$1): $$(BUILD_PLIST_$1) + ifeq ($(call isTargetOs, aix), true) $$(BUILD_LAUNCHER_$1): $(call FindStaticLib, java.base, jli_static) endif diff --git a/make/data/bundle/JDK-Info.plist b/make/data/bundle/JDK-Info.plist index d057e83c1db..e37b4928064 100644 --- a/make/data/bundle/JDK-Info.plist +++ b/make/data/bundle/JDK-Info.plist @@ -22,6 +22,8 @@ ???? CFBundleVersion @@VERSION@@ + NSMicrophoneUsageDescription + The application is requesting access to the microphone. JavaVM JVMCapabilities diff --git a/make/data/bundle/JRE-Info.plist b/make/data/bundle/JRE-Info.plist index b9d045ebc59..0081b240b27 100644 --- a/make/data/bundle/JRE-Info.plist +++ b/make/data/bundle/JRE-Info.plist @@ -22,6 +22,8 @@ ???? CFBundleVersion @@VERSION@@ + NSMicrophoneUsageDescription + The application is requesting access to the microphone. JavaVM JVMMinimumFrameworkVersion diff --git a/src/java.base/macosx/native/launcher/Info-cmdline.plist b/src/java.base/macosx/native/launcher/Info-cmdline.plist index 48ff371e71a..c3728c62f0d 100644 --- a/src/java.base/macosx/native/launcher/Info-cmdline.plist +++ b/src/java.base/macosx/native/launcher/Info-cmdline.plist @@ -3,12 +3,14 @@ CFBundleIdentifier - net.java.openjdk.cmd + @@ID@@ CFBundleInfoDictionaryVersion 6.0 CFBundleShortVersionString 1.0 CFBundleVersion - 1.0 + @@VERSION@@ + NSMicrophoneUsageDescription + The application is requesting access to the microphone. diff --git a/src/java.base/macosx/native/launcher/Info-privileged.plist b/src/java.base/macosx/native/launcher/Info-privileged.plist index 9b2fc0a32fc..569c509b853 100644 --- a/src/java.base/macosx/native/launcher/Info-privileged.plist +++ b/src/java.base/macosx/native/launcher/Info-privileged.plist @@ -3,7 +3,7 @@ CFBundleIdentifier - net.java.openjdk.cmd + @@ID@@ CFBundleInfoDictionaryVersion 6.0 CFBundleName @@ -11,7 +11,7 @@ CFBundleShortVersionString 1.0 CFBundleVersion - 1.0 + @@VERSION@@ SecTaskAccess allowed diff --git a/src/java.base/share/man/java.1 b/src/java.base/share/man/java.1 index a78d5a3d580..3a003645616 100644 --- a/src/java.base/share/man/java.1 +++ b/src/java.base/share/man/java.1 @@ -22,7 +22,7 @@ .\" .\" Automatically generated by Pandoc 2.3.1 .\" -.TH "JAVA" "1" "2020" "JDK 14" "JDK Commands" +.TH "JAVA" "1" "2020" "JDK 15" "JDK Commands" .hy .SH NAME .PP @@ -180,9 +180,10 @@ API that was defined in JDK \f[I]N\f[R]. with new values added and old values removed. You\[aq]ll get an error message if you use a value of \f[I]N\f[R] that is no longer supported. -Supported values of \f[I]N\f[R] for this release are \f[CB]7\f[R], -\f[CB]8\f[R], \f[CB]9\f[R], \f[CB]10\f[R], \f[CB]11\f[R], \f[CB]12\f[R], -\f[CB]13\f[R], and \f[CB]14\f[R]. +The supported values of \f[I]N\f[R] are the current Java SE release +(\f[CB]15\f[R]) and a limited number of previous releases, detailed in the +command\-line help for \f[CB]javac\f[R], under the \f[CB]\-\-source\f[R] and +\f[CB]\-\-release\f[R] options. .RE .PP If the file does not have the \f[CB]\&.java\f[R] extension, the @@ -437,9 +438,9 @@ After the library name, a comma\-separated list of options specific to the library can be used. .RS .IP \[bu] 2 -\f[B]Oracle Solaris, Linux, and macOS:\f[R] If the option -\f[CB]\-agentlib:foo\f[R] is specified, then the JVM attempts to load the -library named \f[CB]libfoo.so\f[R] in the location specified by the +\f[B]Linux and macOS:\f[R] If the option \f[CB]\-agentlib:foo\f[R] is +specified, then the JVM attempts to load the library named +\f[CB]libfoo.so\f[R] in the location specified by the \f[CB]LD_LIBRARY_PATH\f[R] system variable (on macOS this variable is \f[CB]DYLD_LIBRARY_PATH\f[R]). .IP \[bu] 2 @@ -784,8 +785,8 @@ Specifies a list of directories, JAR files, and ZIP archives to append to the end of the default bootstrap class path. .RS .PP -\f[B]Oracle Solaris, Linux, and macOS:\f[R] Colons (\f[CB]:\f[R]) separate -entities in this list. +\f[B]Linux and macOS:\f[R] Colons (\f[CB]:\f[R]) separate entities in this +list. .PP \f[B]Windows:\f[R] Semicolons (\f[CB];\f[R]) separate entities in this list. @@ -948,7 +949,7 @@ running user cleanup code (such as closing database connections) at shutdown, even if the JVM terminates abruptly. .RS .IP \[bu] 2 -\f[B]Oracle Solaris, Linux, and macOS:\f[R] +\f[B]Linux and macOS:\f[R] .RS 2 .IP \[bu] 2 The JVM catches signals to implement shutdown hooks for unexpected @@ -994,8 +995,8 @@ process \f[CB]CTRL_C_EVENT\f[R], \f[CB]CTRL_CLOSE_EVENT\f[R], .PP There are two consequences of specifying \f[CB]\-Xrs\f[R]: .IP \[bu] 2 -\f[B]Oracle Solaris, Linux, and macOS:\f[R] \f[CB]SIGQUIT\f[R] thread dumps -aren\[aq]t available. +\f[B]Linux and macOS:\f[R] \f[CB]SIGQUIT\f[R] thread dumps aren\[aq]t +available. .IP \[bu] 2 \f[B]Windows:\f[R] Ctrl + Break thread dumps aren\[aq]t available. .PP @@ -1082,8 +1083,6 @@ Linux/x64 (64\-bit): 1024 KB .IP \[bu] 2 macOS (64\-bit): 1024 KB .IP \[bu] 2 -Oracle Solaris (64\-bit): 1024 KB -.IP \[bu] 2 Windows: The default value depends on virtual memory .PP The following examples set the thread stack size to 1024 KB in different @@ -1334,8 +1333,8 @@ the identifier of the process is specified as \f[CB]%p\f[R]): \f[CB]\-XX:ErrorFile=./hs_err_pid%p.log\f[R] .RE .IP \[bu] 2 -\f[B]Oracle Solaris, Linux, and macOS:\f[R] The following example shows -how to set the error log to \f[CB]/var/log/java/java_error.log\f[R]: +\f[B]Linux and macOS:\f[R] The following example shows how to set the +error log to \f[CB]/var/log/java/java_error.log\f[R]: .RS 2 .RS .PP @@ -1357,8 +1356,7 @@ Otherwise, if the file can\[aq]t be created in the specified directory (due to insufficient space, permission problem, or another issue), then the file is created in the temporary directory for the operating system: .IP \[bu] 2 -\f[B]Oracle Solaris, Linux, and macOS:\f[R] The temporary directory is -\f[CB]/tmp\f[R]. +\f[B]Linux and macOS:\f[R] The temporary directory is \f[CB]/tmp\f[R]. .IP \[bu] 2 \f[B]Windows:\f[R] The temporary directory is specified by the value of the \f[CB]TMP\f[R] environment variable; if that environment variable @@ -1579,12 +1577,11 @@ If the string contains spaces, then it must be enclosed in quotation marks. .RS .IP \[bu] 2 -\f[B]Oracle Solaris, Linux, and macOS:\f[R] The following example shows -how the \f[CB]\-XX:OnError\f[R] option can be used to run the -\f[CB]gcore\f[R] command to create a core image, and start the -\f[CB]gdb\f[R] debugger to attach to the process in case of an -irrecoverable error (the \f[CB]%p\f[R] designates the current process -identifier): +\f[B]Linux and macOS:\f[R] The following example shows how the +\f[CB]\-XX:OnError\f[R] option can be used to run the \f[CB]gcore\f[R] +command to create a core image, and start the \f[CB]gdb\f[R] debugger to +attach to the process in case of an irrecoverable error (the \f[CB]%p\f[R] +designates the current process identifier): .RS 2 .RS .PP @@ -1691,7 +1688,7 @@ source with a null\-detail message. The null\-detail message is calculated and returned by \f[CB]NullPointerException.getMessage()\f[R], and will be printed as the exception message along with the method, filename, and line number. -By default, this option is disabled. +By default, this option is enabled. .RS .RE .TP @@ -1839,8 +1836,6 @@ Linux/x64 (64\-bit): 1024 KB .IP \[bu] 2 macOS (64\-bit): 1024 KB .IP \[bu] 2 -Oracle Solaris (64\-bit): 1024 KB -.IP \[bu] 2 Windows: The default value depends on virtual memory .PP The following examples show how to set the thread stack size to 1 @@ -1856,17 +1851,6 @@ megabyte in different units: This option is similar to \f[CB]\-Xss\f[R]. .RE .TP -.B \f[CB]\-XX:\-UseBiasedLocking\f[R] -Disables the use of biased locking. -Some applications with significant amounts of uncontended -synchronization may attain significant speedups with this flag enabled, -but applications with certain patterns of locking may see slowdowns. -\&. -.RS -.PP -By default, this option is enabled. -.RE -.TP .B \f[CB]\-XX:\-UseCompressedOops\f[R] Disables the use of compressed pointers. By default, this option is enabled, and compressed pointers are used. @@ -2362,6 +2346,7 @@ To disable method inlining, specify \f[CB]\-XX:\-Inline\f[R]. .B \f[CB]\-XX:InlineSmallCode=\f[R]\f[I]size\f[R] Sets the maximum code size (in bytes) for already compiled methods that may be inlined. +This flag only applies to the C2 compiler. Append the letter \f[CB]k\f[R] or \f[CB]K\f[R] to indicate kilobytes, \f[CB]m\f[R] or \f[CB]M\f[R] to indicate megabytes, or \f[CB]g\f[R] or \f[CB]G\f[R] to indicate gigabytes. @@ -2395,6 +2380,7 @@ console every time a method is compiled by using the .TP .B \f[CB]\-XX:FreqInlineSize=\f[R]\f[I]size\f[R] Sets the maximum bytecode size (in bytes) of a hot method to be inlined. +This flag only applies to the C2 compiler. Append the letter \f[CB]k\f[R] or \f[CB]K\f[R] to indicate kilobytes, \f[CB]m\f[R] or \f[CB]M\f[R] to indicate megabytes, or \f[CB]g\f[R] or \f[CB]G\f[R] to indicate gigabytes. @@ -2410,6 +2396,22 @@ In the following example it is set to 325 bytes: .B \f[CB]\-XX:MaxInlineSize=\f[R]\f[I]size\f[R] Sets the maximum bytecode size (in bytes) of a cold method to be inlined. +This flag only applies to the C2 compiler. +Append the letter \f[CB]k\f[R] or \f[CB]K\f[R] to indicate kilobytes, +\f[CB]m\f[R] or \f[CB]M\f[R] to indicate megabytes, or \f[CB]g\f[R] or +\f[CB]G\f[R] to indicate gigabytes. +By default, the maximum bytecode size is set to 35 bytes: +.RS +.RS +.PP +\f[CB]\-XX:MaxInlineSize=35\f[R] +.RE +.RE +.TP +.B \f[CB]\-XX:C1MaxInlineSize=\f[R]\f[I]size\f[R] +Sets the maximum bytecode size (in bytes) of a cold method to be +inlined. +This flag only applies to the C1 compiler. Append the letter \f[CB]k\f[R] or \f[CB]K\f[R] to indicate kilobytes, \f[CB]m\f[R] or \f[CB]M\f[R] to indicate megabytes, or \f[CB]g\f[R] or \f[CB]G\f[R] to indicate gigabytes. @@ -2424,6 +2426,23 @@ By default, the maximum bytecode size is set to 35 bytes: .B \f[CB]\-XX:MaxTrivialSize=\f[R]\f[I]size\f[R] Sets the maximum bytecode size (in bytes) of a trivial method to be inlined. +This flag only applies to the C2 compiler. +Append the letter \f[CB]k\f[R] or \f[CB]K\f[R] to indicate kilobytes, +\f[CB]m\f[R] or \f[CB]M\f[R] to indicate megabytes, or \f[CB]g\f[R] or +\f[CB]G\f[R] to indicate gigabytes. +By default, the maximum bytecode size of a trivial method is set to 6 +bytes: +.RS +.RS +.PP +\f[CB]\-XX:MaxTrivialSize=6\f[R] +.RE +.RE +.TP +.B \f[CB]\-XX:C1MaxTrivialSize=\f[R]\f[I]size\f[R] +Sets the maximum bytecode size (in bytes) of a trivial method to be +inlined. +This flag only applies to the C1 compiler. Append the letter \f[CB]k\f[R] or \f[CB]K\f[R] to indicate kilobytes, \f[CB]m\f[R] or \f[CB]M\f[R] to indicate megabytes, or \f[CB]g\f[R] or \f[CB]G\f[R] to indicate gigabytes. @@ -2675,7 +2694,7 @@ Flags that control intrinsics now require the option .TP .B \f[CB]\-XX:+UseSHA\f[R] Enables hardware\-based intrinsics for SHA crypto hash functions for -SPARC hardware. +some hardware. The \f[CB]UseSHA\f[R] option is used in conjunction with the \f[CB]UseSHA1Intrinsics\f[R], \f[CB]UseSHA256Intrinsics\f[R], and \f[CB]UseSHA512Intrinsics\f[R] options. @@ -2817,7 +2836,7 @@ Default value is 1/10th of \f[CB]\-XX:LoopStripMiningIter\f[R]. .TP .B \f[CB]\-XX:+UseFMA\f[R] Enables hardware\-based FMA intrinsics for hardware where FMA -instructions are available (such as, Intel, SPARC, and ARM64). +instructions are available (such as, Intel and ARM64). FMA intrinsics are generated for the \f[CB]java.lang.Math.fma(\f[R]\f[I]a\f[R]\f[CB],\f[R] \f[I]b\f[R]\f[CB],\f[R] \f[I]c\f[R]\f[CB])\f[R] methods that calculate the value of \f[CB](\f[R] @@ -2916,8 +2935,8 @@ different JDK version. .RE .TP .B \f[CB]\-XX:+ExtendedDTraceProbes\f[R] -\f[B]Oracle Solaris, Linux, and macOS:\f[R] Enables additional -\f[CB]dtrace\f[R] tool probes that affect the performance. +\f[B]Linux and macOS:\f[R] Enables additional \f[CB]dtrace\f[R] tool probes +that affect the performance. By default, this option is disabled and \f[CB]dtrace\f[R] performs only standard probes. .RS @@ -2949,9 +2968,8 @@ The following example shows how to set the default file explicitly \f[CB]\-XX:HeapDumpPath=./java_pid%p.hprof\f[R] .RE .IP \[bu] 2 -\f[B]Oracle Solaris, Linux, and macOS:\f[R] The following example shows -how to set the heap dump file to -\f[CB]/var/log/java/java_heapdump.hprof\f[R]: +\f[B]Linux and macOS:\f[R] The following example shows how to set the +heap dump file to \f[CB]/var/log/java/java_heapdump.hprof\f[R]: .RS 2 .RS .PP @@ -2975,8 +2993,8 @@ By default, the file is created in the current working directory, and it\[aq]s named \f[CB]hotspot.log\f[R]. .RS .IP \[bu] 2 -\f[B]Oracle Solaris, Linux, and macOS:\f[R] The following example shows -how to set the log file to \f[CB]/var/log/java/hotspot.log\f[R]: +\f[B]Linux and macOS:\f[R] The following example shows how to set the log +file to \f[CB]/var/log/java/hotspot.log\f[R]: .RS 2 .RS .PP @@ -2999,7 +3017,7 @@ Enables printing of a class instance histogram after one of the following events: .RS .IP \[bu] 2 -\f[B]Oracle Solaris, Linux, and macOS:\f[R] \f[CB]Control+Break\f[R] +\f[B]Linux and macOS:\f[R] \f[CB]Control+Break\f[R] .IP \[bu] 2 \f[B]Windows:\f[R] \f[CB]Control+C\f[R] (\f[CB]SIGTERM\f[R]) .PP @@ -3015,7 +3033,7 @@ Enables printing of \f[CB]java.util.concurrent\f[R] locks after one of the following events: .RS .IP \[bu] 2 -\f[B]Oracle Solaris, Linux, and macOS:\f[R] \f[CB]Control+Break\f[R] +\f[B]Linux and macOS:\f[R] \f[CB]Control+Break\f[R] .IP \[bu] 2 \f[B]Windows:\f[R] \f[CB]Control+C\f[R] (\f[CB]SIGTERM\f[R]) .PP @@ -3278,13 +3296,11 @@ amount of memory used for the Java heap: .TP .B \f[CB]\-XX:InitialSurvivorRatio=\f[R]\f[I]ratio\f[R] Sets the initial survivor space ratio used by the throughput garbage -collector (which is enabled by the \f[CB]\-XX:+UseParallelGC\f[R] and/or -\f[CB]\-XX:+UseParallelOldGC\f[R] options). +collector (which is enabled by the \f[CB]\-XX:+UseParallelGC\f[R] option). Adaptive sizing is enabled by default with the throughput garbage -collector by using the \f[CB]\-XX:+UseParallelGC\f[R] and -\f[CB]\-XX:+UseParallelOldGC\f[R] options, and the survivor space is -resized according to the application behavior, starting with the initial -value. +collector by using the \f[CB]\-XX:+UseParallelGC\f[R] option, and the +survivor space is resized according to the application behavior, +starting with the initial value. If adaptive sizing is disabled (using the \f[CB]\-XX:\-UseAdaptiveSizePolicy\f[R] option), then the \f[CB]\-XX:SurvivorRatio\f[R] option should be used to set the size of the @@ -3811,8 +3827,6 @@ application by leveraging multiple processors. .RS .PP By default, this option is disabled and the default collector is used. -If it\[aq]s enabled, then the \f[CB]\-XX:+UseParallelOldGC\f[R] option is -automatically enabled, unless you explicitly disable it. .RE .TP .B \f[CB]\-XX:+UseSerialGC\f[R] @@ -3855,19 +3869,66 @@ To disable the use of TLABs, specify the option \f[CB]\-XX:\-UseTLAB\f[R]. .RE .TP .B \f[CB]\-XX:+UseZGC\f[R] -Enables the use of the Z garbage collector. -This garbage collector is best for providing lowest latency with large -Java heaps at some throughput cost. -This is an experimental garbage collector, you need to specify -\f[CB]\-XX:+UnlockExperimentalVMOptions\f[R] before \f[CB]\-XX:+UseZGC\f[R] -on the command line. +Enables the use of the Z garbage collector (ZGC). +This is a low latency garbage collector, providing max pause times of a +few milliseconds, at some throughput cost. +Pause times are independent of what heap size is used. +Supports heap sizes from 8MB to 16TB. .RS -.PP -Example: -.RS -.PP -\f[CB]\-XX:+UnlockExperimentalVMOptions\ \-XX:+UseZGC\f[R] .RE +.TP +.B \f[CB]\-XX:ZAllocationSpikeTolerance\f[R]=\f[I]factor\f[R] +Sets the allocation spike tolerance for ZGC. +By default, this option is set to 2.0. +This factor describes the level of allocation spikes to expect. +For example, using a factor of 3.0 means the current allocation rate can +be expected to triple at any time. +.RS +.RE +.TP +.B \f[CB]\-XX:ZCollectionInterval\f[R]=\f[I]seconds\f[R] +Sets the maximum interval (in seconds) between two GC cycles when using +ZGC. +By default, this option is set to 0 (disabled). +.RS +.RE +.TP +.B \f[CB]\-XX:ZFragmentationLimit\f[R]=\f[I]percent\f[R] +Sets the maximum acceptable heap fragmentation (in percent) for ZGC. +By default, this option is set to 25. +Using a lower value will cause the heap to be compacted more +aggressively, to reclaim more memory at the cost of using more CPU time. +.RS +.RE +.TP +.B \f[CB]\-XX:+ZProactive\f[R] +Enables proactive GC cycles when using ZGC. +By default, this option is enabled. +ZGC will start a proactive GC cycle if doing so is expected to have +minimal impact on the running application. +This is useful if the application is mostly idle or allocates very few +objects, but you still want to keep the heap size down and allow +reference processing to happen even when there are a lot of free space +on the heap. +.RS +.RE +.TP +.B \f[CB]\-XX:+ZUncommit\f[R] +Enables uncommitting of unused heap memory when using ZGC. +By default, this option is enabled. +Uncommitting unused heap memory will lower the memory footprint of the +JVM, and make that memory available for other processes to use. +.RS +.RE +.TP +.B \f[CB]\-XX:ZUncommitDelay\f[R]=\f[I]seconds\f[R] +Sets the amount of time (in seconds) that heap memory must have been +unused before being uncommitted. +By default, this option is set to 300 (5 minutes). +Committing and uncommitting memory are relatively expensive operations. +Using a lower value will cause heap memory to be uncommitted earlier, at +the risk of soon having to commit it again. +.RS .RE .SH DEPRECATED JAVA OPTIONS .PP @@ -3993,27 +4054,20 @@ The replacement Unified Logging syntax is See \f[B]Enable Logging with the JVM Unified Logging Framework\f[R]. .RE .TP -.B \f[CB]\-XX:+UseParallelOldGC\f[R] -Enables the use of the parallel garbage collector for full GCs. -By default, this option is disabled. -Enabling it automatically enables the \f[CB]\-XX:+UseParallelGC\f[R] -option. +.B \f[CB]\-XX:+UseBiasedLocking\f[R] +Enables the use of biased locking. +Some applications with significant amounts of uncontended +synchronization may attain significant speedups with this flag enabled, +but applications with certain patterns of locking may see slowdowns. .RS +.PP +By default, this option is disabled. .RE .SH OBSOLETE JAVA OPTIONS .PP These \f[CB]java\f[R] options are still accepted but ignored, and a warning is issued when they\[aq]re used. .TP -.B \f[CB]\-XX:+FailOverToOldVerifier\f[R] -Enables automatic failover to the old verifier when the new type checker -fails. -By default, this option is disabled and it\[aq]s ignored (that is, -treated as disabled) for classes with a recent bytecode version. -You can enable it only for classes with older versions of the bytecode. -.RS -.RE -.TP .B \f[CB]\-XX:+UseMembar\f[R] Enabled issuing membars on thread\-state transitions. This option was disabled by default on all platforms except ARM servers, @@ -4035,13 +4089,48 @@ This option was deprecated in JDK 8 and superseded by the \f[CB]\-XX:MetaspaceSize\f[R] option. .RS .RE +.TP +.B \f[CB]\-XX:+UseParallelOldGC\f[R] +Enables the use of the parallel garbage collector for full GCs. +By default, this option is disabled. +Enabling it automatically enables the \f[CB]\-XX:+UseParallelGC\f[R] +option. +.RS +.RE .SH REMOVED JAVA OPTIONS .PP -No documented \f[CB]java\f[R] options have been removed in JDK 14. +These \f[CB]java\f[R] options have been removed in JDK 15 and using them +results in an error of: +.RS +.PP +\f[CB]Unrecognized\ VM\ option\f[R] \f[I]option\-name\f[R] +.RE +.TP +.B \f[CB]\-XX:+FailOverToOldVerifier\f[R] +Enables automatic failover to the old verifier when the new type checker +fails. +By default, this option is disabled and it\[aq]s ignored (that is, +treated as disabled) for classes with a recent bytecode version. +You can enable it only for classes with older versions of the bytecode. +.RS +.RE +.TP +.B \f[CB]\-XX:+UseConcMarkSweepGC\f[R] +Enables the use of the CMS garbage collector for the old generation. +CMS is an alternative to the default garbage collector (G1), which also +focuses on meeting application latency requirements. +By default, this option is disabled and the collector is selected +automatically based on the configuration of the machine and type of the +JVM. +.RS +.RE .PP For the lists and descriptions of options removed in previous releases see the \f[I]Removed Java Options\f[R] section in: .IP \[bu] 2 +\f[B]Java Platform, Standard Edition Tools Reference, Release 14\f[R] +[https://docs.oracle.com/en/java/javase/14/docs/specs/man/java.html] +.IP \[bu] 2 \f[B]Java Platform, Standard Edition Tools Reference, Release 13\f[R] [https://docs.oracle.com/en/java/javase/13/docs/specs/man/java.html] .IP \[bu] 2 @@ -5060,11 +5149,7 @@ fragmentation, which could make it impossible to reserve enough large page memory. When this happens, either the OS or JVM reverts to using regular pages. .PP -Oracle Solaris, Linux, and Windows support large pages. -.SS Large Pages Support for Oracle Solaris -.PP -Oracle Solaris includes Multiple Page Size Support (MPSS). -No additional configuration is necessary. +Linux and Windows support large pages. .SS Large Pages Support for Linux .PP The 2.6 kernel supports large pages. @@ -5623,9 +5708,9 @@ Create a single list of classes used by all the applications that will share the shared archive file. .RS 4 .PP -\f[B]Oracle Solaris, Linux, and macOS\f[R] The following commands combine -the files \f[CB]hello.classlist\f[R] and \f[CB]hi.classlist\f[R] into one -file, \f[CB]common.classlist\f[R]: +\f[B]Linux and macOS\f[R] The following commands combine the files +\f[CB]hello.classlist\f[R] and \f[CB]hi.classlist\f[R] into one file, +\f[CB]common.classlist\f[R]: .RS .PP \f[CB]cat\ hello.classlist\ hi.classlist\ >\ common.classlist\f[R] diff --git a/src/java.base/share/man/jfr.1 b/src/java.base/share/man/jfr.1 index 1471d9535e4..ace59a45852 100644 --- a/src/java.base/share/man/jfr.1 +++ b/src/java.base/share/man/jfr.1 @@ -1,4 +1,4 @@ -.\" Copyright (c) 1994, 2019, Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 2019, 2020, 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 @@ -21,7 +21,7 @@ .\" .\" Automatically generated by Pandoc 2.3.1 .\" -.TH "JFR" "1" "2020" "JDK 14" "JDK Commands" +.TH "JFR" "1" "2020" "JDK 15" "JDK Commands" .hy .SH NAME .PP diff --git a/src/java.base/share/man/keytool.1 b/src/java.base/share/man/keytool.1 index a65ad5cb209..38008bfd7f8 100644 --- a/src/java.base/share/man/keytool.1 +++ b/src/java.base/share/man/keytool.1 @@ -1,5 +1,5 @@ .\"t -.\" Copyright (c) 1994, 2019, Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1998, 2020, 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 @@ -22,7 +22,7 @@ .\" .\" Automatically generated by Pandoc 2.3.1 .\" -.TH "KEYTOOL" "1" "2020" "JDK 14" "JDK Commands" +.TH "KEYTOOL" "1" "2020" "JDK 15" "JDK Commands" .hy .SH NAME .PP @@ -101,6 +101,16 @@ It can also display other security\-related information. .PP The \f[CB]keytool\f[R] command stores the keys and certificates in a keystore. +.PP +The \f[CB]keytool\f[R] command uses the +\f[CB]jdk.certpath.disabledAlgorithms\f[R] and +\f[CB]jdk.security.legacyAlgorithms\f[R] security properties to determine +which algorithms are considered a security risk. +It emits warnings when disabled or legacy algorithms are being used. +The \f[CB]jdk.certpath.disabledAlgorithms\f[R] and +\f[CB]jdk.security.legacyAlgorithms\f[R] security properties are defined +in the \f[CB]java.security\f[R] file (located in the JDK\[aq]s +\f[CB]$JAVA_HOME/conf/security\f[R] directory). .SH COMMAND AND OPTION NOTES .PP The following notes apply to the descriptions in \f[B]Commands and @@ -260,12 +270,10 @@ For example, .PP \f[B]Note:\f[R] .PP -For compatibility reasons, the SunPKCS11 and OracleUcrypto providers can -still be loaded with -\f[CB]\-providerclass\ sun.security.pkcs11.SunPKCS11\f[R] and -\f[CB]\-providerclass\ com.oracle.security.crypto.UcryptoProvider\f[R] -even if they are now defined in modules. -These are the only modules included in JDK that need a configuration, +For compatibility reasons, the SunPKCS11 provider can still be loaded +with \f[CB]\-providerclass\ sun.security.pkcs11.SunPKCS11\f[R] even if it +is now defined in a module. +This is the only module included in the JDK that needs a configuration, and therefore the most widely used with the \f[CB]\-providerclass\f[R] option. For legacy security providers located on classpath and loaded by @@ -2199,8 +2207,7 @@ file. The security properties file is called \f[CB]java.security\f[R], and resides in the security properties directory: .IP \[bu] 2 -\f[B]Oracle Solaris, Linux, and OS X:\f[R] -\f[CB]java.home/lib/security\f[R] +\f[B]Linux and OS X:\f[R] \f[CB]java.home/lib/security\f[R] .IP \[bu] 2 \f[B]Windows:\f[R] \f[CB]java.home\\lib\\security\f[R] .PP @@ -2477,15 +2484,10 @@ A certificates file named \f[CB]cacerts\f[R] resides in the security properties directory: .RS .IP \[bu] 2 -\f[B]Oracle Solaris, Linux, and OS X:\f[R] -\f[I]JAVA_HOME\f[R]\f[CB]/lib/security\f[R] +\f[B]Linux and OS X:\f[R] \f[I]JAVA_HOME\f[R]\f[CB]/lib/security\f[R] .IP \[bu] 2 \f[B]Windows:\f[R] \f[I]JAVA_HOME\f[R]\f[CB]\\lib\\security\f[R] .PP -\f[I]JAVA_HOME\f[R] is the runtime environment directory, which is the -\f[CB]jre\f[R] directory in the JDK or the top\-level directory of the -Java Runtime Environment (JRE). -.PP The \f[CB]cacerts\f[R] file represents a system\-wide keystore with CA certificates. System administrators can configure and manage that file with the @@ -2493,8 +2495,8 @@ System administrators can configure and manage that file with the type. The \f[CB]cacerts\f[R] keystore file ships with a default set of root CA certificates. -For Oracle Solaris, Linux, OS X, and Windows, you can list the default -certificates with the following command: +For Linux, OS X, and Windows, you can list the default certificates with +the following command: .RS .PP \f[CB]keytool\ \-list\ \-cacerts\f[R] @@ -2518,10 +2520,10 @@ bundled in the \f[CB]cacerts\f[R] file and make your own trust decisions. .PP To remove an untrusted CA certificate from the \f[CB]cacerts\f[R] file, use the \f[CB]\-delete\f[R] option of the \f[CB]keytool\f[R] command. -You can find the \f[CB]cacerts\f[R] file in the JRE installation -directory. +You can find the \f[CB]cacerts\f[R] file in the JDK\[aq]s +\f[CB]$JAVA_HOME/lib/security\f[R] directory. Contact your system administrator if you don\[aq]t have permission to -edit this file +edit this file. .RE .TP .B Internet RFC 1421 Certificate Encoding Standard @@ -2672,7 +2674,7 @@ fingerprints, as follows: \f[R] .fi .PP -\f[B]Oracle Solaris Example:\f[R] +\f[B]Linux Example:\f[R] .PP View the certificate first with the \f[CB]\-printcert\f[R] command or the \f[CB]\-importcert\f[R] command without the \f[CB]\-noprompt\f[R] option. @@ -2743,7 +2745,7 @@ it can generate certificates that don\[aq]t conform to the standard, such as self\-signed certificates that would be used for internal testing purposes. Certificates that don\[aq]t conform to the standard might be rejected by -JRE or other applications. +the JDK or other applications. Users should ensure that they provide the correct options for \f[CB]\-dname\f[R], \f[CB]\-ext\f[R], and so on. .SH IMPORT A NEW TRUSTED CERTIFICATE diff --git a/src/java.rmi/share/man/rmid.1 b/src/java.rmi/share/man/rmid.1 index 761a145dda4..340a0523aa5 100644 --- a/src/java.rmi/share/man/rmid.1 +++ b/src/java.rmi/share/man/rmid.1 @@ -1,4 +1,4 @@ -.\" Copyright (c) 1994, 2019, Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1998, 2020, 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 @@ -21,7 +21,7 @@ .\" .\" Automatically generated by Pandoc 2.3.1 .\" -.TH "RMID" "1" "2020" "JDK 14" "JDK Commands" +.TH "RMID" "1" "2020" "JDK 15" "JDK Commands" .hy .SH NAME .PP @@ -38,6 +38,12 @@ See \f[B]Options for rmid\f[R]. .RE .SH DESCRIPTION .PP +\f[B]Deprecation Notice:\f[R] The rmid tool and the RMI Activation +mechanism have been deprecated and may be removed from a future version +of the platform. +See \f[B]JEP 385\f[R] [https://openjdk.java.net/jeps/385] for further +information. +.PP The \f[CB]rmid\f[R] command starts the activation system daemon. The activation system daemon must be started before objects that can be activated are either registered with the activation system or activated @@ -79,11 +85,10 @@ and a registry on the registry\[aq]s default port, 1099. .PP \f[CB]rmid\ \-J\-Djava.security.policy=rmid.policy\ \-port\ 1099\f[R] .RE -.SH START RMID ON DEMAND (ORACLE SOLARIS AND LINUX ONLY) +.SH START RMID ON DEMAND (LINUX ONLY) .PP An alternative to starting \f[CB]rmid\f[R] from the command line is to -configure \f[CB]inetd\f[R] (Oracle Solaris) or \f[CB]xinetd\f[R] (Linux) to -start \f[CB]rmid\f[R] on demand. +configure \f[CB]xinetd\f[R] (Linux) to start \f[CB]rmid\f[R] on demand. .PP When RMID starts, it attempts to obtain an inherited channel (inherited from \f[CB]inetd\f[R]/\f[CB]xinetd\f[R]) by calling the @@ -257,14 +262,14 @@ It is safe to grant these permissions universally because only the An example policy file that grants various execute permissions to the \f[CB]rmid\f[R] command is: .IP \[bu] 2 -\f[B]Oracle Solaris:\f[R] +\f[B]Linux:\f[R] .RS 2 .IP .nf \f[CB] grant\ { \ \ \ \ permission\ com.sun.rmi.rmid.ExecPermission -\ \ \ \ \ \ \ \ "/files/apps/java/jdk1.7.0/solaris/bin/java"; +\ \ \ \ \ \ \ \ "/files/apps/java/jdk1.7.0/linux/bin/java"; \ \ \ \ permission\ com.sun.rmi.rmid.ExecPermission \ \ \ \ \ \ \ \ "/files/apps/rmidcmds/*"; @@ -314,15 +319,13 @@ By default, the version of the \f[CB]java\f[R] command found in \f[CB]java.home\f[R] is used (the same one that the \f[CB]rmid\f[R] command uses), and doesn\[aq]t need to be specified in the policy file. The second permission allows the \f[CB]rmid\f[R] command to execute any -command in either the directory \f[CB]/files/apps/rmidcmds\f[R] (Oracle -Solaris, Linux, and macOS) or the directory -\f[CB]c:\\files\\apps\\rmidcmds\\\f[R] (Windows). +command in either the directory \f[CB]/files/apps/rmidcmds\f[R] (Linux and +macOS) or the directory \f[CB]c:\\files\\apps\\rmidcmds\\\f[R] (Windows). .PP The third permission granted, \f[CB]ExecOptionPermission\f[R], allows the \f[CB]rmid\f[R] command to start an activation group that defines the security policy file to be either \f[CB]/files/policies/group.policy\f[R] -(Oracle Solaris) or \f[CB]c:\\files\\policies\\group.policy\f[R] -(Windows). +(Linux) or \f[CB]c:\\files\\policies\\group.policy\f[R] (Windows). The next permission allows the \f[CB]java.security.debug\ property\f[R] to be used by an activation group. The last permission allows any property in the diff --git a/src/java.rmi/share/man/rmiregistry.1 b/src/java.rmi/share/man/rmiregistry.1 index b6d9f4c2272..ab025ce677b 100644 --- a/src/java.rmi/share/man/rmiregistry.1 +++ b/src/java.rmi/share/man/rmiregistry.1 @@ -1,4 +1,4 @@ -.\" Copyright (c) 1994, 2019, Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1997, 2020, 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 @@ -21,7 +21,7 @@ .\" .\" Automatically generated by Pandoc 2.3.1 .\" -.TH "RMIREGISTRY" "1" "2020" "JDK 14" "JDK Commands" +.TH "RMIREGISTRY" "1" "2020" "JDK 15" "JDK Commands" .hy .SH NAME .PP diff --git a/src/java.scripting/share/man/jrunscript.1 b/src/java.scripting/share/man/jrunscript.1 index 6e069b7c0c5..17c6edbfd3e 100644 --- a/src/java.scripting/share/man/jrunscript.1 +++ b/src/java.scripting/share/man/jrunscript.1 @@ -1,4 +1,4 @@ -.\" Copyright (c) 1994, 2019, Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 2006, 2020, 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 @@ -21,7 +21,7 @@ .\" .\" Automatically generated by Pandoc 2.3.1 .\" -.TH "JRUNSCRIPT" "1" "2020" "JDK 14" "JDK Commands" +.TH "JRUNSCRIPT" "1" "2020" "JDK 15" "JDK Commands" .hy .SH NAME .PP diff --git a/src/jdk.aot/share/man/jaotc.1 b/src/jdk.aot/share/man/jaotc.1 index 7aa491c21df..eb8090dc52b 100644 --- a/src/jdk.aot/share/man/jaotc.1 +++ b/src/jdk.aot/share/man/jaotc.1 @@ -1,4 +1,4 @@ -.\" Copyright (c) 1994, 2019, Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 2019, 2020, 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 @@ -21,7 +21,7 @@ .\" .\" Automatically generated by Pandoc 2.3.1 .\" -.TH "JAOTC" "1" "2020" "JDK 14" "JDK Commands" +.TH "JAOTC" "1" "2020" "JDK 15" "JDK Commands" .hy .SH NAME .PP diff --git a/src/jdk.compiler/share/man/javac.1 b/src/jdk.compiler/share/man/javac.1 index 9e9ece37195..a4ea5962b3c 100644 --- a/src/jdk.compiler/share/man/javac.1 +++ b/src/jdk.compiler/share/man/javac.1 @@ -1,4 +1,4 @@ -.\" Copyright (c) 1994, 2019, Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1994, 2020, 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 @@ -21,7 +21,7 @@ .\" .\" Automatically generated by Pandoc 2.3.1 .\" -.TH "JAVAC" "1" "2020" "JDK 14" "JDK Commands" +.TH "JAVAC" "1" "2020" "JDK 15" "JDK Commands" .hy .SH NAME .PP @@ -1027,7 +1027,7 @@ Note that the following lists have no line\-continuation characters. .PP Create a file named \f[CB]options\f[R] that contains the following: .PP -\f[B]Oracle Solaris, Linux, and macOS:\f[R] +\f[B]Linux and macOS:\f[R] .IP .nf \f[CB] @@ -1274,7 +1274,7 @@ This example compiles the \f[CB]Aloha.java\f[R], \f[CB]GutenTag.java\f[R], \f[CB]Hello.java\f[R], and \f[CB]Hi.java\f[R] source files in the \f[CB]greetings\f[R] package. .PP -\f[B]Oracle Solaris, Linux, and macOS:\f[R] +\f[B]Linux and macOS:\f[R] .IP .nf \f[CB] @@ -1300,7 +1300,7 @@ Aloha.java\ \ \ \ \ \ \ \ \ \ GutenTag.java\ \ \ \ \ \ \ Hello.java\ \ \ \ \ \ \ After changing one of the source files in the previous example, recompile it: .PP -\f[B]Oracle Solaris, Linux, and macOS:\f[R] +\f[B]Linux and macOS:\f[R] .IP .nf \f[CB] @@ -1330,7 +1330,7 @@ you are in, then add the examples directory to the user class path by setting \f[CB]CLASSPATH\f[R]. This example uses the \f[CB]\-classpath\f[R] option. .PP -\f[B]Oracle Solaris, Linux, and macOS:\f[R] +\f[B]Linux and macOS:\f[R] .RS .PP \f[CB]javac\ \-classpath\ /examples\ /examples/greetings/Hi.java\f[R] @@ -1345,7 +1345,7 @@ This example uses the \f[CB]\-classpath\f[R] option. If you change \f[CB]greetings.Hi\f[R] to use a banner utility, then that utility also needs to be accessible through the user class path. .PP -\f[B]Oracle Solaris, Linux, and macOS:\f[R] +\f[B]Linux and macOS:\f[R] .IP .nf \f[CB] @@ -1367,7 +1367,7 @@ To execute a class in the \f[CB]greetings\f[R] package, the program needs access to the \f[CB]greetings\f[R] package, and to the classes that the \f[CB]greetings\f[R] classes use. .PP -\f[B]Oracle Solaris, Linux, and macOS:\f[R] +\f[B]Linux and macOS:\f[R] .RS .PP \f[CB]java\ \-classpath\ /examples:/lib/Banners.jar\ greetings.Hi\f[R] @@ -1571,7 +1571,7 @@ hierarchy\f[R]. .PP While \f[CB]javac\f[R] is fairly relaxed about the organization of source code, beyond the expectation that source will be organized in one or -package hierarchies, and can generally accomodate organizations +package hierarchies, and can generally accommodate organizations prescribed by development environments and build tools, Java tools in general, and \f[CB]javac\f[R] and the Java launcher in particular, are more stringent regarding the organization of compiled class files, and @@ -2105,7 +2105,7 @@ annotation. For example: .RS .IP \[bu] 2 -\f[B]Oracle Solaris, Linux, and macOS:\f[R] +\f[B]Linux and macOS:\f[R] \f[CB]javac\ \-Xlint:path\ \-classpath\ /nonexistentpath\ Example.java\f[R] .IP \[bu] 2 \f[B]Windows:\f[R] diff --git a/src/jdk.compiler/share/man/serialver.1 b/src/jdk.compiler/share/man/serialver.1 index 376ed807780..f5451872557 100644 --- a/src/jdk.compiler/share/man/serialver.1 +++ b/src/jdk.compiler/share/man/serialver.1 @@ -1,4 +1,4 @@ -.\" Copyright (c) 1994, 2019, Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1997, 2020, 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 @@ -21,7 +21,7 @@ .\" .\" Automatically generated by Pandoc 2.3.1 .\" -.TH "SERIALVER" "1" "2020" "JDK 14" "JDK Commands" +.TH "SERIALVER" "1" "2020" "JDK 15" "JDK Commands" .hy .SH NAME .PP diff --git a/src/jdk.hotspot.agent/share/man/jhsdb.1 b/src/jdk.hotspot.agent/share/man/jhsdb.1 index c5345027ffa..cf00c062729 100644 --- a/src/jdk.hotspot.agent/share/man/jhsdb.1 +++ b/src/jdk.hotspot.agent/share/man/jhsdb.1 @@ -1,4 +1,4 @@ -.\" Copyright (c) 1994, 2019, Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 2019, 2020, 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 @@ -21,7 +21,7 @@ .\" .\" Automatically generated by Pandoc 2.3.1 .\" -.TH "JHSDB" "1" "2020" "JDK 14" "JDK Commands" +.TH "JHSDB" "1" "2020" "JDK 15" "JDK Commands" .hy .SH NAME .PP @@ -69,14 +69,6 @@ To get a list of Java processes running on a machine, use the \f[CB]ps\f[R] command or, if the JVM processes are not running in a separate docker instance, the \f[B]jps\f[R] command. .RS -.PP -\f[B]Note:\f[R] JDK 10 has added support for using the Attach API when -attaching to Java processes running in a separate docker process. -However, the \f[CB]jps\f[R] command will not list the JVM processes that -are running in a separate docker instance. -If you are trying to connect a Linux host with a Virtual Machine that is -in a docker container, you must use tools such as \f[CB]ps\f[R] to look up -the PID of the JVM. .RE .TP .B \f[I]executable\f[R] @@ -171,6 +163,31 @@ An optional unique ID for this debug server. This is required if multiple debug servers are run on the same machine. .RS .RE +.TP +.B \f[CB]\-\-rmiport\f[R] \f[I]port\f[R] +Sets the port number to which the RMI connector is bound. +If not specified a random available port is used. +.RS +.RE +.TP +.B \f[CB]\-\-registryport\f[R] \f[I]port\f[R] +Sets the RMI registry port. +This option overrides the system property +\[aq]sun.jvm.hotspot.rmi.port\[aq]. +If not specified, the system property is used. +If the system property is not set, the default port 1099 is used. +.RS +.RE +.TP +.B \f[CB]\-\-hostname\f[R] \f[I]hostname\f[R] +Sets the hostname the RMI connector is bound. +The value could be a hostname or an IPv4/IPv6 address. +This option overrides the system property +\[aq]java.rmi.server.hostname\[aq]. +If not specified, the system property is used. +If the system property is not set, a system hostname is used. +.RS +.RE .SH OPTIONS FOR THE JINFO MODE .TP .B \f[CB]\-\-flags\f[R] diff --git a/src/jdk.incubator.jpackage/share/man/jpackage.1 b/src/jdk.incubator.jpackage/share/man/jpackage.1 index 133a54e7d70..2311b233853 100644 --- a/src/jdk.incubator.jpackage/share/man/jpackage.1 +++ b/src/jdk.incubator.jpackage/share/man/jpackage.1 @@ -1,4 +1,4 @@ -.\" Copyright (c) 1994, 2019, Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 2018, 2020, 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 @@ -21,7 +21,7 @@ .\" .\" Automatically generated by Pandoc 2.3.1 .\" -.TH "JPACKAGE" "1" "2019" "JDK 14" "JDK Commands" +.TH "JPACKAGE" "1" "2019" "JDK 15" "JDK Commands" .hy .SH NAME .PP @@ -56,7 +56,7 @@ Read options and/or mode from a file. This option can be used multiple times. .RE .TP -.B \f[CB]\-\-type\f[R] or \f[CB]\-t\f[R] \f[I]type string\f[R] +.B \f[CB]\-\-type\f[R] or \f[CB]\-t\f[R] The type of package to create .RS .PP @@ -67,17 +67,17 @@ If this option is not specified a platform dependent default type will be created. .RE .TP -.B \f[CB]\-\-app\-version\f[R] \f[I]version\f[R] +.B \f[CB]\-\-app\-version\f[R] Version of the application and/or package` .RS .RE .TP -.B \f[CB]\-\-copyright\f[R] \f[I]copyright string\f[R] +.B \f[CB]\-\-copyright\f[R] Copyright for the application. .RS .RE .TP -.B \f[CB]\-\-description\f[R] \f[I]description string\f[R] +.B \f[CB]\-\-description\f[R] Description of the application. .RS .RE @@ -88,12 +88,12 @@ for the current platform to the output stream, and exit. .RS .RE .TP -.B \f[CB]\-\-name\f[R] or \f[CB]\-n\f[R] \f[I]name\f[R] +.B \f[CB]\-\-name\f[R] or \f[CB]\-n\f[R] Name of the application and/or package. .RS .RE .TP -.B \f[CB]\-\-dest\f[R] or \f[CB]\-d\f[R] \f[I]output path\f[R] +.B \f[CB]\-\-dest\f[R] or \f[CB]\-d\f[R] Path where generated output file is placed .RS .PP @@ -101,7 +101,7 @@ Defaults to the current working directory. (absolute path or relative to the current directory). .RE .TP -.B \f[CB]\-\-temp\f[R] \f[I]file path\f[R] +.B \f[CB]\-\-temp\f[R] Path of a new or empty directory used to create temporary files (absolute path or relative to the current directory). .RS @@ -113,7 +113,7 @@ If not specified, a temporary directory will be created and removed upon the task completion. .RE .TP -.B \f[CB]\-\-vendor\f[R] \f[I]vendor string\f[R] +.B \f[CB]\-\-vendor\f[R] Vendor of the application. .RS .RE @@ -129,7 +129,7 @@ Print the product version to the output stream and exit. .RE .SS Options for creating the runtime image: .TP -.B \f[CB]\-\-add\-modules\f[R] \f[I]module name\f[R] [\f[CB],\f[R]\f[I]module name\f[R]...] +.B \f[CB]\-\-add\-modules\f[R] [\f[CB],\f[R]...] A comma (",") separated list of modules to add. .RS .PP @@ -142,7 +142,7 @@ specified) are used. This option can be used multiple times. .RE .TP -.B \f[CB]\-\-module\-path\f[R] or \f[CB]\-p\f[R] \f[I]module path\f[R]... +.B \f[CB]\-\-module\-path\f[R] or \f[CB]\-p\f[R] ... A File.pathSeparator separated list of paths. .RS .PP @@ -158,7 +158,7 @@ provider modules and their dependences). .RS .RE .TP -.B \f[CB]\-\-runtime\-image\f[R] \f[I]file path\f[R] +.B \f[CB]\-\-runtime\-image\f[R] Path of the predefined runtime image that will be copied into the application image (absolute path or relative to the current directory). .RS @@ -170,13 +170,13 @@ create the runtime image using options: \-\-strip\-debug, .RE .SS Options for creating the application image: .TP -.B \f[CB]\-\-icon\f[R] \f[I]icon file path\f[R] +.B \f[CB]\-\-icon\f[R] Path of the icon of the application bundle (absolute path or relative to the current directory). .RS .RE .TP -.B \f[CB]\-\-input\f[R] or \f[CB]\-i\f[R] \f[I]input path\f[R] +.B \f[CB]\-\-input\f[R] or \f[CB]\-i\f[R] Path of the input directory that contains the files to be packaged (absolute path or relative to the current directory). .RS @@ -186,7 +186,7 @@ image. .RE .SS Options for creating the application launcher(s): .TP -.B \f[CB]\-\-add\-launcher\f[R] \f[I]launcher name\f[R]=\f[I]file path\f[R] +.B \f[CB]\-\-add\-launcher\f[R] = Name of launcher, and a path to a Properties file that contains a list of key, value pairs (absolute path or relative to the current directory). @@ -205,7 +205,7 @@ this option can be used multiple times to build multiple additional launchers. .RE .TP -.B \f[CB]\-\-arguments\f[R] \f[I]main class arguments\f[R] +.B \f[CB]\-\-arguments\f[R]
Command line arguments to pass to the main class if no command line arguments are given to the launcher. .RS @@ -213,21 +213,21 @@ arguments are given to the launcher. This option can be used multiple times. .RE .TP -.B \f[CB]\-\-java\-options\f[R] \f[I]java options\f[R] +.B \f[CB]\-\-java\-options\f[R] Options to pass to the Java runtime. .RS .PP This option can be used multiple times. .RE .TP -.B \f[CB]\-\-main\-class\f[R] \f[I]class name\f[R] +.B \f[CB]\-\-main\-class\f[R] Qualified name of the application main class to execute. .RS .PP This option can only be used if \-\-main\-jar is specified. .RE .TP -.B \f[CB]\-\-main\-jar\f[R] \f[I]main jar file\f[R] +.B \f[CB]\-\-main\-jar\f[R]
The main JAR of the application; containing the main class (specified as a path relative to the input path). .RS @@ -235,7 +235,7 @@ a path relative to the input path). Either \-\-module or \-\-main\-jar option can be specified but not both. .RE .TP -.B \f[CB]\-\-module\f[R] or \f[CB]\-m\f[R] \f[I]module name\f[R]/\f[I]main class\f[R]] +.B \f[CB]\-\-module\f[R] or \f[CB]\-m\f[R] /
] The main module (and optionally main class) of the application This module must be located on the module path. .RS @@ -254,7 +254,7 @@ application which requires console interactions .RE .SS macOS platform options (available only when running on macOS): .TP -.B \f[CB]\-\-mac\-package\-identifier\f[R] \f[I]ID string\f[R] +.B \f[CB]\-\-mac\-package\-identifier\f[R] An identifier that uniquely identifies the application for macOSX. .RS .PP @@ -264,7 +264,7 @@ May only use alphanumeric (A\-Z,a\-z,0\-9), hyphen (\-), and period (.) characters. .RE .TP -.B \f[CB]\-\-mac\-package\-name\f[R] \f[I]name string\f[R] +.B \f[CB]\-\-mac\-package\-name\f[R] Name of the application as it appears in the Menu Bar. .RS .PP @@ -275,7 +275,7 @@ displaying in the menu bar and the application Info window. Defaults to the application name. .RE .TP -.B \f[CB]\-\-mac\-bundle\-signing\-prefix\f[R] \f[I]prefix string\f[R] +.B \f[CB]\-\-mac\-bundle\-signing\-prefix\f[R] When signing the application bundle, this value is prefixed to all components that need to be signed that don\[aq]t have an existing bundle identifier. @@ -287,7 +287,7 @@ Request that the bundle be signed. .RS .RE .TP -.B \f[CB]\-\-mac\-signing\-keychain\f[R] \f[I]file path\f[R] +.B \f[CB]\-\-mac\-signing\-keychain\f[R] Path of the keychain to search for the signing identity (absolute path or relative to the current directory). .RS @@ -295,15 +295,15 @@ or relative to the current directory). If not specified, the standard keychains are used. .RE .TP -.B \f[CB]\-\-mac\-signing\-key\-user\-name\f[R] \f[I]team name\f[R] +.B \f[CB]\-\-mac\-signing\-key\-user\-name\f[R] Team name portion in Apple signing identities\[aq] names. .RS .PP -For example "Developer ID Application: " +For example "Developer ID Application: " .RE .SS Options for creating the application package: .TP -.B \f[CB]\-\-app\-image\f[R] \f[I]file path\f[R] +.B \f[CB]\-\-app\-image\f[R] Location of the predefined application image that is used to build an installable package (absolute path or relative to the current directory). @@ -312,7 +312,7 @@ directory). See create\-app\-image mode options to create the application image. .RE .TP -.B \f[CB]\-\-file\-associations\f[R] \f[I]file path\f[R] +.B \f[CB]\-\-file\-associations\f[R] Path to a Properties file that contains list of key, value pairs (absolute path or relative to the current directory). .RS @@ -323,7 +323,7 @@ used to describe the association. This option can be used multiple times. .RE .TP -.B \f[CB]\-\-install\-dir\f[R] \f[I]file path\f[R] +.B \f[CB]\-\-install\-dir\f[R] Absolute path of the installation directory of the application on OS X or Linux. Relative sub\-path of the installation location of the application such @@ -331,13 +331,13 @@ as "Program Files" or "AppData" on Windows. .RS .RE .TP -.B \f[CB]\-\-license\-file\f[R] \f[I]file path\f[R] +.B \f[CB]\-\-license\-file\f[R] Path to the license file (absolute path or relative to the current directory). .RS .RE .TP -.B \f[CB]\-\-resource\-dir\f[R] \f[I]path\f[R] +.B \f[CB]\-\-resource\-dir\f[R] Path to override jpackage resources (absolute path or relative to the current directory). .RS @@ -346,7 +346,7 @@ Icons, template files, and other resources of jpackage can be over\-ridden by adding replacement resources to this directory. .RE .TP -.B \f[CB]\-\-runtime\-image\f[R] \f[I]file\-path\f[R] +.B \f[CB]\-\-runtime\-image\f[R] Path of the predefined runtime image to install (absolute path or relative to the current directory). .RS @@ -367,7 +367,7 @@ Adds the application to the system menu. .RS .RE .TP -.B \f[CB]\-\-win\-menu\-group\f[R] \f[I]menu group name\f[R] +.B \f[CB]\-\-win\-menu\-group\f[R] Start Menu group this application is placed in. .RS .RE @@ -382,23 +382,23 @@ Creates a desktop shortcut for the application. .RS .RE .TP -.B \f[CB]\-\-win\-upgrade\-uuid\f[R] \f[I]id string\f[R] +.B \f[CB]\-\-win\-upgrade\-uuid\f[R] UUID associated with upgrades for this package. .RS .RE .SS Linux platform options (available only when running on Linux): .TP -.B \f[CB]\-\-linux\-package\-name\f[R] \f[I]package name\f[R] +.B \f[CB]\-\-linux\-package\-name\f[R] Name for Linux package, defaults to the application name. .RS .RE .TP -.B \f[CB]\-\-linux\-deb\-maintainer\f[R] \f[I]email address\f[R] +.B \f[CB]\-\-linux\-deb\-maintainer\f[R] Maintainer for .deb bundle. .RS .RE .TP -.B \f[CB]\-\-linux\-menu\-group\f[R] \f[I]menu\-group\-name\f[R] +.B \f[CB]\-\-linux\-menu\-group\f[R] Menu group this application is placed in. .RS .RE @@ -408,19 +408,20 @@ Required packages or capabilities for the application .RS .RE .TP -.B \f[CB]\-\-linux\-rpm\-license\-type\f[R] \f[I]type string\f[R] -Type of the license ("License: " of the RPM .spec). +.B \f[CB]\-\-linux\-rpm\-license\-type\f[R] +Type of the license ("License: " of the RPM .spec). .RS .RE .TP -.B \f[CB]\-\-linux\-app\-release\f[R] \f[I]release string\f[R] -Release value of the RPM .spec file or Debian revision value of the DEB -control file. +.B \f[CB]\-\-linux\-app\-release\f[R] +Release value of the RPM .spec file or Debian revision value of +the DEB control file. .RS .RE .TP -.B \f[CB]\-\-linux\-app\-category\f[R] \f[I]category string\f[R] -Group value of the RPM .spec file or Section value of DEB control file. +.B \f[CB]\-\-linux\-app\-category\f[R] +Group value of the RPM .spec file or Section value of DEB control +file. .RS .RE .TP diff --git a/src/jdk.jartool/share/man/jar.1 b/src/jdk.jartool/share/man/jar.1 index 015b70f76db..58e658712ca 100644 --- a/src/jdk.jartool/share/man/jar.1 +++ b/src/jdk.jartool/share/man/jar.1 @@ -1,4 +1,4 @@ -.\" Copyright (c) 1994, 2019, Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1997, 2020, 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 @@ -21,7 +21,7 @@ .\" .\" Automatically generated by Pandoc 2.3.1 .\" -.TH "JAR" "1" "2020" "JDK 14" "JDK Commands" +.TH "JAR" "1" "2020" "JDK 15" "JDK Commands" .hy .SH NAME .PP diff --git a/src/jdk.jartool/share/man/jarsigner.1 b/src/jdk.jartool/share/man/jarsigner.1 index b03b78f5cb4..008c2d221c3 100644 --- a/src/jdk.jartool/share/man/jarsigner.1 +++ b/src/jdk.jartool/share/man/jarsigner.1 @@ -1,5 +1,5 @@ .\"t -.\" Copyright (c) 1994, 2019, Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1998, 2020, 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 @@ -22,7 +22,7 @@ .\" .\" Automatically generated by Pandoc 2.3.1 .\" -.TH "JARSIGNER" "1" "2020" "JDK 14" "JDK Commands" +.TH "JARSIGNER" "1" "2020" "JDK 15" "JDK Commands" .hy .SH NAME .PP @@ -145,6 +145,9 @@ Use the \f[CB]\-verify\f[R] option to verify a signed JAR file. .PP The \f[CB]jarsigner\f[R] command also attempts to validate the signer\[aq]s certificate after signing or verifying. +During validation, it checks the revocation status of each certificate +in the signer\[aq]s certificate chain when the \f[CB]\-revCheck\f[R] +option is specified. If there is a validation error or any other problem, the command generates warning messages. If you specify the \f[CB]\-strict\f[R] option, then the command treats @@ -176,8 +179,8 @@ The keystore is by default stored in a file named \f[CB]\&.keystore\f[R] in the user\[aq]s home directory, as determined by the \f[CB]user.home\f[R] system property. .PP -\f[B]Oracle Solaris, Linux, and OS X:\f[R] \f[CB]user.home\f[R] defaults to -the user\[aq]s home directory. +\f[B]Linux and OS X:\f[R] \f[CB]user.home\f[R] defaults to the user\[aq]s +home directory. .PP The input stream from the \f[CB]\-keystore\f[R] option is passed to the \f[CB]KeyStore.load\f[R] method. @@ -351,16 +354,21 @@ T} These default signature algorithms can be overridden by using the \f[CB]\-sigalg\f[R] option. .PP -Signed JAR file algorithms are checked against the -\f[CB]jdk.jar.disabledAlgorithms\f[R] security property during -verification (\f[CB]\-verify\f[R]). +The \f[CB]jarsigner\f[R] command uses the +\f[CB]jdk.jar.disabledAlgorithms\f[R] and +\f[CB]jdk.security.legacyAlgorithms\f[R] security properties to determine +which algorithms are considered a security risk. If the JAR file was signed with any algorithms that are disabled, it will be treated as an unsigned JAR file. +If the JAR file was signed with any legacy algorithms, it will be +treated as signed with an informational warning to inform users that the +legacy algorithm will be disabled in a future update. For detailed verification output, include \f[CB]\-J\-Djava.security.debug=jar\f[R]. -The default value for the \f[CB]jdk.jar.disabledAlgorithms\f[R] security -property is defined in the \f[CB]java.security\f[R] file (located in the -JRE\[aq]s \f[CB]$JAVA_HOME/conf/security\f[R] directory). +The \f[CB]jdk.jar.disabledAlgorithms\f[R] and +\f[CB]jdk.security.legacyAlgorithms\f[R] security properties are defined +in the \f[CB]java.security\f[R] file (located in the JDK\[aq]s +\f[CB]$JAVA_HOME/conf/security\f[R] directory). .PP \f[B]Note:\f[R] .PP @@ -595,7 +603,7 @@ a file: URL, for example, the following are equivalent: .PP If the Sun PKCS #11 provider was configured in the \f[CB]java.security\f[R] security properties file (located in the -JRE\[aq]s \f[CB]$JAVA_HOME/conf/security\f[R] directory), then the +JDK\[aq]s \f[CB]$JAVA_HOME/conf/security\f[R] directory), then the \f[CB]keytool\f[R] and \f[CB]jarsigner\f[R] tools can operate on the PKCS #11 token by specifying these options: .RS @@ -810,6 +818,17 @@ keystore, then the alias name for the keystore entry for that signer is displayed in parentheses. .RE .TP +.B \f[CB]\-revCheck\f[R] +This option enables revocation checking of certificates when signing or +verifying a JAR file. +The \f[CB]jarsigner\f[R] command attempts to make network connections to +fetch OCSP responses and CRLs if the \f[CB]\-revCheck\f[R] option is +specified on the command line. +Note that revocation checks are not enabled unless this option is +specified. +.RS +.RE +.TP .B \f[CB]\-tsa\f[R] \f[I]url\f[R] If \f[CB]\-tsa\ http://example.tsa.url\f[R] appears on the command line when signing a JAR file then a time stamp is generated for the @@ -1031,7 +1050,7 @@ specified. If \f[I]classpathlist\f[R] contains multiple paths or JAR files, then they should be separated with a: .IP \[bu] 2 -Colon (\f[CB]:\f[R]) on Oracle Solaris, Linux, and macOS +Colon (\f[CB]:\f[R]) on Linux and macOS .IP \[bu] 2 Semicolon (\f[CB];\f[R]) on Windows .PP @@ -1073,7 +1092,7 @@ KeyUsage extension that doesn\[aq]t allow it to sign a file, the \f[CB]\-strict\f[R] option is specified. .PP \f[B]Note:\f[R] Exit codes are reused because only the values from 0 to -255 are legal on Oracle Solaris, Linux, and OS X. +255 are legal on Linux and OS X. .PP The following sections describes the names, codes, and descriptions of the errors and warnings that the \f[CB]jarsigner\f[R] command can issue. @@ -1135,10 +1154,9 @@ This JAR contains entries whose signer certificate is self signed. .RS .RE .TP -.B weakAlg +.B disabledAlg Code 4. -An algorithm specified on the command line is considered a security -risk. +An algorithm used is considered a security risk and is disabled. .RS .RE .TP @@ -1206,6 +1224,11 @@ The timestamp will expire within one year on \f[CB]YYYY\-MM\-DD\f[R]. .RS .RE .TP +.B legacyAlg +An algorithm used is considered a security risk but not disabled. +.RS +.RE +.TP .B noTimestamp This JAR contains signatures that doesn\[aq]t include a timestamp. Without a timestamp, users may not be able to validate this JAR file diff --git a/src/jdk.javadoc/share/man/javadoc.1 b/src/jdk.javadoc/share/man/javadoc.1 index ef3cf4435d6..a0fc1354141 100644 --- a/src/jdk.javadoc/share/man/javadoc.1 +++ b/src/jdk.javadoc/share/man/javadoc.1 @@ -1,4 +1,4 @@ -.\" Copyright (c) 1994, 2019, Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1994, 2020, 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 @@ -21,7 +21,7 @@ .\" .\" Automatically generated by Pandoc 2.3.1 .\" -.TH "JAVADOC" "1" "2020" "JDK 14" "JDK Commands" +.TH "JAVADOC" "1" "2020" "JDK 15" "JDK Commands" .hy .SH NAME .PP @@ -141,7 +141,7 @@ descriptions of using these options: .IP \[bu] 2 \f[CB]\-\-release\f[R] .IP \[bu] 2 -\f[CB]\-source\f[R] +\f[CB]\-\-source\f[R] or \f[CB]\-source\f[R] .IP \[bu] 2 \f[CB]\-\-source\-path\f[R] or \f[CB]\-sourcepath\f[R] .IP \[bu] 2 @@ -202,8 +202,8 @@ the path to that JAR file. You can specify an absolute path or a path relative to the current directory. If \f[CB]classpathlist\f[R] contains multiple paths or JAR files, then -they should be separated with a colon (\f[CB]:\f[R]) on Oracle Solaris and -a semi\-colon (\f[CB];\f[R]) on Windows. +they should be separated with a colon (\f[CB]:\f[R]) on Linux and a +semi\-colon (\f[CB];\f[R]) on Windows. This option isn\[aq]t necessary when the \f[CB]doclet\f[R] starting class is already in the search path. .RS @@ -222,7 +222,7 @@ exclude packages rooted at \f[CB]java.net\f[R] and \f[CB]java.lang\f[R]. Notice that these examples exclude \f[CB]java.lang.ref\f[R], which is a subpackage of \f[CB]java.lang\f[R]. .IP \[bu] 2 -\f[B]Oracle Solaris, Linux, and OS X:\f[R] +\f[B]Linux and OS X:\f[R] .RS 2 .RS .PP @@ -253,14 +253,13 @@ dependencies of those modules. \f[CB]all\f[R]: includes all dependencies. .RE .TP -.B \f[CB]\-help\f[R] or \f[CB]\-\-help\f[R] -Displays the online help, which lists all of the \f[CB]javadoc\f[R] and -\f[CB]doclet\f[R] command\-line options. +.B \f[CB]\-\-help\f[R], \f[CB]\-help\f[R], \f[CB]\-h\f[R], or \f[CB]\-?\f[R] +Prints a synopsis of the standard options. .RS .RE .TP .B \f[CB]\-\-help\-extra\f[R] or \f[CB]\-X\f[R] -Prints a synopsis of non\-standard options and exits. +Prints a synopsis of the set of extra options. .RS .RE .TP @@ -405,7 +404,7 @@ For example, the following commands generates documentation for packages named \f[CB]java\f[R] and \f[CB]javax.swing\f[R] and all of their subpackages. .IP \[bu] 2 -\f[B]Oracle Solaris, Linux, and OS X:\f[R] +\f[B]Linux and OS X:\f[R] .RS 2 .RS .PP @@ -436,6 +435,11 @@ that specify the number of milliseconds to parse each Java source file. Prints version information. .RS .RE +.TP +.B \f[CB]\-Werror\f[R] +Reports an error if any warnings occur. +.RS +.RE .SH EXTENDED OPTIONS .PP \f[B]Note:\f[R] @@ -457,19 +461,6 @@ descriptions of using these options: \f[CB]\-Xmaxerrs\f[R] .IP \[bu] 2 \f[CB]\-Xmaxwarns\f[R] -.PP -The following extended \f[CB]javadoc\f[R] options are not equivalent to a -corresponding \f[CB]javac\f[R] option: -.TP -.B \f[CB]\-Xmodule:\f[R]\f[I]module\-name\f[R] -Specifies a module to which the classes being compiled belong. -.RS -.RE -.TP -.B \f[CB]\-Xold\f[R] -Invokes the legacy javadoc tool. -.RS -.RE .SH STANDARD DOCLET OPTIONS .PP The following options are provided by the standard doclet. @@ -543,10 +534,9 @@ The destination directory is automatically created when the \f[CB]javadoc\f[R] tool runs. .RS .IP \[bu] 2 -\f[B]Oracle Solaris, Linux, and OS X:\f[R] For example, the following -command generates the documentation for the package -\f[CB]com.mypackage\f[R] and saves the results in the \f[CB]/user/doc/\f[R] -directory: +\f[B]Linux and OS X:\f[R] For example, the following command generates +the documentation for the package \f[CB]com.mypackage\f[R] and saves the +results in the \f[CB]/user/doc/\f[R] directory: .RS 2 .RS .PP @@ -633,11 +623,6 @@ Use escape characters for any internal quotation marks within a footer. .RS .RE .TP -.B \f[CB]\-\-frames\f[R] -Enables the use of frames in the generated output (default). -.RS -.RE -.TP .B \f[CB]\-group\f[R] \f[I]namep1\f[R]\f[CB]:\f[R]\f[I]p2\f[R] Group the specified packages together in the Overview page. .RS @@ -668,7 +653,7 @@ accordingly. For example: .RS .IP \[bu] 2 -\f[B]Oracle Solaris, Linux, and OS X:\f[R] +\f[B]Linux and OS X:\f[R] .RS 2 .RS .PP @@ -685,15 +670,9 @@ For example: .RE .RE .TP -.B \f[CB]\-html4\f[R] -Generates HTML 4.0.1 output. -If the option is not used, \f[CB]\-html4\f[R] is the default -.RS -.RE -.TP .B \f[CB]\-html5\f[R] -Generates HTML 5 output. -If the option is not used, \f[CB]\-html4\f[R] is the default. +This option is a no\-op and is just retained for backwards +compatibility. .RS .RE .TP @@ -923,7 +902,8 @@ you want to make the navigation bar cleaner. .RE .TP .B \f[CB]\-\-no\-frames\f[R] -Disables the use of frames in the generated output. +This option is a no\-op and is just retained for backwards +compatibility. .RS .RE .TP @@ -1020,10 +1000,9 @@ that contains the topmost package directories. In this location, no path is needed when documenting packages, because the \f[CB]\-sourcepath\f[R] option points to this file. .IP \[bu] 2 -\f[B]Oracle Solaris, Linux, and OS X:\f[R] For example, if the source -tree for the \f[CB]java.lang\f[R] package is -\f[CB]/src/classes/java/lang/\f[R], then you could place the overview file -at /src/classes/overview.html. +\f[B]Linux and OS X:\f[R] For example, if the source tree for the +\f[CB]java.lang\f[R] package is \f[CB]/src/classes/java/lang/\f[R], then you +could place the overview file at /src/classes/overview.html. .IP \[bu] 2 \f[B]Windows:\f[R] For example, if the source tree for the \f[CB]java.lang\f[R] package is \f[CB]\\src\\classes\\java\\lang\\\f[R], @@ -1177,18 +1156,18 @@ For example, .PP The following are additional options provided by the standard doclet and are subject to change without notice. -Additional options might are less commonly used or are otherwise -regarded as advanced. +Additional options are less commonly used or are otherwise regarded as +advanced. .TP .B \f[CB]\-Xdoclint\f[R] -Enables recommended checks for problems in Javadoc comments. +Enables recommended checks for problems in documentation comments. .RS .RE .TP .B \f[CB]\-Xdoclint:\f[R](\f[CB]all\f[R]|\f[CB]none\f[R]|[\f[CB]\-\f[R]]\f[I]group\f[R]) -Enable or disable specific checks for bad references, lack of -accessibility, missing Javadoc comments, and reports errors for invalid -Javadoc syntax and missing HTML tags. +Enable or disable specific checks for bad references, accessibility +issues, missing documentation comments, errors in documentation comment +syntax and missing HTML tags. .RS .PP This option enables the \f[CB]javadoc\f[R] tool to check for all @@ -1197,18 +1176,19 @@ You can select which items to include in the generated output with the standard options \f[CB]\-public\f[R], \f[CB]\-protected\f[R], \f[CB]\-package\f[R] and \f[CB]\-private\f[R]. .PP -When the \f[CB]\-Xdoclint\f[R] is enabled, it reports issues with messages -similar to the \f[CB]javac\f[R] command. +When the \f[CB]\-Xdoclint\f[R] option is enabled, it reports issues with +messages similar to the \f[CB]javac\f[R] command. The \f[CB]javadoc\f[R] tool prints a message, a copy of the source line, and a caret pointing at the exact position where the error was detected. Messages may be either warnings or errors, depending on their severity and the likelihood to cause an error if the generated documentation were -run through a validator. -For example, bad references or missing Javadoc comments don\[aq]t cause -the \f[CB]javadoc\f[R] tool to generate invalid HTML, so these issues are -reported as warnings. -Syntax errors or missing HTML end tags cause the \f[CB]javadoc\f[R] tool -to generate invalid output, so these issues are reported as errors. +to be run through a validator. +For example: missing documentation comments, duplicate information, and +extraneous comments do not cause the \f[CB]javadoc\f[R] tool to generate +invalid HTML, so these issues are reported as warnings; syntax errors, +missing required HTML end tags, and references to missing or misspelled +elements cause the \f[CB]javadoc\f[R] tool to generate invalid output, so +these issues are reported as errors. .PP \f[CB]\-Xdoclint\f[R] option validates input comments based upon the requested markup. @@ -1244,17 +1224,17 @@ doclet \f[CB]html\f[R] output generation selected. This type of check enables the \f[CB]javadoc\f[R] tool to detect HTML issues that some browsers might not interpret as intended. .IP \[bu] 2 -\f[CB]missing\f[R]: Checks for missing Javadoc comments or tags (for +\f[CB]missing\f[R]: Checks for missing documentation comments or tags (for example, a missing comment or class, or a missing \f[CB]\@return\f[R] tag or similar tag on a method). .IP \[bu] 2 \f[CB]reference\f[R]: Checks for issues relating to the references to Java -API elements from Javadoc tags (for example, item not found in -\f[CB]\@see\f[R], or a bad name after \f[CB]\@param)\f[R]. +API elements from documentation comment tags (for example, item not +found in \f[CB]\@see\f[R], or a bad name after \f[CB]\@param)\f[R]. .IP \[bu] 2 \f[CB]syntax\f[R]: Checks for low level issues like unescaped angle brackets (\f[CB]<\f[R] and \f[CB]>\f[R]) and ampersands (\f[CB]&\f[R]) and -invalid Javadoc tags. +invalid documentation comment tags. .PP You can specify the \f[CB]\-Xdoclint\f[R] option multiple times to enable the option to check errors and warnings in multiple categories. diff --git a/src/jdk.jcmd/share/man/jcmd.1 b/src/jdk.jcmd/share/man/jcmd.1 index 5f8fefd901d..9e6a99bd253 100644 --- a/src/jdk.jcmd/share/man/jcmd.1 +++ b/src/jdk.jcmd/share/man/jcmd.1 @@ -1,4 +1,4 @@ -.\" Copyright (c) 1994, 2019, Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 2012, 2020, 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 @@ -21,7 +21,7 @@ .\" .\" Automatically generated by Pandoc 2.3.1 .\" -.TH "JCMD" "1" "2020" "JDK 14" "JDK Commands" +.TH "JCMD" "1" "2020" "JDK 15" "JDK Commands" .hy .SH NAME .PP @@ -248,58 +248,6 @@ The \f[I]options\f[R] must be specified using either \f[I]key\f[R] or objects (BOOLEAN, false) .RE .TP -.B \f[CB]GC.class_stats\f[R] [\f[I]options\f[R]] [\f[I]arguments\f[R]] -(Deprecated) Provide statistics about Java class meta data. -.RS -.PP -Impact: High \-\-\- depends on Java heap size and content. -.PP -\f[B]Note:\f[R] -.PP -The \f[I]options\f[R] must be specified using either \f[I]key\f[R] or -\f[I]key\f[R]\f[CB]=\f[R]\f[I]value\f[R] syntax. -.PP -\f[I]options\f[R]: -.IP \[bu] 2 -\f[CB]\-all\f[R]: (Optional) Shows all columns (BOOLEAN, false) -.IP \[bu] 2 -\f[CB]\-csv\f[R]: (Optional) Prints in CSV (comma\-separated values) -format for spreadsheets (BOOLEAN, false) -.IP \[bu] 2 -\f[CB]\-help\f[R]: (Optional) Shows the meaning of all the columns -(BOOLEAN, false) -.PP -\f[I]arguments\f[R]: -.IP \[bu] 2 -\f[I]columns\f[R]: (Optional) Comma\-separated list of all the columns to -be shown. -If not specified, the following columns are shown: -.RS 2 -.IP \[bu] 2 -InstBytes -.IP \[bu] 2 -KlassBytes -.IP \[bu] 2 -CpAll -.IP \[bu] 2 -annotations -.IP \[bu] 2 -MethodCount -.IP \[bu] 2 -Bytecodes -.IP \[bu] 2 -MethodAll -.IP \[bu] 2 -ROAll -.IP \[bu] 2 -RWAll -.IP \[bu] 2 -Total -.PP -(STRING, no default value) -.RE -.RE -.TP .B \f[CB]GC.finalizer_info\f[R] Provides information about the Java finalization queue. .RS @@ -868,7 +816,7 @@ Permission: \f[CB]java.lang.management.ManagementPermission(monitor)\f[R] .TP .B \f[CB]VM.log\f[R] [\f[I]options\f[R]] Lists current log configuration, enables/disables/configures a log -output, or ro tates all logs. +output, or rotates all logs. .RS .PP Impact: Low diff --git a/src/jdk.jcmd/share/man/jinfo.1 b/src/jdk.jcmd/share/man/jinfo.1 index 5cb38824bc5..a78f5b2e172 100644 --- a/src/jdk.jcmd/share/man/jinfo.1 +++ b/src/jdk.jcmd/share/man/jinfo.1 @@ -1,4 +1,4 @@ -.\" Copyright (c) 1994, 2019, Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 2004, 2020, 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 @@ -21,7 +21,7 @@ .\" .\" Automatically generated by Pandoc 2.3.1 .\" -.TH "JINFO" "1" "2020" "JDK 14" "JDK Commands" +.TH "JINFO" "1" "2020" "JDK 15" "JDK Commands" .hy .SH NAME .PP @@ -46,14 +46,6 @@ To get a list of Java processes running on a machine, use either the \f[CB]ps\f[R] command or, if the JVM processes are not running in a separate docker instance, the \f[B]jps\f[R] command. .RS -.PP -\f[B]Note:\f[R] JDK 10 has added support for using the Attach API when -attaching to Java processes running in a separate docker process. -However, the \f[CB]jps\f[R] command will not list the JVM processes that -are running in a separate docker instance. -If you are trying to connect a Linux host with a Virtual Machine that is -in a docker container, you must use tools such as \f[CB]ps\f[R] to look up -the PID of the JVM. .RE .SH DESCRIPTION .PP diff --git a/src/jdk.jcmd/share/man/jmap.1 b/src/jdk.jcmd/share/man/jmap.1 index ed924c17efb..eb0c92b0775 100644 --- a/src/jdk.jcmd/share/man/jmap.1 +++ b/src/jdk.jcmd/share/man/jmap.1 @@ -1,4 +1,4 @@ -.\" Copyright (c) 1994, 2019, Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 2004, 2020, 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 @@ -21,7 +21,7 @@ .\" .\" Automatically generated by Pandoc 2.3.1 .\" -.TH "JMAP" "1" "2020" "JDK 14" "JDK Commands" +.TH "JMAP" "1" "2020" "JDK 15" "JDK Commands" .hy .SH NAME .PP @@ -46,14 +46,6 @@ To get a list of Java processes running on a machine, use either the \f[CB]ps\f[R] command or, if the JVM processes are not running in a separate docker instance, the \f[B]jps\f[R] command. .RS -.PP -\f[B]Note:\f[R] JDK 10 has added support for using the Attach API when -attaching to Java processes running in a separate docker process. -However, the \f[CB]jps\f[R] command will not list the JVM processes that -are running in a separate docker instance. -If you are trying to connect a Linux host with a Virtual Machine that is -in a docker container, you must use tools such as \f[CB]ps\f[R] to look up -the PID of the JVM. .RE .SH DESCRIPTION .PP diff --git a/src/jdk.jcmd/share/man/jps.1 b/src/jdk.jcmd/share/man/jps.1 index 02d11f0c333..b754ce042a9 100644 --- a/src/jdk.jcmd/share/man/jps.1 +++ b/src/jdk.jcmd/share/man/jps.1 @@ -1,4 +1,4 @@ -.\" Copyright (c) 1994, 2019, Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 2004, 2020, 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 @@ -21,7 +21,7 @@ .\" .\" Automatically generated by Pandoc 2.3.1 .\" -.TH "JPS" "1" "2020" "JDK 14" "JDK Commands" +.TH "JPS" "1" "2020" "JDK 15" "JDK Commands" .hy .SH NAME .PP @@ -81,17 +81,6 @@ target system. The command is limited to reporting information on JVMs for which it has the access permissions. .PP -\f[B]Note:\f[R] -.PP -JDK 10 added support for using the Attach API when attaching to Java -processes running in a separate docker process. -However, the \f[CB]jps\f[R] tool cannot see JVM processes running in a -separate docker instance. -If you are trying to connect a Linux host with a Virtual Machine within -a docker container, you must use tools such as \f[CB]ps\f[R] to look up -the PID of the JVM and then specify the PID on the command line of the -tools that accept the PID. -.PP If the \f[CB]jps\f[R] command is run without specifying a \f[CB]hostid\f[R], then it searches for instrumented JVMs on the local host. If started with a \f[CB]hostid\f[R], then it searches for JVMs on the diff --git a/src/jdk.jcmd/share/man/jstack.1 b/src/jdk.jcmd/share/man/jstack.1 index a1eed3e52e4..ebc294928a2 100644 --- a/src/jdk.jcmd/share/man/jstack.1 +++ b/src/jdk.jcmd/share/man/jstack.1 @@ -1,4 +1,4 @@ -.\" Copyright (c) 1994, 2019, Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 2004, 2020, 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 @@ -21,7 +21,7 @@ .\" .\" Automatically generated by Pandoc 2.3.1 .\" -.TH "JSTACK" "1" "2020" "JDK 14" "JDK Commands" +.TH "JSTACK" "1" "2020" "JDK 15" "JDK Commands" .hy .SH NAME .PP @@ -46,14 +46,6 @@ To get a list of Java processes running on a machine, use either the \f[CB]ps\f[R] command or, if the JVM processes are not running in a separate docker instance, the \f[B]jps\f[R] command. .RS -.PP -\f[B]Note:\f[R] JDK 10 has added support for using the Attach API when -attaching to Java processes running in a separate docker process. -However, the \f[CB]jps\f[R] command will not list the JVM processes that -are running in a separate docker instance. -If you are trying to connect a Linux host with a Virtual Machine that is -in a docker container, you must use tools such as \f[CB]ps\f[R] to look up -the PID of the JVM. .RE .SH DESCRIPTION .PP diff --git a/src/jdk.jcmd/share/man/jstat.1 b/src/jdk.jcmd/share/man/jstat.1 index f544e2d9476..7623a3769a5 100644 --- a/src/jdk.jcmd/share/man/jstat.1 +++ b/src/jdk.jcmd/share/man/jstat.1 @@ -1,4 +1,4 @@ -.\" Copyright (c) 1994, 2019, Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 2004, 2020, 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 @@ -21,7 +21,7 @@ .\" .\" Automatically generated by Pandoc 2.3.1 .\" -.TH "JSTAT" "1" "2020" "JDK 14" "JDK Commands" +.TH "JSTAT" "1" "2020" "JDK 15" "JDK Commands" .hy .SH NAME .PP @@ -553,18 +553,10 @@ The \f[I]lvmid\f[R] is typically, but not necessarily, the operating system\[aq]s process identifier for the target JVM process. You can use the \f[CB]jps\f[R] command to determine the \f[I]lvmid\f[R] provided the JVM processes is not running in a separate docker instance. -You can also determine the \f[I]lvmid\f[R] on Oracle Solaris, Linux, and -OS X platforms with the \f[CB]ps\f[R] command, and on Windows with the -Windows Task Manager. +You can also determine the \f[I]lvmid\f[R] on Linux and OS X platforms +with the \f[CB]ps\f[R] command, and on Windows with the Windows Task +Manager. .RS -.PP -\f[B]Note:\f[R] JDK 10 has added support for using the Attach API when -attaching to Java processes running in a separate docker process. -However, the \f[CB]jps\f[R] command will not list the JVM processes that -are running in a separate docker instance. -If you are trying to connect a Linux host with a Virtual Machine that is -in a docker container, you must use tools such as \f[CB]ps\f[R] to look up -the PID of the JVM. .RE .TP .B \f[I]hostname\f[R] diff --git a/src/jdk.jconsole/share/man/jconsole.1 b/src/jdk.jconsole/share/man/jconsole.1 index 698fcf2893f..da8196d9e05 100644 --- a/src/jdk.jconsole/share/man/jconsole.1 +++ b/src/jdk.jconsole/share/man/jconsole.1 @@ -1,4 +1,4 @@ -.\" Copyright (c) 1994, 2019, Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 2004, 2020, 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 @@ -21,7 +21,7 @@ .\" .\" Automatically generated by Pandoc 2.3.1 .\" -.TH "JCONSOLE" "1" "2020" "JDK 14" "JDK Commands" +.TH "JCONSOLE" "1" "2020" "JDK 15" "JDK Commands" .hy .SH NAME .PP diff --git a/src/jdk.jdeps/share/man/javap.1 b/src/jdk.jdeps/share/man/javap.1 index 30417779e21..d19f23559c6 100644 --- a/src/jdk.jdeps/share/man/javap.1 +++ b/src/jdk.jdeps/share/man/javap.1 @@ -1,4 +1,4 @@ -.\" Copyright (c) 1994, 2019, Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1994, 2020, 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 @@ -21,7 +21,7 @@ .\" .\" Automatically generated by Pandoc 2.3.1 .\" -.TH "JAVAP" "1" "2020" "JDK 14" "JDK Commands" +.TH "JAVAP" "1" "2020" "JDK 15" "JDK Commands" .hy .SH NAME .PP @@ -79,7 +79,7 @@ options can use the equal sign (\f[CB]=\f[R]) instead of a white space to separate the name of an option from its value. .SH OPTIONS FOR JAVAP .TP -.B \f[CB]\-help\f[R], \f[CB]\-\-help\f[R] , or \f[CB]\-?\f[R] +.B \f[CB]\-\-help\f[R], \f[CB]\-help\f[R] , \f[CB]\-h\f[R], or \f[CB]\-?\f[R] Prints a help message for the \f[CB]javap\f[R] command. .RS .RE diff --git a/src/jdk.jdeps/share/man/jdeprscan.1 b/src/jdk.jdeps/share/man/jdeprscan.1 index c5738fcea59..c4ca77319a5 100644 --- a/src/jdk.jdeps/share/man/jdeprscan.1 +++ b/src/jdk.jdeps/share/man/jdeprscan.1 @@ -1,4 +1,4 @@ -.\" Copyright (c) 1994, 2019, Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 2017, 2020, 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 @@ -21,7 +21,7 @@ .\" .\" Automatically generated by Pandoc 2.3.1 .\" -.TH "JDEPRSCAN" "1" "2020" "JDK 14" "JDK Commands" +.TH "JDEPRSCAN" "1" "2020" "JDK 15" "JDK Commands" .hy .SH NAME .PP @@ -104,7 +104,7 @@ Provides a search path for resolution of dependent classes. directories separated by the system\-specific path separator. For example: .IP \[bu] 2 -\f[B]Oracle Solaris, Linux, and OS X:\f[R] +\f[B]Linux and OS X:\f[R] .RS 2 .RS .PP diff --git a/src/jdk.jdeps/share/man/jdeps.1 b/src/jdk.jdeps/share/man/jdeps.1 index 8868f7a8713..3a08fe64406 100644 --- a/src/jdk.jdeps/share/man/jdeps.1 +++ b/src/jdk.jdeps/share/man/jdeps.1 @@ -1,4 +1,4 @@ -.\" Copyright (c) 1994, 2019, Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 2013, 2020, 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 @@ -21,7 +21,7 @@ .\" .\" Automatically generated by Pandoc 2.3.1 .\" -.TH "JDEPS" "1" "2020" "JDK 14" "JDK Commands" +.TH "JDEPS" "1" "2020" "JDK 15" "JDK Commands" .hy .SH NAME .PP @@ -337,7 +337,7 @@ classes in that containing archive are analyzed. The following example demonstrates analyzing the dependencies of the \f[CB]Notepad.jar\f[R] file. .PP -\f[B]Oracle Solaris, Linux, and OS X:\f[R] +\f[B]Linux and OS X:\f[R] .IP .nf \f[CB] diff --git a/src/jdk.jdi/share/man/jdb.1 b/src/jdk.jdi/share/man/jdb.1 index 7e162f3f76f..6f6d6c4e95d 100644 --- a/src/jdk.jdi/share/man/jdb.1 +++ b/src/jdk.jdi/share/man/jdb.1 @@ -1,4 +1,4 @@ -.\" Copyright (c) 1994, 2019, Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1995, 2020, 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 @@ -21,7 +21,7 @@ .\" .\" Automatically generated by Pandoc 2.3.1 .\" -.TH "JDB" "1" "2020" "JDK 14" "JDK Commands" +.TH "JDB" "1" "2020" "JDK 15" "JDK Commands" .hy .SH NAME .PP diff --git a/src/jdk.jlink/share/man/jlink.1 b/src/jdk.jlink/share/man/jlink.1 index cd82c8d14ad..631b1b0d147 100644 --- a/src/jdk.jlink/share/man/jlink.1 +++ b/src/jdk.jlink/share/man/jlink.1 @@ -1,4 +1,4 @@ -.\" Copyright (c) 1994, 2019, Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 2017, 2020, 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 @@ -21,7 +21,7 @@ .\" .\" Automatically generated by Pandoc 2.3.1 .\" -.TH "JLINK" "1" "2020" "JDK 14" "JDK Commands" +.TH "JLINK" "1" "2020" "JDK 15" "JDK Commands" .hy .SH NAME .PP diff --git a/src/jdk.jlink/share/man/jmod.1 b/src/jdk.jlink/share/man/jmod.1 index 4b2d11cb8a4..5b089d8d357 100644 --- a/src/jdk.jlink/share/man/jmod.1 +++ b/src/jdk.jlink/share/man/jmod.1 @@ -1,4 +1,4 @@ -.\" Copyright (c) 1994, 2019, Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 2017, 2020, 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 @@ -21,7 +21,7 @@ .\" .\" Automatically generated by Pandoc 2.3.1 .\" -.TH "JMOD" "1" "2020" "JDK 14" "JDK Commands" +.TH "JMOD" "1" "2020" "JDK 15" "JDK Commands" .hy .SH NAME .PP @@ -412,7 +412,7 @@ the directory \f[CB]jmodhashex\f[R]. Run the following command from the \f[CB]jmodhashex2\f[R] directory: .RS 4 .IP \[bu] 2 -\f[B]Oracle Solaris, Linux, and OS X:\f[R] +\f[B]Linux and OS X:\f[R] .RS 2 .RS .PP diff --git a/src/jdk.jshell/share/man/jshell.1 b/src/jdk.jshell/share/man/jshell.1 index 6e7e7128c64..5fb056b0e31 100644 --- a/src/jdk.jshell/share/man/jshell.1 +++ b/src/jdk.jshell/share/man/jshell.1 @@ -1,5 +1,5 @@ .\"t -.\" Copyright (c) 1994, 2019, Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 2017, 2020, 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 @@ -22,7 +22,7 @@ .\" .\" Automatically generated by Pandoc 2.3.1 .\" -.TH "JSHELL" "1" "2020" "JDK 14" "JDK Commands" +.TH "JSHELL" "1" "2020" "JDK 15" "JDK Commands" .hy .SH NAME .PP @@ -102,6 +102,12 @@ variations and make corrections. To keep snippets for later use, save them to a file. .SH OPTIONS FOR JSHELL .TP +.B \f[CB]\-\-add\-exports\f[R] \f[I]module\f[R]/\f[I]package\f[R] +Specifies a package to be considered as exported from its defining +module. +.RS +.RE +.TP .B \f[CB]\-\-add\-modules\f[R] \f[I]module\f[R][\f[CB],\f[R]\f[I]module\f[R]...] Specifies the root modules to resolve in addition to the initial module. .RS @@ -121,12 +127,24 @@ This option overrides the path in the \f[CB]CLASSPATH\f[R] environment variable. If the environment variable isn\[aq]t set and this option isn\[aq]t used, then the current directory is searched. -For Oracle Solaris, Linux, and macOS, use a colon (:) to separate items -in the path. +For Linux and macOS, use a colon (:) to separate items in the path. For Windows, use a semicolon (;) to separate items. .RS .RE .TP +.B \f[CB]\-\-enable\-preview\f[R] +Allows code to depend on the preview features of this release. +.RS +.RE +.TP +.B \f[CB]\-\-execution\f[R] \f[I]specification\f[R] +Specifies an alternate execution engine, where \f[I]specification\f[R] is +an ExecutionControl spec. +See the documentation of the package jdk.jshell.spi for the syntax of +the spec. +.RS +.RE +.TP .B \f[CB]\-\-feedback\f[R] \f[I]mode\f[R] Sets the initial level of feedback provided in response to what\[aq]s entered. @@ -191,8 +209,7 @@ flag or flag argument needed. .TP .B \f[CB]\-\-module\-path\f[R] \f[I]modulepath\f[R] Specifies where to find application modules. -For Oracle Solaris, Linux, and macOS, use a colon (:) to separate items -in the path. +For Linux and macOS, use a colon (:) to separate items in the path. For Windows, use a semicolon (;) to separate items. .RS .RE @@ -376,16 +393,16 @@ This option overrides the path in the \f[CB]CLASSPATH\f[R] environment variable. If the environment variable isn\[aq]t set and this option isn\[aq]t used, then the current directory is searched. -For Oracle Solaris, Linux, and macOS, use a colon (\f[CB]:\f[R]) to -separate items in the path. +For Linux and macOS, use a colon (\f[CB]:\f[R]) to separate items in the +path. For Windows, use a semicolon (\f[CB];\f[R]) to separate items. .RS .RE .TP .B \f[CB]\-\-module\-path\f[R] \f[I]modulepath\f[R] Specifies where to find application modules. -For Oracle Solaris, Linux, and macOS, use a colon (\f[CB]:\f[R]) to -separate items in the path. +For Linux and macOS, use a colon (\f[CB]:\f[R]) to separate items in the +path. For Windows, use a semicolon (\f[CB];\f[R]) to separate items. .RS .RE @@ -566,16 +583,16 @@ This option overrides the path in the \f[CB]CLASSPATH\f[R] environment variable. If the environment variable isn\[aq]t set and this option isn\[aq]t used, then the current directory is searched. -For Oracle Solaris, Linux, and macOS, use a colon (\f[CB]:\f[R]) to -separate items in the path. +For Linux and macOS, use a colon (\f[CB]:\f[R]) to separate items in the +path. For Windows, use a semicolon (\f[CB];\f[R]) to separate items. .RS .RE .TP .B \f[CB]\-\-module\-path\f[R] \f[I]modulepath\f[R] Specifies where to find application modules. -For Oracle Solaris, Linux, and macOS, use a colon (\f[CB]:\f[R]) to -separate items in the path. +For Linux and macOS, use a colon (\f[CB]:\f[R]) to separate items in the +path. For Windows, use a semicolon (\f[CB];\f[R]) to separate items. .RS .RE @@ -634,16 +651,16 @@ This option overrides the path in the \f[CB]CLASSPATH\f[R] environment variable. If the environment variable isn\[aq]t set and this option isn\[aq]t used, then the current directory is searched. -For Oracle Solaris, Linux, and macOS, use a colon (\f[CB]:\f[R]) to -separate items in the path. +For Linux and macOS, use a colon (\f[CB]:\f[R]) to separate items in the +path. For Windows, use a semicolon (\f[CB];\f[R]) to separate items. .RS .RE .TP .B \f[CB]\-\-module\-path\f[R] \f[I]modulepath\f[R] Specifies where to find application modules. -For Oracle Solaris, Linux, and macOS, use a colon (\f[CB]:\f[R]) to -separate items in the path. +For Linux and macOS, use a colon (\f[CB]:\f[R]) to separate items in the +path. For Windows, use a semicolon (\f[CB];\f[R]) to separate items. .RS .RE diff --git a/src/jdk.jstatd/share/man/jstatd.1 b/src/jdk.jstatd/share/man/jstatd.1 index 02256a766a2..9e4a849eca7 100644 --- a/src/jdk.jstatd/share/man/jstatd.1 +++ b/src/jdk.jstatd/share/man/jstatd.1 @@ -1,4 +1,4 @@ -.\" Copyright (c) 1994, 2019, Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 2004, 2020, 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 @@ -21,7 +21,7 @@ .\" .\" Automatically generated by Pandoc 2.3.1 .\" -.TH "JSTATD" "1" "2020" "JDK 14" "JDK Commands" +.TH "JSTATD" "1" "2020" "JDK 15" "JDK Commands" .hy .SH NAME .PP @@ -72,6 +72,12 @@ isn\[aq]t specified. .RS .RE .TP +.B \f[CB]\-r\f[R] \f[I]rmiport\f[R] +This option sets the port number to which the RMI connector is bound. +If not specified a random available port is used. +.RS +.RE +.TP .B \f[CB]\-n\f[R] \f[I]rminame\f[R] This option sets the name to which the remote RMI object is bound in the RMI registry. @@ -98,9 +104,9 @@ The \f[CB]jstatd\f[R] server can monitor only JVMs for which it has the appropriate native access permissions. Therefore, the \f[CB]jstatd\f[R] process must be running with the same user credentials as the target JVMs. -Some user credentials, such as the root user in Oracle Solaris, Linux, -and OS X operating systems, have permission to access the -instrumentation exported by any JVM on the system. +Some user credentials, such as the root user in Linux and OS X operating +systems, have permission to access the instrumentation exported by any +JVM on the system. A \f[CB]jstatd\f[R] process running with such credentials can monitor any JVM on the system, but introduces additional security concerns. .PP @@ -168,6 +174,17 @@ jstatd\ \-J\-Djava.security.policy=all.policy\ \-p\ 2020 .fi .PP This example starts a \f[CB]jstatd\f[R] session with an external RMI +registry server on port \f[CB]2020\f[R] and JMX connector bound to port +\f[CB]2021\f[R]. +.IP +.nf +\f[CB] +jrmiregistry\ 2020& +jstatd\ \-J\-Djava.security.policy=all.policy\ \-p\ 2020\ \-r\ 2021 +\f[R] +.fi +.PP +This example starts a \f[CB]jstatd\f[R] session with an external RMI registry on port 2020 that\[aq]s bound to \f[CB]AlternateJstatdServerName\f[R]. .IP diff --git a/test/hotspot/jtreg/gc/stress/gclocker/TestGCLocker.java b/test/hotspot/jtreg/gc/stress/gclocker/TestGCLocker.java index 358fd3c379b..5d1b7315074 100644 --- a/test/hotspot/jtreg/gc/stress/gclocker/TestGCLocker.java +++ b/test/hotspot/jtreg/gc/stress/gclocker/TestGCLocker.java @@ -80,13 +80,14 @@ class MemoryWatcher { private final int criticalThresholdPromille = 800; private final int minGCWaitMS = 1000; private final int minFreeWaitElapsedMS = 30000; - private final int minFreeCriticalWaitMS = 500; + private final int minFreeCriticalWaitMS; private int lastUsage = 0; private long lastGCDetected = System.currentTimeMillis(); private long lastFree = System.currentTimeMillis(); - public MemoryWatcher(String mxBeanName) { + public MemoryWatcher(String mxBeanName, int minFreeCriticalWaitMS) { + this.minFreeCriticalWaitMS = minFreeCriticalWaitMS; List memoryBeans = ManagementFactory.getMemoryPoolMXBeans(); for (MemoryPoolMXBean bean : memoryBeans) { if (bean.getName().equals(mxBeanName)) { @@ -151,8 +152,8 @@ class MemoryUser extends Exitable implements Runnable { cache.add(new Filler()); } - public MemoryUser(String mxBeanName) { - watcher = new MemoryWatcher(mxBeanName); + public MemoryUser(String mxBeanName, int minFreeCriticalWaitMS) { + watcher = new MemoryWatcher(mxBeanName, minFreeCriticalWaitMS); } @Override @@ -191,8 +192,8 @@ public class TestGCLocker { return task; } - private static Exitable startMemoryUser(String mxBeanName) { - MemoryUser task = new MemoryUser(mxBeanName); + private static Exitable startMemoryUser(String mxBeanName, int minFreeCriticalWaitMS) { + MemoryUser task = new MemoryUser(mxBeanName, minFreeCriticalWaitMS); Thread thread = new Thread(task); thread.setName("Memory User"); @@ -206,12 +207,13 @@ public class TestGCLocker { long durationMinutes = args.length > 0 ? Long.parseLong(args[0]) : 5; String mxBeanName = args.length > 1 ? args[1] : null; + int minFreeCriticalWaitMS = args.length > 2 ? Integer.parseInt(args[2]) : 500; long startMS = System.currentTimeMillis(); Exitable stresser1 = startGCLockerStresser("GCLockerStresser1"); Exitable stresser2 = startGCLockerStresser("GCLockerStresser2"); - Exitable memoryUser = startMemoryUser(mxBeanName); + Exitable memoryUser = startMemoryUser(mxBeanName, minFreeCriticalWaitMS); long durationMS = durationMinutes * 60 * 1000; while ((System.currentTimeMillis() - startMS) < durationMS) { diff --git a/test/hotspot/jtreg/gc/stress/gclocker/TestGCLockerWithShenandoah.java b/test/hotspot/jtreg/gc/stress/gclocker/TestGCLockerWithShenandoah.java index 40889a6963d..09fb69f2433 100644 --- a/test/hotspot/jtreg/gc/stress/gclocker/TestGCLockerWithShenandoah.java +++ b/test/hotspot/jtreg/gc/stress/gclocker/TestGCLockerWithShenandoah.java @@ -58,7 +58,7 @@ package gc.stress.gclocker; */ public class TestGCLockerWithShenandoah { public static void main(String[] args) { - String[] testArgs = {"2", "Shenandoah heap"}; + String[] testArgs = {"2", "Shenandoah", "0"}; TestGCLocker.main(testArgs); } }