Permalink
Browse files

Fixes after JPA 2.0 to 2.1 upgrade

1 parent 306167a commit b576a3e1228a29b43ae4bbd97c4fce42d3d72e27 @psiroky psiroky committed with psiroky Jun 9, 2016
Showing with 202 additions and 388 deletions.
  1. +1 −1 jbpm-audit/pom.xml
  2. +6 −8 jbpm-audit/src/test/filtered-resources/META-INF/persistence.xml
  3. +3 −4 jbpm-audit/src/test/java/org/jbpm/test/util/AbstractBaseTest.java
  4. +1 −1 jbpm-bpmn2/pom.xml
  5. +4 −6 jbpm-bpmn2/src/test/filtered-resources/META-INF/persistence.xml
  6. +1 −1 jbpm-container-test/jbpm-in-container-test/jbpm-container-test-suite/pom.xml
  7. +5 −5 jbpm-container-test/jbpm-in-container-test/shrinkwrap-war-profiles/pom.xml
  8. +1 −1 jbpm-container-test/jbpm-remote-ejb-test/jbpm-remote-ejb-test-suite/pom.xml
  9. +5 −8 jbpm-examples/src/main/resources/META-INF/persistence.xml
  10. +5 −7 jbpm-human-task/jbpm-human-task-audit/src/test/resources/META-INF/persistence.xml
  11. +1 −1 jbpm-human-task/jbpm-human-task-core/pom.xml
  12. +5 −7 jbpm-human-task/jbpm-human-task-core/src/test/filtered-resources/META-INF/persistence.xml
  13. +1 −1 jbpm-human-task/jbpm-human-task-jpa/pom.xml
  14. +5 −7 jbpm-human-task/jbpm-human-task-jpa/src/test/resources/META-INF/persistence.xml
  15. +7 −1 jbpm-human-task/jbpm-human-task-workitems/pom.xml
  16. +5 −7 jbpm-human-task/jbpm-human-task-workitems/src/test/resources/META-INF/persistence.xml
  17. +5 −164 jbpm-installer/pom.xml
  18. +5 −6 jbpm-installer/src/main/resources/db/jbpm-persistence-JPA2.xml
  19. +7 −8 jbpm-installer/src/test/filtered-resources/META-INF/persistence.xml
  20. +1 −1 jbpm-persistence-jpa/pom.xml
  21. +20 −21 jbpm-persistence-jpa/src/main/resources/META-INF/JBPMorm.xml
  22. +6 −7 jbpm-persistence-jpa/src/test/filtered-resources/META-INF/persistence.xml
  23. +1 −1 jbpm-query-jpa/pom.xml
  24. +3 −3 jbpm-query-jpa/src/test/java/org/jbpm/query/QueryBuilderCoverageTestUtil.java
  25. +5 −6 jbpm-runtime-manager/src/test/filtered-resources/META-INF/persistence.xml
  26. +1 −1 jbpm-services/jbpm-executor-cdi/pom.xml
  27. +7 −9 jbpm-services/jbpm-executor-cdi/src/test/filtered-resources/META-INF/persistence.xml
  28. +1 −1 jbpm-services/jbpm-executor/pom.xml
  29. +7 −7 jbpm-services/jbpm-executor/src/main/resources/META-INF/Executor-orm.xml
  30. +7 −9 jbpm-services/jbpm-executor/src/test/filtered-resources/META-INF/persistence.xml
  31. +1 −1 jbpm-services/jbpm-kie-services/pom.xml
  32. +4 −6 jbpm-services/jbpm-kie-services/src/test/resources/META-INF/persistence.xml
  33. +4 −6 jbpm-services/jbpm-services-cdi/src/test/resources/META-INF/persistence.xml
  34. +1 −1 jbpm-services/jbpm-services-ejb/jbpm-executor-ejb/pom.xml
  35. +5 −7 jbpm-services/jbpm-services-ejb/jbpm-executor-ejb/src/test/resources/META-INF/persistence.xml
  36. +4 −6 jbpm-services/jbpm-services-ejb/jbpm-services-ejb-impl/src/test/resources/META-INF/persistence.xml
  37. +4 −6 jbpm-services/jbpm-services-ejb/jbpm-services-ejb-timer/src/test/resources/META-INF/persistence.xml
  38. +1 −1 jbpm-services/jbpm-shared-services/pom.xml
  39. +7 −7 jbpm-test-coverage/src/test/filtered-resources/META-INF/persistence.xml
  40. +1 −1 jbpm-test/pom.xml
  41. +2 −2 jbpm-test/src/main/resources/META-INF/persistence.xml
  42. +5 −5 jbpm-test/src/test/filtered-resources/META-INF/persistence.xml
  43. +24 −23 jbpm-workitems/pom.xml
  44. +7 −6 jbpm-workitems/src/test/resources/META-INF/persistence.xml
