From a2756ba7c37c4d269dc100cc468482f77dd9e3cc Mon Sep 17 00:00:00 2001 From: Kirill Anisimov Date: Thu, 2 Apr 2026 22:05:38 +0700 Subject: [PATCH] IGNITE-28438: Upgrade HSQLDB to 2.7.4 --- modules/core/pom.xml | 2 +- .../checkpoint/GridCheckpointManagerAbstractSelfTest.java | 4 ++-- .../apache/ignite/session/GridSessionCheckpointSelfTest.java | 4 ++-- .../spi/checkpoint/jdbc/JdbcCheckpointSpiConfigSelfTest.java | 4 ++-- .../jdbc/JdbcCheckpointSpiCustomConfigSelfTest.java | 4 ++-- .../jdbc/JdbcCheckpointSpiDefaultConfigSelfTest.java | 4 ++-- .../checkpoint/jdbc/JdbcCheckpointSpiStartStopSelfTest.java | 4 ++-- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/modules/core/pom.xml b/modules/core/pom.xml index 421d3071a8701..9d9526a7746e1 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -125,7 +125,7 @@ org.hsqldb hsqldb - 1.8.0.10 + 2.7.4 test diff --git a/modules/core/src/test/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointManagerAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointManagerAbstractSelfTest.java index 50f1a426af053..adfab8413ef42 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointManagerAbstractSelfTest.java +++ b/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"); diff --git a/modules/core/src/test/java/org/apache/ignite/session/GridSessionCheckpointSelfTest.java b/modules/core/src/test/java/org/apache/ignite/session/GridSessionCheckpointSelfTest.java index 868e6f5fb4a7e..778443f912624 100644 --- a/modules/core/src/test/java/org/apache/ignite/session/GridSessionCheckpointSelfTest.java +++ b/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"); diff --git a/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/jdbc/JdbcCheckpointSpiConfigSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/jdbc/JdbcCheckpointSpiConfigSelfTest.java index 7517a0fb78cec..e90180ef1832a 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/jdbc/JdbcCheckpointSpiConfigSelfTest.java +++ b/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 { /** {@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"); diff --git a/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/jdbc/JdbcCheckpointSpiDefaultConfigSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/jdbc/JdbcCheckpointSpiDefaultConfigSelfTest.java index 5bf8082136af3..69fbe2ba05e4b 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/jdbc/JdbcCheckpointSpiDefaultConfigSelfTest.java +++ b/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 { /** {@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"); diff --git a/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/jdbc/JdbcCheckpointSpiStartStopSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/jdbc/JdbcCheckpointSpiStartStopSelfTest.java index 050ac1a30c557..5775c922b2cb5 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/jdbc/JdbcCheckpointSpiStartStopSelfTest.java +++ b/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 { /** {@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");