IGNITE-28438: Upgrade HSQLDB to 2.7.4 (#12973)

Author: animovscw

modules/core/pom.xml

@@ -125,7 +125,7 @@
         <dependency>
             <groupId>org.hsqldb</groupId>
             <artifactId>hsqldb</artifactId>
-            <version>1.8.0.10</version>
+            <version>2.7.4</version>
             <scope>test</scope>
         </dependency>
 

modules/core/src/test/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointManagerAbstractSelfTest.java

@@ -53,7 +53,7 @@
 import org.apache.ignite.spi.checkpoint.jdbc.JdbcCheckpointSpi;
 import org.apache.ignite.testframework.GridTestUtils;
 import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
-import org.hsqldb.jdbc.jdbcDataSource;
+import org.hsqldb.jdbc.JDBCDataSource;
 import org.jetbrains.annotations.Nullable;
 
 import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
@@ -153,7 +153,7 @@ private GridCheckpointManager checkpoints(Ignite ignite) {
         else if (igniteInstanceName.contains("jdbc")) {
             JdbcCheckpointSpi spi = new JdbcCheckpointSpi();
 
-            jdbcDataSource ds = new jdbcDataSource();
+            JDBCDataSource ds = new JDBCDataSource();
 
             ds.setDatabase("jdbc:hsqldb:mem:gg_test_" + getClass().getSimpleName());
             ds.setUser("sa");

modules/core/src/test/java/org/apache/ignite/session/GridSessionCheckpointSelfTest.java

@@ -26,7 +26,7 @@
 import org.apache.ignite.spi.checkpoint.jdbc.JdbcCheckpointSpi;
 import org.apache.ignite.spi.checkpoint.sharedfs.SharedFsCheckpointSpi;
 import org.apache.ignite.testframework.junits.common.GridCommonTest;
-import org.hsqldb.jdbc.jdbcDataSource;
+import org.hsqldb.jdbc.JDBCDataSource;
 import org.junit.Test;
 
 /**
@@ -53,7 +53,7 @@ public void testSharedFsCheckpoint() throws Exception {
     public void testJdbcCheckpoint() throws Exception {
         IgniteConfiguration cfg = getConfiguration();
 
-        jdbcDataSource ds = new jdbcDataSource();
+        JDBCDataSource ds = new JDBCDataSource();
 
         ds.setDatabase("jdbc:hsqldb:mem:gg_test");
         ds.setUser("sa");

modules/core/src/test/java/org/apache/ignite/spi/checkpoint/jdbc/JdbcCheckpointSpiConfigSelfTest.java

@@ -20,7 +20,7 @@
 import javax.sql.DataSource;
 import org.apache.ignite.testframework.junits.spi.GridSpiAbstractConfigTest;
 import org.apache.ignite.testframework.junits.spi.GridSpiTest;
-import org.hsqldb.jdbc.jdbcDataSource;
+import org.hsqldb.jdbc.JDBCDataSource;
 import org.junit.Test;
 
 import static org.apache.ignite.spi.checkpoint.jdbc.JdbcCheckpointSpi.DFLT_CHECKPOINT_TABLE_NAME;
@@ -42,7 +42,7 @@ public class JdbcCheckpointSpiConfigSelfTest extends GridSpiAbstractConfigTest<J
     public void testNegativeConfig() throws Exception {
         checkNegativeSpiProperty(new JdbcCheckpointSpi(), "dataSource", null);
 
-        DataSource ds = new jdbcDataSource();
+        DataSource ds = new JDBCDataSource();
 
         JdbcCheckpointSpi spi = new JdbcCheckpointSpi();
 

modules/core/src/test/java/org/apache/ignite/spi/checkpoint/jdbc/JdbcCheckpointSpiCustomConfigSelfTest.java

@@ -19,7 +19,7 @@
 
 import org.apache.ignite.spi.checkpoint.GridCheckpointSpiAbstractTest;
 import org.apache.ignite.testframework.junits.spi.GridSpiTest;
-import org.hsqldb.jdbc.jdbcDataSource;
+import org.hsqldb.jdbc.JDBCDataSource;
 
 /**
  * Grid jdbc checkpoint SPI custom config self test.
@@ -29,7 +29,7 @@ public class JdbcCheckpointSpiCustomConfigSelfTest extends
     GridCheckpointSpiAbstractTest<JdbcCheckpointSpi> {
     /** {@inheritDoc} */
     @Override protected void spiConfigure(JdbcCheckpointSpi spi) throws Exception {
-        jdbcDataSource ds = new jdbcDataSource();
+        JDBCDataSource ds = new JDBCDataSource();
 
         ds.setDatabase("jdbc:hsqldb:mem:gg_test_" + getClass().getSimpleName());
         ds.setUser("sa");

modules/core/src/test/java/org/apache/ignite/spi/checkpoint/jdbc/JdbcCheckpointSpiDefaultConfigSelfTest.java

@@ -19,7 +19,7 @@
 
 import org.apache.ignite.spi.checkpoint.GridCheckpointSpiAbstractTest;
 import org.apache.ignite.testframework.junits.spi.GridSpiTest;
-import org.hsqldb.jdbc.jdbcDataSource;
+import org.hsqldb.jdbc.JDBCDataSource;
 
 /**
  * Grid jdbc checkpoint SPI default config self test.
@@ -29,7 +29,7 @@ public class JdbcCheckpointSpiDefaultConfigSelfTest extends
     GridCheckpointSpiAbstractTest<JdbcCheckpointSpi> {
     /** {@inheritDoc} */
     @Override protected void spiConfigure(JdbcCheckpointSpi spi) throws Exception {
-        jdbcDataSource ds = new jdbcDataSource();
+        JDBCDataSource ds = new JDBCDataSource();
 
         ds.setDatabase("jdbc:hsqldb:mem:gg_test_" + getClass().getSimpleName());
         ds.setUser("sa");

modules/core/src/test/java/org/apache/ignite/spi/checkpoint/jdbc/JdbcCheckpointSpiStartStopSelfTest.java

@@ -19,7 +19,7 @@
 
 import org.apache.ignite.spi.GridSpiStartStopAbstractTest;
 import org.apache.ignite.testframework.junits.spi.GridSpiTest;
-import org.hsqldb.jdbc.jdbcDataSource;
+import org.hsqldb.jdbc.JDBCDataSource;
 
 /**
  * Grid jdbc checkpoint SPI start stop self test.
@@ -29,7 +29,7 @@ public class JdbcCheckpointSpiStartStopSelfTest
     extends GridSpiStartStopAbstractTest<JdbcCheckpointSpi> {
     /** {@inheritDoc} */
     @Override protected void spiConfigure(JdbcCheckpointSpi spi) throws Exception {
-        jdbcDataSource ds = new jdbcDataSource();
+        JDBCDataSource ds = new JDBCDataSource();
 
         ds.setDatabase("jdbc:hsqldb:mem:gg_test_" + getClass().getSimpleName());
         ds.setUser("sa");