Commit abae922b3ff36126ab047a45473110af4b5ab2fb
1 parent
4c8b1a16
Exists in
master
Correção e simplificação do build dos testes
Showing
21 changed files
with
193 additions
and
325 deletions
Show diff stats
impl/core/pom.xml
... | ... | @@ -104,60 +104,7 @@ |
104 | 104 | <groupId>org.codehaus.mojo</groupId> |
105 | 105 | <artifactId>cobertura-maven-plugin</artifactId> |
106 | 106 | </plugin> |
107 | - | |
108 | - <!-- | |
109 | - <plugin> | |
110 | - <groupId>org.jacoco</groupId> | |
111 | - <artifactId>jacoco-maven-plugin</artifactId> | |
112 | - <version>${jacoco.version}</version> | |
113 | - <executions> | |
114 | - <execution> | |
115 | - <goals> | |
116 | - <goal>prepare-agent</goal> | |
117 | - </goals> | |
118 | - </execution> | |
119 | - <execution> | |
120 | - <id>report</id> | |
121 | - <phase>prepare-package</phase> | |
122 | - <goals> | |
123 | - <goal>report</goal> | |
124 | - </goals> | |
125 | - </execution> | |
126 | - </executions> | |
127 | - </plugin> | |
128 | - --> | |
129 | 107 | </plugins> |
130 | - | |
131 | - <!-- | |
132 | - <pluginManagement> | |
133 | - <plugins> | |
134 | - <plugin> | |
135 | - <groupId>org.eclipse.m2e</groupId> | |
136 | - <artifactId>lifecycle-mapping</artifactId> | |
137 | - <version>1.0.0</version> | |
138 | - <configuration> | |
139 | - <lifecycleMappingMetadata> | |
140 | - <pluginExecutions> | |
141 | - <pluginExecution> | |
142 | - <pluginExecutionFilter> | |
143 | - <groupId>org.jacoco</groupId> | |
144 | - <artifactId>jacoco-maven-plugin</artifactId> | |
145 | - <versionRange>[${jacoco.version},)</versionRange> | |
146 | - <goals> | |
147 | - <goal>prepare-agent</goal> | |
148 | - </goals> | |
149 | - </pluginExecutionFilter> | |
150 | - <action> | |
151 | - <ignore></ignore> | |
152 | - </action> | |
153 | - </pluginExecution> | |
154 | - </pluginExecutions> | |
155 | - </lifecycleMappingMetadata> | |
156 | - </configuration> | |
157 | - </plugin> | |
158 | - </plugins> | |
159 | - </pluginManagement> | |
160 | - --> | |
161 | 108 | </build> |
162 | 109 | |
163 | 110 | <dependencies> |
... | ... | @@ -196,7 +143,7 @@ |
196 | 143 | <dependency> |
197 | 144 | <groupId>org.jboss.arquillian.container</groupId> |
198 | 145 | <artifactId>arquillian-weld-se-embedded-1.1</artifactId> |
199 | - <version>${arquillian.weld.version}</version> | |
146 | +<!-- <version>1.0.0.CR7</version> --> | |
200 | 147 | <scope>test</scope> |
201 | 148 | </dependency> |
202 | 149 | <dependency> |
... | ... | @@ -214,40 +161,6 @@ |
214 | 161 | <artifactId>slf4j-log4j12</artifactId> |
215 | 162 | <scope>test</scope> |
216 | 163 | </dependency> |
217 | - | |
218 | - <!-- | |
219 | - <dependency> | |
220 | - <groupId>javax.servlet</groupId> | |
221 | - <artifactId>servlet-api</artifactId> | |
222 | - <scope>test</scope> | |
223 | - </dependency> | |
224 | - | |
225 | - <dependency> | |
226 | - <groupId>org.jboss.arquillian.extension</groupId> | |
227 | - <artifactId>arquillian-jacoco</artifactId> | |
228 | - <version>1.0.0.Alpha5</version> | |
229 | - <scope>test</scope> | |
230 | - </dependency> | |
231 | - <dependency> | |
232 | - <groupId>org.jacoco</groupId> | |
233 | - <artifactId>org.jacoco.core</artifactId> | |
234 | - <version>${jacoco.version}</version> | |
235 | - <scope>test</scope> | |
236 | - </dependency> | |
237 | - | |
238 | - <dependency> | |
239 | - <groupId>org.jboss.shrinkwrap.descriptors</groupId> | |
240 | - <artifactId>shrinkwrap-descriptors-spi</artifactId> | |
241 | - <version>2.0.0-alpha-4</version> | |
242 | - <scope>test</scope> | |
243 | - </dependency> | |
244 | - | |
245 | - <dependency> | |
246 | - <groupId>javax.el</groupId> | |
247 | - <artifactId>el-api</artifactId> | |
248 | - <scope>test</scope> | |
249 | - </dependency> | |
250 | - --> | |
251 | 164 | </dependencies> |
252 | 165 | |
253 | 166 | <repositories> |
... | ... | @@ -276,10 +189,7 @@ |
276 | 189 | </repositories> |
277 | 190 | |
278 | 191 | <properties> |
279 | - <arquillian.bom.version>1.1.1.Final</arquillian.bom.version> | |
280 | - <arquillian.weld.version>1.0.0.CR7</arquillian.weld.version> | |
281 | - | |
282 | - <!-- <jacoco.version>0.6.0.201210061924</jacoco.version> --> | |
283 | 192 | <demoiselle.validation.version>2.4.0-BETA2-SNAPSHOT</demoiselle.validation.version> |
193 | + <arquillian.bom.version>1.1.1.Final</arquillian.bom.version> | |
284 | 194 | </properties> |
285 | 195 | </project> | ... | ... |
impl/extension/jdbc/pom.xml
... | ... | @@ -74,6 +74,16 @@ |
74 | 74 | |
75 | 75 | <!-- for tests --> |
76 | 76 | <dependency> |
77 | + <groupId>org.jboss.arquillian.container</groupId> | |
78 | + <artifactId>arquillian-glassfish-embedded-3.1</artifactId> | |
79 | + <scope>test</scope> | |
80 | + </dependency> | |
81 | + <dependency> | |
82 | + <groupId>org.glassfish.main.extras</groupId> | |
83 | + <artifactId>glassfish-embedded-all</artifactId> | |
84 | + <scope>test</scope> | |
85 | + </dependency> | |
86 | + <dependency> | |
77 | 87 | <groupId>hsqldb</groupId> |
78 | 88 | <artifactId>hsqldb</artifactId> |
79 | 89 | <scope>test</scope> | ... | ... |
impl/extension/jdbc/src/test/resources/.arquillian-glassfish-embedded.profile
impl/extension/jmx/pom.xml
... | ... | @@ -57,18 +57,8 @@ |
57 | 57 | |
58 | 58 | <!-- Test dependencies --> |
59 | 59 | <dependency> |
60 | - <groupId>junit</groupId> | |
61 | - <artifactId>junit</artifactId> | |
62 | - <scope>test</scope> | |
63 | - </dependency> | |
64 | - <dependency> | |
65 | - <groupId>org.jboss.arquillian.junit</groupId> | |
66 | - <artifactId>arquillian-junit-container</artifactId> | |
67 | - <scope>test</scope> | |
68 | - </dependency> | |
69 | - <dependency> | |
70 | - <groupId>org.jboss.shrinkwrap.resolver</groupId> | |
71 | - <artifactId>shrinkwrap-resolver-impl-maven</artifactId> | |
60 | + <groupId>org.jboss.arquillian.container</groupId> | |
61 | + <artifactId>arquillian-weld-se-embedded-1.1</artifactId> | |
72 | 62 | <scope>test</scope> |
73 | 63 | </dependency> |
74 | 64 | <dependency> |
... | ... | @@ -76,13 +66,6 @@ |
76 | 66 | <artifactId>weld-se-core</artifactId> |
77 | 67 | <scope>test</scope> |
78 | 68 | </dependency> |
79 | - <!-- | |
80 | - <dependency> | |
81 | - <groupId>org.jboss.arquillian.container</groupId> | |
82 | - <artifactId>arquillian-weld-se-embedded-1.1</artifactId> | |
83 | - <scope>test</scope> | |
84 | - </dependency> | |
85 | - --> | |
86 | 69 | <dependency> |
87 | 70 | <groupId>org.hibernate</groupId> |
88 | 71 | <artifactId>hibernate-validator</artifactId> | ... | ... |
impl/extension/jmx/src/test/resources/.arquillian-weld-se-embedded.profile
impl/extension/jpa/pom.xml
... | ... | @@ -71,6 +71,18 @@ |
71 | 71 | <groupId>org.eclipse.persistence</groupId> |
72 | 72 | <artifactId>javax.persistence</artifactId> |
73 | 73 | </dependency> |
74 | + | |
75 | + <!-- for tests --> | |
76 | + <dependency> | |
77 | + <groupId>org.jboss.arquillian.container</groupId> | |
78 | + <artifactId>arquillian-glassfish-embedded-3.1</artifactId> | |
79 | + <scope>test</scope> | |
80 | + </dependency> | |
81 | + <dependency> | |
82 | + <groupId>org.glassfish.main.extras</groupId> | |
83 | + <artifactId>glassfish-embedded-all</artifactId> | |
84 | + <scope>test</scope> | |
85 | + </dependency> | |
74 | 86 | </dependencies> |
75 | 87 | |
76 | 88 | <repositories> | ... | ... |
impl/extension/jpa/src/test/resources/.arquillian-glassfish-embedded.profile
impl/extension/jsf/pom.xml
... | ... | @@ -80,22 +80,27 @@ |
80 | 80 | <artifactId>el-impl</artifactId> |
81 | 81 | <scope>provided</scope> |
82 | 82 | </dependency> |
83 | - <!-- For Tests --> | |
83 | + | |
84 | + <!-- for tests --> | |
84 | 85 | <dependency> |
85 | 86 | <groupId>com.sun.faces</groupId> |
86 | 87 | <artifactId>jsf-impl</artifactId> |
87 | 88 | <scope>test</scope> |
88 | 89 | </dependency> |
89 | 90 | <dependency> |
90 | - <groupId>commons-httpclient</groupId> | |
91 | - <artifactId>commons-httpclient</artifactId> | |
92 | - <version>3.1</version> | |
91 | + <groupId>org.jboss.arquillian.container</groupId> | |
92 | + <artifactId>arquillian-glassfish-embedded-3.1</artifactId> | |
93 | 93 | <scope>test</scope> |
94 | 94 | </dependency> |
95 | 95 | <dependency> |
96 | - <groupId>com.ocpsoft</groupId> | |
97 | - <artifactId>prettyfaces-jsf2</artifactId> | |
98 | - <version>3.3.0</version> | |
96 | + <groupId>org.glassfish.main.extras</groupId> | |
97 | + <artifactId>glassfish-embedded-all</artifactId> | |
98 | + <scope>test</scope> | |
99 | + </dependency> | |
100 | + <dependency> | |
101 | + <groupId>commons-httpclient</groupId> | |
102 | + <artifactId>commons-httpclient</artifactId> | |
103 | + <version>3.1</version> | |
99 | 104 | <scope>test</scope> |
100 | 105 | </dependency> |
101 | 106 | </dependencies> |
... | ... | @@ -124,4 +129,37 @@ |
124 | 129 | </releases> |
125 | 130 | </repository> |
126 | 131 | </repositories> |
132 | + | |
133 | + <profiles> | |
134 | + <profile> | |
135 | + <id>arquillian-test</id> | |
136 | + <dependencies> | |
137 | + <dependency> | |
138 | + <groupId>com.sun.faces</groupId> | |
139 | + <artifactId>jsf-api</artifactId> | |
140 | + <scope>provided</scope> | |
141 | + </dependency> | |
142 | + <dependency> | |
143 | + <groupId>br.gov.frameworkdemoiselle</groupId> | |
144 | + <artifactId>demoiselle-servlet</artifactId> | |
145 | + <exclusions> | |
146 | + <exclusion> | |
147 | + <groupId>javax.servlet</groupId> | |
148 | + <artifactId>javax.servlet-api</artifactId> | |
149 | + </exclusion> | |
150 | + </exclusions> | |
151 | + </dependency> | |
152 | + <!-- | |
153 | + --> | |
154 | + <dependency> | |
155 | + <groupId>com.ocpsoft</groupId> | |
156 | + <artifactId>prettyfaces-jsf2</artifactId> | |
157 | + <version>3.3.0</version> | |
158 | + <scope>runtime</scope> | |
159 | + </dependency> | |
160 | + <!-- | |
161 | + --> | |
162 | + </dependencies> | |
163 | + </profile> | |
164 | + </profiles> | |
127 | 165 | </project> | ... | ... |
impl/extension/jsf/src/main/java/br/gov/frameworkdemoiselle/util/Redirector.java
... | ... | @@ -48,11 +48,10 @@ import javax.faces.application.ViewHandler; |
48 | 48 | import javax.faces.context.FacesContext; |
49 | 49 | |
50 | 50 | /** |
51 | - * | |
52 | 51 | * Utility class to redirect determined page to another one. |
53 | 52 | * |
54 | 53 | * @author SERPRO |
55 | - * */ | |
54 | + */ | |
56 | 55 | public class Redirector { |
57 | 56 | |
58 | 57 | private Redirector() { |
... | ... | @@ -74,6 +73,7 @@ public class Redirector { |
74 | 73 | } |
75 | 74 | |
76 | 75 | } catch (NullPointerException cause) { |
76 | + cause.printStackTrace(); | |
77 | 77 | throw new PageNotFoundException(viewId); |
78 | 78 | |
79 | 79 | } catch (IOException cause) { | ... | ... |
impl/extension/jsf/src/test/java/test/Tests.java
... | ... | @@ -80,6 +80,7 @@ import br.gov.frameworkdemoiselle.util.PageNotFoundException; |
80 | 80 | import br.gov.frameworkdemoiselle.util.Parameter; |
81 | 81 | import br.gov.frameworkdemoiselle.util.Redirector; |
82 | 82 | |
83 | +@SuppressWarnings("deprecation") | |
83 | 84 | @Ignore |
84 | 85 | public final class Tests { |
85 | 86 | ... | ... |
impl/extension/jsf/src/test/resources/.arquillian-glassfish-embedded.profile
impl/extension/jsf/src/test/resources/xxx/web.xml
... | ... | @@ -1,52 +0,0 @@ |
1 | -<!-- | |
2 | - Demoiselle Framework | |
3 | - Copyright (C) 2010 SERPRO | |
4 | - ============================================================================ | |
5 | - This file is part of Demoiselle Framework. | |
6 | - | |
7 | - Demoiselle Framework is free software; you can redistribute it and/or | |
8 | - modify it under the terms of the GNU Lesser General Public License version 3 | |
9 | - as published by the Free Software Foundation. | |
10 | - | |
11 | - This program is distributed in the hope that it will be useful, | |
12 | - but WITHOUT ANY WARRANTY; without even the implied warranty of | |
13 | - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
14 | - GNU General Public License for more details. | |
15 | - | |
16 | - You should have received a copy of the GNU Lesser General Public License version 3 | |
17 | - along with this program; if not, see <http://www.gnu.org/licenses /> | |
18 | - or write to the Free Software Foundation, Inc., 51 Franklin Street, | |
19 | - Fifth Floor, Boston, MA 02110-1301, USA. | |
20 | - ============================================================================ | |
21 | - Este arquivo é parte do Framework Demoiselle. | |
22 | - | |
23 | - O Framework Demoiselle é um software livre; você pode redistribuí-lo e/ou | |
24 | - modificá-lo dentro dos termos da GNU LGPL versão 3 como publicada pela Fundação | |
25 | - do Software Livre (FSF). | |
26 | - | |
27 | - Este programa é distribuído na esperança que possa ser útil, mas SEM NENHUMA | |
28 | - GARANTIA; sem uma garantia implícita de ADEQUAÇÃO a qualquer MERCADO ou | |
29 | - APLICAÇÃO EM PARTICULAR. Veja a Licença Pública Geral GNU/LGPL em português | |
30 | - para maiores detalhes. | |
31 | - | |
32 | - Você deve ter recebido uma cópia da GNU LGPL versão 3, sob o título | |
33 | - "LICENCA.txt", junto com esse programa. Se não, acesse <http://www.gnu.org/licenses /> | |
34 | - ou escreva para a Fundação do Software Livre (FSF) Inc., | |
35 | - 51 Franklin St, Fifth Floor, Boston, MA 02111-1301, USA. | |
36 | ---> | |
37 | -<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" | |
38 | - xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd" version="3.0"> | |
39 | - | |
40 | - <listener> | |
41 | - <listener-class>br.gov.frameworkdemoiselle.util.ServletListener</listener-class> | |
42 | - </listener> | |
43 | - <filter> | |
44 | - <filter-name>Demoiselle Servlet Filter</filter-name> | |
45 | - <filter-class>br.gov.frameworkdemoiselle.util.ServletFilter</filter-class> | |
46 | - </filter> | |
47 | - <filter-mapping> | |
48 | - <filter-name>Demoiselle Servlet Filter</filter-name> | |
49 | - <url-pattern>/*</url-pattern> | |
50 | - </filter-mapping> | |
51 | - | |
52 | -</web-app> | |
53 | 0 | \ No newline at end of file |
impl/extension/jta/pom.xml
... | ... | @@ -72,6 +72,17 @@ |
72 | 72 | <artifactId>jta</artifactId> |
73 | 73 | </dependency> |
74 | 74 | |
75 | + <!-- for tests --> | |
76 | + <dependency> | |
77 | + <groupId>org.jboss.arquillian.container</groupId> | |
78 | + <artifactId>arquillian-glassfish-embedded-3.1</artifactId> | |
79 | + <scope>test</scope> | |
80 | + </dependency> | |
81 | + <dependency> | |
82 | + <groupId>org.glassfish.main.extras</groupId> | |
83 | + <artifactId>glassfish-embedded-all</artifactId> | |
84 | + <scope>test</scope> | |
85 | + </dependency> | |
75 | 86 | <dependency> |
76 | 87 | <groupId>org.hibernate</groupId> |
77 | 88 | <artifactId>hibernate-entitymanager</artifactId> | ... | ... |
impl/extension/jta/src/test/resources/.arquillian-glassfish-embedded.profile
impl/extension/se/pom.xml
... | ... | @@ -53,7 +53,21 @@ |
53 | 53 | Extensão para aplicações SE |
54 | 54 | </description> |
55 | 55 | <url>http://www.frameworkdemoiselle.gov.br</url> |
56 | - | |
56 | + | |
57 | + <dependencies> | |
58 | + <!-- for tests --> | |
59 | + <dependency> | |
60 | + <groupId>org.jboss.arquillian.container</groupId> | |
61 | + <artifactId>arquillian-weld-se-embedded-1.1</artifactId> | |
62 | + <scope>test</scope> | |
63 | + </dependency> | |
64 | + <dependency> | |
65 | + <groupId>org.jboss.weld.se</groupId> | |
66 | + <artifactId>weld-se-core</artifactId> | |
67 | + <scope>test</scope> | |
68 | + </dependency> | |
69 | + </dependencies> | |
70 | + | |
57 | 71 | <licenses> |
58 | 72 | <license> |
59 | 73 | <name>GNU Lesser General Public License, Version 3</name> | ... | ... |
impl/extension/se/src/test/resources/.arquillian-weld-se-embedded.profile
impl/extension/servlet/pom.xml
... | ... | @@ -85,6 +85,17 @@ |
85 | 85 | </dependency> |
86 | 86 | --> |
87 | 87 | |
88 | + <!-- for tests --> | |
89 | + <dependency> | |
90 | + <groupId>org.jboss.arquillian.container</groupId> | |
91 | + <artifactId>arquillian-glassfish-embedded-3.1</artifactId> | |
92 | + <scope>test</scope> | |
93 | + </dependency> | |
94 | + <dependency> | |
95 | + <groupId>org.glassfish.main.extras</groupId> | |
96 | + <artifactId>glassfish-embedded-all</artifactId> | |
97 | + <scope>test</scope> | |
98 | + </dependency> | |
88 | 99 | <dependency> |
89 | 100 | <groupId>org.apache.httpcomponents</groupId> |
90 | 101 | <artifactId>httpclient</artifactId> | ... | ... |
impl/extension/servlet/src/test/resources/.arquillian-glassfish-embedded.profile
parent/bom/pom.xml
... | ... | @@ -347,6 +347,25 @@ |
347 | 347 | <artifactId>easymock</artifactId> |
348 | 348 | <version>${easymock.version}</version> |
349 | 349 | </dependency> |
350 | + | |
351 | + <!-- arquillian --> | |
352 | + <!-- | |
353 | + --> | |
354 | + <dependency> | |
355 | + <groupId>org.jboss.arquillian.container</groupId> | |
356 | + <artifactId>arquillian-weld-se-embedded-1.1</artifactId> | |
357 | + <version>${arquillian.container.weld.version}</version> | |
358 | + </dependency> | |
359 | + <dependency> | |
360 | + <groupId>org.jboss.arquillian.container</groupId> | |
361 | + <artifactId>arquillian-glassfish-embedded-3.1</artifactId> | |
362 | + <version>${arquillian.container.glassfish.version}</version> | |
363 | + </dependency> | |
364 | + <dependency> | |
365 | + <groupId>org.glassfish.main.extras</groupId> | |
366 | + <artifactId>glassfish-embedded-all</artifactId> | |
367 | + <version>${glassfish.embedded.version}</version> | |
368 | + </dependency> | |
350 | 369 | |
351 | 370 | <!-- Plug-ins --> |
352 | 371 | <dependency> |
... | ... | @@ -395,6 +414,14 @@ |
395 | 414 | <hibernate.version>4.1.7.Final</hibernate.version> |
396 | 415 | <hibernate.validator.version>4.2.0.Final</hibernate.validator.version> |
397 | 416 | |
417 | + <!-- | |
418 | + <arquillian.bom.version>1.1.1.Final</arquillian.bom.version> | |
419 | + --> | |
420 | + <arquillian.weld.version>1.0.0.CR7</arquillian.weld.version> | |
421 | + <arquillian.container.glassfish.version>1.0.0.CR4</arquillian.container.glassfish.version> | |
422 | + <arquillian.container.weld.version>1.0.0.CR7</arquillian.container.weld.version> | |
423 | + <glassfish.embedded.version>3.1.2.2</glassfish.embedded.version> | |
424 | + | |
398 | 425 | <junit.version>4.8.1</junit.version> |
399 | 426 | <easymock.version>3.0</easymock.version> |
400 | 427 | ... | ... |
parent/extension/pom.xml
... | ... | @@ -75,6 +75,8 @@ |
75 | 75 | <scope>import</scope> |
76 | 76 | <type>pom</type> |
77 | 77 | </dependency> |
78 | + <!-- | |
79 | + --> | |
78 | 80 | <dependency> |
79 | 81 | <groupId>org.jboss.arquillian</groupId> |
80 | 82 | <artifactId>arquillian-bom</artifactId> |
... | ... | @@ -83,6 +85,21 @@ |
83 | 85 | <type>pom</type> |
84 | 86 | </dependency> |
85 | 87 | </dependencies> |
88 | + | |
89 | + <!-- | |
90 | + <dependency> | |
91 | + <groupId>org.jboss.arquillian.container</groupId> | |
92 | + <artifactId>arquillian-glassfish-embedded-3.1</artifactId> | |
93 | + <version>${arquillian.container.glassfish.version}</version> | |
94 | + <scope>test</scope> | |
95 | + </dependency> | |
96 | + <dependency> | |
97 | + <groupId>org.glassfish.main.extras</groupId> | |
98 | + <artifactId>glassfish-embedded-all</artifactId> | |
99 | + <version>${glassfish.embedded.version}</version> | |
100 | + <scope>test</scope> | |
101 | + </dependency> | |
102 | + --> | |
86 | 103 | </dependencyManagement> |
87 | 104 | |
88 | 105 | <build> |
... | ... | @@ -159,6 +176,7 @@ |
159 | 176 | </repository> |
160 | 177 | </repositories> |
161 | 178 | |
179 | + | |
162 | 180 | <profiles> |
163 | 181 | <profile> |
164 | 182 | <id>arquillian-test</id> |
... | ... | @@ -187,18 +205,13 @@ |
187 | 205 | </dependency> |
188 | 206 | </dependencies> |
189 | 207 | </profile> |
208 | + <!-- | |
190 | 209 | <profile> |
191 | 210 | <id>arquillian-weld-se-embedded</id> |
192 | - <activation> | |
193 | - <file> | |
194 | - <exists>src/test/resources/.arquillian-weld-se-embedded.profile</exists> | |
195 | - </file> | |
196 | - </activation> | |
197 | 211 | <dependencies> |
198 | 212 | <dependency> |
199 | 213 | <groupId>org.jboss.arquillian.container</groupId> |
200 | 214 | <artifactId>arquillian-weld-se-embedded-1.1</artifactId> |
201 | - <version>${arquillian.container.weld.version}</version> | |
202 | 215 | </dependency> |
203 | 216 | <dependency> |
204 | 217 | <groupId>org.jboss.weld.se</groupId> |
... | ... | @@ -209,12 +222,6 @@ |
209 | 222 | <profile> |
210 | 223 | <id>arquillian-glassfish-embedded</id> |
211 | 224 | <activation> |
212 | - <file> | |
213 | - <exists>src/test/resources/.arquillian-glassfish-embedded.profile</exists> | |
214 | - </file> | |
215 | - <!-- | |
216 | - <activeByDefault>true</activeByDefault> | |
217 | - --> | |
218 | 225 | </activation> |
219 | 226 | <dependencies> |
220 | 227 | <dependency> |
... | ... | @@ -231,155 +238,21 @@ |
231 | 238 | </dependency> |
232 | 239 | </dependencies> |
233 | 240 | </profile> |
234 | - <profile> | |
235 | - <id>arquillian-jbossas7-managed</id> | |
236 | - <activation> | |
237 | - <file> | |
238 | - <exists>src/test/resources/.arquillian-jbossas7-managed.profile</exists> | |
239 | - </file> | |
240 | - </activation> | |
241 | - <build> | |
242 | - <testResources> | |
243 | - <testResource> | |
244 | - <directory>src/test/resources</directory> | |
245 | - <filtering>true</filtering> | |
246 | - </testResource> | |
247 | - </testResources> | |
248 | - <plugins> | |
249 | - <plugin> | |
250 | - <artifactId>maven-dependency-plugin</artifactId> | |
251 | - <executions> | |
252 | - <execution> | |
253 | - <id>unpack</id> | |
254 | - <phase>process-test-classes</phase> | |
255 | - <goals> | |
256 | - <goal>unpack</goal> | |
257 | - </goals> | |
258 | - <configuration> | |
259 | - <artifactItems> | |
260 | - <artifactItem> | |
261 | - <groupId>org.jboss.as</groupId> | |
262 | - <artifactId>jboss-as-dist</artifactId> | |
263 | - <version>${jboss.as.version}</version> | |
264 | - <type>zip</type> | |
265 | - <overWrite>false</overWrite> | |
266 | - <outputDirectory>target</outputDirectory> | |
267 | - </artifactItem> | |
268 | - </artifactItems> | |
269 | - </configuration> | |
270 | - </execution> | |
271 | - </executions> | |
272 | - </plugin> | |
273 | - <plugin> | |
274 | - <groupId>org.jacoco</groupId> | |
275 | - <artifactId>jacoco-maven-plugin</artifactId> | |
276 | - <version>${jacoco.version}</version> | |
277 | - <executions> | |
278 | - <execution> | |
279 | - <goals> | |
280 | - <goal>prepare-agent</goal> | |
281 | - </goals> | |
282 | - </execution> | |
283 | - <execution> | |
284 | - <id>report</id> | |
285 | - <phase>prepare-package</phase> | |
286 | - <goals> | |
287 | - <goal>report</goal> | |
288 | - </goals> | |
289 | - </execution> | |
290 | - </executions> | |
291 | - </plugin> | |
292 | - </plugins> | |
293 | - </build> | |
294 | - <dependencies> | |
295 | - <dependency> | |
296 | - <groupId>org.jboss.as</groupId> | |
297 | - <artifactId>jboss-as-arquillian-container-managed</artifactId> | |
298 | - <version>${jboss.as.version}</version> | |
299 | - <scope>test</scope> | |
300 | - </dependency> | |
301 | - <dependency> | |
302 | - <groupId>org.jboss.arquillian.protocol</groupId> | |
303 | - <artifactId>arquillian-protocol-servlet</artifactId> | |
304 | - <scope>test</scope> | |
305 | - </dependency> | |
306 | - <dependency> | |
307 | - <groupId>org.jboss.arquillian.extension</groupId> | |
308 | - <artifactId>arquillian-jacoco</artifactId> | |
309 | - <version>${arquillian.jacoco.version}</version> | |
310 | - <scope>test</scope> | |
311 | - </dependency> | |
312 | - <dependency> | |
313 | - <groupId>org.jacoco</groupId> | |
314 | - <artifactId>org.jacoco.core</artifactId> | |
315 | - <version>${jacoco.version}</version> | |
316 | - <scope>test</scope> | |
317 | - </dependency> | |
318 | - </dependencies> | |
319 | - </profile> | |
320 | - <profile> | |
321 | - <id>arquillian-drone</id> | |
322 | - <activation> | |
323 | - <file> | |
324 | - <exists>src/test/resources/.arquillian-drone.profile</exists> | |
325 | - </file> | |
326 | - </activation> | |
327 | - <dependencyManagement> | |
328 | - <dependencies> | |
329 | - <dependency> | |
330 | - <groupId>org.jboss.arquillian.extension</groupId> | |
331 | - <artifactId>arquillian-drone-bom</artifactId> | |
332 | - <version>${arquillian.bom.version}</version> | |
333 | - <type>pom</type> | |
334 | - <scope>import</scope> | |
335 | - </dependency> | |
336 | - </dependencies> | |
337 | - </dependencyManagement> | |
338 | - <dependencies> | |
339 | - <dependency> | |
340 | - <groupId>org.jboss.arquillian.extension</groupId> | |
341 | - <artifactId>arquillian-drone-impl</artifactId> | |
342 | - <scope>test</scope> | |
343 | - </dependency> | |
344 | - <dependency> | |
345 | - <groupId>org.jboss.arquillian.extension</groupId> | |
346 | - <artifactId>arquillian-drone-selenium</artifactId> | |
347 | - <scope>test</scope> | |
348 | - </dependency> | |
349 | - <dependency> | |
350 | - <groupId>org.jboss.arquillian.extension</groupId> | |
351 | - <artifactId>arquillian-drone-selenium-server</artifactId> | |
352 | - <scope>test</scope> | |
353 | - </dependency> | |
354 | - <dependency> | |
355 | - <groupId>org.seleniumhq.selenium</groupId> | |
356 | - <artifactId>selenium-java</artifactId> | |
357 | - <scope>test</scope> | |
358 | - </dependency> | |
359 | - <dependency> | |
360 | - <groupId>org.seleniumhq.selenium</groupId> | |
361 | - <artifactId>selenium-server</artifactId> | |
362 | - <scope>test</scope> | |
363 | - <exclusions> | |
364 | - <exclusion> | |
365 | - <groupId>org.mortbay.jetty</groupId> | |
366 | - <artifactId>servlet-api-2.5</artifactId> | |
367 | - </exclusion> | |
368 | - </exclusions> | |
369 | - </dependency> | |
370 | - </dependencies> | |
371 | - </profile> | |
241 | + --> | |
372 | 242 | </profiles> |
373 | 243 | |
374 | 244 | <properties> |
375 | 245 | <arquillian.bom.version>1.1.1.Final</arquillian.bom.version> |
376 | - <arquillian.jacoco.version>1.0.0.Alpha5</arquillian.jacoco.version> | |
246 | + <!-- | |
247 | + | |
248 | + <glassfish.embedded.version>3.1.2.2</glassfish.embedded.version> | |
249 | + | |
377 | 250 | <arquillian.container.glassfish.version>1.0.0.CR4</arquillian.container.glassfish.version> |
378 | 251 | <arquillian.container.weld.version>1.0.0.CR7</arquillian.container.weld.version> |
379 | 252 | |
380 | - <glassfish.embedded.version>3.1.2.2</glassfish.embedded.version> | |
381 | 253 | <jboss.as.version>7.1.1.Final</jboss.as.version> |
382 | 254 | |
383 | 255 | <jacoco.version>0.6.0.201210061924</jacoco.version> |
256 | + --> | |
384 | 257 | </properties> |
385 | 258 | </project> | ... | ... |
parent/framework/pom.xml
... | ... | @@ -55,6 +55,26 @@ |
55 | 55 | Se você é usuário do framework, certamente este POM não servirá para você. |
56 | 56 | </description> |
57 | 57 | <url>http://www.frameworkdemoiselle.gov.br</url> |
58 | + | |
59 | + <!-- | |
60 | + <dependencyManagement> | |
61 | + <dependency> | |
62 | + <groupId>org.jboss.arquillian.container</groupId> | |
63 | + <artifactId>arquillian-weld-se-embedded-1.1</artifactId> | |
64 | + <version>${arquillian.weld.version}</version> | |
65 | + </dependency> | |
66 | + <dependency> | |
67 | + <groupId>org.jboss.arquillian.container</groupId> | |
68 | + <artifactId>arquillian-glassfish-embedded-3.1</artifactId> | |
69 | + <version>${arquillian.container.glassfish.version}</version> | |
70 | + </dependency> | |
71 | + <dependency> | |
72 | + <groupId>org.glassfish.main.extras</groupId> | |
73 | + <artifactId>glassfish-embedded-all</artifactId> | |
74 | + <version>${glassfish.embedded.version}</version> | |
75 | + </dependency> | |
76 | + </dependencyManagement> | |
77 | + --> | |
58 | 78 | |
59 | 79 | <licenses> |
60 | 80 | <license> |
... | ... | @@ -92,4 +112,14 @@ |
92 | 112 | </releases> |
93 | 113 | </repository> |
94 | 114 | </repositories> |
115 | + | |
116 | + <!-- | |
117 | + <properties> | |
118 | + <arquillian.bom.version>1.1.1.Final</arquillian.bom.version> | |
119 | + <arquillian.weld.version>1.0.0.CR7</arquillian.weld.version> | |
120 | + <arquillian.container.glassfish.version>1.0.0.CR4</arquillian.container.glassfish.version> | |
121 | + <arquillian.container.weld.version>1.0.0.CR7</arquillian.container.weld.version> | |
122 | + <glassfish.embedded.version>3.2.1.1</glassfish.embedded.version> | |
123 | + </properties> | |
124 | + --> | |
95 | 125 | </project> | ... | ... |