diff --git a/.gitignore b/.gitignore index 496d42b..99effd0 100644 --- a/.gitignore +++ b/.gitignore @@ -6,4 +6,5 @@ /.settings/ /basic/target/ /basic (cópia)/target/ -/jwt/target/ \ No newline at end of file +/jwt/target/ +/target/ diff --git a/demoiselle-core/pom.xml b/demoiselle-core/pom.xml index dfcbba0..ac0d6a4 100644 --- a/demoiselle-core/pom.xml +++ b/demoiselle-core/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - org.demoiselle.jee + demoiselle-core 3.0.0-SNAPSHOT jar @@ -11,25 +11,23 @@ Contém funcionalidades comuns a todos os módulos framework. + + + org.demoiselle.jee + demoiselle-parent + 3.0.0-BETA1-SNAPSHOT + ../demoiselle-parent + - http://demoiselle.org - - - - UTF-8 - 1.8 - 1.8 - javax javaee-web-api - 7.0 + javax.enterprise cdi-api - 1.2 @@ -37,13 +35,11 @@ org.apache.deltaspike.core deltaspike-core-api compile - 1.7.1 org.apache.deltaspike.core deltaspike-core-impl runtime - 1.7.1 diff --git a/demoiselle-core/src/main/java/org/demoiselle/jee/core/util/ResourceBundle.java b/demoiselle-core/src/main/java/org/demoiselle/jee/core/util/ResourceBundle.java index 600ceae..849f9a7 100644 --- a/demoiselle-core/src/main/java/org/demoiselle/jee/core/util/ResourceBundle.java +++ b/demoiselle-core/src/main/java/org/demoiselle/jee/core/util/ResourceBundle.java @@ -18,7 +18,7 @@ import java.util.Set; * and provide the locale and the base name for the bundle.

* *

