This is an automated email from the ASF dual-hosted git repository.
fpapon pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shiro.git
The following commit(s) were added to refs/heads/master by this push:
new f427ae3 SHIRO-703 - Update HSQL
new a73cf77 Merge pull request #147 from coheigea/SHIRO-703
f427ae3 is described below
commit f427ae3903ef58b70b327ce1383fc5b7fa805020
Author: Colm O hEigeartaigh <[email protected]>
AuthorDate: Thu Jun 13 12:04:12 2019 +0100
SHIRO-703 - Update HSQL
---
core/pom.xml | 2 +-
.../test/java/org/apache/shiro/realm/jdbc/JDBCRealmTest.java | 10 +++++-----
pom.xml | 4 ++--
samples/spring-hibernate/pom.xml | 2 +-
samples/spring-mvc/pom.xml | 2 +-
5 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/core/pom.xml b/core/pom.xml
index 0c842b9..c1b272f 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -110,7 +110,7 @@
</dependency>
<!-- JDBC Realm tests: -->
<dependency>
- <groupId>hsqldb</groupId>
+ <groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
<scope>test</scope>
</dependency>
diff --git a/core/src/test/java/org/apache/shiro/realm/jdbc/JDBCRealmTest.java
b/core/src/test/java/org/apache/shiro/realm/jdbc/JDBCRealmTest.java
index bd356dc..e3c34f9 100644
--- a/core/src/test/java/org/apache/shiro/realm/jdbc/JDBCRealmTest.java
+++ b/core/src/test/java/org/apache/shiro/realm/jdbc/JDBCRealmTest.java
@@ -30,7 +30,7 @@ import org.apache.shiro.realm.AuthorizingRealm;
import org.apache.shiro.subject.Subject;
import org.apache.shiro.util.JdbcUtils;
import org.apache.shiro.util.ThreadContext;
-import org.hsqldb.jdbc.jdbcDataSource;
+import org.hsqldb.jdbc.JDBCDataSource;
import org.junit.*;
import org.junit.rules.TestName;
@@ -294,7 +294,7 @@ public class JDBCRealmTest {
* are executed in multithreaded mode, each test method gets its own
database.)
*/
protected void createDefaultSchema(String testName, boolean salted) {
- jdbcDataSource ds = new jdbcDataSource();
+ JDBCDataSource ds = new JDBCDataSource();
ds.setDatabase("jdbc:hsqldb:mem:" + name);
ds.setUser("SA");
ds.setPassword("");
@@ -303,7 +303,7 @@ public class JDBCRealmTest {
try {
conn = ds.getConnection();
sql = conn.createStatement();
- sql.executeUpdate("create table users (username varchar(20),
password varchar(20))");
+ sql.executeUpdate("create table users (username varchar(20),
password varchar(100))");
Sha256Hash sha256Hash = salted ? new Sha256Hash(plainTextPassword,
salt) :
new Sha256Hash(plainTextPassword);
String password = sha256Hash.toHex();
@@ -324,7 +324,7 @@ public class JDBCRealmTest {
* DataSource of the realm associated with the test to a DataSource
connected to the database.
*/
protected void createSaltColumnSchema(String testName) {
- jdbcDataSource ds = new jdbcDataSource();
+ JDBCDataSource ds = new JDBCDataSource();
ds.setDatabase("jdbc:hsqldb:mem:" + name);
ds.setUser("SA");
ds.setPassword("");
@@ -334,7 +334,7 @@ public class JDBCRealmTest {
conn = ds.getConnection();
sql = conn.createStatement();
sql.executeUpdate(
- "create table users (username varchar(20), password
varchar(20), password_salt varchar(20))");
+ "create table users (username varchar(20), password
varchar(100), password_salt varchar(20))");
Sha256Hash sha256Hash = new Sha256Hash(plainTextPassword, salt);
String password = sha256Hash.toHex();
sql.executeUpdate("insert into users values ('" + username + "',
'" + password + "', '" + salt + "')");
diff --git a/pom.xml b/pom.xml
index 3a4e873..b8274e7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -92,7 +92,7 @@
<ehcache.version>2.6.11</ehcache.version>
<!-- Don't change this version without also changing the
shiro-hazelcast and shiro-features OSGi metadata: -->
<hazelcast.version>3.12</hazelcast.version>
- <hsqldb.version>1.8.0.7</hsqldb.version>
+ <hsqldb.version>2.4.1</hsqldb.version>
<jdk.version>1.8</jdk.version>
<jetty.version>9.4.18.v20190429</jetty.version>
<!-- Don't change this version without also changing the shiro-quartz
and shiro-features
@@ -913,7 +913,7 @@
</exclusions>
</dependency>
<dependency>
- <groupId>hsqldb</groupId>
+ <groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
<version>${hsqldb.version}</version>
<scope>runtime</scope>
diff --git a/samples/spring-hibernate/pom.xml b/samples/spring-hibernate/pom.xml
index 269b737..566a8eb 100644
--- a/samples/spring-hibernate/pom.xml
+++ b/samples/spring-hibernate/pom.xml
@@ -77,7 +77,7 @@
<artifactId>geronimo-jta_1.1_spec</artifactId>
</dependency>
<dependency>
- <groupId>hsqldb</groupId>
+ <groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
</dependency>
<dependency>
diff --git a/samples/spring-mvc/pom.xml b/samples/spring-mvc/pom.xml
index 7e01e11..10149fe 100644
--- a/samples/spring-mvc/pom.xml
+++ b/samples/spring-mvc/pom.xml
@@ -153,7 +153,7 @@
<artifactId>spring-webmvc</artifactId>
</dependency>
<dependency>
- <groupId>hsqldb</groupId>
+ <groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
<version>${hsqldb.version}</version>
<scope>runtime</scope>