View
@@ -40,7 +40,7 @@
</dependency>
<dependency>
<groupId>org.hibernate.javax.persistence</groupId>
- <artifactId>hibernate-jpa-2.0-api</artifactId>
+ <artifactId>hibernate-jpa-2.1-api</artifactId>
</dependency>
<dependency>
<groupId>org.kie</groupId>
@@ -1,13 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
-<persistence version="2.0"
- xmlns="http://java.sun.com/xml/ns/persistence"
- xmlns:orm="http://java.sun.com/xml/ns/persistence/orm"
+<persistence version="2.1"
+ xmlns="http://xmlns.jcp.org/xml/ns/persistence"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd
- http://java.sun.com/xml/ns/persistence/orm http://java.sun.com/xml/ns/persistence/orm_2_0.xsd">
+ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/persistence http://xmlns.jcp.org/xml/ns/persistence/persistence_2_1.xsd">
<persistence-unit name="org.jbpm.persistence.jpa" transaction-type="JTA">
- <provider>org.hibernate.ejb.HibernatePersistence</provider>
+ <provider>org.hibernate.jpa.HibernatePersistenceProvider</provider>
<jta-data-source>jdbc/testDS1</jta-data-source>
<mapping-file>META-INF/JBPMorm.xml</mapping-file>
@@ -41,7 +39,7 @@
</persistence-unit>
<persistence-unit name="org.jbpm.logging.jta" transaction-type="JTA">
- <provider>org.hibernate.ejb.HibernatePersistence</provider>
+ <provider>org.hibernate.jpa.HibernatePersistenceProvider</provider>
<class>org.jbpm.process.audit.ProcessInstanceLog</class>
<class>org.jbpm.process.audit.NodeInstanceLog</class>
@@ -66,7 +64,7 @@
</persistence-unit>
<persistence-unit name="org.jbpm.logging.local" transaction-type="RESOURCE_LOCAL">
- <provider>org.hibernate.ejb.HibernatePersistence</provider>
+ <provider>org.hibernate.jpa.HibernatePersistenceProvider</provider>
<class>org.jbpm.process.audit.ProcessInstanceLog</class>
<class>org.jbpm.process.audit.NodeInstanceLog</class>
@@ -16,9 +16,8 @@
package org.jbpm.test.util;
import java.lang.reflect.Field;
+import java.sql.DatabaseMetaData;
-import org.hibernate.internal.CoreMessageLogger;
-import org.hibernate.tool.hbm2ddl.DatabaseMetadata;
import org.jbpm.process.instance.impl.util.LoggingPrintStream;
import org.junit.AfterClass;
import org.junit.BeforeClass;
@@ -32,7 +31,7 @@
@BeforeClass
public static void configure() {
LoggingPrintStream.interceptSysOutSysErr();
- Logger logger = LoggerFactory.getLogger(DatabaseMetadata.class);
+ Logger logger = LoggerFactory.getLogger(DatabaseMetaData.class);
}
public static void hackTheDatabaseMetadataLoggerBecauseTheresALogbackXmlInTheClasspath() {
@@ -43,7 +42,7 @@ public static void hackTheDatabaseMetadataLoggerBecauseTheresALogbackXmlInTheCla
Field loggerField;
Class objClass = null;
if( loggerObj == null ) {
- objClass = DatabaseMetadata.class;
+ objClass = DatabaseMetaData.class;
} else {
objClass = loggerObj.getClass();
}
View
@@ -92,7 +92,7 @@
</dependency>
<dependency>
<groupId>org.hibernate.javax.persistence</groupId>
- <artifactId>hibernate-jpa-2.0-api</artifactId>
+ <artifactId>hibernate-jpa-2.1-api</artifactId>
<scope>test</scope>
</dependency>
<dependency>
@@ -1,13 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
-<persistence version="2.0"
- xmlns="http://java.sun.com/xml/ns/persistence"
- xmlns:orm="http://java.sun.com/xml/ns/persistence/orm"
+<persistence version="2.1"
+ xmlns="http://xmlns.jcp.org/xml/ns/persistence"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd
- http://java.sun.com/xml/ns/persistence/orm http://java.sun.com/xml/ns/persistence/orm_2_0.xsd">
+ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/persistence http://xmlns.jcp.org/xml/ns/persistence/persistence_2_1.xsd">
<persistence-unit name="org.jbpm.persistence.jpa" transaction-type="JTA">
- <provider>org.hibernate.ejb.HibernatePersistence</provider>
+ <provider>org.hibernate.jpa.HibernatePersistenceProvider</provider>
<jta-data-source>jdbc/testDS1</jta-data-source>
<mapping-file>META-INF/JBPMorm.xml</mapping-file>
@@ -182,7 +182,7 @@
<dependency>
<groupId>org.hibernate.javax.persistence</groupId>
- <artifactId>hibernate-jpa-2.0-api</artifactId>
+ <artifactId>hibernate-jpa-2.1-api</artifactId>
<scope>test</scope>
</dependency>
<dependency>
@@ -58,7 +58,7 @@
<!-- conflicts with Hibernate on WAS -->
<exclusion>
<groupId>org.hibernate.javax.persistence</groupId>
- <artifactId>hibernate-jpa-2.0-api</artifactId>
+ <artifactId>hibernate-jpa-2.1-api</artifactId>
</exclusion>
<!-- conflicts with Weld and Hibernate on WAS -->
<exclusion>
@@ -90,7 +90,7 @@
<!-- conflicts with Hibernate on WAS -->
<exclusion>
<groupId>org.hibernate.javax.persistence</groupId>
- <artifactId>hibernate-jpa-2.0-api</artifactId>
+ <artifactId>hibernate-jpa-2.1-api</artifactId>
</exclusion>
<!-- conflicts with Weld and Hibernate on WAS -->
<exclusion>
@@ -132,7 +132,7 @@
<!-- conflicts with Hibernate on EWS -->
<exclusion>
<groupId>org.hibernate.javax.persistence</groupId>
- <artifactId>hibernate-jpa-2.0-api</artifactId>
+ <artifactId>hibernate-jpa-2.1-api</artifactId>
</exclusion>
<!-- conflicts with BTM/Hibernate on EWS -->
<exclusion>
@@ -234,7 +234,7 @@
</exclusion>
<exclusion>
<groupId>org.hibernate.javax.persistence</groupId>
- <artifactId>hibernate-jpa-2.0-api</artifactId>
+ <artifactId>hibernate-jpa-2.1-api</artifactId>
</exclusion>
<exclusion>
<groupId>org.javassist</groupId>
@@ -280,7 +280,7 @@
</exclusion>
<exclusion>
<groupId>org.hibernate.javax.persistence</groupId>
- <artifactId>hibernate-jpa-2.0-api</artifactId>
+ <artifactId>hibernate-jpa-2.1-api</artifactId>
</exclusion>
<exclusion>
<groupId>org.javassist</groupId>
@@ -233,7 +233,7 @@
<dependency>
<groupId>org.hibernate.javax.persistence</groupId>
- <artifactId>hibernate-jpa-2.0-api</artifactId>
+ <artifactId>hibernate-jpa-2.1-api</artifactId>
</dependency>
<!-- EJB -->
@@ -1,13 +1,10 @@
-<persistence
- version="2.0"
- xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd
- http://java.sun.com/xml/ns/persistence/orm http://java.sun.com/xml/ns/persistence/orm_2_0.xsd"
- xmlns:orm="http://java.sun.com/xml/ns/persistence/orm"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="http://java.sun.com/xml/ns/persistence">
+<persistence version="2.1"
+ xmlns="http://xmlns.jcp.org/xml/ns/persistence"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/persistence http://xmlns.jcp.org/xml/ns/persistence/persistence_2_1.xsd">
<persistence-unit name="org.jbpm.persistence.jpa" transaction-type="JTA">
- <provider>org.hibernate.ejb.HibernatePersistence</provider>
+ <provider>org.hibernate.jpa.HibernatePersistenceProvider</provider>
<jta-data-source>jdbc/jbpm-ds</jta-data-source>
<mapping-file>META-INF/JBPMorm.xml</mapping-file>
@@ -1,13 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
-<persistence version="2.0"
- xmlns="http://java.sun.com/xml/ns/persistence"
- xmlns:orm="http://java.sun.com/xml/ns/persistence/orm"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd
- http://java.sun.com/xml/ns/persistence/orm http://java.sun.com/xml/ns/persistence/orm_2_0.xsd">
+<persistence version="2.1"
+ xmlns="http://xmlns.jcp.org/xml/ns/persistence"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/persistence http://xmlns.jcp.org/xml/ns/persistence/persistence_2_1.xsd">
<persistence-unit name="org.jbpm.services.task" transaction-type="JTA">
- <provider>org.hibernate.ejb.HibernatePersistence</provider>
+ <provider>org.hibernate.jpa.HibernatePersistenceProvider</provider>
<jta-data-source>jdbc/jbpm-ds</jta-data-source>
<mapping-file>META-INF/Taskorm.xml</mapping-file>
<mapping-file>META-INF/TaskAuditorm.xml</mapping-file>
@@ -68,7 +68,7 @@
<dependency>
<groupId>org.hibernate.javax.persistence</groupId>
- <artifactId>hibernate-jpa-2.0-api</artifactId>
+ <artifactId>hibernate-jpa-2.1-api</artifactId>
</dependency>
<dependency>
@@ -1,13 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
-<persistence version="2.0"
- xmlns="http://java.sun.com/xml/ns/persistence"
- xmlns:orm="http://java.sun.com/xml/ns/persistence/orm"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd
- http://java.sun.com/xml/ns/persistence/orm http://java.sun.com/xml/ns/persistence/orm_2_0.xsd">
+<persistence version="2.1"
+ xmlns="http://xmlns.jcp.org/xml/ns/persistence"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/persistence http://xmlns.jcp.org/xml/ns/persistence/persistence_2_1.xsd">
<persistence-unit name="org.jbpm.services.task" transaction-type="JTA">
- <provider>org.hibernate.ejb.HibernatePersistence</provider>
+ <provider>org.hibernate.jpa.HibernatePersistenceProvider</provider>
<jta-data-source>jdbc/jbpm-ds</jta-data-source>
<mapping-file>META-INF/Taskorm.xml</mapping-file>
@@ -30,7 +30,7 @@
</dependency>
<dependency>
<groupId>org.hibernate.javax.persistence</groupId>
- <artifactId>hibernate-jpa-2.0-api</artifactId>
+ <artifactId>hibernate-jpa-2.1-api</artifactId>
</dependency>
<dependency>
<groupId>org.kie</groupId>
@@ -1,13 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
-<persistence version="2.0"
- xmlns="http://java.sun.com/xml/ns/persistence"
- xmlns:orm="http://java.sun.com/xml/ns/persistence/orm"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd
- http://java.sun.com/xml/ns/persistence/orm http://java.sun.com/xml/ns/persistence/orm_2_0.xsd">
+<persistence version="2.1"
+ xmlns="http://xmlns.jcp.org/xml/ns/persistence"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/persistence http://xmlns.jcp.org/xml/ns/persistence/persistence_2_1.xsd">
<persistence-unit name="org.jbpm.services.task" transaction-type="JTA">
- <provider>org.hibernate.ejb.HibernatePersistence</provider>
+ <provider>org.hibernate.jpa.HibernatePersistenceProvider</provider>
<jta-data-source>jdbc/jbpm-ds</jta-data-source>
<mapping-file>META-INF/Taskorm.xml</mapping-file>
@@ -53,7 +53,6 @@
</dependency>
<!--test-->
-
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-entitymanager</artifactId>
@@ -69,6 +68,13 @@
<artifactId>hibernate-validator</artifactId>
<scope>test</scope>
</dependency>
+ <!-- javax.el required by hibernate-validator -->
+ <dependency>
+ <groupId>org.jboss.spec.javax.el</groupId>
+ <artifactId>jboss-el-api_3.0_spec</artifactId>
+ <scope>test</scope>
+ </dependency>
+
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
@@ -1,13 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
-<persistence version="1.0"
- xmlns="http://java.sun.com/xml/ns/persistence"
- xmlns:orm="http://java.sun.com/xml/ns/persistence/orm"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd
- http://java.sun.com/xml/ns/persistence/orm http://java.sun.com/xml/ns/persistence/orm_2_0.xsd">
+<persistence version="2.1"
+ xmlns="http://xmlns.jcp.org/xml/ns/persistence"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/persistence http://xmlns.jcp.org/xml/ns/persistence/persistence_2_1.xsd">
<persistence-unit name="org.jbpm.services.task" transaction-type="JTA">
- <provider>org.hibernate.ejb.HibernatePersistence</provider>
+ <provider>org.hibernate.jpa.HibernatePersistenceProvider</provider>
<jta-data-source>jdbc/jbpm-ds</jta-data-source>
<mapping-file>META-INF/Taskorm.xml</mapping-file>
Oops, something went wrong.

0 comments on commit b576a3e

Please sign in to comment.