To select which resource properties file to load when injecting beans of this class, qualify - * the injection point with {@link org.demoiselle.annotation.Name}, using the resource name (without + * the injection point with {@link org.demoiselle.jee.core.annotation.Name}, using the resource name (without * the '.properties' extension) as the value. If the injection point isn't qualified the default * file messages.properties will be loaded from the root of the classpath.

* diff --git a/demoiselle-parent/.gitignore b/demoiselle-parent/.gitignore new file mode 100644 index 0000000..38d0b44 --- /dev/null +++ b/demoiselle-parent/.gitignore @@ -0,0 +1,3 @@ +/target/ +/.settings/ +/.project diff --git a/demoiselle-parent/pom.xml b/demoiselle-parent/pom.xml new file mode 100644 index 0000000..f3bb9e9 --- /dev/null +++ b/demoiselle-parent/pom.xml @@ -0,0 +1,175 @@ + + + + demoiselle-parent + pom + 4.0.0 + + Demoiselle Parent POM + + + org.demoiselle.jee + demoiselle-build + 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 + + + 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} + + + + + 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 + ${project.version} + + + + + + + diff --git a/demoiselle-persistence-jpa/pom.xml b/demoiselle-persistence-jpa/pom.xml index 777115d..308e2e0 100644 --- a/demoiselle-persistence-jpa/pom.xml +++ b/demoiselle-persistence-jpa/pom.xml @@ -1,56 +1,55 @@ - - 4.0.0 - org.demoiselle.jee - demoiselle-persistence-jpa - 3.0.0-SNAPSHOT - jar - - Demoiselle Persistence + + 4.0.0 + demoiselle-persistence-jpa + 3.0.0-SNAPSHOT + jar + + Demoiselle Persistence Demoiselle Persistence - - - UTF-8 - 1.8 - 1.8 - - - - ${project.groupId} - demoiselle-core - ${project.version} - - - javax.ejb - javax.ejb-api - 3.2 - provided - - - javax.cache - cache-api - 1.0.0 - jar - - - javax.cache - cache-api - 1.0.0 - jar - - - javax.persistence - persistence-api - 1.0.2 - jar - - - javax.transaction - javax.transaction-api - 1.2 - jar - - + + + org.demoiselle.jee + demoiselle-parent + 3.0.0-BETA1-SNAPSHOT + ../demoiselle-parent + + + + + + org.demoiselle.jee + demoiselle-core + + + + javax.ejb + javax.ejb-api + + + + javax.cache + cache-api + jar + + + + javax.cache + cache-api + + + + javax.persistence + persistence-api + + + + javax.transaction + javax.transaction-api + + + diff --git a/demoiselle-security/pom.xml b/demoiselle-security/pom.xml index 4d5e8aa..27eba86 100644 --- a/demoiselle-security/pom.xml +++ b/demoiselle-security/pom.xml @@ -2,7 +2,6 @@ 4.0.0 - org.demoiselle.jee demoiselle-security 3.0.0-SNAPSHOT jar @@ -11,18 +10,20 @@ Demoiselle Security + + + org.demoiselle.jee + demoiselle-parent + 3.0.0-BETA1-SNAPSHOT + ../demoiselle-parent + - - UTF-8 - 1.8 - 1.8 - + - ${project.groupId} + org.demoiselle.jee demoiselle-core - ${project.version} diff --git a/demoiselle-ws-jaxrs/.gitignore b/demoiselle-ws-jaxrs/.gitignore index b83d222..731eb43 100644 --- a/demoiselle-ws-jaxrs/.gitignore +++ b/demoiselle-ws-jaxrs/.gitignore @@ -1 +1,2 @@ /target/ +/.settings/ diff --git a/demoiselle-ws-jaxrs/.project b/demoiselle-ws-jaxrs/.project index 248ffed..1dffaec 100644 --- a/demoiselle-ws-jaxrs/.project +++ b/demoiselle-ws-jaxrs/.project @@ -16,12 +16,12 @@ - org.eclipse.m2e.core.maven2Builder + org.eclipse.wst.validation.validationbuilder - org.eclipse.wst.validation.validationbuilder + org.eclipse.m2e.core.maven2Builder diff --git a/pom.xml b/pom.xml index 6d68644..538f021 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ 3.0.0-BETA1-SNAPSHOT Demoiselle Framework - Framework de integração para Java EE 7 baseado na especificação CDI 1.1 (JSR 346). + Framework de integração para Java EE 7 baseado na especificação CDI 1.2 (JSR 346). http://demoiselle.io @@ -64,6 +64,7 @@ + demoiselle-parent demoiselle-core demoiselle-persistence-jpa demoiselle-security @@ -91,7 +92,7 @@ maven-deploy-plugin 2.8.2 - + org.apache.maven.plugins maven-source-plugin @@ -105,7 +106,7 @@ - + org.apache.maven.plugins maven-gpg-plugin diff --git a/target/demoiselle-build-3.0.0-BETA1-SNAPSHOT.pom b/target/demoiselle-build-3.0.0-BETA1-SNAPSHOT.pom deleted file mode 100644 index 6d68644..0000000 --- a/target/demoiselle-build-3.0.0-BETA1-SNAPSHOT.pom +++ /dev/null @@ -1,215 +0,0 @@ - - - 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.1 (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-core - demoiselle-persistence-jpa - demoiselle-security - demoiselle-ws-jaxrs - - - - 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.apache.maven.plugins - maven-javadoc-plugin - 2.9.1 - - - attach-javadocs - - jar - - - - - - - org.apache.maven.plugins - maven-gpg-plugin - 1.5 - - - sign-artifacts - verify - - sign - - - - - - - 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 - - - - - diff --git a/target/demoiselle-build-3.0.0-BETA1-SNAPSHOT.pom.asc b/target/demoiselle-build-3.0.0-BETA1-SNAPSHOT.pom.asc deleted file mode 100644 index fb1dbdf..0000000 --- a/target/demoiselle-build-3.0.0-BETA1-SNAPSHOT.pom.asc +++ /dev/null @@ -1,11 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.11 (GNU/Linux) - -iQEcBAABAgAGBQJX5Rn6AAoJEA9xDIcuJD2zCHIIAIMI6VIeM7S9Wn4BZsi194M+ -6jmukWNMJayf+ulkx8mDvV32Y3+tNMZ9mijUav2E8WpvCujlzGTPlXzA1PaBWzdk -G3g+n0xOn5hzGt2NVf8oR7Y92wNEwCq7SeBsnnz9IxuscJeoZmjGBLNWUKbbp9sE -9bvnRWCKd7PYiAIZO4hiDm60NKkullnCTsB77Fw+V7at2ai63xJehU0I246cpE2h -DlTWZ51K+RTgR6Hbdgm0jKH78Tdguo8OfFeHA6v77c3PL6DPltex+uVYyDD0csIB -YEjnSpMiwJuyUVuSOCDO4ZqEn3my57U4NU2zcUm90XDoX8uvKSSxv1Z7aKYjsz4= -=DhQK ------END PGP SIGNATURE----- -- libgit2 0.21.2