Migrate Hibernate 5 to 6 (#649) and fix missing placeholders.
Change-Id: I91bf666a9ad0418d89eb58f87124d1257da0169e
diff --git a/full/Changes b/full/Changes
index 129c931..fc6b2c9 100644
--- a/full/Changes
+++ b/full/Changes
@@ -4,7 +4,8 @@
- Upgrading Jersey 2.40 to 3.x (#646)
- Updated Spring 5.x to 6.x and jetty 9.x to 11.x (#645)
- Replaced javax.persistence with jakarta.persistence (#648)
-
+- Migrate Hibernate 5 to 6 (#649)
+- Fix missing placeholders
# version 0.71
diff --git a/full/pom.xml b/full/pom.xml
index 15fb79e..8ac1a0e 100644
--- a/full/pom.xml
+++ b/full/pom.xml
@@ -8,7 +8,8 @@
<java.version>17</java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<jersey.version>3.0.11</jersey.version>
- <hibernate.version>5.6.15.Final</hibernate.version>
+ <hibernate.ehcache.version>6.0.0.Alpha7</hibernate.ehcache.version>
+ <hibernate.version>6.1.7.Final</hibernate.version>
<spring.version>6.0.11</spring.version>
<jetty.version>11.0.15</jetty.version>
<flyway.version>9.21.1</flyway.version>
@@ -158,6 +159,7 @@
<include>**/*.info</include>
<include>**/*.json</include>
<include>**/*.ldif</include>
+ <include>**/*.properties</include>
</includes>
</testResource>
</testResources>
@@ -599,43 +601,42 @@
<!-- Hibernate -->
<dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-ehcache</artifactId>
+ <groupId>org.hibernate.orm</groupId>
+ <artifactId>hibernate-core</artifactId>
<version>${hibernate.version}</version>
</dependency>
<dependency>
- <groupId>org.hibernate</groupId>
+ <groupId>org.hibernate.orm</groupId>
<artifactId>hibernate-jpamodelgen</artifactId>
<version>${hibernate.version}</version>
- <scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-entitymanager</artifactId>
- <version>${hibernate.version}</version>
+ <groupId>org.hibernate.orm</groupId>
+ <artifactId>hibernate-ehcache</artifactId>
+ <version>${hibernate.ehcache.version}</version>
<exclusions>
<exclusion>
- <groupId>org.javassist</groupId>
- <artifactId>javassist</artifactId>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-core</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-java8</artifactId>
- <version>${hibernate.version}</version>
- </dependency>
- <dependency>
- <groupId>org.hibernate</groupId>
+ <groupId>org.hibernate.orm</groupId>
<artifactId>hibernate-c3p0</artifactId>
<version>${hibernate.version}</version>
</dependency>
<!-- Sqlite -->
- <dependency>
+ <!--<dependency>
<groupId>com.github.gwenn</groupId>
<artifactId>sqlite-dialect</artifactId>
<version>0.1.0</version>
+ </dependency>-->
+ <dependency>
+ <groupId>org.hibernate.orm</groupId>
+ <artifactId>hibernate-community-dialects</artifactId>
+ <version>${hibernate.version}</version>
</dependency>
<dependency>
@@ -744,10 +745,16 @@
</dependency>
<dependency>
+ <groupId>jakarta.activation</groupId>
+ <artifactId>jakarta.activation-api</artifactId>
+ <version>2.1.2</version>
+ </dependency>
+
+ <!--<dependency>
<groupId>javax.activation</groupId>
<artifactId>activation</artifactId>
<version>1.1.1</version>
- </dependency>
+ </dependency>-->
<!-- OAuth -->
<dependency>
diff --git a/full/src/main/resources/properties/hibernate.properties b/full/src/main/resources/properties/hibernate.properties
index 23979b2..e394a88 100644
--- a/full/src/main/resources/properties/hibernate.properties
+++ b/full/src/main/resources/properties/hibernate.properties
@@ -1,4 +1,4 @@
-hibernate.dialect=org.hibernate.dialect.SQLiteDialect
+hibernate.dialect=org.hibernate.community.dialect.SQLiteDialect
hibernate.hbm2ddl.auto=none
hibernate.show_sql=false
hibernate.cache.use_query_cache=false
diff --git a/full/src/test/resources/test-hibernate.properties b/full/src/test/resources/test-hibernate.properties
index 23979b2..e394a88 100644
--- a/full/src/test/resources/test-hibernate.properties
+++ b/full/src/test/resources/test-hibernate.properties
@@ -1,4 +1,4 @@
-hibernate.dialect=org.hibernate.dialect.SQLiteDialect
+hibernate.dialect=org.hibernate.community.dialect.SQLiteDialect
hibernate.hbm2ddl.auto=none
hibernate.show_sql=false
hibernate.cache.use_query_cache=false