From add68bbe93f26712a1ddf4421ecf76405c92abd9 Mon Sep 17 00:00:00 2001 From: Andrea Boriero Date: Tue, 29 Mar 2016 18:04:48 +0200 Subject: [PATCH] Add mariadb config to be used with gradle processTestResources -Pdb= --- build.gradle | 1 + databases.gradle | 7 +++++++ libraries.gradle | 2 ++ 3 files changed, 10 insertions(+) diff --git a/build.gradle b/build.gradle index 0057cec2a7..65c96b112e 100644 --- a/build.gradle +++ b/build.gradle @@ -142,6 +142,7 @@ subprojects { subProject -> testRuntime( libraries.hsqldb ) testRuntime( libraries.postgresql ) testRuntime( libraries.mysql ) + testRuntime( libraries.mariadb ) testRuntime( libraries.woodstox ) // 6.6 gave me some NPE problems from within checkstyle... diff --git a/databases.gradle b/databases.gradle index 2e4f573f48..f2ca14339d 100644 --- a/databases.gradle +++ b/databases.gradle @@ -36,6 +36,13 @@ ext { 'jdbc.user' : 'hibernateormtest', 'jdbc.pass' : 'hibernateormtest', 'jdbc.url' : 'jdbc:mysql://localhost/hibernate_orm_test' + ], + mariadb : [ + 'db.dialect' : 'org.hibernate.dialect.MySQL57InnoDBDialect', + 'jdbc.driver': 'org.mariadb.jdbc.Driver', + 'jdbc.user' : 'hibernate_orm_test', + 'jdbc.pass' : 'hibernate_orm_test', + 'jdbc.url' : 'jdbc:mariadb://localhost/hibernate_orm_test' ] ] } diff --git a/libraries.gradle b/libraries.gradle index 562bb791c7..1a8a525e8b 100644 --- a/libraries.gradle +++ b/libraries.gradle @@ -87,10 +87,12 @@ ext { derby: "org.apache.derby:derby:10.11.1.1", postgresql: 'org.postgresql:postgresql:9.4-1202-jdbc41', mysql: 'mysql:mysql-connector-java:5.1.38', + mariadb: 'org.mariadb.jdbc:mariadb-java-client:1.1.7', jboss_jta: "org.jboss.jbossts:jbossjta:4.16.4.Final", xapool: "com.experlog:xapool:1.5.0", mockito: 'org.mockito:mockito-core:1.9.0', + validator: 'org.hibernate:hibernate-validator:5.2.0.CR1', // EL required by Hibernate Validator at test runtime expression_language_api: "javax.el:javax.el-api:${elVersion}",