Disable unstable Sqlserver and DB2 tests

- Add healthchecks for Sybase and Vertica
- Bump dependencies

model/pom.xml

@@ -64,11 +64,11 @@
         <jaxb-api.version>2.1</jaxb-api.version>
         <jaybird.version>5.0.5.java11</jaybird.version>
         <jcabi-log.version>0.24.3</jcabi-log.version>
-        <jna.version>5.15.0</jna.version>
+        <jna.version>5.16.0</jna.version>
         <jquery.version>3.7.1</jquery.version>
         <json.version>20240303</json.version>
-        <jsoup.version>1.18.2</jsoup.version>
-        <junit-pioneer.version>2.2.0</junit-pioneer.version>
+        <jsoup.version>1.18.3</jsoup.version>
+        <junit-pioneer.version>2.3.0</junit-pioneer.version>
         <juniversalchardet.version>1.0.3</juniversalchardet.version>
         <maven-failsafe-plugin.version>3.3.1</maven-failsafe-plugin.version>
         <mckoisqldb.version>1.0.5</mckoisqldb.version>
@@ -77,7 +77,7 @@
         <mssql-jdbc.version>12.8.1.jre11</mssql-jdbc.version>
         <mysql-connector-j.version>9.0.0</mysql-connector-j.version>
         <nashorn-core.version>15.6</nashorn-core.version>
-        <neo4j-java-driver.version>5.25.0</neo4j-java-driver.version>
+        <neo4j-java-driver.version>5.27.0</neo4j-java-driver.version>
         <neo4j-jdbc-driver.version>4.0.10</neo4j-jdbc-driver.version>
         <ojdbc8.version>23.6.0.24.10</ojdbc8.version>
         <pitest-junit5-plugin.version>1.2.1</pitest-junit5-plugin.version>

model/src/test/java/com/test/vendor/db2/ConcreteDb2SuiteIT.java → model/src/test/java/com/test/vendor/db2/ConcreteDb2SuiteIgnoreIT.java

@@ -4,9 +4,9 @@
 import org.hibernate.cfg.JdbcSettings;
 import spring.SpringTargetApplication;
 
