Merge branch 'develop' into master

Author: JohannesRabauer

CONTRIBUTING.md

@@ -1,10 +1,12 @@
 ## Contributing
 
-We would absolutely love to get the community involved, and we welcome any form of contributions – comments and questions on different communication channels, issues and pull request in the repositories, and anything that you build and share using our components.
+We would absolutely love to get the community involved, and we welcome any form of contributions – comments and
+questions on different communication channels, issues and pull request in the repositories, and anything that you build
+and share using our components.
 
 ### Get in touch with the team
 
-Twitter: https://twitter.com/xdevsoftware 
+Twitter: https://twitter.com/xdevsoftware
 <br/>
 Mail: opensource@xdev-software.de
 
@@ -13,33 +15,44 @@ Mail: opensource@xdev-software.de
 - **Report bugs**: File issues on GitHub.
 - **Send pull requests**: If you want to contribute code, check out the development instructions below.
 
-We encourage you to read the [contribution instructions by GitHub](https://guides.github.com/activities/contributing-to-open-source/#contributing) also.
+We encourage you to read
+the [contribution instructions by GitHub](https://guides.github.com/activities/contributing-to-open-source/#contributing)
+also.
 
 ## Developing
 
 ### Software Requirements
+
 You should have the following things installed:
+
 * Git
-* Java 8, 11 or 17 - should be as unmodified as possible (Recommended: [Eclipse Adoptium](https://adoptium.net/temurin/releases/))
+* Java 8, 11 or 17 - should be as unmodified as possible (
+  Recommended: [Eclipse Adoptium](https://adoptium.net/temurin/releases/))
 * Maven
 
 ### Recommended setup
+
 * Install ``IntelliJ`` (Community Edition is sufficient)
   * Install the following plugins:
-    * [Save Actions](https://plugins.jetbrains.com/plugin/7642-save-actions) - Provides save actions, like running the formatter or adding ``final`` to fields
+    * [Save Actions](https://plugins.jetbrains.com/plugin/7642-save-actions) - Provides save actions, like running the
+      formatter or adding ``final`` to fields
     * [SonarLint](https://plugins.jetbrains.com/plugin/7973-sonarlint) - CodeStyle/CodeAnalysis
     * [Checkstyle-IDEA](https://plugins.jetbrains.com/plugin/1065-checkstyle-idea) - CodeStyle/CodeAnalysis
   * Import the project
   * Ensure that everything is encoded in ``UTF-8``
   * Ensure that the JDK/Java-Version is correct
 
-## Releasing [![Build](https://img.shields.io/github/actions/workflow/status/xdev-software/xapi-db-hsqldb2/release.yml?branch=master)](https://github.com/xdev-software/xapi-db-hsqldb2/actions/workflows/release.yml)
+## Releasing [![Build](https://img.shields.io/github/actions/workflow/status/xdev-software/xapi-db-hsql2/release.yml?branch=master)](https://github.com/xdev-software/xapi-db-hsql2/actions/workflows/release.yml)
 
 Before releasing:
-* Consider doing a [test-deployment](https://github.com/xdev-software/xapi-db-hsqldb2/actions/workflows/test-deploy.yml?query=branch%3Adevelop) before actually releasing.
+
+* Consider doing
+  a [test-deployment](https://github.com/xdev-software/xapi-db-hsql2/actions/workflows/test-deploy.yml?query=branch%3Adevelop)
+  before actually releasing.
 * Check the [changelog](CHANGELOG.md)
 
 If the ``develop`` is ready for release, create a pull request to the ``master``-Branch and merge the changes.
 
 When the release is finished do the following:
-* Merge the auto-generated PR (with the incremented version number) back into the ``develop``
+
+* Merge the auto-generated PR (with the incremented version number) back into the ``develop``

README.md

@@ -1,20 +1,35 @@
-[![Latest version](https://img.shields.io/maven-central/v/com.xdev-software/xapi-db-hsqldb2)](https://mvnrepository.com/artifact/com.xdev-software/xapi-db-hsqldb2)
-[![Build](https://img.shields.io/github/actions/workflow/status/xdev-software/xapi-db-hsqldb2/checkBuild.yml?branch=develop)](https://github.com/xdev-software/xapi-db-hsqldb2/actions/workflows/checkBuild.yml?query=branch%3Adevelop)
-[![javadoc](https://javadoc.io/badge2/com.xdev-software/xapi-db-hsqldb2/javadoc.svg)](https://javadoc.io/doc/com.xdev-software/xapi-db-hsqldb2) 
-# SqlEngine Database Adapter HSQLDB2
+[![Latest version](https://img.shields.io/maven-central/v/com.xdev-software/xapi-db-hsql2)](https://mvnrepository.com/artifact/com.xdev-software/xapi-db-hsql2)
+[![Build](https://img.shields.io/github/actions/workflow/status/xdev-software/xapi-db-hsql2/checkBuild.yml?branch=develop)](https://github.com/xdev-software/xapi-db-hsql2/actions/workflows/checkBuild.yml?query=branch%3Adevelop)
+[![javadoc](https://javadoc.io/badge2/com.xdev-software/xapi-db-hsql2/javadoc.svg)](https://javadoc.io/doc/com.xdev-software/xapi-db-hsql2)
 
-The XDEV Application Framework provides an abstraction over database dialects as part of its SqlEngine. This module is the Database Adapter for HSQLDB2 which includes the HSQLDB2-specific implementation for database access.
+# SqlEngine Database Adapter HyperSQL 2
+
+The XDEV Application Framework provides an abstraction over database dialects as part of its SqlEngine. This module is
+the Database Adapter for HyperSQL 2 which includes the HyperSQL 2-specific implementation for database access.
 
 ## XDEV-IDE
-The [XDEV(-IDE)](https://xdev.software/en/products/swing-builder) is a visual Java development environment for fast and easy application development (RAD - Rapid Application Development). XDEV differs from other Java IDEs such as Eclipse or NetBeans, focusing on programming through a far-reaching RAD concept. The IDE's main components are a Swing GUI builder, the XDEV Application Framework and numerous drag-and-drop tools and wizards with which the functions of the framework can be integrated.
 
-The XDEV-IDE was license-free up to version 4 inclusive and is available for Windows, Linux and macOS. From version 5, the previously proprietary licensed additional modules are included in the IDE and the license of the entire product has been converted to a paid subscription model. The XDEV Application Framework, which represents the core of the RAD concept of XDEV and is part of every XDEV application, was released as open-source in 2008.
+The [XDEV(-IDE)](https://xdev.software/en/products/swing-builder) is a visual Java development environment for fast and
+easy application development (RAD - Rapid Application Development). XDEV differs from other Java IDEs such as Eclipse or
+NetBeans, focusing on programming through a far-reaching RAD concept. The IDE's main components are a Swing GUI builder,
+the XDEV Application Framework and numerous drag-and-drop tools and wizards with which the functions of the framework
+can be integrated.
+
+The XDEV-IDE was license-free up to version 4 inclusive and is available for Windows, Linux and macOS. From version 5,
+the previously proprietary licensed additional modules are included in the IDE and the license of the entire product has
+been converted to a paid subscription model. The XDEV Application Framework, which represents the core of the RAD
+concept of XDEV and is part of every XDEV application, was released as open-source in 2008.
 
 ## Support
-If you need support as soon as possible and you can't wait for any pull request, feel free to use [our support](https://xdev.software/en/services/support).
+
+If you need support as soon as possible and you can't wait for any pull request, feel free to
+use [our support](https://xdev.software/en/services/support).
 
 ## Contributing
+
 See the [contributing guide](./CONTRIBUTING.md) for detailed instructions on how to get started with our project.
 
 ## Dependencies and Licenses
-View the [license of the current project](LICENSE) or the [summary including all dependencies](https://xdev-software.github.io/xapi-db-hsqldb2/dependencies/)
+
+View the [license of the current project](LICENSE) or
+the [summary including all dependencies](https://xdev-software.github.io/xapi-db-hsql2/dependencies/)

SECURITY.md

@@ -2,4 +2,5 @@
 
 ## Reporting a Vulnerability
 
-Please report a security vulnerability [on GitHub Security Advisories](https://github.com/xdev-software/xapi-db-hsqldb2/security/advisories/new).
+Please report a security
+vulnerability [on GitHub Security Advisories](https://github.com/xdev-software/xapi-db-hsql2/security/advisories/new).

pom.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
@@ -10,13 +10,13 @@
     <packaging>jar</packaging>
 
     <name>SqlEngine Database Adapter HSQL2</name>
-	<description>XAPI SqlEngine Database Adapter for HSQL2</description>
-	<url>https://github.com/xdev-software/xapi-db-hsql2</url>
+    <description>XAPI SqlEngine Database Adapter for HSQL2</description>
+    <url>https://github.com/xdev-software/xapi-db-hsql2</url>
 
     <scm>
-		<url>https://github.com/xdev-software/xapi-db-hsql2</url>
-		<connection>https://github.com/xdev-software/xapi-db-hsql2.git</connection>
-	</scm>
+        <url>https://github.com/xdev-software/xapi-db-hsql2</url>
+        <connection>https://github.com/xdev-software/xapi-db-hsql2.git</connection>
+    </scm>
 
     <inceptionYear>2003</inceptionYear>
 
@@ -48,7 +48,7 @@
 
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        
+
         <xdev.xapi.version>6.0.1</xdev.xapi.version>
     </properties>
 
@@ -100,6 +100,8 @@
             <groupId>org.hsqldb</groupId>
             <artifactId>hsqldb</artifactId>
             <version>2.7.1</version>
+            <!-- For compatibility with JDK 8. See https://hsqldb.org/doc/2.0/changelist_2_0.txt and https://stackoverflow.com/a/74261846/2351407 -->
+            <classifier>jdk8</classifier>
         </dependency>
     </dependencies>
 

src/main/java/hsql.png

@@ -18,29 +18,8 @@
 
 package xdev.db.hsql2.jdbc;
 
-/*-
- * #%L
- * HSQL2
- * %%
- * Copyright (C) 2003 - 2023 XDEV Software
- * %%
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * <http://www.gnu.org/licenses/lgpl-3.0.html>.
- * #L%
- */
-
 import com.xdev.jadoth.sqlengine.dbms.DbmsConnectionInformation;
+
 import xdev.db.ConnectionInformation;
 
 
@@ -53,57 +32,52 @@ public class HSQL2ConnectionInformation extends ConnectionInformation<HSQL2Dbms>
 	/**
 	 * Instantiates a new hsql20 connection information.
 	 *
-	 * @param user
-	 *            the user
-	 * @param password
-	 *            the password
-	 * @param database
-	 *            the database
-	 * @param urlExtension
-	 *            the extended url properties
-	 * @param dbmsAdaptor
-	 *            the dbms adaptor
+	 * @param user         the user
+	 * @param password     the password
+	 * @param database     the database
+	 * @param urlExtension the extended url properties
+	 * @param dbmsAdaptor  the dbms adaptor
 	 */
-	public HSQL2ConnectionInformation(final String host, final int port, final String user,
-			final String password, final String database, final String urlExtension,
-			final HSQL2Dbms dbmsAdaptor)
+	public HSQL2ConnectionInformation(
+		final String host, final int port, final String user,
+		final String password, final String database, final String urlExtension,
+		final HSQL2Dbms dbmsAdaptor)
 	{
-		super(host,port,user,password,database,urlExtension,dbmsAdaptor);
+		super(host, port, user, password, database, urlExtension, dbmsAdaptor);
 	}
 
-	
 	// /////////////////////////////////////////////////////////////////////////
 	// getters //
 	// ///////////////////
+	
 	/**
 	 * Gets the database.
-	 * 
+	 *
 	 * @return the database
 	 */
 	public String getDatabase()
 	{
 		return this.getCatalog();
 	}
 
-	
 	// /////////////////////////////////////////////////////////////////////////
 	// setters //
 	// ///////////////////
+	
 	/**
 	 * Sets the database.
-	 * 
-	 * @param database
-	 *            the database to set
+	 *
+	 * @param database the database to set
 	 */
 	public void setDatabase(final String database)
 	{
 		this.setCatalog(database);
 	}
 
-	
 	// /////////////////////////////////////////////////////////////////////////
 	// override methods //
 	// ///////////////////
+	
 	/**
 	 * @see DbmsConnectionInformation#createJdbcConnectionUrl()
 	 */
@@ -114,7 +88,6 @@ public String createJdbcConnectionUrl()
 		return appendUrlExtension(url);
 	}
 
-	
 	/**
 	 * @see com.xdev.jadoth.sqlengine.dbms.DbmsConnectionInformation#getJdbcDriverClassName()
 	 */
@@ -123,5 +96,4 @@ public String getJdbcDriverClassName()
 	{
 		return "org.hsqldb.jdbc.JDBCDriver";
 	}
-	
 }

src/main/java/xdev/db/hsql2/jdbc/HSQL2ConnectionInformation.java

@@ -17,29 +17,6 @@
  */
 package xdev.db.hsql2.jdbc;
 
-/*-
- * #%L
- * HSQL2
- * %%
- * Copyright (C) 2003 - 2023 XDEV Software
- * %%
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * <http://www.gnu.org/licenses/lgpl-3.0.html>.
- * #L%
- */
-
-
 import com.xdev.jadoth.sqlengine.dbms.standard.StandardDDLMapper;
 
 

src/main/java/xdev/db/hsql2/jdbc/HSQL2DDLMapper.java

@@ -17,28 +17,6 @@
  */
 package xdev.db.hsql2.jdbc;
 
-/*-
- * #%L
- * HSQL2
- * %%
- * Copyright (C) 2003 - 2023 XDEV Software
- * %%
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Lesser Public License for more details.
- * 
- * You should have received a copy of the GNU General Lesser Public
- * License along with this program.  If not, see
- * <http://www.gnu.org/licenses/lgpl-3.0.html>.
- * #L%
- */
-
 import com.xdev.jadoth.sqlengine.dbms.standard.StandardDMLAssembler;