Skip to content

Commit 3de4771

Browse files
committed
WIP: bumped spring, hibernate and hypersistence to fix tests
1 parent 6bee6e9 commit 3de4771

File tree

4 files changed

+23
-11
lines changed

4 files changed

+23
-11
lines changed

pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
<java.version>17</java.version>
2424
<maven.compiler.target>17</maven.compiler.target>
2525
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
26-
<spring-boot.version>3.4.1</spring-boot.version>
27-
<spring-data-releasetrain.version>2024.1.1</spring-data-releasetrain.version>
26+
<spring-boot.version>4.0.0</spring-boot.version>
27+
<spring-data-releasetrain.version>2025.1.0</spring-data-releasetrain.version>
2828
<querydsl.version>4.1.4</querydsl.version>
2929
<rsql-parser.version>2.3.3</rsql-parser.version>
3030
<lombok.version>1.18.24</lombok.version>

rsql-common/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@
3434
</dependency>
3535
<dependency>
3636
<groupId>io.hypersistence</groupId>
37-
<artifactId>hypersistence-utils-hibernate-63</artifactId>
38-
<version>3.9.0</version>
37+
<artifactId>hypersistence-utils-hibernate-71</artifactId>
38+
<version>3.12.0</version>
3939
<scope>test</scope>
4040
</dependency>
4141
<dependency>

rsql-jpa-spring-boot-starter/src/main/java/io/github/perplexhub/rsql/RSQLJPAAutoConfiguration.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@
1212
import java.util.Optional;
1313
import lombok.extern.slf4j.Slf4j;
1414
import org.hibernate.Session;
15-
import org.hibernate.dialect.AbstractHANADialect;
1615
import org.hibernate.dialect.CockroachDialect;
1716
import org.hibernate.dialect.DB2Dialect;
18-
import org.hibernate.dialect.DerbyDialect;
17+
// import org.hibernate.dialect.DerbyDialect;
1918
import org.hibernate.dialect.Dialect;
2019
import org.hibernate.dialect.H2Dialect;
20+
import org.hibernate.dialect.HANADialect;
2121
import org.hibernate.dialect.HSQLDialect;
2222
import org.hibernate.dialect.MySQLDialect;
2323
import org.hibernate.dialect.OracleDialect;
@@ -80,13 +80,13 @@ private Database toDatabase(Dialect dialect) {
8080
return Database.SQL_SERVER;
8181
} else if (dialect instanceof OracleDialect) {
8282
return Database.ORACLE;
83-
} else if (dialect instanceof DerbyDialect) {
84-
return Database.DERBY;
83+
// } else if (dialect instanceof DerbyDialect) {
84+
// return Database.DERBY;
8585
} else if (dialect instanceof DB2Dialect) {
8686
return Database.DB2;
8787
} else if (dialect instanceof H2Dialect) {
8888
return Database.H2;
89-
} else if (dialect instanceof AbstractHANADialect) {
89+
} else if (dialect instanceof HANADialect) {
9090
return Database.HANA;
9191
} else if (dialect instanceof HSQLDialect) {
9292
return Database.HSQL;

rsql-jpa/pom.xml

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,12 @@
2929
<dependency>
3030
<groupId>org.springframework.boot</groupId>
3131
<artifactId>spring-boot-starter-web</artifactId>
32+
<exclusions>
33+
<exclusion>
34+
<groupId>org.springframework.boot</groupId>
35+
<artifactId>spring-boot-jackson</artifactId>
36+
</exclusion>
37+
</exclusions>
3238
<scope>test</scope>
3339
</dependency>
3440
<dependency>
@@ -54,8 +60,14 @@
5460
</dependency>
5561
<dependency>
5662
<groupId>io.hypersistence</groupId>
57-
<artifactId>hypersistence-utils-hibernate-63</artifactId>
58-
<version>3.9.0</version>
63+
<artifactId>hypersistence-utils-hibernate-71</artifactId>
64+
<version>3.12.0</version>
65+
<scope>test</scope>
66+
</dependency>
67+
<!-- required by hypersistence, since they don't support jackson 3 -->
68+
<dependency>
69+
<groupId>org.springframework.boot</groupId>
70+
<artifactId>spring-boot-jackson2</artifactId>
5971
<scope>test</scope>
6072
</dependency>
6173
<dependency>

0 commit comments

Comments
 (0)