prepare release

h2/src/installer/buildRelease.bat

@@ -26,7 +26,7 @@ call build -quiet installer mavenDeployCentral
 rem call build -quiet compile benchmark
 rem == Copy the benchmark results and update the performance page and diagram
 
-call java16 >nul 2>nul
+call java15 >nul 2>nul
 call build -quiet switchSource
 ren ..\h2web h2web-%today%
 

h2/src/main/org/h2/res/javadoc.properties

-org.h2.tools.Backup=Creates a backup of a database.
-org.h2.tools.Backup.main=Options are case sensitive. Supported options are\:\n[-help] or [-?]     Print the list of options\n[-file <filename>]  The target file name (default\: backup.zip)\n[-dir <dir>]        The source directory (default\: .)\n[-db <database>]    Source database; not required if there is only one\n[-quiet]            Do not print progress information
-org.h2.tools.ChangeFileEncryption=Allows changing the database file encryption password or algorithm.\nThis tool can not be used to change a password of a user.
-org.h2.tools.ChangeFileEncryption.main=Options are case sensitive. Supported options are\:\n[-help] or [-?]   Print the list of options\n[-cipher type]    The encryption type (AES or XTEA)\n[-dir <dir>]      The database directory (default\: .)\n[-db <database>]  Database name (all databases if not set)\n[-decrypt <pwd>]  The decryption password (if not set\: not yet encrypted)\n[-encrypt <pwd>]  The encryption password (if not set\: do not encrypt)\n[-quiet]          Do not print progress information
-org.h2.tools.Console=Starts the H2 Console (web-) server, as well as the TCP and PG server.
-org.h2.tools.Console.main=When running without options, -tcp, -web, -browser and -pg are started.\nOptions are case sensitive. Supported options are\:\n[-help] or [-?]  Print the list of options\n[-web]           Start the web server with the H2 Console\n[-tool]          Start the icon or window that allows to start a browser\n[-browser]       Start a browser and open a page to connect to the web server\n[-tcp]           Start the TCP server\n[-pg]            Start the PG server\nFor each Server, additional options are available;\n for details, see the Server tool.\nIf a service can not be started, the program\n terminates with an exit code of 1.
-org.h2.tools.ConvertTraceFile=Converts a .trace.db file to a SQL script and Java source code.\nSQL statement statistics are listed as well.
-org.h2.tools.ConvertTraceFile.main=Options are case sensitive. Supported options are\:\n[-help] or [-?]      Print the list of options\n[-traceFile <file>]  The trace file name (default\: test.trace.db)\n[-script <file>]     The script file name (default\: test.sql)\n[-javaClass <file>]  The Java directory and class file name (default\: Test)
-org.h2.tools.CreateCluster=Creates a cluster from a standalone database.\nCopies a database to another location if required.
-org.h2.tools.CreateCluster.main=Options are case sensitive. Supported options are\:\n[-help] or [-?]       Print the list of options\n[-urlSource <url>]    The database URL of the source database (jdbc\:h2\:...)\n[-urlTarget <url>]    The database URL of the target database (jdbc\:h2\:...)\n[-user <user>]        The user name (default\: sa)\n[-password <pwd>]     The password\n[-serverList <list>]  The comma separated list of host names or IP addresses
-org.h2.tools.DeleteDbFiles=Deletes all files belonging to a database.\nThe database must be closed before calling this tool.
-org.h2.tools.DeleteDbFiles.main=Options are case sensitive. Supported options are\:\n[-help] or [-?]   Print the list of options\n[-dir <dir>]      The directory (default\: .)\n[-db <database>]  The database name\n[-quiet]          Do not print progress information
-org.h2.tools.Recover=Helps recovering a corrupted database.
-org.h2.tools.Recover.main=Options are case sensitive. Supported options are\:\n[-help] or [-?]   Print the list of options\n[-dir <dir>]      The directory (default\: .)\n[-db <database>]  The database name (all databases if not set)\n[-trace]          Print additional trace information
-org.h2.tools.Restore=Restores a H2 database by extracting the database files from a .zip file.
-org.h2.tools.Restore.main=Options are case sensitive. Supported options are\:\n[-help] or [-?]     Print the list of options\n[-file <filename>]  The source file name (default\: backup.zip)\n[-dir <dir>]        The target directory (default\: .)\n[-db <database>]    The target database name (as stored if not set)\n[-quiet]            Do not print progress information
-org.h2.tools.RunScript=Runs a SQL script against a database.
-org.h2.tools.RunScript.main=Options are case sensitive. Supported options are\:\n[-help] or [-?]    Print the list of options\n[-url <url>]       The database URL (jdbc\:...)\n[-user <user>]     The user name (default\: sa)\n[-password <pwd>]  The password\n[-script <file>]   The script file to run (default\: backup.sql)\n[-driver <class>]  The JDBC driver class to use (not required in most cases)\n[-showResults]     Show the statements and the results of queries\n[-checkResults]    Check if the query results match the expected results\n[-options ...]     RUNSCRIPT options (embedded H2; -*Results not supported)
-org.h2.tools.Script=Creates a SQL script file by extracting the schema and data of a database.
-org.h2.tools.Script.main=Options are case sensitive. Supported options are\:\n[-help] or [-?]    Print the list of options\n[-url <url>]       The database URL (jdbc\:...)\n[-user <user>]     The user name (default\: sa)\n[-password <pwd>]  The password\n[-script <file>]   The target script file name (default\: backup.sql)\n[-options ...]     A list of options (only for embedded H2, see RUNSCRIPT)\n[-quiet]           Do not print progress information
-org.h2.tools.Server=Starts the H2 Console (web-) server, TCP, and PG server.
-org.h2.tools.Server.main=When running without options, -tcp, -web, -browser and -pg are started.\nOptions are case sensitive. Supported options are\:\n[-help] or [-?]       Print the list of options\n[-web]                Start the web server with the H2 Console\n[-webAllowOthers]     Allow other computers to connect\n[-webPort <port>]     The port (default\: 8082)\n[-webSSL]             Use encrypted (HTTPS) connections\n[-browser]            Start a browser and open a page to connect to the web server\n[-tcp]                Start the TCP server\n[-tcpAllowOthers]     Allow other computers to connect\n[-tcpPort <port>]     The port (default\: 9092)\n[-tcpSSL]             Use encrypted (SSL) connections\n[-tcpPassword <pwd>]  The password for shutting down a TCP server\n[-tcpShutdown <url>]  Stop the TCP server; example\: tcp\://localhost\:9094\n[-tcpShutdownForce]   Do not wait until all connections are closed\n[-pg]                 Start the PG server\n[-pgAllowOthers]      Allow other computers to connect\n[-pgPort <port>]      The port (default\: 5435)\n[-baseDir <dir>]      The base directory for H2 databases; for all servers\n[-ifExists]           Only existing databases may be opened; for all servers\n[-trace]              Print additional trace information; for all servers
-org.h2.tools.Shell=Interactive command line tool to access a database using JDBC.
-org.h2.tools.Shell.main=Options are case sensitive. Supported options are\:\n[-help] or [-?]    Print the list of options\n[-url <url>]       The database URL (jdbc\:h2\:...)\n[-user <user>]     The user name\n[-password <pwd>]  The password\n[-driver <class>]  The JDBC driver class to use (not required in most cases)
+org.h2.tools.Backup=Creates a backup of a database.
+org.h2.tools.Backup.main=Options are case sensitive. Supported options are\:\n[-help] or [-?]     Print the list of options\n[-file <filename>]  The target file name (default\: backup.zip)\n[-dir <dir>]        The source directory (default\: .)\n[-db <database>]    Source database; not required if there is only one\n[-quiet]            Do not print progress information
+org.h2.tools.ChangeFileEncryption=Allows changing the database file encryption password or algorithm.\nThis tool can not be used to change a password of a user.
+org.h2.tools.ChangeFileEncryption.main=Options are case sensitive. Supported options are\:\n[-help] or [-?]   Print the list of options\n[-cipher type]    The encryption type (AES or XTEA)\n[-dir <dir>]      The database directory (default\: .)\n[-db <database>]  Database name (all databases if not set)\n[-decrypt <pwd>]  The decryption password (if not set\: not yet encrypted)\n[-encrypt <pwd>]  The encryption password (if not set\: do not encrypt)\n[-quiet]          Do not print progress information
+org.h2.tools.Console=Starts the H2 Console (web-) server, as well as the TCP and PG server.
+org.h2.tools.Console.main=When running without options, -tcp, -web, -browser and -pg are started.\nOptions are case sensitive. Supported options are\:\n[-help] or [-?]  Print the list of options\n[-web]           Start the web server with the H2 Console\n[-tool]          Start the icon or window that allows to start a browser\n[-browser]       Start a browser and open a page to connect to the web server\n[-tcp]           Start the TCP server\n[-pg]            Start the PG server\nFor each Server, additional options are available;\n for details, see the Server tool.\nIf a service can not be started, the program\n terminates with an exit code of 1.
+org.h2.tools.ConvertTraceFile=Converts a .trace.db file to a SQL script and Java source code.\nSQL statement statistics are listed as well.
+org.h2.tools.ConvertTraceFile.main=Options are case sensitive. Supported options are\:\n[-help] or [-?]      Print the list of options\n[-traceFile <file>]  The trace file name (default\: test.trace.db)\n[-script <file>]     The script file name (default\: test.sql)\n[-javaClass <file>]  The Java directory and class file name (default\: Test)
+org.h2.tools.CreateCluster=Creates a cluster from a standalone database.\nCopies a database to another location if required.
+org.h2.tools.CreateCluster.main=Options are case sensitive. Supported options are\:\n[-help] or [-?]       Print the list of options\n[-urlSource <url>]    The database URL of the source database (jdbc\:h2\:...)\n[-urlTarget <url>]    The database URL of the target database (jdbc\:h2\:...)\n[-user <user>]        The user name (default\: sa)\n[-password <pwd>]     The password\n[-serverList <list>]  The comma separated list of host names or IP addresses
+org.h2.tools.DeleteDbFiles=Deletes all files belonging to a database.\nThe database must be closed before calling this tool.
+org.h2.tools.DeleteDbFiles.main=Options are case sensitive. Supported options are\:\n[-help] or [-?]   Print the list of options\n[-dir <dir>]      The directory (default\: .)\n[-db <database>]  The database name\n[-quiet]          Do not print progress information
+org.h2.tools.Recover=Helps recovering a corrupted database.
+org.h2.tools.Recover.main=Options are case sensitive. Supported options are\:\n[-help] or [-?]   Print the list of options\n[-dir <dir>]      The directory (default\: .)\n[-db <database>]  The database name (all databases if not set)\n[-trace]          Print additional trace information
+org.h2.tools.Restore=Restores a H2 database by extracting the database files from a .zip file.
+org.h2.tools.Restore.main=Options are case sensitive. Supported options are\:\n[-help] or [-?]     Print the list of options\n[-file <filename>]  The source file name (default\: backup.zip)\n[-dir <dir>]        The target directory (default\: .)\n[-db <database>]    The target database name (as stored if not set)\n[-quiet]            Do not print progress information
+org.h2.tools.RunScript=Runs a SQL script against a database.
+org.h2.tools.RunScript.main=Options are case sensitive. Supported options are\:\n[-help] or [-?]    Print the list of options\n[-url <url>]       The database URL (jdbc\:...)\n[-user <user>]     The user name (default\: sa)\n[-password <pwd>]  The password\n[-script <file>]   The script file to run (default\: backup.sql)\n[-driver <class>]  The JDBC driver class to use (not required in most cases)\n[-showResults]     Show the statements and the results of queries\n[-checkResults]    Check if the query results match the expected results\n[-options ...]     RUNSCRIPT options (embedded H2; -*Results not supported)
+org.h2.tools.Script=Creates a SQL script file by extracting the schema and data of a database.
+org.h2.tools.Script.main=Options are case sensitive. Supported options are\:\n[-help] or [-?]    Print the list of options\n[-url <url>]       The database URL (jdbc\:...)\n[-user <user>]     The user name (default\: sa)\n[-password <pwd>]  The password\n[-script <file>]   The target script file name (default\: backup.sql)\n[-options ...]     A list of options (only for embedded H2, see RUNSCRIPT)\n[-quiet]           Do not print progress information
+org.h2.tools.Server=Starts the H2 Console (web-) server, TCP, and PG server.
+org.h2.tools.Server.main=When running without options, -tcp, -web, -browser and -pg are started.\nOptions are case sensitive. Supported options are\:\n[-help] or [-?]       Print the list of options\n[-web]                Start the web server with the H2 Console\n[-webAllowOthers]     Allow other computers to connect\n[-webPort <port>]     The port (default\: 8082)\n[-webSSL]             Use encrypted (HTTPS) connections\n[-browser]            Start a browser and open a page to connect to the web server\n[-tcp]                Start the TCP server\n[-tcpAllowOthers]     Allow other computers to connect\n[-tcpPort <port>]     The port (default\: 9092)\n[-tcpSSL]             Use encrypted (SSL) connections\n[-tcpPassword <pwd>]  The password for shutting down a TCP server\n[-tcpShutdown <url>]  Stop the TCP server; example\: tcp\://localhost\:9094\n[-tcpShutdownForce]   Do not wait until all connections are closed\n[-pg]                 Start the PG server\n[-pgAllowOthers]      Allow other computers to connect\n[-pgPort <port>]      The port (default\: 5435)\n[-baseDir <dir>]      The base directory for H2 databases; for all servers\n[-ifExists]           Only existing databases may be opened; for all servers\n[-trace]              Print additional trace information; for all servers
+org.h2.tools.Shell=Interactive command line tool to access a database using JDBC.
+org.h2.tools.Shell.main=Options are case sensitive. Supported options are\:\n[-help] or [-?]    Print the list of options\n[-url <url>]       The database URL (jdbc\:h2\:...)\n[-user <user>]     The user name\n[-password <pwd>]  The password\n[-driver <class>]  The JDBC driver class to use (not required in most cases)

h2/src/main/org/h2/util/SoftHashMap.java

@@ -83,7 +83,7 @@ public class SoftHashMap extends AbstractMap {
      * A soft reference that has a hard reference to the key.
      */
     private static class SoftValue extends SoftReference {
-        private final Object key;
+        final Object key;
 
         public SoftValue(Object ref, ReferenceQueue q, Object key) {
             super(ref, q);

h2/src/test/org/h2/test/utils/OutputCatcher.java

@@ -85,8 +85,12 @@ public class OutputCatcher {
      */
     static class DualOutputStream extends FilterOutputStream {
 
+        /**
+         * The original print stream.
+         */
+        final PrintStream print;
+
         private final HtmlOutputStream out;
-        private final PrintStream print;
         private final boolean error;
 
         DualOutputStream(HtmlOutputStream out, PrintStream print, boolean error) {

h2/src/tools/org/h2/build/BuildBase.java

@@ -50,7 +50,7 @@ public class BuildBase {
 
         private static final long serialVersionUID = 1L;
 
-        private StringList(String... args) {
+        StringList(String... args) {
             super();
             addAll(Arrays.asList(args));
         }