From 32081084423e138fd99fa9627a95f9dfd06784aa Mon Sep 17 00:00:00 2001 From: Danilo Costa Viana Date: Thu, 14 Apr 2016 11:36:49 -0300 Subject: [PATCH] Atualizando versões de dependências nos arquivos POM --- .gitignore | 1 + archetype/jsf-jpa/src/main/resources/archetype-resources/pom.xml | 2 +- impl/core/pom.xml | 2 +- impl/core/src/main/java/br/gov/frameworkdemoiselle/lifecycle/ViewScoped.java | 3 +++ impl/extension/jsf/pom.xml | 4 ++-- impl/extension/jsf/src/main/java/br/gov/frameworkdemoiselle/internal/context/FacesViewContextImpl.java | 4 ++++ impl/extension/jta/pom.xml | 18 +++++++++++++++++- impl/extension/rest/pom.xml | 2 +- parent/bom/pom.xml | 102 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------ parent/framework/pom.xml | 2 +- parent/jsf/pom.xml | 15 ++++++++++++++- parent/rest/pom.xml | 2 +- parent/servlet/pom.xml | 50 +++++++++++++++++++++++++++++++++++++++++++++++++- 13 files changed, 155 insertions(+), 52 deletions(-) diff --git a/.gitignore b/.gitignore index db54f59..26cd5fa 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /.idea /archetype/angularModular/src/main/resources/archetype-resources/view/nbproject/private/ *.iml +.directory diff --git a/archetype/jsf-jpa/src/main/resources/archetype-resources/pom.xml b/archetype/jsf-jpa/src/main/resources/archetype-resources/pom.xml index 272c416..b1a2fd3 100755 --- a/archetype/jsf-jpa/src/main/resources/archetype-resources/pom.xml +++ b/archetype/jsf-jpa/src/main/resources/archetype-resources/pom.xml @@ -36,7 +36,7 @@ org.primefaces primefaces - 5.0 + 5.3 compile diff --git a/impl/core/pom.xml b/impl/core/pom.xml index 8d9b913..929ef4d 100755 --- a/impl/core/pom.xml +++ b/impl/core/pom.xml @@ -185,6 +185,6 @@ - 1.1.1.Final + 1.1.11.Final diff --git a/impl/core/src/main/java/br/gov/frameworkdemoiselle/lifecycle/ViewScoped.java b/impl/core/src/main/java/br/gov/frameworkdemoiselle/lifecycle/ViewScoped.java index 3ed923b..41eb8ee 100644 --- a/impl/core/src/main/java/br/gov/frameworkdemoiselle/lifecycle/ViewScoped.java +++ b/impl/core/src/main/java/br/gov/frameworkdemoiselle/lifecycle/ViewScoped.java @@ -51,11 +51,14 @@ import javax.enterprise.context.NormalScope; * This scope maintains the context for viewed page; when the viewed page change, the data will be lost. * * @author SERPRO + * + * @deprecated */ @Inherited @Target({ METHOD, TYPE, FIELD }) @Retention(RUNTIME) @NormalScope(passivating = true) +@Deprecated public @interface ViewScoped { } diff --git a/impl/extension/jsf/pom.xml b/impl/extension/jsf/pom.xml index a2cdae4..dfaeaa9 100755 --- a/impl/extension/jsf/pom.xml +++ b/impl/extension/jsf/pom.xml @@ -76,8 +76,8 @@ jsf-api - org.glassfish.web - el-impl + org.glassfish + javax.el provided diff --git a/impl/extension/jsf/src/main/java/br/gov/frameworkdemoiselle/internal/context/FacesViewContextImpl.java b/impl/extension/jsf/src/main/java/br/gov/frameworkdemoiselle/internal/context/FacesViewContextImpl.java index 4018e38..234b99f 100644 --- a/impl/extension/jsf/src/main/java/br/gov/frameworkdemoiselle/internal/context/FacesViewContextImpl.java +++ b/impl/extension/jsf/src/main/java/br/gov/frameworkdemoiselle/internal/context/FacesViewContextImpl.java @@ -63,9 +63,13 @@ import br.gov.frameworkdemoiselle.util.Faces; * stored on this store are kept as long as the view is still active. * * @author serpro + * + * @deprecated This context is deprecated, it's preferred to use the annotation + * javax.faces.view.ViewScoped */ @Priority(Priority.L2_PRIORITY) @Alternative +@Deprecated public class FacesViewContextImpl extends AbstractCustomContext implements ViewContext { private final AtomicLong atomicLong = new AtomicLong(); diff --git a/impl/extension/jta/pom.xml b/impl/extension/jta/pom.xml index 7e4cd1a..ffd76bb 100755 --- a/impl/extension/jta/pom.xml +++ b/impl/extension/jta/pom.xml @@ -69,7 +69,7 @@ javax.transaction - jta + javax.transaction-api @@ -90,6 +90,22 @@ + + + wildfly8 + + true + + + + javax.transaction + javax.transaction-api + provided + + + + + sonatype-nexus-snapshots diff --git a/impl/extension/rest/pom.xml b/impl/extension/rest/pom.xml index 4a6ba88..77ecf27 100755 --- a/impl/extension/rest/pom.xml +++ b/impl/extension/rest/pom.xml @@ -73,7 +73,7 @@ javax.ws.rs - jsr311-api + javax.ws.rs-api diff --git a/parent/bom/pom.xml b/parent/bom/pom.xml index 8a59340..298b331 100755 --- a/parent/bom/pom.xml +++ b/parent/bom/pom.xml @@ -34,7 +34,8 @@ ou escreva para a Fundação do Software Livre (FSF) Inc., 51 Franklin St, Fifth Floor, Boston, MA 02111-1301, USA. --> - + 4.0.0 @@ -120,16 +121,16 @@ javax.enterprise cdi-api ${cdi.version} - + - + - + validation-api javax.validation ${validation.version} - + org.hibernate hibernate-validator @@ -170,28 +171,31 @@ - - + + - + --> + + + org.glassfish + javax.el + ${el.version} - + com.sun.faces jsf-api ${jsf.version} - + com.sun.faces jsf-impl @@ -210,35 +214,35 @@ ${javaee.version} - - + + javax.servlet javax.servlet-api - 3.0.1 + ${servlet.version} javax.servlet jstl - 1.2 + ${jstl.version} - + org.eclipse.persistence javax.persistence ${persistence.version} - + org.eclipse.persistence eclipselink - 2.1.0 + 2.6.2 org.hibernate @@ -247,19 +251,31 @@ - + + + javax.transaction + javax.transaction-api + ${transaction.version} - + javax.ws.rs - jsr311-api + javax.ws.rs-api ${rest.version} + + + javax.enterprise.concurrent + javax.enterprise.concurrent-api + ${concurrent.version} + + org.slf4j @@ -307,7 +323,7 @@ commons-dbcp ${commons.dbcp.version} - + hsqldb @@ -347,7 +363,7 @@ easymock ${easymock.version} - + @@ -402,21 +418,23 @@ - 6.0 - 1.0-SP4 - 1.0.0.GA + 7.0 + 1.1 + 1.1.0.Final 1.1 - 2.1.11 - 2.2 - 2.5 - 2.0.0 - 1.1.1 + 2.2.13 + 1.2 + 3.0.0 + 3.1.0 + 2.1.0 + 2.0 + 1.0 - 4.1.7.Final - 4.2.0.Final + 5.1.0.Final + 5.2.4.Final 1.0.0.CR7 1.0.0.CR4 @@ -429,13 +447,13 @@ 2.16 1.4.6 - 1.6.1 + 1.7.21 1.1.8.Final - 1.9 + 20041012.002804 1.4 1.8.0.10 4.0.1 1.4.4 - 3.14.0-GA + 3.20.0-GA diff --git a/parent/framework/pom.xml b/parent/framework/pom.xml index 35c4de5..9501686 100755 --- a/parent/framework/pom.xml +++ b/parent/framework/pom.xml @@ -45,7 +45,7 @@ br.gov.frameworkdemoiselle demoiselle-parent - 10 + 11-SNAPSHOT ../../../internal/parent/demoiselle diff --git a/parent/jsf/pom.xml b/parent/jsf/pom.xml index f40b812..149c7a3 100755 --- a/parent/jsf/pom.xml +++ b/parent/jsf/pom.xml @@ -77,7 +77,7 @@ - + + + wildfly8 + + true + + + + com.sun.faces + jsf-api + provided + + diff --git a/parent/rest/pom.xml b/parent/rest/pom.xml index eff9a70..7e77e4a 100755 --- a/parent/rest/pom.xml +++ b/parent/rest/pom.xml @@ -143,7 +143,7 @@ javax.ws.rs - jsr311-api + javax.ws.rs-api provided diff --git a/parent/servlet/pom.xml b/parent/servlet/pom.xml index 2adadb9..39929de 100755 --- a/parent/servlet/pom.xml +++ b/parent/servlet/pom.xml @@ -104,7 +104,7 @@ - + + + wildfly8 + + true + + + + javax.servlet + javax.servlet-api + provided + + + javax.enterprise + cdi-api + provided + + + org.javassist + javassist + provided + + + validation-api + javax.validation + provided + + + javax.transaction + javax.transaction-api + provided + + + org.eclipse.persistence + javax.persistence + provided + + + hsqldb + hsqldb + provided + + + org.hibernate + hibernate-entitymanager + test + + -- libgit2 0.21.2