-public abstract class ConcreteDb2SuiteIT extends AbstractTestSuite {
+public abstract class ConcreteDb2SuiteIgnoreIT extends AbstractTestSuite {
 
-    public ConcreteDb2SuiteIT() {
+    public ConcreteDb2SuiteIgnoreIT() {
         this.config();
     }
 

model/src/test/java/com/test/vendor/db2/Db2BlindSuiteIgnoreIT.java

@@ -7,7 +7,7 @@
 import org.junit.jupiter.api.Assertions;
 import org.junitpioneer.jupiter.RetryingTest;
 
-public class Db2BlindSuiteIgnoreIT extends ConcreteDb2SuiteIT {
+public class Db2BlindSuiteIgnoreIT extends ConcreteDb2SuiteIgnoreIT {
     // Unstable
 
     @Override

model/src/test/java/com/test/vendor/db2/Db2ErrorSuiteIT.java → model/src/test/java/com/test/vendor/db2/Db2ErrorSuiteIgnoreIT.java

@@ -8,7 +8,7 @@
 import org.junit.jupiter.api.RepeatedTest;
 
 @SuppressWarnings("java:S2699")
-public class Db2ErrorSuiteIT extends ConcreteDb2SuiteIT {
+public class Db2ErrorSuiteIgnoreIT extends ConcreteDb2SuiteIgnoreIT {
     //Unstable
 
     @Override

model/src/test/java/com/test/vendor/db2/Db2NormalSuiteIT.java → model/src/test/java/com/test/vendor/db2/Db2NormalSuiteIgnoreIT.java

@@ -8,7 +8,7 @@
 import org.junit.jupiter.api.RepeatedTest;
 
 @SuppressWarnings("java:S2699")
-public class Db2NormalSuiteIT extends ConcreteDb2SuiteIT {
+public class Db2NormalSuiteIgnoreIT extends ConcreteDb2SuiteIgnoreIT {
 
     @Override
     public void setupInjection() throws Exception {

model/src/test/java/com/test/vendor/sqlserver/ConcreteSqlServerSuiteIT.java → model/src/test/java/com/test/vendor/sqlserver/ConcreteSqlServerSuiteIgnoreIT.java

@@ -4,9 +4,9 @@
 import org.hibernate.cfg.JdbcSettings;
 import spring.SpringTargetApplication;
 
-public abstract class ConcreteSqlServerSuiteIT extends AbstractTestSuite {
+public abstract class ConcreteSqlServerSuiteIgnoreIT extends AbstractTestSuite {
 
-    public ConcreteSqlServerSuiteIT() {
+    public ConcreteSqlServerSuiteIgnoreIT() {
 
         this.jdbcURL = SpringTargetApplication.propsSqlServer.getProperty(JdbcSettings.JAKARTA_JDBC_URL);
         this.jdbcUser = SpringTargetApplication.propsSqlServer.getProperty(JdbcSettings.JAKARTA_JDBC_USER);

model/src/test/java/com/test/vendor/sqlserver/SqlServerBlindGetSuiteIT.java → model/src/test/java/com/test/vendor/sqlserver/SqlServerBlindGetSuiteIgnoreIT.java

@@ -7,7 +7,7 @@
 import org.junit.jupiter.api.Assertions;
 import org.junitpioneer.jupiter.RetryingTest;
 
-public class SqlServerBlindGetSuiteIT extends ConcreteSqlServerSuiteIT {
+public class SqlServerBlindGetSuiteIgnoreIT extends ConcreteSqlServerSuiteIgnoreIT {
 
     @Override
     public void setupInjection() throws Exception {

model/src/test/java/com/test/vendor/sqlserver/SqlServerErrorSuiteIT.java → model/src/test/java/com/test/vendor/sqlserver/SqlServerErrorSuiteIgnoreIT.java

@@ -7,7 +7,7 @@
 import org.junit.jupiter.api.Assertions;
 import org.junitpioneer.jupiter.RetryingTest;
 
-public class SqlServerErrorSuiteIT extends ConcreteSqlServerSuiteIT {
+public class SqlServerErrorSuiteIgnoreIT extends ConcreteSqlServerSuiteIgnoreIT {
 
     @Override
     public void setupInjection() throws Exception {

model/src/test/java/com/test/vendor/sqlserver/SqlServerNormalGetSuiteIT.java → model/src/test/java/com/test/vendor/sqlserver/SqlServerNormalGetSuiteIgnoreIT.java

@@ -7,7 +7,7 @@
 import org.junit.jupiter.api.Assertions;
 import org.junitpioneer.jupiter.RetryingTest;
 
-public class SqlServerNormalGetSuiteIT extends ConcreteSqlServerSuiteIT {
+public class SqlServerNormalGetSuiteIgnoreIT extends ConcreteSqlServerSuiteIgnoreIT {
 
     @Override
     public void setupInjection() throws Exception {

model/src/test/java/com/test/vendor/sqlserver/SqlServerStackedSuiteIT.java → model/src/test/java/com/test/vendor/sqlserver/SqlServerStackedSuiteIgnoreIT.java

@@ -7,7 +7,7 @@
 import org.junit.jupiter.api.Assertions;
 import org.junitpioneer.jupiter.RetryingTest;
 
-public class SqlServerStackedSuiteIT extends ConcreteSqlServerSuiteIT {
+public class SqlServerStackedSuiteIgnoreIT extends ConcreteSqlServerSuiteIgnoreIT {
 
     @Override
     public void setupInjection() throws Exception {

model/src/test/java/com/test/vendor/sqlserver/SqlServerTimeGetSuiteIT.java → model/src/test/java/com/test/vendor/sqlserver/SqlServerTimeGetSuiteIgnoreIT.java

@@ -7,7 +7,7 @@
 import org.junit.jupiter.api.Assertions;
 import org.junitpioneer.jupiter.RetryingTest;
 
-public class SqlServerTimeGetSuiteIT extends ConcreteSqlServerSuiteIT {
+public class SqlServerTimeGetSuiteIgnoreIT extends ConcreteSqlServerSuiteIgnoreIT {
 
     @Override
     public void setupInjection() throws Exception {

model/src/test/resources/docker/docker-compose-additional.yml

@@ -1,34 +1,34 @@
 version: "3.7"
 services:
 
-  db2:
-    ports:
-      - "50000:50000"
-    privileged: true
-    build:
-      context: .
-      dockerfile: Dockerfile.db2
-    environment:
-      LICENSE: accept
-      DB2INST1_PASSWORD: test
-      DBNAME: testdb
-    container_name: jsql-db2
-    networks:
-      - jsql-network
-
-  sqlserver:
-    ports:
-      - "1434:1434"
-      - "1433:1433"
-    build:
-      context: .
-      dockerfile: Dockerfile.sqlserver
-    environment:
-      SA_PASSWORD: yourStrong(!)Password
-      ACCEPT_EULA: Y
-    container_name: jsql-sqlserver
-    networks:
-      - jsql-network
+#  db2:
+#    ports:
+#      - "50000:50000"
+#    privileged: true
+#    build:
+#      context: .
+#      dockerfile: Dockerfile.db2
+#    environment:
+#      LICENSE: accept
+#      DB2INST1_PASSWORD: test
+#      DBNAME: testdb
+#    container_name: jsql-db2
+#    networks:
+#      - jsql-network
+#
+#  sqlserver:
+#    ports:
+#      - "1434:1434"
+#      - "1433:1433"
+#    build:
+#      context: .
+#      dockerfile: Dockerfile.sqlserver
+#    environment:
+#      SA_PASSWORD: yourStrong(!)Password
+#      ACCEPT_EULA: Y
+#    container_name: jsql-sqlserver
+#    networks:
+#      - jsql-network
 
   sybase:
     ports:

model/src/test/resources/docker/scripts/healthcheck/healthcheck-additional.sh

@@ -5,5 +5,7 @@ function __echoStep {
   steps=$((steps+1)) && echo "## Step $steps/2"
 }
 
-__echoStep && ./model/src/test/resources/docker/scripts/healthcheck/sqlserver.sh
-__echoStep && ./model/src/test/resources/docker/scripts/healthcheck/db2.sh
+#__echoStep && ./model/src/test/resources/docker/scripts/healthcheck/sqlserver.sh
+#__echoStep && ./model/src/test/resources/docker/scripts/healthcheck/db2.sh
+__echoStep && ./model/src/test/resources/docker/scripts/healthcheck/sybase.sh
+__echoStep && ./model/src/test/resources/docker/scripts/healthcheck/vertica.sh

model/src/test/resources/docker/scripts/healthcheck/sybase.sh

@@ -0,0 +1,21 @@
+#!/bin/sh
+
+set -e
+
+retry=0
+
+until cat <<EOF | docker exec -i jsql-sybase /sybase/isql
+select 'jsqlValue' as jsqlColumn
+go
+EOF
+do
+  retry=$((retry+1))
+  if [ $retry -gt 60 ] ; then
+    exit 1
+  fi
+
+  >&2 echo "Sybase is unavailable - sleeping #${retry}"
+  sleep 1
+done
+
+>&2 echo "Sybase is up - executing command"

model/src/test/resources/docker/scripts/healthcheck/vertica.sh

@@ -0,0 +1,20 @@
+#!/bin/sh
+
+set -e
+
+retry=0
+
+until cat <<EOF | docker exec -i jsql-vertica /opt/vertica/bin/vsql
+select 'jsqlValue' as jsqlColumn
+EOF
+do
+  retry=$((retry+1))
+  if [ $retry -gt 60 ] ; then
+    exit 1
+  fi
+
+  >&2 echo "Vertica is unavailable - sleeping #${retry}"
+  sleep 1
+done
+
+>&2 echo "Vertica is up - executing command"

pom.xml

@@ -28,7 +28,7 @@
         <jacoco-maven-plugin.version>0.8.12</jacoco-maven-plugin.version>
         <log4j-bom.version>2.24.3</log4j-bom.version>
         <maven-antrun-plugin.version>3.1.0</maven-antrun-plugin.version>
-        <maven-checkstyle-plugin.version>3.5.0</maven-checkstyle-plugin.version>
+        <maven-checkstyle-plugin.version>3.6.0</maven-checkstyle-plugin.version>
         <maven-clean-plugin.version>3.4.0</maven-clean-plugin.version>
         <maven-assembly-plugin.version>3.7.1</maven-assembly-plugin.version>
         <maven-dependency-plugin.version>3.7.1</maven-dependency-plugin.version>