From 69a46d72a01791e42a5e4a011db8187fe700f53f Mon Sep 17 00:00:00 2001
From: ghilaima <ghilainm@gmail.com>
Date: Fri, 11 Dec 2015 14:13:27 +0100
Subject: [PATCH] JUDDI-953 -  juddi-core and juddi-core-openjpa do not use the
 same JPA version

---
 juddi-core/pom.xml                                 |  9 +---
 .../apache/juddi/config/EntityManagerWrapper.java  | 59 ----------------------
 2 files changed, 2 insertions(+), 66 deletions(-)

diff --git a/juddi-core/pom.xml b/juddi-core/pom.xml
index 1fca1f1..14b0491 100644
--- a/juddi-core/pom.xml
+++ b/juddi-core/pom.xml
@@ -114,14 +114,9 @@ language governing permissions and * limitations under the License. * */ -->
             <version>3.1</version>
         </dependency>
         <dependency>
-            <groupId>org.hibernate.javax.persistence</groupId>
-            <artifactId>hibernate-jpa-2.1-api</artifactId>
-            <version>1.0.0.Final</version>
-        </dependency>
-        <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-core</artifactId>
-            <version>4.3.6.Final</version>
+            <version>4.2.21.Final</version>
             <exclusions>
                 <exclusion>
                     <groupId>cglib</groupId>
@@ -132,7 +127,7 @@ language governing permissions and * limitations under the License. * */ -->
         <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-entitymanager</artifactId>
-            <version>4.3.6.Final</version>
+            <version>4.2.21.Final</version>
         </dependency>
         <dependency>
             <groupId>cglib</groupId>
diff --git a/juddi-core/src/main/java/org/apache/juddi/config/EntityManagerWrapper.java b/juddi-core/src/main/java/org/apache/juddi/config/EntityManagerWrapper.java
index fef178a..a21c2ef 100644
--- a/juddi-core/src/main/java/org/apache/juddi/config/EntityManagerWrapper.java
+++ b/juddi-core/src/main/java/org/apache/juddi/config/EntityManagerWrapper.java
@@ -2,11 +2,8 @@ package org.apache.juddi.config;
 
 import javax.persistence.*;
 import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaDelete;
 import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.CriteriaUpdate;
 import javax.persistence.metamodel.Metamodel;
-import java.util.List;
 import java.util.Map;
 
 public class EntityManagerWrapper implements EntityManager {
@@ -150,16 +147,6 @@ public class EntityManagerWrapper implements EntityManager {
     }
 
     @Override
-    public Query createQuery(CriteriaUpdate updateQuery) {
-        return entityManager.createQuery(updateQuery);
-    }
-
-    @Override
-    public Query createQuery(CriteriaDelete deleteQuery) {
-        return entityManager.createQuery(deleteQuery);
-    }
-
-    @Override
     public <T> TypedQuery<T> createQuery(String qlString, Class<T> resultClass) {
         return entityManager.createQuery(qlString, resultClass);
     }
@@ -188,38 +175,12 @@ public class EntityManagerWrapper implements EntityManager {
     public Query createNativeQuery(String sqlString, String resultSetMapping) {
         return entityManager.createNativeQuery(sqlString, resultSetMapping);
     }
-
-    @Override
-    public StoredProcedureQuery createNamedStoredProcedureQuery(String name) {
-        return entityManager.createNamedStoredProcedureQuery(name);
-    }
-
-    @Override
-    public StoredProcedureQuery createStoredProcedureQuery(String procedureName) {
-        return entityManager.createStoredProcedureQuery(procedureName);
-    }
-
-    @Override
-    public StoredProcedureQuery createStoredProcedureQuery(String procedureName, Class... resultClasses) {
-        return entityManager.createStoredProcedureQuery(procedureName, resultClasses);
-    }
-
-    @Override
-    public StoredProcedureQuery createStoredProcedureQuery(String procedureName, String... resultSetMappings) {
-        return entityManager.createStoredProcedureQuery(procedureName, resultSetMappings);
-    }
-
     @Override
     public void joinTransaction() {
         entityManager.joinTransaction();
     }
 
     @Override
-    public boolean isJoinedToTransaction() {
-        return entityManager.isJoinedToTransaction();
-    }
-
-    @Override
     public <T> T unwrap(Class<T> cls) {
         return entityManager.unwrap(cls);
     }
@@ -258,24 +219,4 @@ public class EntityManagerWrapper implements EntityManager {
     public Metamodel getMetamodel() {
         return entityManager.getMetamodel();
     }
-
-    @Override
-    public <T> EntityGraph<T> createEntityGraph(Class<T> rootType) {
-        return entityManager.createEntityGraph(rootType);
-    }
-
-    @Override
-    public EntityGraph<?> createEntityGraph(String graphName) {
-        return entityManager.createEntityGraph(graphName);
-    }
-
-    @Override
-    public EntityGraph<?> getEntityGraph(String graphName) {
-        return entityManager.getEntityGraph(graphName);
-    }
-
-    @Override
-    public <T> List<EntityGraph<? super T>> getEntityGraphs(Class<T> entityClass) {
-        return entityManager.getEntityGraphs(entityClass);
-    }
 }
-- 
1.9.5.msysgit.1