Merge pull request #3038 from hazendaz/hsqldb

Fix hsqldb to latest to clear CVE issues in our tests

Author: hazendaz

pom.xml

@@ -198,7 +198,7 @@
     <dependency>
       <groupId>org.hsqldb</groupId>
       <artifactId>hsqldb</artifactId>
-      <version>2.6.1</version>
+      <version>2.7.2</version>
       <scope>test</scope>
     </dependency>
     <dependency>

src/test/java/org/apache/ibatis/submitted/localtime/LocalTimeTest.java

@@ -19,6 +19,7 @@
 
 import java.io.Reader;
 import java.time.LocalTime;
+import java.util.TimeZone;
 
 import org.apache.ibatis.BaseDataTest;
 import org.apache.ibatis.io.Resources;
@@ -52,6 +53,7 @@ void shouldSelectLocalTimeWithNanoseconds() {
 
   @Test
   void shouldInsertLocalTimeWithNanoseconds() {
+    TimeZone.setDefault(TimeZone.getTimeZone("GMT"));
     LocalTime t = LocalTime.of(11, 22, 33, 123456789);
     try (SqlSession sqlSession = sqlSessionFactory.openSession()) {
       Mapper mapper = sqlSession.getMapper(Mapper.class);

src/test/java/org/apache/ibatis/submitted/timestamp_with_timezone/TimestampWithTimezoneTypeHandlerTest.java

@@ -52,8 +52,7 @@ void shouldSelectOffsetDateTime() {
       Record record = mapper.selectById(1);
       assertEquals(OffsetDateTime.of(2018, 1, 2, 11, 22, 33, 123456000, ZoneOffset.ofHoursMinutes(1, 23)),
           record.getOdt());
-      // HSQLDB 2.4.1 truncates nano seconds.
-      assertEquals(OffsetTime.of(11, 22, 33, 0, ZoneOffset.ofHoursMinutes(1, 23)), record.getOt());
+      assertEquals(OffsetTime.of(11, 22, 33, 123456000, ZoneOffset.ofHoursMinutes(1, 23)), record.getOt());
     }
   }
 

src/test/java/org/apache/ibatis/submitted/timezone_edge_case/TimezoneEdgeCaseTest.java

@@ -63,7 +63,8 @@ void restoreTimeZone() {
 
   @Test
   void shouldSelectNonExistentLocalTimestampAsIs() {
-    TimeZone.setDefault(TimeZone.getTimeZone("America/Los_Angeles"));
+    // Newer hsqldb requires we use a bogus timezone as timezone now works
+    TimeZone.setDefault(TimeZone.getTimeZone("Bad/Zone"));
     try (SqlSession sqlSession = sqlSessionFactory.openSession()) {
       Mapper mapper = sqlSession.getMapper(Mapper.class);
       Record record = mapper.selectById(1);
@@ -73,7 +74,8 @@ void shouldSelectNonExistentLocalTimestampAsIs() {
 
   @Test
   void shouldInsertNonExistentLocalTimestampAsIs() throws Exception {
-    TimeZone.setDefault(TimeZone.getTimeZone("America/Los_Angeles"));
+    // Newer hsqldb requires we use a bogus timezone as timezone now works
+    TimeZone.setDefault(TimeZone.getTimeZone("Bad/Zone"));
     LocalDateTime localDateTime = LocalDateTime.of(LocalDate.of(2019, 3, 10), LocalTime.of(2, 30));
     try (SqlSession sqlSession = sqlSessionFactory.openSession()) {
       Mapper mapper = sqlSession.getMapper(Mapper.class);
@@ -93,7 +95,8 @@ void shouldInsertNonExistentLocalTimestampAsIs() throws Exception {
 
   @Test
   void shouldSelectNonExistentLocalDateAsIs() {
-    TimeZone.setDefault(TimeZone.getTimeZone("Pacific/Apia"));
+    // Newer hsqldb requires we use a bogus timezone as timezone now works
+    TimeZone.setDefault(TimeZone.getTimeZone("Bad/Zone"));
     try (SqlSession sqlSession = sqlSessionFactory.openSession()) {
       Mapper mapper = sqlSession.getMapper(Mapper.class);
       Record record = mapper.selectById(1);
@@ -103,7 +106,8 @@ void shouldSelectNonExistentLocalDateAsIs() {
 
   @Test
   void shouldInsertNonExistentLocalDateAsIs() throws Exception {
-    TimeZone.setDefault(TimeZone.getTimeZone("Pacific/Apia"));
+    // Newer hsqldb requires we use a bogus timezone as timezone now works
+    TimeZone.setDefault(TimeZone.getTimeZone("Bad/Zone"));
     LocalDate localDate = LocalDate.of(2011, 12, 30);
     try (SqlSession sqlSession = sqlSessionFactory.openSession()) {
       Mapper mapper = sqlSession.getMapper(Mapper.class);