Bump micronaut-sql to 4.0.0-RC1 (micronaut-projects#5738)

* Bump micronaut-sql to 4.0.0-RC1 * Move to SQL BOM / upgrade driver versions Co-authored-by: Graeme Rocher <graeme.rocher@oracle.com>
glorrian · Jul 12, 2021 · 3926927 · 3926927
1 parent 0441c9e
commit 3926927
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 31 deletions.
diff --git a/build.gradle b/build.gradle
@@ -66,6 +66,11 @@ ext {
                     name: 'micronaut-aws-bom',
                     version: micronautAwsVersion
             ],
+            'micronaut.sql': [
+                    group: 'io.micronaut.sql',
+                    name: 'micronaut-sql-bom',
+                    version: micronautSqlVersion
+            ],
             //Third-party
             'netty': [
                     group: 'io.netty',
@@ -336,12 +341,6 @@ ext {
                     name:'micronaut-spring-annotation',
                     modules:['micronaut-spring', 'micronaut-spring-boot', 'micronaut-spring-boot-annotation', 'micronaut-spring-context', 'micronaut-spring-web', 'micronaut-spring-web-annotation']
             ],
-            'micronaut.sql': [
-                version:micronautSqlVersion,
-                group:'io.micronaut.sql',
-                name:'micronaut-hibernate-jpa',
-                modules:['micronaut-jdbc', 'micronaut-jdbc-tomcat', 'micronaut-jdbc-hikari', 'micronaut-jdbc-ucp', 'micronaut-jdbc-dbcp', 'micronaut-jasync-sql', 'micronaut-jooq', 'micronaut-jdbi', 'micronaut-hibernate-jpa-spring', 'micronaut-vertx-mysql-client', 'micronaut-vertx-pg-client']
-            ],
             'micronaut.mongo': [
                     version:micronautMongoVersion,
                     group:'io.micronaut.mongodb',
@@ -509,11 +508,6 @@ ext {
                     group  : 'javax.validation',
                     name   : 'validation-api'
             ],
-            hikari                    : [
-                    version: hikariVersion,
-                    group  : 'com.zaxxer',
-                    name   : 'HikariCP'
-            ],
             hystrix                    : [
                     version: hystrixVersion,
                     group  : 'com.netflix.hystrix',
@@ -555,11 +549,6 @@ ext {
                     group  : 'com.microsoft.sqlserver',
                     name   : 'mssql-jdbc'
             ],
-            tomcatJdbc                 : [
-                    version: tomcatJdbcVersion,
-                    group  : 'org.apache.tomcat',
-                    name   : 'tomcat-jdbc'
-            ],
             liquibase                  : [
                     version: liquibaseVersion,
                     group  : 'org.liquibase',
@@ -575,12 +564,6 @@ ext {
                     group  : 'net.java.dev.jna',
                     name   : 'jna'
             ],
-            hibernate                  : [
-                    version: hibernateVersion,
-                    group  : 'org.hibernate',
-                    name   : 'hibernate-core',
-                    modules: ['hibernate-jcache', 'hibernate-ehcache']
-            ],
             elasticsearch              : [
                     version: elasticsearchVersion,
                     group  : 'org.elasticsearch.client',

diff --git a/gradle.properties b/gradle.properties
@@ -57,7 +57,7 @@ micronautReactorVersion=1.1.0
 micronautRedisVersion=4.0.2
 micronautMongoVersion=3.1.0
 micronautNeo4jVersion=4.2.0
-micronautSqlVersion=3.4.0
+micronautSqlVersion=4.0.0-RC1
 micronautViewsVersion=2.2.1
 micronautMicrometerVersion=4.0.0.RC1
 micronautTestVersion=2.3.7
@@ -138,24 +138,21 @@ gebVersion=3.4
 seleniumVersion=3.141.59
 graalVersion=21.1.0
 h2Version=1.4.199
-tomcatJdbcVersion=9.0.41
-hikariVersion=3.4.5
 commonsDbcpVersion=2.8.0
 liquibaseVersion=4.3.5
 flywayVersion=7.9.1
 jcacheVersion=1.1.0
-hibernateVersion=5.4.24.Final
 methvinDirectoryWatcherVersion=0.9.6
 jnaVersion=5.3.1
 elasticsearchVersion=7.12.0
 kotlinVersion=1.4.31
 kotlinCoroutinesVersion=1.4.3
 kotlin.stdlib.default.dependency=false
 ktorVersion=1.5.1
-postgresDriverVersion=42.2.18
-mysqlDriverVersion=8.0.22
-mariadbDriverVersion=2.7.0
-mssqlDriverVersion=8.4.1.jre8
+postgresDriverVersion=42.2.23
+mysqlDriverVersion=8.0.25
+mariadbDriverVersion=2.7.3
+mssqlDriverVersion=9.2.1.jre8
 oracleDriverVersion=21.1.0.0
 ojdbcVersion=21.1.0.0
 dekorateVersion=1.0.3

diff --git a/test-suite/build.gradle b/test-suite/build.gradle
@@ -54,7 +54,6 @@ dependencies {
     testAnnotationProcessor project(":inject-java")
     testAnnotationProcessor project(":test-suite")
 
-    testRuntimeOnly dependencyVersion("tomcatJdbc")
     testRuntimeOnly dependencyVersion("h2")
     testRuntimeOnly "org.junit.vintage:junit-vintage-engine:$junitVersion"
     testRuntimeOnly "ch.qos.logback:logback-classic:1.2.3"