From bfc0761980947d9d4a81c19ac79fd4ec70154a17 Mon Sep 17 00:00:00 2001 From: Martin Goellnitz Date: Thu, 31 Mar 2016 17:56:08 +0200 Subject: [PATCH] Update db dependencies used for tests: h2 and hsqldb --- .../groovy/org/tangram/gradle/plugin/TangramVersions.groovy | 6 ++++-- ebean/build.gradle | 2 +- jpa/build.gradle | 2 +- nucleus/build.gradle | 2 +- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/buildSrc/src/main/groovy/org/tangram/gradle/plugin/TangramVersions.groovy b/buildSrc/src/main/groovy/org/tangram/gradle/plugin/TangramVersions.groovy index f4e6f558..8ddd215f 100644 --- a/buildSrc/src/main/groovy/org/tangram/gradle/plugin/TangramVersions.groovy +++ b/buildSrc/src/main/groovy/org/tangram/gradle/plugin/TangramVersions.groovy @@ -31,7 +31,7 @@ public class TangramVersions { String servlet_api = 'javax.servlet:javax.servlet-api:3.1.0' String jsp_api = 'javax.servlet.jsp:jsp-api:2.2' String groovy = '2.4.6' - String asm = '4.0' + String asm = '5.1' String velocity = '1.7' String slf4j = '1.7.20' String log4j = '1.2.17' @@ -47,7 +47,9 @@ public class TangramVersions { // For testing purposes String junit = '4.12' - String testng = '6.3.1' // Gradle 2.10 has 6.3.1 - tests fail with other versions - latest is 6.9.11 + String testng = '6.9.11' // Gradle 2.12 has 6.3.1 - tests using e.g. testng listeners fail with other versions + String hsqldb = '1.8.1.1' + String h2db = '1.4.191' // The dependency injection options String dinistiq = '0.5' diff --git a/ebean/build.gradle b/ebean/build.gradle index 13b95c34..9450dd8a 100644 --- a/ebean/build.gradle +++ b/ebean/build.gradle @@ -36,7 +36,7 @@ dependencies { testCompile project (':tangram-core').sourceSets.test.output testCompile "org.springframework:spring-core:$versions.springframework" testCompile "org.springframework:spring-test:$versions.springframework" - testCompile "com.h2database:h2:1.4.191" + testCompile "com.h2database:h2:$versions.h2db" } compileTestJava.doLast { diff --git a/jpa/build.gradle b/jpa/build.gradle index 76b250a2..12778f54 100644 --- a/jpa/build.gradle +++ b/jpa/build.gradle @@ -44,7 +44,7 @@ dependencies { testCompile project (':tangram-core').sourceSets.test.output testCompile "org.springframework:spring-core:$versions.springframework" testCompile "org.springframework:spring-test:$versions.springframework" - testCompile "hsqldb:hsqldb:1.8.0.10" + testCompile "hsqldb:hsqldb:$versions.hsqldb" } // For Java EE environments diff --git a/nucleus/build.gradle b/nucleus/build.gradle index f6347f2e..149c3552 100644 --- a/nucleus/build.gradle +++ b/nucleus/build.gradle @@ -38,7 +38,7 @@ dependencies { testCompile project (':tangram-core').sourceSets.test.output testCompile "org.datanucleus:datanucleus-rdbms:$versions.datanucleus" testCompile "$versions.jdo_api" - testCompile "hsqldb:hsqldb:1.8.0.10" + testCompile "hsqldb:hsqldb:$versions.hsqldb" } compileTestJava.doLast {