This is an automated email from the ASF dual-hosted git repository. rzo1 pushed a commit to branch jpa3.2 in repository https://gitbox.apache.org/repos/asf/tomee-jakartaee-api.git
commit 78943bd2e44312f11efb837a4790f73aae502ff1 Author: Richard Zowalla <[email protected]> AuthorDate: Tue Jul 15 21:17:51 2025 +0200 Replace JPA 3.1 with JPA 3.2 to allow end users to use Hibernate 7.x --- api/pom.xml | 6 ++++-- pom.xml | 2 +- tck/pom.xml | 29 +++++++++++++++-------------- 3 files changed, 20 insertions(+), 17 deletions(-) diff --git a/api/pom.xml b/api/pom.xml index 198ad6f..8a3b8eb 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -27,7 +27,7 @@ <artifactId>jakartaee-api</artifactId> - <name>Apache TomEE :: Jakarta EE 10 Full API</name> + <name>Apache TomEE :: Jakarta EE 10 (with JPA 3.2) Full API</name> <properties> <geronimo-j2ee-connector_1.6_spec.version>1.0</geronimo-j2ee-connector_1.6_spec.version> @@ -52,7 +52,9 @@ <jakarta.interceptor-api.version>2.1.0</jakarta.interceptor-api.version> <jakarta.json-api.version>2.1.1</jakarta.json-api.version> <jakarta.json.bind-api.version>3.0.0</jakarta.json.bind-api.version> - <jakarta.persistence-api.version>3.1.0</jakarta.persistence-api.version> + + <!-- Override this on purpose to allow end users to use Hibernate 7 - should be JPA 3.1 for EE10 --> + <jakarta.persistence-api.version>3.2.0</jakarta.persistence-api.version> <jakarta.security.enterprise-api.version>3.0.0</jakarta.security.enterprise-api.version> <jakarta.servlet-api.version>6.0.0</jakarta.servlet-api.version> <jakarta.servlet.jsp-api.version>3.1.0</jakarta.servlet.jsp-api.version> diff --git a/pom.xml b/pom.xml index 0fb3bcc..cefdf1b 100644 --- a/pom.xml +++ b/pom.xml @@ -31,7 +31,7 @@ <version>10.1-SNAPSHOT</version> <packaging>pom</packaging> - <name>Apache TomEE :: Jakarta EE 10 Full API :: Parent</name> + <name>Apache TomEE :: Jakarta EE 10 (with JPA 3.2) Full API :: Parent</name> <modules> <module>api</module> diff --git a/tck/pom.xml b/tck/pom.xml index a336e40..e4c3cd3 100644 --- a/tck/pom.xml +++ b/tck/pom.xml @@ -28,7 +28,7 @@ <version>10.1-SNAPSHOT</version> <packaging>pom</packaging> - <name>Apache TomEE :: Jakarta EE 10 Full API :: Signature Tests</name> + <name>Apache TomEE :: Jakarta EE 10 (with JPA 3.2) Full API :: Signature Tests</name> <properties> <tck.file>jakarta-jakartaeetck-10.0.6.zip</tck.file> @@ -292,19 +292,20 @@ <!-- <packages>jakarta.mail.**</packages>--> <!-- </configuration>--> <!-- </execution>--> - <execution> - <id>check-jakarta-persistence</id> - <goals> - <goal>check</goal> - </goals> - <configuration> - <ignoreJDKClass>true</ignoreJDKClass> - <sigfile>${project.build.directory}/jakartaeetck/src/com/sun/ts/tests/signaturetest/signature-repository/jakarta.persistence.sig</sigfile> - <action>strictcheck</action> - <failOnError>true</failOnError> - <packages>jakarta.persistence.**</packages> - </configuration> - </execution> + <!-- This is overridden with JPA 3.2 for Hibernate 7.x compatibility on purpose, so do not check it. --> +<!-- <execution>--> +<!-- <id>check-jakarta-persistence</id>--> +<!-- <goals>--> +<!-- <goal>check</goal>--> +<!-- </goals>--> +<!-- <configuration>--> +<!-- <ignoreJDKClass>true</ignoreJDKClass>--> +<!-- <sigfile>${project.build.directory}/jakartaeetck/src/com/sun/ts/tests/signaturetest/signature-repository/jakarta.persistence.sig</sigfile>--> +<!-- <action>strictcheck</action>--> +<!-- <failOnError>true</failOnError>--> +<!-- <packages>jakarta.persistence.**</packages>--> +<!-- </configuration>--> +<!-- </execution>--> <execution> <id>check-jakarta-resource</id> <goals>
