diff --git a/acl/src/main/java/org/springframework/security/acls/jdbc/JdbcMutableAclService.java b/acl/src/main/java/org/springframework/security/acls/jdbc/JdbcMutableAclService.java
index 22d86d4cb4..154276a901 100644
--- a/acl/src/main/java/org/springframework/security/acls/jdbc/JdbcMutableAclService.java
+++ b/acl/src/main/java/org/springframework/security/acls/jdbc/JdbcMutableAclService.java
@@ -119,6 +119,9 @@ public class JdbcMutableAclService extends JdbcAclService implements MutableAclS
      * @param acl containing the ACEs to insert
      */
     protected void createEntries(final MutableAcl acl) {
+        if(acl.getEntries().isEmpty()) {
+            return;
+        }
         jdbcTemplate.batchUpdate(insertEntry,
             new BatchPreparedStatementSetter() {
                 public int getBatchSize() {
diff --git a/config/config.gradle b/config/config.gradle
index b7291ecfc6..986aa6e403 100644
--- a/config/config.gradle
+++ b/config/config.gradle
@@ -52,7 +52,7 @@ dependencies {
     }
 
 
-    testRuntime "hsqldb:hsqldb:$hsqlVersion",
+    testRuntime "org.hsqldb:hsqldb:$hsqlVersion",
                 "cglib:cglib-nodep:2.2"
 }
 
diff --git a/config/src/test/java/org/springframework/security/config/DataSourcePopulator.java b/config/src/test/java/org/springframework/security/config/DataSourcePopulator.java
index 43ee33bb97..f4767054e3 100644
--- a/config/src/test/java/org/springframework/security/config/DataSourcePopulator.java
+++ b/config/src/test/java/org/springframework/security/config/DataSourcePopulator.java
@@ -34,7 +34,7 @@ public class DataSourcePopulator implements InitializingBean {
     public void afterPropertiesSet() throws Exception {
         Assert.notNull(template, "dataSource required");
 
-        template.execute("CREATE TABLE USERS(USERNAME VARCHAR_IGNORECASE(50) NOT NULL PRIMARY KEY,PASSWORD VARCHAR_IGNORECASE(50) NOT NULL,ENABLED BOOLEAN NOT NULL);");
+        template.execute("CREATE TABLE USERS(USERNAME VARCHAR_IGNORECASE(50) NOT NULL PRIMARY KEY,PASSWORD VARCHAR_IGNORECASE(500) NOT NULL,ENABLED BOOLEAN NOT NULL);");
         template.execute("CREATE TABLE AUTHORITIES(USERNAME VARCHAR_IGNORECASE(50) NOT NULL,AUTHORITY VARCHAR_IGNORECASE(50) NOT NULL,CONSTRAINT FK_AUTHORITIES_USERS FOREIGN KEY(USERNAME) REFERENCES USERS(USERNAME));");
         template.execute("CREATE UNIQUE INDEX IX_AUTH_USERNAME ON AUTHORITIES(USERNAME,AUTHORITY);");
 
diff --git a/core/core.gradle b/core/core.gradle
index de8dc724a5..e565dc1087 100644
--- a/core/core.gradle
+++ b/core/core.gradle
@@ -30,7 +30,7 @@ dependencies {
                 "org.slf4j:jcl-over-slf4j:$slf4jVersion",
                 powerMockDependencies
 
-    testRuntime "hsqldb:hsqldb:$hsqlVersion",
+    testRuntime "org.hsqldb:hsqldb:$hsqlVersion",
                 "cglib:cglib-nodep:$cglibVersion"
 }
 
diff --git a/core/src/test/java/org/springframework/security/PopulatedDatabase.java b/core/src/test/java/org/springframework/security/PopulatedDatabase.java
index 000c7e9b0f..8e7646dc4e 100644
--- a/core/src/test/java/org/springframework/security/PopulatedDatabase.java
+++ b/core/src/test/java/org/springframework/security/PopulatedDatabase.java
@@ -49,7 +49,7 @@ public class PopulatedDatabase {
         JdbcTemplate template = new JdbcTemplate(dataSource);
 
         template.execute(
-            "CREATE TABLE USERS(USERNAME VARCHAR_IGNORECASE(50) NOT NULL PRIMARY KEY,PASSWORD VARCHAR_IGNORECASE(50) NOT NULL,ENABLED BOOLEAN NOT NULL)");
+            "CREATE TABLE USERS(USERNAME VARCHAR_IGNORECASE(50) NOT NULL PRIMARY KEY,PASSWORD VARCHAR_IGNORECASE(500) NOT NULL,ENABLED BOOLEAN NOT NULL)");
         template.execute(
             "CREATE TABLE AUTHORITIES(USERNAME VARCHAR_IGNORECASE(50) NOT NULL,AUTHORITY VARCHAR_IGNORECASE(50) NOT NULL,CONSTRAINT FK_AUTHORITIES_USERS FOREIGN KEY(USERNAME) REFERENCES USERS(USERNAME))");
         template.execute("CREATE UNIQUE INDEX IX_AUTH_USERNAME ON AUTHORITIES(USERNAME,AUTHORITY)");
diff --git a/gradle/javaprojects.gradle b/gradle/javaprojects.gradle
index 3f413e830a..86e7e69129 100644
--- a/gradle/javaprojects.gradle
+++ b/gradle/javaprojects.gradle
@@ -17,7 +17,7 @@ ext.aspectjVersion = '1.6.10'
 ext.apacheDsVersion = '1.5.5'
 ext.jstlVersion = '1.2'
 ext.jettyVersion = '6.1.26'
-ext.hsqlVersion = '1.8.0.10'
+ext.hsqlVersion = '2.3.1'
 ext.slf4jVersion = '1.7.5'
 ext.logbackVersion = '0.9.29'
 ext.cglibVersion = '2.2'
diff --git a/samples/contacts-xml/contacts.gradle b/samples/contacts-xml/contacts.gradle
index c8f6029068..5b24ab7dc3 100644
--- a/samples/contacts-xml/contacts.gradle
+++ b/samples/contacts-xml/contacts.gradle
@@ -20,7 +20,7 @@ dependencies {
             project(':spring-security-taglibs'),
             "org.springframework:spring-context-support:$springVersion",
             "javax.servlet:jstl:$jstlVersion",
-            "hsqldb:hsqldb:$hsqlVersion",
+            "org.hsqldb:hsqldb:$hsqlVersion",
             "org.slf4j:jcl-over-slf4j:$slf4jVersion",
             "ch.qos.logback:logback-classic:$logbackVersion",
             "net.sf.ehcache:ehcache:$ehcacheVersion"
diff --git a/samples/contacts-xml/src/main/java/sample/contact/DataSourcePopulator.java b/samples/contacts-xml/src/main/java/sample/contact/DataSourcePopulator.java
index d446e1592d..05cbc34cf2 100644
--- a/samples/contacts-xml/src/main/java/sample/contact/DataSourcePopulator.java
+++ b/samples/contacts-xml/src/main/java/sample/contact/DataSourcePopulator.java
@@ -120,7 +120,7 @@ public class DataSourcePopulator implements InitializingBean {
                     "CONSTRAINT FOREIGN_FK_5 FOREIGN KEY(SID) REFERENCES ACL_SID(ID));");
 
         template.execute(
-            "CREATE TABLE USERS(USERNAME VARCHAR_IGNORECASE(50) NOT NULL PRIMARY KEY,PASSWORD VARCHAR_IGNORECASE(50) NOT NULL,ENABLED BOOLEAN NOT NULL);");
+            "CREATE TABLE USERS(USERNAME VARCHAR_IGNORECASE(50) NOT NULL PRIMARY KEY,PASSWORD VARCHAR_IGNORECASE(500) NOT NULL,ENABLED BOOLEAN NOT NULL);");
         template.execute(
             "CREATE TABLE AUTHORITIES(USERNAME VARCHAR_IGNORECASE(50) NOT NULL,AUTHORITY VARCHAR_IGNORECASE(50) NOT NULL,CONSTRAINT FK_AUTHORITIES_USERS FOREIGN KEY(USERNAME) REFERENCES USERS(USERNAME));");
         template.execute("CREATE UNIQUE INDEX IX_AUTH_USERNAME ON AUTHORITIES(USERNAME,AUTHORITY);");
diff --git a/samples/dms-xml/dms.gradle b/samples/dms-xml/dms.gradle
index 62f10d80d1..fa332974f9 100644
--- a/samples/dms-xml/dms.gradle
+++ b/samples/dms-xml/dms.gradle
@@ -9,7 +9,7 @@ dependencies {
     testCompile "org.springframework:spring-context:$springVersion"
 
     runtime project(':spring-security-config'),
-            "hsqldb:hsqldb:$hsqlVersion",
+            "org.hsqldb:hsqldb:$hsqlVersion",
             "org.springframework:spring-context-support:$springVersion"
 
     optional "net.sf.ehcache:ehcache:$ehcacheVersion"
diff --git a/samples/dms-xml/src/main/java/sample/dms/DataSourcePopulator.java b/samples/dms-xml/src/main/java/sample/dms/DataSourcePopulator.java
index ea52fe83c9..1407fe5015 100755
--- a/samples/dms-xml/src/main/java/sample/dms/DataSourcePopulator.java
+++ b/samples/dms-xml/src/main/java/sample/dms/DataSourcePopulator.java
@@ -39,7 +39,7 @@ public class DataSourcePopulator implements InitializingBean {
         template.execute("CREATE TABLE ACL_ENTRY(ID BIGINT GENERATED BY DEFAULT AS IDENTITY(START WITH 100) NOT NULL PRIMARY KEY,ACL_OBJECT_IDENTITY BIGINT NOT NULL,ACE_ORDER INT NOT NULL,SID BIGINT NOT NULL,MASK INTEGER NOT NULL,GRANTING BOOLEAN NOT NULL,AUDIT_SUCCESS BOOLEAN NOT NULL,AUDIT_FAILURE BOOLEAN NOT NULL,CONSTRAINT UNIQUE_UK_4 UNIQUE(ACL_OBJECT_IDENTITY,ACE_ORDER),CONSTRAINT FOREIGN_FK_4 FOREIGN KEY(ACL_OBJECT_IDENTITY) REFERENCES ACL_OBJECT_IDENTITY(ID),CONSTRAINT FOREIGN_FK_5 FOREIGN KEY(SID) REFERENCES ACL_SID(ID));");
 
         // Normal authentication tables
-        template.execute("CREATE TABLE USERS(USERNAME VARCHAR_IGNORECASE(50) NOT NULL PRIMARY KEY,PASSWORD VARCHAR_IGNORECASE(50) NOT NULL,ENABLED BOOLEAN NOT NULL);");
+        template.execute("CREATE TABLE USERS(USERNAME VARCHAR_IGNORECASE(50) NOT NULL PRIMARY KEY,PASSWORD VARCHAR_IGNORECASE(500) NOT NULL,ENABLED BOOLEAN NOT NULL);");
         template.execute("CREATE TABLE AUTHORITIES(USERNAME VARCHAR_IGNORECASE(50) NOT NULL,AUTHORITY VARCHAR_IGNORECASE(50) NOT NULL,CONSTRAINT FK_AUTHORITIES_USERS FOREIGN KEY(USERNAME) REFERENCES USERS(USERNAME));");
         template.execute("CREATE UNIQUE INDEX IX_AUTH_USERNAME ON AUTHORITIES(USERNAME,AUTHORITY);");
 
diff --git a/samples/messages-jc/src/main/resources/data.sql b/samples/messages-jc/src/main/resources/data.sql
index 9fed841095..7ca2b297ed 100644
--- a/samples/messages-jc/src/main/resources/data.sql
+++ b/samples/messages-jc/src/main/resources/data.sql
@@ -1,2 +1,2 @@
-insert into message(id,created,summary,text) values (100,'2013-10-04 10:00:00','Hello Rob','This message is for Rob');
-insert into message(id,created,summary,text) values (110,'2013-10-04 10:00:00','Hello Luke','This message is for Luke');
\ No newline at end of file
+insert into message(created,summary,text) values ('2013-10-04 10:00:00','Hello Rob','This message is for Rob');
+insert into message(created,summary,text) values ('2013-10-04 10:00:00','Hello Luke','This message is for Luke');
\ No newline at end of file
diff --git a/sandbox/heavyduty/build.gradle b/sandbox/heavyduty/build.gradle
index 379e2edcee..0fef98de5a 100644
--- a/sandbox/heavyduty/build.gradle
+++ b/sandbox/heavyduty/build.gradle
@@ -37,7 +37,7 @@ dependencies {
             'org.apache.directory.server:apacheds-core:1.5.5',
             'org.apache.directory.server:apacheds-server-jndi:1.5.5',
             'org.freemarker:freemarker:2.3.16',
-            "hsqldb:hsqldb:1.8.0.10",
+            "org.hsqldb:hsqldb:1.8.0.10",
             'org.slf4j:slf4j-log4j12:1.5.11',
             'log4j:log4j:1.2.14'
 }
diff --git a/web/src/test/java/org/springframework/security/web/authentication/rememberme/JdbcTokenRepositoryImplTests.java b/web/src/test/java/org/springframework/security/web/authentication/rememberme/JdbcTokenRepositoryImplTests.java
index 4d89d0c166..45421d5548 100644
--- a/web/src/test/java/org/springframework/security/web/authentication/rememberme/JdbcTokenRepositoryImplTests.java
+++ b/web/src/test/java/org/springframework/security/web/authentication/rememberme/JdbcTokenRepositoryImplTests.java
@@ -56,7 +56,7 @@ public class JdbcTokenRepositoryImplTests {
     @BeforeClass
     public static void createDataSource() {
         dataSource = new SingleConnectionDataSource("jdbc:hsqldb:mem:tokenrepotest", "sa", "", true);
-        dataSource.setDriverClassName("org.hsqldb.jdbcDriver");
+        dataSource.setDriverClassName("org.hsqldb.jdbc.JDBCDriver");
     }
 
     @AfterClass
@@ -72,8 +72,8 @@ public class JdbcTokenRepositoryImplTests {
         repo.setDataSource(dataSource);
         repo.initDao();
         template = repo.getJdbcTemplate();
-        template.execute("create table persistent_logins (username varchar not null, " +
-                "series varchar not null, token varchar not null, last_used timestamp not null)");
+        template.execute("create table persistent_logins (username varchar(100) not null, " +
+                "series varchar(100) not null, token varchar(500) not null, last_used timestamp not null)");
     }
 
     @After
diff --git a/web/web.gradle b/web/web.gradle
index cc43b0cdcf..8cd750d33b 100644
--- a/web/web.gradle
+++ b/web/web.gradle
@@ -22,5 +22,5 @@ dependencies {
                 "org.codehaus.groovy:groovy:$groovyVersion",
                 powerMockDependencies
 
-    testRuntime "hsqldb:hsqldb:$hsqlVersion"
+    testRuntime "org.hsqldb:hsqldb:$hsqlVersion"
 }
\ No newline at end of file