From 93d7034a5fb5fd07e97f9c0db417c141b6f59336 Mon Sep 17 00:00:00 2001 From: Tony Germano Date: Fri, 20 Nov 2026 07:53:50 -0500 Subject: [PATCH 1/2] Add a smoke-test configuration for the Microsoft SQL Server driver The sqlserver configuration connects through jTDS, so mssql-jdbc is never loaded in CI. Add a configuration that sets database.driver to com.microsoft.sqlserver.jdbc.SQLServerDriver (via _MP_DATABASE_DRIVER, since configure-from-env has no dedicated variable) and uses a jdbc:sqlserver URL. encrypt=true is the driver default, so the URL sets trustServerCertificate=true for the container's self-signed certificate. The harness's DatabaseMetadataTest uses the same driver and URL. Run the Microsoft driver against SQL Server 2025 and move the jTDS configuration to SQL Server 2022, which is still widely deployed and keeps jTDS covered while it heads toward deprecation. Both configurations pass all 47 tests with mssql-jdbc 10.2.4. Assisted-by: Claude:claude-sonnet-5-5 Signed-off-by: Tony Germano --- ...temurin21-sqlserver-mssql-jdbc.compose.yml | 64 +++++++++++++++++++ .../alpine-temurin21-sqlserver.compose.yml | 4 +- 2 files changed, 66 insertions(+), 2 deletions(-) create mode 100644 ci/configurations/alpine-temurin21-sqlserver-mssql-jdbc.compose.yml diff --git a/ci/configurations/alpine-temurin21-sqlserver-mssql-jdbc.compose.yml b/ci/configurations/alpine-temurin21-sqlserver-mssql-jdbc.compose.yml new file mode 100644 index 0000000000..94b41cb910 --- /dev/null +++ b/ci/configurations/alpine-temurin21-sqlserver-mssql-jdbc.compose.yml @@ -0,0 +1,64 @@ +services: + db: + platform: linux/amd64 + image: mcr.microsoft.com/mssql/server:2025-latest + environment: + ACCEPT_EULA: Y + MSSQL_PID: Developer + MSSQL_SA_PASSWORD: OieSqlServerPassw0rd! + healthcheck: + test: + - CMD-SHELL + - /opt/mssql-tools18/bin/sqlcmd -C -S 127.0.0.1 -U sa -P "$$MSSQL_SA_PASSWORD" -Q "SELECT 1" || /opt/mssql-tools/bin/sqlcmd -S 127.0.0.1 -U sa -P "$$MSSQL_SA_PASSWORD" -Q "SELECT 1" + interval: 3s + timeout: 5s + retries: 30 + start_period: 30s + + db-init: + platform: linux/amd64 + image: mcr.microsoft.com/mssql/server:2025-latest + depends_on: + db: + condition: service_healthy + environment: + MSSQL_SA_PASSWORD: OieSqlServerPassw0rd! + restart: "no" + entrypoint: + - /bin/bash + - -lc + - /opt/mssql-tools18/bin/sqlcmd -C -S db -U sa -P "$$MSSQL_SA_PASSWORD" -Q "IF DB_ID('mirthdb') IS NULL CREATE DATABASE mirthdb;" || /opt/mssql-tools/bin/sqlcmd -S db -U sa -P "$$MSSQL_SA_PASSWORD" -Q "IF DB_ID('mirthdb') IS NULL CREATE DATABASE mirthdb;" + + oie: + image: ${OIE_IMAGE} + depends_on: + db-init: + condition: service_completed_successfully + environment: + DATABASE: sqlserver + DATABASE_URL: jdbc:sqlserver://db:1433;databaseName=mirthdb;encrypt=true;trustServerCertificate=true + _MP_DATABASE_DRIVER: com.microsoft.sqlserver.jdbc.SQLServerDriver + DATABASE_USERNAME: sa + DATABASE_PASSWORD: OieSqlServerPassw0rd! + DATABASE_MAX_CONNECTIONS: 20 + DATABASE_MAX_RETRY: 20 + DATABASE_RETRY_WAIT: 5000 + ports: + - "8443:8443" + healthcheck: + test: + - CMD-SHELL + - bash -lc 'exec 3<>/dev/tcp/127.0.0.1/8443' + interval: 3s + timeout: 5s + retries: 30 + start_period: 40s + + # Lets the Database Connector metadata test reach this configuration's database. The URL is + # resolved by the oie service, not the harness, so it is the same one the engine uses. + harness: + environment: + OIE_DB_DRIVER: com.microsoft.sqlserver.jdbc.SQLServerDriver + OIE_DB_URL: jdbc:sqlserver://db:1433;databaseName=mirthdb;encrypt=true;trustServerCertificate=true + OIE_DB_USERNAME: sa + OIE_DB_PASSWORD: OieSqlServerPassw0rd! diff --git a/ci/configurations/alpine-temurin21-sqlserver.compose.yml b/ci/configurations/alpine-temurin21-sqlserver.compose.yml index ca85e78869..938caf8b8e 100644 --- a/ci/configurations/alpine-temurin21-sqlserver.compose.yml +++ b/ci/configurations/alpine-temurin21-sqlserver.compose.yml @@ -1,7 +1,7 @@ services: db: platform: linux/amd64 - image: mcr.microsoft.com/mssql/server:2025-latest + image: mcr.microsoft.com/mssql/server:2022-latest environment: ACCEPT_EULA: Y MSSQL_PID: Developer @@ -17,7 +17,7 @@ services: db-init: platform: linux/amd64 - image: mcr.microsoft.com/mssql/server:2025-latest + image: mcr.microsoft.com/mssql/server:2022-latest depends_on: db: condition: service_healthy From a9741914e26b202e69c13f0aa8345ac2c2ddf2b8 Mon Sep 17 00:00:00 2001 From: Tony Germano Date: Fri, 20 Nov 2026 07:58:58 -0500 Subject: [PATCH 2/2] Upgrade mssql-jdbc from 10.2.4 to 13.6.2 Move to the current stable release (13.6.2.jre11, released 2026-11-02). The jre11 build is the one Microsoft publishes for Java 11 and later. OSV lists no advisories for either version, so this is a currency upgrade, not a security fix. The driver's runtime dependencies are all optional, so no further packages are added. Behavior changes since 10.2.4 that can affect existing connections: - loginTimeout now defaults to 30 seconds (it was 15), and during login socketTimeout is capped at loginTimeout. A server that accepts the connection but never answers now fails the login at the timeout instead of waiting indefinitely. - getReference() no longer includes sensitive connection properties. - getProcedures and getFunctions filter on sys.all_objects, and getColumns prefers sp_columns_170 on SQL Server 2025, falling back to sp_columns_100. encrypt=true has been the default since 10.2.0, so it does not change. Verified with the sqlserver-mssql-jdbc smoke-test configuration against SQL Server 2025: all 47 tests pass. Assisted-by: Claude:claude-sonnet-5-5 Signed-off-by: Tony Germano --- gradle/libs.versions.toml | 2 +- gradle/verification-metadata.xml | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 789e7ac22d..19102e6501 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -215,7 +215,7 @@ miglayout-swing = { module = "com.miglayout:miglayout-swing", version.ref = "mig mimepull = { module = "org.jvnet.mimepull:mimepull", version = "1.9.7" } mockito-core = { module = "org.mockito:mockito-core", version.ref = "mockito" } mockito-inline = { module = "org.mockito:mockito-inline", version.ref = "mockito" } -mssql-jdbc = { module = "com.microsoft.sqlserver:mssql-jdbc", version = "10.2.4.jre11" } +mssql-jdbc = { module = "com.microsoft.sqlserver:mssql-jdbc", version = "13.6.2.jre11" } mybatis = { module = "org.mybatis:mybatis", version = "3.1.1" } mysql-connector-j = { module = "com.mysql:mysql-connector-j", version = "8.4.0" } netty-buffer = { module = "io.netty:netty-buffer", version.ref = "netty" } diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index 04c10db547..01dc52fb2f 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -485,12 +485,12 @@ - - - + + + - - + +