Download as
Browse Code »

Commit f27df23ddd5d729a3b39d2d74136cb22973d93af

Authored by Cleverson Sacramento
2 parents 3ca50263 22e9b381
Exists in master

Merge branch '2.4.0' of github.com:demoiselle/framework into 2.4.0

Showing 21 changed files with 36 additions and 30 deletions   Show diff stats
archetype/jsf-jpa/pom.xml
  Diff comments   View file @f27df23
@@ -45,7 +45,7 @@ @@ -45,7 +45,7 @@
45 <parent> 45 <parent>
46 <groupId>br.gov.frameworkdemoiselle</groupId> 46 <groupId>br.gov.frameworkdemoiselle</groupId>
47 <artifactId>demoiselle-archetype-parent</artifactId> 47 <artifactId>demoiselle-archetype-parent</artifactId>
48 - <version>2.4.0-BETA3-SNAPSHOT</version> 48 + <version>2.4.0-BETA4-SNAPSHOT</version>
49 <relativePath>../../parent/archetype</relativePath> 49 <relativePath>../../parent/archetype</relativePath>
50 </parent> 50 </parent>
51 51
archetype/minimal/pom.xml
  Diff comments   View file @f27df23
@@ -45,7 +45,7 @@ @@ -45,7 +45,7 @@
45 <parent> 45 <parent>
46 <groupId>br.gov.frameworkdemoiselle</groupId> 46 <groupId>br.gov.frameworkdemoiselle</groupId>
47 <artifactId>demoiselle-archetype-parent</artifactId> 47 <artifactId>demoiselle-archetype-parent</artifactId>
48 - <version>2.4.0-BETA3-SNAPSHOT</version> 48 + <version>2.4.0-BETA4-SNAPSHOT</version>
49 <relativePath>../../parent/archetype</relativePath> 49 <relativePath>../../parent/archetype</relativePath>
50 </parent> 50 </parent>
51 51
documentation/quickstart/pom.xml
  Diff comments   View file @f27df23
@@ -40,7 +40,7 @@ @@ -40,7 +40,7 @@
40 40
41 <artifactId>demoiselle-framework-quickstart</artifactId> 41 <artifactId>demoiselle-framework-quickstart</artifactId>
42 <packaging>jdocbook</packaging> 42 <packaging>jdocbook</packaging>
43 - <version>2.4.0-BETA3-SNAPSHOT</version> 43 + <version>2.4.0-BETA4-SNAPSHOT</version>
44 44
45 <parent> 45 <parent>
46 <groupId>br.gov.frameworkdemoiselle</groupId> 46 <groupId>br.gov.frameworkdemoiselle</groupId>
documentation/reference/pom.xml
  Diff comments   View file @f27df23
@@ -40,7 +40,7 @@ @@ -40,7 +40,7 @@
40 40
41 <artifactId>demoiselle-framework-reference</artifactId> 41 <artifactId>demoiselle-framework-reference</artifactId>
42 <packaging>jdocbook</packaging> 42 <packaging>jdocbook</packaging>
43 - <version>2.4.0-BETA3-SNAPSHOT</version> 43 + <version>2.4.0-BETA4-SNAPSHOT</version>
44 44
45 <parent> 45 <parent>
46 <groupId>br.gov.frameworkdemoiselle</groupId> 46 <groupId>br.gov.frameworkdemoiselle</groupId>
impl/core/pom.xml
  Diff comments   View file @f27df23
@@ -44,7 +44,7 @@ @@ -44,7 +44,7 @@
44 <parent> 44 <parent>
45 <groupId>br.gov.frameworkdemoiselle</groupId> 45 <groupId>br.gov.frameworkdemoiselle</groupId>
46 <artifactId>demoiselle-framework-parent</artifactId> 46 <artifactId>demoiselle-framework-parent</artifactId>
47 - <version>2.4.0-BETA3-SNAPSHOT</version> 47 + <version>2.4.0-BETA4-SNAPSHOT</version>
48 <relativePath>../../parent/framework</relativePath> 48 <relativePath>../../parent/framework</relativePath>
49 </parent> 49 </parent>
50 50
@@ -72,7 +72,7 @@ @@ -72,7 +72,7 @@
72 <dependency> 72 <dependency>
73 <groupId>br.gov.frameworkdemoiselle</groupId> 73 <groupId>br.gov.frameworkdemoiselle</groupId>
74 <artifactId>demoiselle-framework-bom</artifactId> 74 <artifactId>demoiselle-framework-bom</artifactId>
75 - <version>2.4.0-BETA3-SNAPSHOT</version> 75 + <version>2.4.0-BETA4-SNAPSHOT</version>
76 <scope>import</scope> 76 <scope>import</scope>
77 <type>pom</type> 77 <type>pom</type>
78 </dependency> 78 </dependency>
impl/core/src/test/java/exception/basic/ExceptionHandlerTest.java
  Diff comments   View file @f27df23
