From b147652193fd4540183aa27b4c751a1905d5ba8e Mon Sep 17 00:00:00 2001 From: Luke Taylor Date: Sat, 27 Feb 2010 00:41:16 +0000 Subject: [PATCH] Make hsqldb a testRuntime/runtime dependency. --- acl/acl.gradle | 2 ++ build.gradle | 3 ++- config/config.gradle | 6 ++---- core/core.gradle | 4 ++-- samples/contacts/contacts.gradle | 1 + 5 files changed, 9 insertions(+), 7 deletions(-) diff --git a/acl/acl.gradle b/acl/acl.gradle index 550a7614d6..869464d000 100644 --- a/acl/acl.gradle +++ b/acl/acl.gradle @@ -12,4 +12,6 @@ dependencies { testCompile "org.springframework:spring-beans:$springVersion", "org.springframework:spring-context-support:$springVersion", "org.springframework:spring-test:$springVersion" + + testRuntime "hsqldb:hsqldb:$hsqlVersion" } \ No newline at end of file diff --git a/build.gradle b/build.gradle index efc5d31cdb..2c3a790b77 100644 --- a/build.gradle +++ b/build.gradle @@ -26,7 +26,8 @@ configure(javaProjects()) { aspectjVersion = '1.6.8' apacheDsVersion = '1.5.5' jstlVersion = '1.1.2' - jettyVersion = '6.1.22' + jettyVersion = '6.1.22' + hsqlVersion = '1.8.0.10' configurations { bundlor diff --git a/config/config.gradle b/config/config.gradle index 0049d66423..e595e52df4 100644 --- a/config/config.gradle +++ b/config/config.gradle @@ -21,8 +21,6 @@ dependencies { 'aopalliance:aopalliance:1.0', "org.springframework.ldap:spring-ldap-core:$springLdapVersion", "org.springframework:spring-jdbc:$springVersion" -} -task show << { - println dependencies -} \ No newline at end of file + testRuntime "hsqldb:hsqldb:$hsqlVersion" +} diff --git a/core/core.gradle b/core/core.gradle index a005d0e822..fbb83e09f7 100644 --- a/core/core.gradle +++ b/core/core.gradle @@ -15,8 +15,8 @@ dependencies { "org.aspectj:aspectjweaver:$aspectjVersion", 'javax.annotation:jsr250-api:1.0' - runtime 'hsqldb:hsqldb:1.8.0.10' - testCompile 'commons-collections:commons-collections:3.2', "org.springframework:spring-test:$springVersion" + + testRuntime "hsqldb:hsqldb:$hsqlVersion" } diff --git a/samples/contacts/contacts.gradle b/samples/contacts/contacts.gradle index 86459f6537..0eddb980b4 100644 --- a/samples/contacts/contacts.gradle +++ b/samples/contacts/contacts.gradle @@ -22,5 +22,6 @@ dependencies { project(':spring-security-taglibs'), "org.springframework:spring-context-support:$springVersion", "net.sf.ehcache:ehcache:$ehcacheVersion", + "hsqldb:hsqldb:$hsqlVersion", 'log4j:log4j:1.2.15@jar' } \ No newline at end of file