Skip to content

IGNITE-28438: Upgrade HSQLDB to 2.7.4 #12973

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
animovscw wants to merge 1 commit into
base: master
Choose a base branch
from
Open

IGNITE-28438: Upgrade HSQLDB to 2.7.4 #12973

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion modules/core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
4 changes: 2 additions & 2 deletions ...org/apache/ignite/internal/managers/checkpoint/GridCheckpointManagerAbstractSelfTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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");
Expand Down
4 changes: 2 additions & 2 deletions modules/core/src/test/java/org/apache/ignite/session/GridSessionCheckpointSelfTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/**
Expand All @@ -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");
Expand Down
4 changes: 2 additions & 2 deletions .../src/test/java/org/apache/ignite/spi/checkpoint/jdbc/JdbcCheckpointSpiConfigSelfTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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();

Expand Down
4 changes: 2 additions & 2 deletions ...est/java/org/apache/ignite/spi/checkpoint/jdbc/JdbcCheckpointSpiCustomConfigSelfTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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");
Expand Down
4 changes: 2 additions & 2 deletions ...st/java/org/apache/ignite/spi/checkpoint/jdbc/JdbcCheckpointSpiDefaultConfigSelfTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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");
Expand Down
4 changes: 2 additions & 2 deletions ...c/test/java/org/apache/ignite/spi/checkpoint/jdbc/JdbcCheckpointSpiStartStopSelfTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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");
Expand Down