From 2f648aea19e869f1528a1dbb5b3fdf2dca6b3e59 Mon Sep 17 00:00:00 2001
From: Dom Eori <4j6dq2zi8@relay.firefox.com>
Date: Wed, 18 Aug 2021 11:40:15 +0900
Subject: [PATCH] Update to Spring Boot 2.5

---
 pom.xml                                              | 12 ++++++------
 .../samnyan/aqua/spring/data/OffsetPageRequest.java  |  5 +++++
 src/main/resources/application.properties            |  2 +-
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/pom.xml b/pom.xml
index a3aebbaa..a2c28113 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.2.2.RELEASE</version>
+        <version>2.5.3</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
     <groupId>icu.samnya</groupId>
@@ -46,14 +46,14 @@
         <dependency>
             <groupId>io.netty</groupId>
             <artifactId>netty-all</artifactId>
-            <version>4.1.43.Final</version>
+            <version>4.1.66.Final</version>
         </dependency>
 
         <!-- https://mvnrepository.com/artifact/org.apache.commons/commons-lang3 -->
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
-            <version>3.9</version>
+            <version>3.12.0</version>
         </dependency>
 
         <!-- https://mvnrepository.com/artifact/commons-fileupload/commons-fileupload -->
@@ -66,18 +66,18 @@
         <dependency>
             <groupId>org.xerial</groupId>
             <artifactId>sqlite-jdbc</artifactId>
-            <version>3.30.1</version>
+            <version>3.36.0.1</version>
         </dependency>
         <dependency>
             <groupId>com.github.gwenn</groupId>
             <artifactId>sqlite-dialect</artifactId>
-            <version>0.1.0</version>
+            <version>0.1.2</version>
         </dependency>
 
         <dependency>
             <groupId>org.flywaydb</groupId>
             <artifactId>flyway-core</artifactId>
-            <version>6.1.4</version>
+            <version>7.7.3</version>
         </dependency>
         <dependency>
             <groupId>org.mariadb.jdbc</groupId>
diff --git a/src/main/java/icu/samnyan/aqua/spring/data/OffsetPageRequest.java b/src/main/java/icu/samnyan/aqua/spring/data/OffsetPageRequest.java
index ad34e317..6942fd0d 100644
--- a/src/main/java/icu/samnyan/aqua/spring/data/OffsetPageRequest.java
+++ b/src/main/java/icu/samnyan/aqua/spring/data/OffsetPageRequest.java
@@ -153,4 +153,9 @@ public class OffsetPageRequest implements Pageable, Serializable {
         return this.offset == other.offset && this.limit == other.limit;
     }
 
+    @Override
+    public Pageable withPage(int pageNumber) {
+        return new OffsetPageRequest(pageNumber, getPageSize(), getSort());
+    }
+
 }
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index b33b41a2..da62910b 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -27,7 +27,7 @@ spring.datasource.url=jdbc:sqlite:data/db.sqlite
 spring.datasource.hikari.maximum-pool-size=1
 #auto schema update will case sqlite error
 spring.jpa.hibernate.ddl-auto=none
-spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.SQLiteDialect
+spring.jpa.properties.hibernate.dialect=org.sqlite.hibernate.dialect.SQLiteDialect
 ########## For Mysql ##########
 #spring.datasource.driver-class-name=org.mariadb.jdbc.Driver
 #spring.datasource.username=