This is an automated email from the ASF dual-hosted git repository. rzo1 pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/tomee.git
commit aa7be4cb08b8e94d4a41596b1e8e4626eb7317f8 Author: Richard Zowalla <[email protected]> AuthorDate: Thu Mar 24 09:40:44 2022 +0100 TOMEE-3866 - Upgrade Hibernate to 5.6.7 / Hibernate Validator to 7.0.2 (Jakarta Artifact) --- .../classic/ReloadableEntityManagerFactory.java | 20 +++++++++--------- container/openejb-jpa-integration/pom.xml | 14 ++++++++++++- pom.xml | 22 +++++++++++++++----- utils/openejb-core-hibernate/pom.xml | 24 ++++++++++++++-------- 4 files changed, 56 insertions(+), 24 deletions(-) diff --git a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ReloadableEntityManagerFactory.java b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ReloadableEntityManagerFactory.java index 1030120..dbf809b 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ReloadableEntityManagerFactory.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ReloadableEntityManagerFactory.java @@ -77,9 +77,9 @@ import static org.apache.openejb.monitoring.LocalMBeanServer.tabularData; public class ReloadableEntityManagerFactory implements EntityManagerFactory, Serializable { private static final Logger LOGGER = Logger.getInstance(LogCategory.OPENEJB, ReloadableEntityManagerFactory.class); - public static final String JAVAX_PERSISTENCE_SHARED_CACHE_MODE = "jakarta.persistence.sharedCache.mode"; - public static final String JAVAX_PERSISTENCE_VALIDATION_MODE = "jakarta.persistence.validation.mode"; - public static final String JAVAX_PERSISTENCE_TRANSACTION_TYPE = "jakarta.persistence.transactionType"; + public static final String JAKARTA_PERSISTENCE_SHARED_CACHE_MODE = "jakarta.persistence.sharedCache.mode"; + public static final String JAKARTA_PERSISTENCE_VALIDATION_MODE = "jakarta.persistence.validation.mode"; + public static final String JAKARTA_PERSISTENCE_TRANSACTION_TYPE = "jakarta.persistence.transactionType"; public static final String OPENEJB_JPA_CRITERIA_LOG_JPQL = "openejb.jpa.criteria.log.jpql"; public static final String OPENEJB_JPA_CRITERIA_LOG_JPQL_LEVEL = "openejb.jpa.criteria.log.jpql.level"; @@ -350,8 +350,8 @@ public class ReloadableEntityManagerFactory implements EntityManagerFactory, Ser info.setSharedCacheMode(mode); final Properties properties = entityManagerFactoryCallable.getUnitInfo().getProperties(); - if (properties.containsKey(JAVAX_PERSISTENCE_SHARED_CACHE_MODE)) { - properties.setProperty(JAVAX_PERSISTENCE_SHARED_CACHE_MODE, mode.name()); + if (properties.containsKey(JAKARTA_PERSISTENCE_SHARED_CACHE_MODE)) { + properties.setProperty(JAKARTA_PERSISTENCE_SHARED_CACHE_MODE, mode.name()); } } @@ -360,8 +360,8 @@ public class ReloadableEntityManagerFactory implements EntityManagerFactory, Ser info.setValidationMode(mode); final Properties properties = entityManagerFactoryCallable.getUnitInfo().getProperties(); - if (properties.containsKey(JAVAX_PERSISTENCE_VALIDATION_MODE)) { - properties.setProperty(JAVAX_PERSISTENCE_VALIDATION_MODE, mode.name()); + if (properties.containsKey(JAKARTA_PERSISTENCE_VALIDATION_MODE)) { + properties.setProperty(JAKARTA_PERSISTENCE_VALIDATION_MODE, mode.name()); } } @@ -399,8 +399,8 @@ public class ReloadableEntityManagerFactory implements EntityManagerFactory, Ser info.setTransactionType(type); final Properties properties = entityManagerFactoryCallable.getUnitInfo().getProperties(); - if (properties.containsKey(JAVAX_PERSISTENCE_TRANSACTION_TYPE)) { - properties.setProperty(JAVAX_PERSISTENCE_TRANSACTION_TYPE, type.name()); + if (properties.containsKey(JAKARTA_PERSISTENCE_TRANSACTION_TYPE)) { + properties.setProperty(JAKARTA_PERSISTENCE_TRANSACTION_TYPE, type.name()); } } @@ -602,7 +602,7 @@ public class ReloadableEntityManagerFactory implements EntityManagerFactory, Ser reloadableEntityManagerFactory.setValidationMode(mode); } catch (final Exception iae) { LOGGER.warning("Can't set validation mode " + value, iae); - reloadableEntityManagerFactory.setProperty(JAVAX_PERSISTENCE_VALIDATION_MODE, value); + reloadableEntityManagerFactory.setProperty(JAKARTA_PERSISTENCE_VALIDATION_MODE, value); } } diff --git a/container/openejb-jpa-integration/pom.xml b/container/openejb-jpa-integration/pom.xml index b9d0bda..4bccb65 100644 --- a/container/openejb-jpa-integration/pom.xml +++ b/container/openejb-jpa-integration/pom.xml @@ -40,9 +40,21 @@ </dependency> <dependency> <groupId>org.hibernate</groupId> - <artifactId>hibernate-entitymanager</artifactId> + <artifactId>hibernate-core-jakarta</artifactId> <exclusions> <exclusion> + <groupId>jakarta.persistence</groupId> + <artifactId>jakarta.persistence-api</artifactId> + </exclusion> + <exclusion> + <groupId>jakarta.transaction</groupId> + <artifactId>jakarta.transaction-api</artifactId> + </exclusion> + <exclusion> + <groupId>jakarta.activation</groupId> + <artifactId>jakarta.activation-api</artifactId> + </exclusion> + <exclusion> <artifactId>jboss-logging</artifactId> <groupId>org.jboss.logging</groupId> </exclusion> diff --git a/pom.xml b/pom.xml index 30c4375..9ec3932 100644 --- a/pom.xml +++ b/pom.xml @@ -213,7 +213,7 @@ <version.hsqldb>2.3.4</version.hsqldb> <version.axiom>1.3.0</version.axiom> <version.xalan>2.7.2</version.xalan> - <version.hibernate>5.4.10.Final</version.hibernate> + <version.hibernate>5.6.7.Final</version.hibernate> <version.eclipselink>3.0.2</version.eclipselink> <version.groovy>2.4.12</version.groovy> <version.ecj>4.6.1</version.ecj> @@ -1884,23 +1884,35 @@ </dependency> <dependency> <groupId>org.hibernate</groupId> - <artifactId>hibernate-entitymanager</artifactId> + <artifactId>hibernate-core-jakarta</artifactId> <version>${version.hibernate}</version> <exclusions> <exclusion> + <groupId>jakarta.persistence</groupId> + <artifactId>jakarta.persistence-api</artifactId> + </exclusion> + <exclusion> + <groupId>jakarta.transaction</groupId> + <artifactId>jakarta.transaction-api</artifactId> + </exclusion> + <exclusion> + <groupId>jakarta.activation</groupId> + <artifactId>jakarta.activation-api</artifactId> + </exclusion> + <exclusion> <artifactId>jboss-logging</artifactId> <groupId>org.jboss.logging</groupId> </exclusion> </exclusions> </dependency> <dependency> - <groupId>org.hibernate</groupId> + <groupId>org.hibernate.validator</groupId> <artifactId>hibernate-validator</artifactId> - <version>5.1.3.Final</version> + <version>7.0.4.Final</version> <exclusions> <exclusion> <groupId>jakarta.validation</groupId> - <artifactId>validation-api</artifactId> + <artifactId>jakarta.validation-api</artifactId> </exclusion> <exclusion> <artifactId>jboss-logging</artifactId> diff --git a/utils/openejb-core-hibernate/pom.xml b/utils/openejb-core-hibernate/pom.xml index cd8847d..9b743f4 100644 --- a/utils/openejb-core-hibernate/pom.xml +++ b/utils/openejb-core-hibernate/pom.xml @@ -47,15 +47,19 @@ </dependency> <dependency> <groupId>org.hibernate</groupId> - <artifactId>hibernate-entitymanager</artifactId> + <artifactId>hibernate-core-jakarta</artifactId> <exclusions> <exclusion> - <groupId>org.hibernate.jakarta.persistence</groupId> - <artifactId>hibernate-jpa-2.0-api</artifactId> + <groupId>jakarta.persistence</groupId> + <artifactId>jakarta.persistence-api</artifactId> </exclusion> <exclusion> - <groupId>org.jboss.spec.jakarta.transaction</groupId> - <artifactId>jboss-transaction-api_1.1_spec</artifactId> + <groupId>jakarta.transaction</groupId> + <artifactId>jakarta.transaction-api</artifactId> + </exclusion> + <exclusion> + <groupId>jakarta.activation</groupId> + <artifactId>jakarta.activation-api</artifactId> </exclusion> <exclusion> <artifactId>jboss-logging</artifactId> @@ -64,12 +68,12 @@ </exclusions> </dependency> <dependency> - <groupId>org.hibernate</groupId> + <groupId>org.hibernate.validator</groupId> <artifactId>hibernate-validator</artifactId> <exclusions> <exclusion> <groupId>jakarta.validation</groupId> - <artifactId>validation-api</artifactId> + <artifactId>jakarta.validation-api</artifactId> </exclusion> <exclusion> <artifactId>jboss-logging</artifactId> @@ -83,8 +87,12 @@ <version>${version.hibernate}</version> <exclusions> <exclusion> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-core</artifactId> + </exclusion> + <exclusion> <groupId>net.sf.ehcache</groupId> - <artifactId>ehcache-core</artifactId> + <artifactId>ehcache</artifactId> </exclusion> </exclusions> </dependency>
