Commit 5913b3da126a465ac656988758d9c8f458f70f7b

Authored by Cleverson Sacramento
1 parent adc83660
Exists in master

Ajuste nas dependências

impl/core/pom.xml
@@ -108,7 +108,6 @@ @@ -108,7 +108,6 @@
108 <dependency> 108 <dependency>
109 <groupId>org.javassist</groupId> 109 <groupId>org.javassist</groupId>
110 <artifactId>javassist</artifactId> 110 <artifactId>javassist</artifactId>
111 - <version>3.14.0-GA</version>  
112 </dependency> 111 </dependency>
113 112
114 <dependency> 113 <dependency>
parent/bom/pom.xml
  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 +-->
1 <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/maven-v4_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/maven-v4_0_0.xsd">
2 38
3 <modelVersion>4.0.0</modelVersion> 39 <modelVersion>4.0.0</modelVersion>
@@ -20,7 +56,6 @@ @@ -20,7 +56,6 @@
20 56
21 <dependencyManagement> 57 <dependencyManagement>
22 <dependencies> 58 <dependencies>
23 -  
24 <!-- core + extensions --> 59 <!-- core + extensions -->
25 <dependency> 60 <dependency>
26 <groupId>br.gov.frameworkdemoiselle</groupId> 61 <groupId>br.gov.frameworkdemoiselle</groupId>
@@ -83,11 +118,6 @@ @@ -83,11 +118,6 @@
83 <artifactId>weld-servlet-core</artifactId> 118 <artifactId>weld-servlet-core</artifactId>
84 <version>${weld.version}</version> 119 <version>${weld.version}</version>
85 </dependency> 120 </dependency>
86 - <dependency>  
87 - <groupId>org.jboss.weld.se</groupId>  
88 - <artifactId>weld-se-core</artifactId>  
89 - <version>${weld.version}</version>  
90 - </dependency>  
91 121
92 <!-- jsr-303 api --> 122 <!-- jsr-303 api -->
93 <dependency> 123 <dependency>
@@ -217,13 +247,19 @@ @@ -217,13 +247,19 @@
217 <version>${commons.configuration.version}</version> 247 <version>${commons.configuration.version}</version>
218 </dependency> 248 </dependency>
219 249
220 - <!-- banco de dados embarcado --> 250 + <!-- embedded database -->
221 <dependency> 251 <dependency>
222 <groupId>hsqldb</groupId> 252 <groupId>hsqldb</groupId>
223 <artifactId>hsqldb</artifactId> 253 <artifactId>hsqldb</artifactId>
224 <version>${hsqldb.version}</version> 254 <version>${hsqldb.version}</version>
225 </dependency> 255 </dependency>
226 256
  257 + <dependency>
  258 + <artifactId>javassist</artifactId>
  259 + <groupId>org.javassist</groupId>
  260 + <version>${javassist.version}</version>
  261 + </dependency>
  262 +
227 <!-- test tools --> 263 <!-- test tools -->
228 <dependency> 264 <dependency>
229 <groupId>junit</groupId> 265 <groupId>junit</groupId>
@@ -291,9 +327,6 @@ @@ -291,9 +327,6 @@
291 <servlet.version>2.5</servlet.version> 327 <servlet.version>2.5</servlet.version>
292 <persistence.version>2.0.1</persistence.version> 328 <persistence.version>2.0.1</persistence.version>
293 329
294 - <vaadin.version>6.5.2</vaadin.version>  
295 - <gwt.version>2.1.1</gwt.version>  
296 - <shiro.version>1.1.0</shiro.version>  
297 <hibernate.version>3.6.0.Final</hibernate.version> 330 <hibernate.version>3.6.0.Final</hibernate.version>
298 331
299 <junit.version>4.8.1</junit.version> 332 <junit.version>4.8.1</junit.version>
@@ -309,12 +342,9 @@ @@ -309,12 +342,9 @@
309 <jasperreports.version>4.0.1</jasperreports.version> 342 <jasperreports.version>4.0.1</jasperreports.version>
310 <mail.version>1.4.4</mail.version> 343 <mail.version>1.4.4</mail.version>
311 <mockjavamail.version>1.9</mockjavamail.version> 344 <mockjavamail.version>1.9</mockjavamail.version>
  345 + <javassist.version>3.14.0-GA</javassist.version>
312 346
313 - <demoiselle.junit.version>2.3.0-BETA2</demoiselle.junit.version>  
314 - <demoiselle.vaadin.version>2.3.0-BETA1</demoiselle.vaadin.version>  
315 - <demoiselle.shiro.version>2.2.2</demoiselle.shiro.version>  
316 - <demoiselle.valitation.version>2.0.0</demoiselle.valitation.version>  
317 - <demoiselle.report.version>2.0.3</demoiselle.report.version> 347 + <demoiselle.junit.version>2.3.0-RC2-SNAPSHOT</demoiselle.junit.version>
318 <demoiselle.authorization.version>2.0.2</demoiselle.authorization.version> 348 <demoiselle.authorization.version>2.0.2</demoiselle.authorization.version>
319 </properties> 349 </properties>
320 </project> 350 </project>
parent/servlet/pom.xml
@@ -302,6 +302,11 @@ @@ -302,6 +302,11 @@
302 <scope>provided</scope> 302 <scope>provided</scope>
303 </dependency> 303 </dependency>
304 <dependency> 304 <dependency>
  305 + <groupId>org.javassist</groupId>
  306 + <artifactId>javassist</artifactId>
  307 + <scope>provided</scope>
  308 + </dependency>
  309 + <dependency>
305 <artifactId>validation-api</artifactId> 310 <artifactId>validation-api</artifactId>
306 <groupId>javax.validation</groupId> 311 <groupId>javax.validation</groupId>
307 <scope>provided</scope> 312 <scope>provided</scope>
@@ -350,6 +355,11 @@ @@ -350,6 +355,11 @@
350 <scope>provided</scope> 355 <scope>provided</scope>
351 </dependency> 356 </dependency>
352 <dependency> 357 <dependency>
  358 + <groupId>org.javassist</groupId>
  359 + <artifactId>javassist</artifactId>
  360 + <scope>provided</scope>
  361 + </dependency>
  362 + <dependency>
353 <artifactId>validation-api</artifactId> 363 <artifactId>validation-api</artifactId>
354 <groupId>javax.validation</groupId> 364 <groupId>javax.validation</groupId>
355 <scope>provided</scope> 365 <scope>provided</scope>