From 74b7da8ae9ebd142710e4d29183effed7c164a8b Mon Sep 17 00:00:00 2001
From: Danilo Costa Viana <dcviana@gmail.com>
Date: Thu, 14 Apr 2016 15:14:21 -0300
Subject: [PATCH] * Alterada dependência a commons-configuration, versão anterior causava problemas durante a compilação do projeto. * Implementados métodos adicionais de EntityManagerProxy criados no JPA 2.1 para a interface EntityManager.

---
 impl/extension/jpa/src/main/java/br/gov/frameworkdemoiselle/internal/proxy/EntityManagerProxy.java | 57 +++++++++++++++++++++++++++++++++++++++++++++++++--------
 parent/bom/pom.xml                                                                                 |  4 ++--
 2 files changed, 51 insertions(+), 10 deletions(-)

diff --git a/impl/extension/jpa/src/main/java/br/gov/frameworkdemoiselle/internal/proxy/EntityManagerProxy.java b/impl/extension/jpa/src/main/java/br/gov/frameworkdemoiselle/internal/proxy/EntityManagerProxy.java
index d96a39e..d111234 100644
--- a/impl/extension/jpa/src/main/java/br/gov/frameworkdemoiselle/internal/proxy/EntityManagerProxy.java
+++ b/impl/extension/jpa/src/main/java/br/gov/frameworkdemoiselle/internal/proxy/EntityManagerProxy.java
@@ -37,19 +37,15 @@
 package br.gov.frameworkdemoiselle.internal.proxy;
 
 import java.io.Serializable;
+import java.util.List;
 import java.util.Map;
 import java.util.logging.Logger;
 
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.EntityTransaction;
-import javax.persistence.FlushModeType;
-import javax.persistence.LockModeType;
-import javax.persistence.Query;
-import javax.persistence.TransactionRequiredException;
-import javax.persistence.TypedQuery;
+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 br.gov.frameworkdemoiselle.DemoiselleException;
@@ -585,4 +581,49 @@ public class EntityManagerProxy implements EntityManager, Serializable {
 		return Beans.getReference(ResourceBundle.class, new NameQualifier("demoiselle-jpa-bundle"));
 	}
 
+
+	@Override public Query createQuery(CriteriaUpdate updateQuery) {
+		return getEntityManagerDelegate().createQuery(updateQuery);
+	}
+
+	@Override public Query createQuery(CriteriaDelete deleteQuery) {
+		return getEntityManagerDelegate().createQuery(deleteQuery);
+	}
+
+	@Override public StoredProcedureQuery createNamedStoredProcedureQuery(String name) {
+		return getEntityManagerDelegate().createNamedStoredProcedureQuery(name);
+	}
+
+	@Override public StoredProcedureQuery createStoredProcedureQuery(String procedureName) {
+		return getEntityManagerDelegate().createStoredProcedureQuery(procedureName);
+	}
+
+	@Override public StoredProcedureQuery createStoredProcedureQuery(String procedureName, Class... resultClasses) {
+		return getEntityManagerDelegate().createStoredProcedureQuery(procedureName, resultClasses);
+	}
+
+	@Override public StoredProcedureQuery createStoredProcedureQuery(String procedureName,
+			String... resultSetMappings) {
+		return getEntityManagerDelegate().createStoredProcedureQuery(procedureName, resultSetMappings);
+	}
+
+	@Override public boolean isJoinedToTransaction() {
+		return getEntityManagerDelegate().isJoinedToTransaction();
+	}
+
+	@Override public <T> EntityGraph<T> createEntityGraph(Class<T> rootType) {
+		return getEntityManagerDelegate().createEntityGraph(rootType);
+	}
+
+	@Override public EntityGraph<?> createEntityGraph(String graphName) {
+		return getEntityManagerDelegate().createEntityGraph(graphName);
+	}
+
+	@Override public EntityGraph<?> getEntityGraph(String graphName) {
+		return getEntityManagerDelegate().getEntityGraph(graphName);
+	}
+
+	@Override public <T> List<EntityGraph<? super T>> getEntityGraphs(Class<T> entityClass) {
+		return getEntityManagerDelegate().getEntityGraphs(entityClass);
+	}
 }
diff --git a/parent/bom/pom.xml b/parent/bom/pom.xml
index 298b331..1901acd 100755
--- a/parent/bom/pom.xml
+++ b/parent/bom/pom.xml
@@ -421,7 +421,7 @@
 		<javaee.version>7.0</javaee.version>
 		<cdi.version>1.1</cdi.version>
 		<validation.version>1.1.0.Final</validation.version>
-		<transaction.version>1.1</transaction.version>
+		<transaction.version>1.2</transaction.version>
 		<jsf.version>2.2.13</jsf.version>
 		<jstl.version>1.2</jstl.version>
 		<el.version>3.0.0</el.version>
@@ -449,7 +449,7 @@
 		<powermock.version>1.4.6</powermock.version>
 		<slf4j.version>1.7.21</slf4j.version>
 		<weld.version>1.1.8.Final</weld.version>
-		<commons.configuration.version>20041012.002804</commons.configuration.version>
+		<commons.configuration.version>1.10</commons.configuration.version>
 		<commons.dbcp.version>1.4</commons.dbcp.version>
 		<hsqldb.version>1.8.0.10</hsqldb.version>
 		<jasperreports.version>4.0.1</jasperreports.version>
--
libgit2 0.21.2