Merge remote-tracking branch 'origin/joinis' into joinis

micronaut-projects · Sep 20, 2024 · d60ccca · d60ccca
2 parents d0fa345 + 8a60f85
commit d60ccca
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 16 deletions.
diff --git a/data-connection-jdbc/build.gradle b/data-connection-jdbc/build.gradle
@@ -21,33 +21,18 @@ dependencies {
 
     testImplementation mnReactor.micronaut.reactor
 
-    testImplementation(mnTestResources.testcontainers.mysql)
-    testImplementation(mnTestResources.testcontainers.mariadb)
     testImplementation(mnTestResources.testcontainers.postgres)
-    testImplementation(mnTestResources.testcontainers.mssql)
-    testImplementation(mnTestResources.testcontainers.oracle.xe)
 
     testCompileOnly mn.micronaut.inject.groovy
 
     testImplementation mn.micronaut.http.netty
     testRuntimeOnly mnSql.micronaut.jdbc.tomcat
     testRuntimeOnly mnSql.h2
-    testRuntimeOnly mnSql.mariadb.java.client
-    testRuntimeOnly mnSql.ojdbc11
-    testRuntimeOnly mnSql.mysql.connector.java
     testRuntimeOnly mnSql.postgresql
-    testRuntimeOnly mnSql.mssql.jdbc
     testRuntimeOnly mn.snakeyaml
 
-    testResourcesService mnSql.mariadb.java.client
-    testResourcesService mnSql.ojdbc11
-    testResourcesService mnSql.mysql.connector.java
     testResourcesService mnSql.postgresql
-    testResourcesService mnSql.mssql.jdbc
-
     testImplementation libs.micronaut.testresources.client
-
-    testRuntimeOnly mnSerde.micronaut.serde.oracle.jdbc.json
 }
 
 micronaut {

diff --git a/data-jdbc/src/test/resources/application.yml b/data-jdbc/src/test/resources/application.yml
@@ -3,6 +3,7 @@ test-resources:
     mssql:
       accept-license: true
       startup-timeout: 300s
+      image-name: mcr.microsoft.com/mssql/server:2022-latest
     mariadb:
       startup-timeout: 300s
     mysql:

diff --git a/data-r2dbc/src/test/resources/application.yaml b/data-r2dbc/src/test/resources/application.yaml
@@ -3,6 +3,7 @@ test-resources:
     mssql:
       accept-license: true
       startup-timeout: 300s
+      image-name: mcr.microsoft.com/mssql/server:2022-latest
     mariadb:
       startup-timeout: 300s
     mysql:

diff --git a/.../test/groovy/io/micronaut/transaction/hibernate6/SqlServerHibernateTransactionSpec.groovy b/.../test/groovy/io/micronaut/transaction/hibernate6/SqlServerHibernateTransactionSpec.groovy
@@ -17,7 +17,8 @@ class SqlServerHibernateTransactionSpec extends HibernateTransactionSpec impleme
                 "datasources.default.name"                       : "mymssqldb",
                 'jpa.default.properties.hibernate.hbm2ddl.auto'  : 'create-drop',
                 'jpa.default.properties.hibernate.dialect'       : 'org.hibernate.dialect.SQLServerDialect',
-                'test-resources.containers.mssql.accept-license' : 'true'
+                'test-resources.containers.mssql.accept-license' : 'true',
+                'test-resources.containers.mssql.image-name'     : 'mcr.microsoft.com/mssql/server:2022-latest'
         ]
     }