Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 4 additions & 2 deletions examples/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,10 @@ dependencies {
api 'org.slf4j:slf4j-api:1.7.36'
api 'com.fasterxml.jackson.core:jackson-databind:2.14.1'

// hsqldb 2.6+ requires Java 11+
api 'org.hsqldb:hsqldb:2.5.2'
// hsqldb < 2.7 has a High CVE - https://nvd.nist.gov/vuln/detail/CVE-2022-41853 .
// And hsqldb 2.6+ requires Java 11+. So this is ignored, along with the associated test,
// until the Java Client can drop Java 8 support.
// api 'org.hsqldb:hsqldb:2.7.1'

api 'org.jdom:jdom2:2.0.6.1'
api 'org.dom4j:dom4j:2.1.3'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,12 @@

import com.marklogic.client.example.cookbook.Util;
import com.marklogic.client.example.cookbook.Util.ExampleProperties;
import com.marklogic.client.example.cookbook.datamovement.*;
import org.hsqldb.server.Server;
import com.marklogic.client.example.cookbook.datamovement.BulkExportToJdbc;
import com.marklogic.client.example.cookbook.datamovement.BulkLoadFromJdbcRaw;
import com.marklogic.client.example.cookbook.datamovement.BulkLoadFromJdbcWithJoins;
import com.marklogic.client.example.cookbook.datamovement.BulkLoadFromJdbcWithSimpleJoins;
import com.marklogic.client.example.cookbook.datamovement.IncrementalLoadFromJdbc;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.jdbc.datasource.DriverManagerDataSource;
Expand All @@ -29,19 +33,19 @@
public class JdbcCookbookTest {

class Database {
Server hsqlDBServer;
// Server hsqlDBServer;
JdbcTemplate jdbcTemplate;
Database() throws IOException {
setupHSQLDBServer();
jdbcTemplate = new JdbcTemplate(getDataSource());
}

private void setupHSQLDBServer() {
hsqlDBServer = new Server();
hsqlDBServer.setDatabaseName(0, "employees");
hsqlDBServer.setDatabasePath(0, "mem:employees");
hsqlDBServer.setPort(9002);
hsqlDBServer.start();
// hsqlDBServer = new Server();
// hsqlDBServer.setDatabaseName(0, "employees");
// hsqlDBServer.setDatabasePath(0, "mem:employees");
// hsqlDBServer.setPort(9002);
// hsqlDBServer.start();
}

private DataSource getDataSource() throws IOException {
Expand All @@ -54,10 +58,12 @@ public void execute(String query) {
}

public void tearDown() {
hsqlDBServer.stop();
// hsqlDBServer.stop();
}
}

@Disabled("Disabled until the Java Client drops Java 8 support, which then allows for the most recent version " +
"of org.hsqldb:hsqldb to be used, thus avoiding a High CVE.")
@Test
public void testMain() throws Exception {
Database hsqlDB = new Database();
Expand Down