Skip to content

Commit 63a79d3

Browse files
authored
Merge pull request #904 from playframework/update/main/hibernate-core-7.0.5.Final
hibernate-core 7.0.5.Final (was 6.6.20.Final)
2 parents fdae22a + c8a8839 commit 63a79d3

File tree

6 files changed

+26
-10
lines changed

6 files changed

+26
-10
lines changed

java/jpa/build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ lazy val root = (project in file("."))
1212
guice,
1313
javaJpa,
1414
"com.h2database" % "h2" % "2.2.224",
15-
"org.hibernate" % "hibernate-core" % "6.6.20.Final",
15+
"org.hibernate.orm" % "hibernate-core" % "7.3.0.Final",
1616
javaWs % "test",
1717
"org.awaitility" % "awaitility" % "4.2.2" % "test",
1818
"org.assertj" % "assertj-core" % "3.26.3" % "test",

java/jpa/conf/META-INF/persistence.xml

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,19 @@
11
<persistence xmlns="https://jakarta.ee/xml/ns/persistence"
22
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3-
xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd"
4-
version="3.0">
3+
xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence https://jakarta.ee/xml/ns/persistence/persistence_3_2.xsd"
4+
version="3.2">
55

66
<persistence-unit name="defaultPersistenceUnit" transaction-type="RESOURCE_LOCAL">
77
<provider>org.hibernate.jpa.HibernatePersistenceProvider</provider>
88
<non-jta-data-source>DefaultDS</non-jta-data-source>
9+
<validation-mode>NONE</validation-mode>
10+
<!--
11+
Hibernate ORM 7 no longer performs the old automatic entity discovery by default.
12+
Listing entities explicitly keeps this sample self-contained.
13+
As an alternative, add org.hibernate.orm:hibernate-scan-jandex to your project dependencies
14+
and use Jandex-based scanning.
15+
-->
16+
<class>models.Person</class>
917
<jar-file>build/classes/scala/main</jar-file>
1018
<properties>
1119
<property name="hibernate.hbm2ddl.auto" value="update"/>

java/jpa/gradle/libs.versions.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ twirl = "2.1.0-M9"
33
play = "3.1.0-M7"
44
node = "7.1.0"
55
h2 = "2.3.232"
6-
hibernate = "6.6.45.Final"
6+
hibernate = "7.3.0.Final"
77
junit = "4.13.2"
88
assertj = "3.27.7"
99
awaitility = "4.3.0"
@@ -15,7 +15,7 @@ junit = { group = "junit", name = "junit", version.ref = "junit" }
1515
assertj = { group = "org.assertj", name = "assertj-core", version.ref = "assertj" }
1616
awaitility = { group = "org.awaitility", name = "awaitility", version.ref = "awaitility" }
1717
mockito = { group = "org.mockito", name = "mockito-core", version.ref = "mockito" }
18-
hibernate-core = { group = "org.hibernate", name = "hibernate-core", version.ref = "hibernate" }
18+
hibernate-core = { group = "org.hibernate.orm", name = "hibernate-core", version.ref = "hibernate" }
1919

2020
[plugins]
2121
twirl = { id = "org.playframework.twirl", version.ref = "twirl" }

java/rest-api/build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ lazy val root = (project in file("."))
1515
guice,
1616
javaJpa,
1717
"com.h2database" % "h2" % "2.2.224",
18-
"org.hibernate" % "hibernate-core" % "6.6.20.Final",
18+
"org.hibernate.orm" % "hibernate-core" % "7.3.0.Final",
1919
"io.dropwizard.metrics" % "metrics-core" % "4.2.25",
2020
"com.palominolabs.http" % "url-builder" % "1.1.5",
2121
"net.jodah" % "failsafe" % "2.4.4",

java/rest-api/conf/META-INF/persistence.xml

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,19 @@
11
<persistence xmlns="https://jakarta.ee/xml/ns/persistence"
22
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3-
xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd"
4-
version="3.0">
3+
xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence https://jakarta.ee/xml/ns/persistence/persistence_3_2.xsd"
4+
version="3.2">
55

66
<persistence-unit name="defaultPersistenceUnit" transaction-type="RESOURCE_LOCAL">
77
<provider>org.hibernate.jpa.HibernatePersistenceProvider</provider>
88
<non-jta-data-source>DefaultDS</non-jta-data-source>
9+
<validation-mode>NONE</validation-mode>
10+
<!--
11+
Hibernate ORM 7 no longer performs the old automatic entity discovery by default.
12+
Listing entities explicitly keeps this sample self-contained.
13+
As an alternative, add org.hibernate.orm:hibernate-scan-jandex to your project dependencies
14+
and use Jandex-based scanning.
15+
-->
16+
<class>v1.post.PostData</class>
917
<!--
1018
Gradle workaround to use Play with JPA
1119
https://www.playframework.com/documentation/latest/JavaJPA#Deploying-Play-with-JPA

java/rest-api/gradle/libs.versions.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ play = "3.1.0-M7"
44
failsafe = "2.4.4"
55
url-builder = "1.1.5"
66
h2 = "2.3.232"
7-
hibernate = "6.6.45.Final"
7+
hibernate = "7.3.0.Final"
88
metrics = "4.2.38"
99
junit = "4.13.2"
1010
scalatestplus-play = "8.0.0-M2"
@@ -13,7 +13,7 @@ scalatestplus-play = "8.0.0-M2"
1313
failsafe = { group = "net.jodah", name = "failsafe", version.ref = "failsafe" }
1414
url-builder = { group = "com.palominolabs.http", name = "url-builder", version.ref = "url-builder" }
1515
h2 = { group = "com.h2database", name = "h2", version.ref = "h2" }
16-
hibernate-core = { group = "org.hibernate", name = "hibernate-core", version.ref = "hibernate" }
16+
hibernate-core = { group = "org.hibernate.orm", name = "hibernate-core", version.ref = "hibernate" }
1717
metrics-core = { group = "io.dropwizard.metrics", name = "metrics-core", version.ref = "metrics" }
1818
junit = { group = "junit", name = "junit", version.ref = "junit" }
1919
scalatestplus-play = { group = "org.scalatestplus.play", name = "scalatestplus-play_2.13", version.ref = "scalatestplus-play" }

0 commit comments

Comments
 (0)