@@ -44,6 +44,7 @@ import javax.inject.Inject; @@ -44,6 +44,7 @@ import javax.inject.Inject;
44 import org.jboss.arquillian.container.test.api.Deployment; 44 import org.jboss.arquillian.container.test.api.Deployment;
45 import org.jboss.arquillian.junit.Arquillian; 45 import org.jboss.arquillian.junit.Arquillian;
46 import org.jboss.shrinkwrap.api.spec.JavaArchive; 46 import org.jboss.shrinkwrap.api.spec.JavaArchive;
  47 +import org.junit.Ignore;
47 import org.junit.Test; 48 import org.junit.Test;
48 import org.junit.runner.RunWith; 49 import org.junit.runner.RunWith;
49 50
@@ -99,6 +100,7 @@ public class ExceptionHandlerTest { @@ -99,6 +100,7 @@ public class ExceptionHandlerTest {
99 assertEquals(false, exceptionHandler.isArithmeticExceptionHandler()); 100 assertEquals(false, exceptionHandler.isArithmeticExceptionHandler());
100 } 101 }
101 102
  103 + @Ignore
102 @Test 104 @Test
103 public void exceptionWithMultiHandler() { 105 public void exceptionWithMultiHandler() {
104 multiExceptionHandler.throwIllegalArgumentException(); 106 multiExceptionHandler.throwIllegalArgumentException();
impl/extension/jdbc/pom.xml
  Diff comments   View file @f27df23
@@ -44,7 +44,7 @@ @@ -44,7 +44,7 @@
44 <parent> 44 <parent>
45 <groupId>br.gov.frameworkdemoiselle</groupId> 45 <groupId>br.gov.frameworkdemoiselle</groupId>
46 <artifactId>demoiselle-extension-parent</artifactId> 46 <artifactId>demoiselle-extension-parent</artifactId>
47 - <version>2.4.0-BETA3-SNAPSHOT</version> 47 + <version>2.4.0-BETA4-SNAPSHOT</version>
48 <relativePath>../../../parent/extension</relativePath> 48 <relativePath>../../../parent/extension</relativePath>
49 </parent> 49 </parent>
50 50
impl/extension/jmx/pom.xml
  Diff comments   View file @f27df23
@@ -34,8 +34,7 @@ @@ -34,8 +34,7 @@
34 ou escreva para a Fundação do Software Livre (FSF) Inc., 34 ou escreva para a Fundação do Software Livre (FSF) Inc.,
35 51 Franklin St, Fifth Floor, Boston, MA 02111-1301, USA. 35 51 Franklin St, Fifth Floor, Boston, MA 02111-1301, USA.
36 --> 36 -->
37 -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"  
38 - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 37 +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
39 <modelVersion>4.0.0</modelVersion> 38 <modelVersion>4.0.0</modelVersion>
40 39
41 <artifactId>demoiselle-jmx</artifactId> 40 <artifactId>demoiselle-jmx</artifactId>
@@ -45,7 +44,7 @@ @@ -45,7 +44,7 @@
45 <parent> 44 <parent>
46 <artifactId>demoiselle-extension-parent</artifactId> 45 <artifactId>demoiselle-extension-parent</artifactId>
47 <groupId>br.gov.frameworkdemoiselle</groupId> 46 <groupId>br.gov.frameworkdemoiselle</groupId>
48 - <version>2.4.0-BETA3-SNAPSHOT</version> 47 + <version>2.4.0-BETA4-SNAPSHOT</version>
49 <relativePath>../../../parent/extension</relativePath> 48 <relativePath>../../../parent/extension</relativePath>
50 </parent> 49 </parent>
51 50
impl/extension/jsf/pom.xml
  Diff comments   View file @f27df23
@@ -44,7 +44,7 @@ @@ -44,7 +44,7 @@
44 <parent> 44 <parent>
45 <groupId>br.gov.frameworkdemoiselle</groupId> 45 <groupId>br.gov.frameworkdemoiselle</groupId>
46 <artifactId>demoiselle-extension-parent</artifactId> 46 <artifactId>demoiselle-extension-parent</artifactId>
47 - <version>2.4.0-BETA3-SNAPSHOT</version> 47 + <version>2.4.0-BETA4-SNAPSHOT</version>
48 <relativePath>../../../parent/extension</relativePath> 48 <relativePath>../../../parent/extension</relativePath>
49 </parent> 49 </parent>
50 50
impl/extension/jta/pom.xml
  Diff comments   View file @f27df23
@@ -44,7 +44,7 @@ @@ -44,7 +44,7 @@
44 <parent> 44 <parent>
45 <groupId>br.gov.frameworkdemoiselle</groupId> 45 <groupId>br.gov.frameworkdemoiselle</groupId>
46 <artifactId>demoiselle-extension-parent</artifactId> 46 <artifactId>demoiselle-extension-parent</artifactId>
47 - <version>2.4.0-BETA3-SNAPSHOT</version> 47 + <version>2.4.0-BETA4-SNAPSHOT</version>
48 <relativePath>../../../parent/extension</relativePath> 48 <relativePath>../../../parent/extension</relativePath>
49 </parent> 49 </parent>
50 50
impl/extension/se/pom.xml
  Diff comments   View file @f27df23
@@ -44,7 +44,7 @@ @@ -44,7 +44,7 @@
44 <parent> 44 <parent>
45 <groupId>br.gov.frameworkdemoiselle</groupId> 45 <groupId>br.gov.frameworkdemoiselle</groupId>
46 <artifactId>demoiselle-extension-parent</artifactId> 46 <artifactId>demoiselle-extension-parent</artifactId>
47 - <version>2.4.0-BETA3-SNAPSHOT</version> 47 + <version>2.4.0-BETA4-SNAPSHOT</version>
48 <relativePath>../../../parent/extension</relativePath> 48 <relativePath>../../../parent/extension</relativePath>
49 </parent> 49 </parent>
50 50
impl/extension/servlet/pom.xml
  Diff comments   View file @f27df23
@@ -44,7 +44,7 @@ @@ -44,7 +44,7 @@
44 <parent> 44 <parent>
45 <groupId>br.gov.frameworkdemoiselle</groupId> 45 <groupId>br.gov.frameworkdemoiselle</groupId>
46 <artifactId>demoiselle-extension-parent</artifactId> 46 <artifactId>demoiselle-extension-parent</artifactId>
47 - <version>2.4.0-BETA3-SNAPSHOT</version> 47 + <version>2.4.0-BETA4-SNAPSHOT</version>
48 <relativePath>../../../parent/extension</relativePath> 48 <relativePath>../../../parent/extension</relativePath>
49 </parent> 49 </parent>
50 50
parent/archetype/pom.xml
  Diff comments   View file @f27df23
@@ -44,7 +44,7 @@ @@ -44,7 +44,7 @@
44 <parent> 44 <parent>
45 <groupId>br.gov.frameworkdemoiselle</groupId> 45 <groupId>br.gov.frameworkdemoiselle</groupId>
46 <artifactId>demoiselle-framework-parent</artifactId> 46 <artifactId>demoiselle-framework-parent</artifactId>
47 - <version>2.4.0-BETA3-SNAPSHOT</version> 47 + <version>2.4.0-BETA4-SNAPSHOT</version>
48 <relativePath>../framework</relativePath> 48 <relativePath>../framework</relativePath>
49 </parent> 49 </parent>
50 50
parent/bom/pom.xml
  Diff comments   View file @f27df23
@@ -44,7 +44,7 @@ @@ -44,7 +44,7 @@
44 <parent> 44 <parent>
45 <groupId>br.gov.frameworkdemoiselle</groupId> 45 <groupId>br.gov.frameworkdemoiselle</groupId>
46 <artifactId>demoiselle-framework-parent</artifactId> 46 <artifactId>demoiselle-framework-parent</artifactId>
47 - <version>2.4.0-BETA3-SNAPSHOT</version> 47 + <version>2.4.0-BETA4-SNAPSHOT</version>
48 <relativePath>../framework</relativePath> 48 <relativePath>../framework</relativePath>
49 </parent> 49 </parent>
50 50
@@ -72,37 +72,37 @@ @@ -72,37 +72,37 @@
72 <dependency> 72 <dependency>
73 <groupId>br.gov.frameworkdemoiselle</groupId> 73 <groupId>br.gov.frameworkdemoiselle</groupId>
74 <artifactId>demoiselle-core</artifactId> 74 <artifactId>demoiselle-core</artifactId>
75 - <version>2.4.0-BETA3-SNAPSHOT</version> 75 + <version>2.4.0-BETA4-SNAPSHOT</version>
76 </dependency> 76 </dependency>
77 <dependency> 77 <dependency>
78 <groupId>br.gov.frameworkdemoiselle</groupId> 78 <groupId>br.gov.frameworkdemoiselle</groupId>
79 <artifactId>demoiselle-jta</artifactId> 79 <artifactId>demoiselle-jta</artifactId>
80 - <version>2.4.0-BETA3-SNAPSHOT</version> 80 + <version>2.4.0-BETA4-SNAPSHOT</version>
81 </dependency> 81 </dependency>
82 <dependency> 82 <dependency>
83 <groupId>br.gov.frameworkdemoiselle</groupId> 83 <groupId>br.gov.frameworkdemoiselle</groupId>
84 <artifactId>demoiselle-jdbc</artifactId> 84 <artifactId>demoiselle-jdbc</artifactId>
85 - <version>2.4.0-BETA3-SNAPSHOT</version> 85 + <version>2.4.0-BETA4-SNAPSHOT</version>
86 </dependency> 86 </dependency>
87 <dependency> 87 <dependency>
88 <groupId>br.gov.frameworkdemoiselle</groupId> 88 <groupId>br.gov.frameworkdemoiselle</groupId>
89 <artifactId>demoiselle-jpa</artifactId> 89 <artifactId>demoiselle-jpa</artifactId>
90 - <version>2.4.0-BETA3-SNAPSHOT</version> 90 + <version>2.4.0-BETA4-SNAPSHOT</version>
91 </dependency> 91 </dependency>
92 <dependency> 92 <dependency>
93 <groupId>br.gov.frameworkdemoiselle</groupId> 93 <groupId>br.gov.frameworkdemoiselle</groupId>
94 <artifactId>demoiselle-servlet</artifactId> 94 <artifactId>demoiselle-servlet</artifactId>
95 - <version>2.4.0-BETA3-SNAPSHOT</version> 95 + <version>2.4.0-BETA4-SNAPSHOT</version>
96 </dependency> 96 </dependency>
97 <dependency> 97 <dependency>
98 <groupId>br.gov.frameworkdemoiselle</groupId> 98 <groupId>br.gov.frameworkdemoiselle</groupId>
99 <artifactId>demoiselle-jsf</artifactId> 99 <artifactId>demoiselle-jsf</artifactId>
100 - <version>2.4.0-BETA3-SNAPSHOT</version> 100 + <version>2.4.0-BETA4-SNAPSHOT</version>
101 </dependency> 101 </dependency>
102 <dependency> 102 <dependency>
103 <groupId>br.gov.frameworkdemoiselle</groupId> 103 <groupId>br.gov.frameworkdemoiselle</groupId>
104 <artifactId>demoiselle-se</artifactId> 104 <artifactId>demoiselle-se</artifactId>
105 - <version>2.4.0-BETA3-SNAPSHOT</version> 105 + <version>2.4.0-BETA4-SNAPSHOT</version>
106 </dependency> 106 </dependency>
107 <dependency> 107 <dependency>
108 <groupId>br.gov.frameworkdemoiselle</groupId> 108 <groupId>br.gov.frameworkdemoiselle</groupId>
parent/framework/pom.xml
  Diff comments   View file @f27df23
@@ -39,7 +39,7 @@ @@ -39,7 +39,7 @@
39 <modelVersion>4.0.0</modelVersion> 39 <modelVersion>4.0.0</modelVersion>
40 40
41 <artifactId>demoiselle-framework-parent</artifactId> 41 <artifactId>demoiselle-framework-parent</artifactId>
42 - <version>2.4.0-BETA3-SNAPSHOT</version> 42 + <version>2.4.0-BETA4-SNAPSHOT</version>
43 <packaging>pom</packaging> 43 <packaging>pom</packaging>
44 44
45 <parent> 45 <parent>
parent/jsf/pom.xml
  Diff comments   View file @f27df23
@@ -44,7 +44,7 @@ @@ -44,7 +44,7 @@
44 <parent> 44 <parent>
45 <groupId>br.gov.frameworkdemoiselle</groupId> 45 <groupId>br.gov.frameworkdemoiselle</groupId>
46 <artifactId>demoiselle-servlet-parent</artifactId> 46 <artifactId>demoiselle-servlet-parent</artifactId>
47 - <version>2.4.0-BETA3-SNAPSHOT</version> 47 + <version>2.4.0-BETA4-SNAPSHOT</version>
48 <relativePath>../servlet</relativePath> 48 <relativePath>../servlet</relativePath>
49 </parent> 49 </parent>
50 50
parent/minimal/pom.xml
  Diff comments   View file @f27df23
@@ -44,7 +44,7 @@ @@ -44,7 +44,7 @@
44 <parent> 44 <parent>
45 <groupId>br.gov.frameworkdemoiselle</groupId> 45 <groupId>br.gov.frameworkdemoiselle</groupId>
46 <artifactId>demoiselle-framework-parent</artifactId> 46 <artifactId>demoiselle-framework-parent</artifactId>
47 - <version>2.4.0-BETA3-SNAPSHOT</version> 47 + <version>2.4.0-BETA4-SNAPSHOT</version>
48 <relativePath>../framework</relativePath> 48 <relativePath>../framework</relativePath>
49 </parent> 49 </parent>
50 50
@@ -72,7 +72,7 @@ @@ -72,7 +72,7 @@
72 <dependency> 72 <dependency>
73 <groupId>br.gov.frameworkdemoiselle</groupId> 73 <groupId>br.gov.frameworkdemoiselle</groupId>
74 <artifactId>demoiselle-framework-bom</artifactId> 74 <artifactId>demoiselle-framework-bom</artifactId>
75 - <version>2.4.0-BETA3-SNAPSHOT</version> 75 + <version>2.4.0-BETA4-SNAPSHOT</version>
76 <scope>import</scope> 76 <scope>import</scope>
77 <type>pom</type> 77 <type>pom</type>
78 </dependency> 78 </dependency>
parent/se/pom.xml
  Diff comments   View file @f27df23
@@ -44,7 +44,7 @@ @@ -44,7 +44,7 @@
44 <parent> 44 <parent>
45 <groupId>br.gov.frameworkdemoiselle</groupId> 45 <groupId>br.gov.frameworkdemoiselle</groupId>
46 <artifactId>demoiselle-extension-parent</artifactId> 46 <artifactId>demoiselle-extension-parent</artifactId>
47 - <version>2.4.0-BETA3-SNAPSHOT</version> 47 + <version>2.4.0-BETA4-SNAPSHOT</version>
48 <relativePath>../extension</relativePath> 48 <relativePath>../extension</relativePath>
49 </parent> 49 </parent>
50 50
parent/servlet/pom.xml
  Diff comments   View file @f27df23
@@ -44,7 +44,7 @@ @@ -44,7 +44,7 @@
44 <parent> 44 <parent>
45 <groupId>br.gov.frameworkdemoiselle</groupId> 45 <groupId>br.gov.frameworkdemoiselle</groupId>
46 <artifactId>demoiselle-extension-parent</artifactId> 46 <artifactId>demoiselle-extension-parent</artifactId>
47 - <version>2.4.0-BETA3-SNAPSHOT</version> 47 + <version>2.4.0-BETA4-SNAPSHOT</version>
48 <relativePath>../extension</relativePath> 48 <relativePath>../extension</relativePath>
49 </parent> 49 </parent>
50 50
@@ -39,7 +39,7 @@ @@ -39,7 +39,7 @@
39 <modelVersion>4.0.0</modelVersion> 39 <modelVersion>4.0.0</modelVersion>
40 40
41 <artifactId>demoiselle-framework-build</artifactId> 41 <artifactId>demoiselle-framework-build</artifactId>
42 - <version>2.4.0-BETA3-SNAPSHOT</version> 42 + <version>2.4.0-BETA4-SNAPSHOT</version>
43 <packaging>pom</packaging> 43 <packaging>pom</packaging>
44 44
45 <parent> 45 <parent>
site/apt/release-notes.apt
  Diff comments   View file @f27df23
@@ -38,6 +38,11 @@ @@ -38,6 +38,11 @@
38 38
39 Notas de Versão 39 Notas de Versão
40 40
  41 +* v2.4.0-BETA3
  42 +
  43 + * {{{https://demoiselle.atlassian.net/secure/ReleaseNote.jspa?projectId=10007&version=11300}Notas de Versão no JIRA}}
  44 +
  45 +
41 * v2.4.0-BETA2 46 * v2.4.0-BETA2
42 47
43 * {{{https://demoiselle.atlassian.net/secure/ReleaseNote.jspa?projectId=10007&version=11000}Notas de Versão no JIRA}} 48 * {{{https://demoiselle.atlassian.net/secure/ReleaseNote.jspa?projectId=10007&version=11000}Notas de Versão no JIRA}}