From ce903dd6b51e1f84a08e17600d784b1e3290359d Mon Sep 17 00:00:00 2001 From: Vanderson Botelho da Silva Date: Thu, 29 Sep 2016 18:31:49 -0300 Subject: [PATCH] parent bom --- demoiselle-core/src/main/java/org/demoiselle/jee/core/annotation/Ignore.java | 3 +-- demoiselle-core/src/main/java/org/demoiselle/jee/core/annotation/Name.java | 3 --- demoiselle-core/src/main/java/org/demoiselle/jee/core/interfaces/security/SecurityContext.java | 7 ------- demoiselle-parent-bom/.gitignore | 2 ++ demoiselle-parent-bom/pom.xml | 222 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ demoiselle-parent-rest/.gitignore | 5 +++++ demoiselle-parent-rest/pom.xml | 66 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ demoiselle-parent/pom.xml | 224 +++++++++++++++++++++++++------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- pom.xml | 451 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- 9 files changed, 555 insertions(+), 428 deletions(-) create mode 100644 demoiselle-parent-bom/.gitignore create mode 100644 demoiselle-parent-bom/pom.xml create mode 100644 demoiselle-parent-rest/.gitignore create mode 100644 demoiselle-parent-rest/pom.xml diff --git a/demoiselle-core/src/main/java/org/demoiselle/jee/core/annotation/Ignore.java b/demoiselle-core/src/main/java/org/demoiselle/jee/core/annotation/Ignore.java index 910a923..373573f 100644 --- a/demoiselle-core/src/main/java/org/demoiselle/jee/core/annotation/Ignore.java +++ b/demoiselle-core/src/main/java/org/demoiselle/jee/core/annotation/Ignore.java @@ -12,11 +12,10 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME; import java.lang.annotation.Target; /** - *

Used in fields of classes annotated with {@link org.demoiselle.configuration.Configuration} + *

Used in fields of classes annotated with * to indicate that the system should ignore this field when population the new configuration * instance with values extracted from the source file.

* - * @see org.demoiselle.configuration.Configuration * @author SERPRO */ @Target(FIELD) diff --git a/demoiselle-core/src/main/java/org/demoiselle/jee/core/annotation/Name.java b/demoiselle-core/src/main/java/org/demoiselle/jee/core/annotation/Name.java index 3321a4a..7e799da 100644 --- a/demoiselle-core/src/main/java/org/demoiselle/jee/core/annotation/Name.java +++ b/demoiselle-core/src/main/java/org/demoiselle/jee/core/annotation/Name.java @@ -40,9 +40,6 @@ import javax.inject.Qualifier; * * @author SERPRO * - * @see org.demoiselle.util.ResourceBundle - * @see org.demoiselle.internal.producer.ResourceBundleProducer#create(InjectionPoint) - * @see org.demoiselle.internal.producer.LoggerProducer#createNamed(InjectionPoint) */ @Qualifier @Inherited diff --git a/demoiselle-core/src/main/java/org/demoiselle/jee/core/interfaces/security/SecurityContext.java b/demoiselle-core/src/main/java/org/demoiselle/jee/core/interfaces/security/SecurityContext.java index 150e63a..87d65e7 100644 --- a/demoiselle-core/src/main/java/org/demoiselle/jee/core/interfaces/security/SecurityContext.java +++ b/demoiselle-core/src/main/java/org/demoiselle/jee/core/interfaces/security/SecurityContext.java @@ -31,9 +31,6 @@ public interface SecurityContext extends Serializable { * @param resource resource to be checked * @param operation operation to be checked * @return {@code true} if the user has the permission - * @throws AuthorizationException When the permission checking fails, this - * exception is thrown. - * @throws NotLoggedInException if there is no user logged in a specific * session. */ boolean hasPermission(String resource, String operation); @@ -43,9 +40,6 @@ public interface SecurityContext extends Serializable { * * @param role role to be checked * @return {@code true} if the user has the role - * @throws AuthorizationException When the permission checking fails, this - * exception is thrown. - * @throws NotLoggedInException if there is no user logged in a specific * session. */ boolean hasRole(String role); @@ -53,7 +47,6 @@ public interface SecurityContext extends Serializable { /** * Return the user logged in the session. * - * @param token * @return the user logged in a specific authenticated session. If there is * no active session {@code null} is returned. */ diff --git a/demoiselle-parent-bom/.gitignore b/demoiselle-parent-bom/.gitignore new file mode 100644 index 0000000..0c2b833 --- /dev/null +++ b/demoiselle-parent-bom/.gitignore @@ -0,0 +1,2 @@ +/.settings/ +/.project diff --git a/demoiselle-parent-bom/pom.xml b/demoiselle-parent-bom/pom.xml new file mode 100644 index 0000000..fcde49b --- /dev/null +++ b/demoiselle-parent-bom/pom.xml @@ -0,0 +1,222 @@ + + + + org.demoiselle.jee + demoiselle-parent-bom + 3.0.0-BETA1-SNAPSHOT + pom + 4.0.0 + + Demoiselle Bill of Materials + + + Contém a lista de todas as dependências utilizadas na construção do framework. + + + http://demoiselle.io + + + + GNU Lesser General Public License, Version 3 + http://www.gnu.org/licenses/lgpl-3.0.txt + + + + + SERPRO - Serviço Federal de Processamento de Dados + http://www.serpro.gov.br + + + + + 3.0.0-BETA1-SNAPSHOT + UTF-8 + + + 7.0 + 1.2 + 1.1.0.Final + 1.2 + 1.2 + 3.0.0 + 3.1.0 + 1.0.2 + 2.0 + 1.0 + 5.1.0.Final + 5.2.4.Final + 2.0 + 2.0.1 + 7.0 + 1.7.1 + 3.2 + 1.0.0 + + 2016.8 + + + 3.5.1 + 2.6 + 1.8 + 1.8 + + + + + + + + + + org.demoiselle.jee + demoiselle-core + ${demoiselle.version} + + + + org.demoiselle.jee + demoiselle-security + ${demoiselle.version} + + + + org.demoiselle.jee + demoiselle-rest + ${demoiselle.version} + + + + org.demoiselle.jee + demoiselle-persistence-jpa + ${demoiselle.version} + + + + org.demoiselle.jee + demoiselle-security-jwt + ${demoiselle.version} + + + + + javax.enterprise + cdi-api + provided + ${cdi.version} + + + + + validation-api + javax.validation + provided + ${validation.version} + + + + + org.glassfish + javax.el + provided + ${el.version} + + + + + javax + javaee-api + provided + ${javaee.version} + + + + + javax.servlet + javax.servlet-api + provided + ${servlet.version} + + + javax.servlet + jstl + provided + ${jstl.version} + + + + + org.hibernate + hibernate-entitymanager + provided + ${hibernate.version} + + + + + javax.ws.rs + javax.ws.rs-api + provided + ${jaxrs.version} + + + + + javax + javaee-web-api + ${javaee.version} + + + + + javax.ejb + javax.ejb-api + ${ejb.version} + provided + + + + + javax.cache + cache-api + ${cache.version} + + + + + javax.persistence + persistence-api + ${persistence.version} + + + + javax.transaction + javax.transaction-api + ${transaction.version} + + + + javax.json + javax.json-api + 1.0 + + + + + org.apache.deltaspike.core + deltaspike-core-api + compile + ${deltaspike.version} + + + org.apache.deltaspike.core + deltaspike-core-impl + runtime + ${deltaspike.version} + + + + + + + diff --git a/demoiselle-parent-rest/.gitignore b/demoiselle-parent-rest/.gitignore new file mode 100644 index 0000000..fdbbecd --- /dev/null +++ b/demoiselle-parent-rest/.gitignore @@ -0,0 +1,5 @@ +.settings +.classpath +.project +/target/ +/bin/ diff --git a/demoiselle-parent-rest/pom.xml b/demoiselle-parent-rest/pom.xml new file mode 100644 index 0000000..b3b4e11 --- /dev/null +++ b/demoiselle-parent-rest/pom.xml @@ -0,0 +1,66 @@ + + + + demoiselle-parent-rest + pom + 4.0.0 + + Demoiselle Parent Rest + + + Especialização do POM mínimo, contendo configurações úteis para todas as aplicações REST que utilizam o framework. + + + + org.demoiselle.jee + demoiselle-parent + 3.0.0-BETA1-SNAPSHOT + ../demoiselle-parent + + + http://demoiselle.io + + + + GNU Lesser General Public License, Version 3 + http://www.gnu.org/licenses/lgpl-3.0.txt + + + + + SERPRO - Serviço Federal de Processamento de Dados + http://www.serpro.gov.br + + + + + + org.demoiselle.jee + demoiselle-core + + + + org.demoiselle.jee + demoiselle-rest + + + + org.demoiselle.jee + demoiselle-persistence-jpa + + + + org.demoiselle.jee + demoiselle-security-jwt + + + + + + + swarm + + + + diff --git a/demoiselle-parent/pom.xml b/demoiselle-parent/pom.xml index 832887a..777a7bb 100644 --- a/demoiselle-parent/pom.xml +++ b/demoiselle-parent/pom.xml @@ -1,203 +1,29 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + + demoiselle-parent + pom + 4.0.0 + + Demoiselle Parent + + + org.demoiselle.jee + demoiselle-build + 3.0.0-BETA1-SNAPSHOT + + + + + + org.demoiselle.jee + demoiselle-parent-bom + 3.0.0-BETA1-SNAPSHOT + import + pom + + + - demoiselle-parent - 3.0.0-BETA1-SNAPSHOT - pom - 4.0.0 - - Demoiselle Parent POM - - - org.demoiselle.jee - demoiselle-build - 3.0.0-BETA1-SNAPSHOT - - - - - 3.0.0-BETA1-SNAPSHOT - UTF-8 - - - 7.0 - 1.2 - 1.1.0.Final - 1.2 - 1.2 - 3.0.0 - 3.1.0 - 1.0.2 - 2.0 - 1.0 - 5.1.0.Final - 5.2.4.Final - 2.0 - 2.0.1 - 7.0 - 1.7.1 - 3.2 - 1.0.0 - - 2016.8 - - - 3.5.1 - 2.6 - 1.8 - 1.8 - - - - - - - - - - javax.enterprise - cdi-api - provided - ${cdi.version} - - - - - validation-api - javax.validation - provided - ${validation.version} - - - - - org.glassfish - javax.el - provided - ${el.version} - - - - - javax - javaee-api - provided - ${javaee.version} - - - - - javax.servlet - javax.servlet-api - provided - ${servlet.version} - - - javax.servlet - jstl - provided - ${jstl.version} - - - - - org.hibernate - hibernate-entitymanager - provided - ${hibernate.version} - - - - - javax.ws.rs - javax.ws.rs-api - provided - ${jaxrs.version} - - - - - javax - javaee-web-api - ${javaee.version} - - - - - javax.ejb - javax.ejb-api - ${ejb.version} - provided - - - - - javax.cache - cache-api - ${cache.version} - - - - - javax.persistence - persistence-api - ${persistence.version} - - - - javax.transaction - javax.transaction-api - ${transaction.version} - - - - javax.json - javax.json-api - 1.0 - - - - - org.apache.deltaspike.core - deltaspike-core-api - compile - ${deltaspike.version} - - - org.apache.deltaspike.core - deltaspike-core-impl - runtime - ${deltaspike.version} - - - - - org.demoiselle.jee - demoiselle-core - 3.0.0-BETA1-SNAPSHOT - - - - org.demoiselle.jee - demoiselle-security - ${demoiselle.version} - - - - org.demoiselle.jee - demoiselle-rest - ${demoiselle.version} - - - - org.demoiselle.jee - demoiselle-persistence-jpa - ${demoiselle.version} - - - - - - diff --git a/pom.xml b/pom.xml index 47025eb..2f4885a 100644 --- a/pom.xml +++ b/pom.xml @@ -1,221 +1,238 @@ - 4.0.0 - - org.demoiselle.jee - demoiselle-build - pom - 3.0.0-BETA1-SNAPSHOT - - Demoiselle Framework - Framework de integração para Java EE 7 baseado na especificação CDI 1.2 (JSR 346). - http://demoiselle.io - - - - GNU Lesser General Public License, Version 3 - http://www.gnu.org/licenses/lgpl-3.0.txt - - - - - SERPRO - Serviço Federal de Processamento de Dados - http://www.serpro.gov.br - - - - - - Cassio Maes da Fonseca - cassiomaes@gmail.com - SERPRO - http://www.serpro.gov.br - - - - Clovis Lemes Ferreira Junior - clovisjunior2009@gmail.com - SERPRO - http://www.serpro.gov.br - - - - Julian Cesar dos Santos - juliancesar@gmail.com - SERPRO - http://www.serpro.gov.br - - - - Paulo Gladson Ximenes Pinheiro - paulopinheiro777@gmail.com - SERPRO - http://www.serpro.gov.br - - - - Vanderson Botelho da Silva - botelhojp@gmail.com - SERPRO - http://www.serpro.gov.br - - - - - - demoiselle-parent - demoiselle-core - demoiselle-configuration - demoiselle-persistence-jpa - demoiselle-rest - demoiselle-security - demoiselle-security-token - demoiselle-security-basic - demoiselle-security-jwt - - - - - framework - 1.8 - 1.8 - 1.8 - UTF-8 - - - - - - org.apache.maven.plugins - maven-assembly-plugin - 2.6 - - - - org.apache.maven.plugins - maven-deploy-plugin - 2.8.2 - - - - org.apache.maven.plugins - maven-source-plugin - 2.2.1 - - - attach-sources - - jar-no-fork - - - - - - - - - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.3 - true - - sonatype-nexus-staging - https://oss.sonatype.org/ - false - - - - - org.apache.maven.plugins - maven-release-plugin - 2.5 - - true - false - release - deploy - - - - - - - - scm:git:git@github.com:demoiselle/${project.alias}.git - scm:git:git@github.com:demoiselle/${project.alias}.git - http://github.com/demoiselle/${project.alias} - HEAD - - - - - demoiselle.sourceforge.net - ${site.url} - - - - sonatype-nexus-snapshots - https://oss.sonatype.org/content/repositories/snapshots - - - - sonatype-nexus-staging - https://oss.sonatype.org/service/local/staging/deploy/maven2/ - - - - - - sonatype-nexus-snapshots - Sonatype Nexus Snapshots - https://oss.sonatype.org/content/repositories/snapshots - - true - - - false - - - - - sonatype-nexus-releases - Sonatype Nexus Releases - https://oss.sonatype.org/content/repositories/releases - - false - - - true - - - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + + org.demoiselle.jee + demoiselle-build + pom + 3.0.0-BETA1-SNAPSHOT + + Demoiselle Framework + Framework de integração para Java EE 7 baseado na especificação CDI 1.2 (JSR 346). + http://demoiselle.io + + + + GNU Lesser General Public License, Version 3 + http://www.gnu.org/licenses/lgpl-3.0.txt + + + + + SERPRO - Serviço Federal de Processamento de Dados + http://www.serpro.gov.br + + + + + + Cassio Maes da Fonseca + cassiomaes@gmail.com + SERPRO + http://www.serpro.gov.br + + + + Clovis Lemes Ferreira Junior + clovisjunior2009@gmail.com + SERPRO + http://www.serpro.gov.br + + + + Julian Cesar dos Santos + juliancesar@gmail.com + SERPRO + http://www.serpro.gov.br + + + + Paulo Gladson Ximenes Pinheiro + paulopinheiro777@gmail.com + SERPRO + http://www.serpro.gov.br + + + + Vanderson Botelho da Silva + botelhojp@gmail.com + SERPRO + http://www.serpro.gov.br + + + + + + demoiselle-parent-bom + demoiselle-parent + demoiselle-parent-rest + demoiselle-core + demoiselle-configuration + demoiselle-persistence-jpa + demoiselle-rest + demoiselle-security + demoiselle-security-token + demoiselle-security-basic + demoiselle-security-jwt + + + + + framework + 1.8 + 1.8 + 1.8 + UTF-8 + + + + + + org.apache.maven.plugins + maven-assembly-plugin + 2.6 + + + + org.apache.maven.plugins + maven-deploy-plugin + 2.8.2 + + + + org.apache.maven.plugins + maven-source-plugin + 2.2.1 + + + attach-sources + + jar-no-fork + + + + + + org.sonatype.plugins + nexus-staging-maven-plugin + 1.6.3 + true + + sonatype-nexus-staging + https://oss.sonatype.org/ + false + + + + + org.apache.maven.plugins + maven-release-plugin + 2.5 + + true + false + release + deploy + + + + + + + + + release + + + + org.apache.maven.plugins + maven-deploy-plugin + 2.8.2 + + true + + + + org.apache.maven.plugins + maven-javadoc-plugin + 2.10.4 + + + attach-javadocs + + jar + + + + + + org.apache.maven.plugins + maven-gpg-plugin + 1.5 + + + sign-artifacts + verify + + sign + + + + + + + + + + + scm:git:git@github.com:demoiselle/${project.alias}.git + scm:git:git@github.com:demoiselle/${project.alias}.git + http://github.com/demoiselle/${project.alias} + HEAD + + + + + demoiselle.sourceforge.net + ${site.url} + + + + sonatype-nexus-snapshots + https://oss.sonatype.org/content/repositories/snapshots + + + + sonatype-nexus-staging + https://oss.sonatype.org/service/local/staging/deploy/maven2/ + + + + + + sonatype-nexus-snapshots + Sonatype Nexus Snapshots + https://oss.sonatype.org/content/repositories/snapshots + + true + + + false + + + + + sonatype-nexus-releases + Sonatype Nexus Releases + https://oss.sonatype.org/content/repositories/releases + + false + + + true + + + -- libgit2 0.21.2