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
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 @@
-
-
-
+
+
+
-
-
+
+