Download as
Browse Code »

Commit 32081084423e138fd99fa9627a95f9dfd06784aa

Authored by Danilo Costa Viana
1 parent 98bb9503

Atualizando versões de dependências nos arquivos POM

Showing 13 changed files with 155 additions and 52 deletions   Show diff stats
.gitignore
  Diff comments   View file @3208108
... ... @@ -8,3 +8,4 @@
8 8 /.idea
9 9 /archetype/angularModular/src/main/resources/archetype-resources/view/nbproject/private/
10 10 *.iml
  11 +.directory
... ...
archetype/jsf-jpa/src/main/resources/archetype-resources/pom.xml
  Diff comments   View file @3208108
... ... @@ -36,7 +36,7 @@
36 36 <dependency>
37 37 <groupId>org.primefaces</groupId>
38 38 <artifactId>primefaces</artifactId>
39   - <version>5.0</version>
  39 + <version>5.3</version>
40 40 <scope>compile</scope>
41 41 </dependency>
42 42  
... ...
impl/core/pom.xml
  Diff comments   View file @3208108
... ... @@ -185,6 +185,6 @@
185 185 </repositories>
186 186  
187 187 <properties>
188   - <arquillian.bom.version>1.1.1.Final</arquillian.bom.version>
  188 + <arquillian.bom.version>1.1.11.Final</arquillian.bom.version>
189 189 </properties>
190 190 </project>
... ...
impl/core/src/main/java/br/gov/frameworkdemoiselle/lifecycle/ViewScoped.java
  Diff comments   View file @3208108
... ... @@ -51,11 +51,14 @@ import javax.enterprise.context.NormalScope;
51 51 * This scope maintains the context for viewed page; when the viewed page change, the data will be lost.
52 52 *
53 53 * @author SERPRO
  54 + *
  55 + * @deprecated
54 56 */
55 57 @Inherited
56 58 @Target({ METHOD, TYPE, FIELD })
57 59 @Retention(RUNTIME)
58 60 @NormalScope(passivating = true)
  61 +@Deprecated
59 62 public @interface ViewScoped {
60 63  
61 64 }
... ...
impl/extension/jsf/pom.xml
  Diff comments   View file @3208108
... ... @@ -76,8 +76,8 @@
76 76 <artifactId>jsf-api</artifactId>
77 77 </dependency>
78 78 <dependency>
79   - <groupId>org.glassfish.web</groupId>
80   - <artifactId>el-impl</artifactId>
  79 + <groupId>org.glassfish</groupId>
  80 + <artifactId>javax.el</artifactId>
81 81 <scope>provided</scope>
82 82 </dependency>
83 83  
... ...
impl/extension/jsf/src/main/java/br/gov/frameworkdemoiselle/internal/context/FacesViewContextImpl.java
  Diff comments   View file @3208108
... ... @@ -63,9 +63,13 @@ import br.gov.frameworkdemoiselle.util.Faces;
63 63 * stored on this store are kept as long as the view is still active.
64 64 *
65 65 * @author serpro
  66 + *
  67 + * @deprecated This context is deprecated, it's preferred to use the annotation
  68 + * javax.faces.view.ViewScoped
66 69 */
67 70 @Priority(Priority.L2_PRIORITY)
68 71 @Alternative
  72 +@Deprecated
69 73 public class FacesViewContextImpl extends AbstractCustomContext implements ViewContext {
70 74  
71 75 private final AtomicLong atomicLong = new AtomicLong();
... ...
impl/extension/jta/pom.xml
  Diff comments   View file @3208108
... ... @@ -69,7 +69,7 @@
69 69 <dependencies>
70 70 <dependency>
71 71 <groupId>javax.transaction</groupId>
72   - <artifactId>jta</artifactId>
  72 + <artifactId>javax.transaction-api</artifactId>
73 73 </dependency>
74 74  
75 75 <!-- for tests -->
... ... @@ -90,6 +90,22 @@
90 90 </dependency>
91 91 </dependencies>
92 92  
  93 + <profiles>
  94 + <profile>
  95 + <id>wildfly8</id>
  96 + <activation>
  97 + <activeByDefault>true</activeByDefault>
  98 + </activation>
  99 + <dependencies>
  100 + <dependency>
  101 + <groupId>javax.transaction</groupId>
  102 + <artifactId>javax.transaction-api</artifactId>
  103 + <scope>provided</scope>
  104 + </dependency>
  105 + </dependencies>
  106 + </profile>
  107 + </profiles>
  108 +
93 109 <repositories>
94 110 <repository>
95 111 <id>sonatype-nexus-snapshots</id>
... ...
impl/extension/rest/pom.xml
  Diff comments   View file @3208108
... ... @@ -73,7 +73,7 @@
73 73 </dependency>
74 74 <dependency>
75 75 <groupId>javax.ws.rs</groupId>
76   - <artifactId>jsr311-api</artifactId>
  76 + <artifactId>javax.ws.rs-api</artifactId>
77 77 </dependency>
78 78  
79 79 <!-- for tests -->
... ...
parent/bom/pom.xml
  Diff comments   View file @3208108
... ... @@ -34,7 +34,8 @@
34 34 ou escreva para a Fundação do Software Livre (FSF) Inc.,
35 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" 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"
  38 + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
38 39  
39 40 <modelVersion>4.0.0</modelVersion>
40 41  
... ... @@ -120,16 +121,16 @@
120 121 <groupId>javax.enterprise</groupId>
121 122 <artifactId>cdi-api</artifactId>
122 123 <version>${cdi.version}</version>
123   - <exclusions>
  124 + <!--<exclusions>
124 125 <exclusion>
125 126 <artifactId>jsr250-api</artifactId>
126 127 <groupId>javax.annotation</groupId>
127 128 </exclusion>
128   - </exclusions>
  129 + </exclusions>-->
129 130 </dependency>
130 131  
131 132 <!-- jsr-299 impl -->
132   - <dependency>
  133 + <!--<dependency>
133 134 <groupId>org.jboss.weld</groupId>
134 135 <artifactId>weld-core</artifactId>
135 136 <version>${weld.version}</version>
... ... @@ -144,16 +145,16 @@
144 145 <groupId>org.jboss.weld.servlet</groupId>
145 146 <artifactId>weld-servlet-core</artifactId>
146 147 <version>${weld.version}</version>
147   - </dependency>
  148 + </dependency>-->
148 149  
149   - <!-- jsr-303 api -->
  150 + <!-- jsr-349 api -->
150 151 <dependency>
151 152 <artifactId>validation-api</artifactId>
152 153 <groupId>javax.validation</groupId>
153 154 <version>${validation.version}</version>
154 155 </dependency>
155 156  
156   - <!-- jsr-303 impl -->
  157 + <!-- jsr-349 impl -->
157 158 <dependency>
158 159 <groupId>org.hibernate</groupId>
159 160 <artifactId>hibernate-validator</artifactId>
... ... @@ -170,28 +171,31 @@
170 171 </exclusions>
171 172 </dependency>
172 173  
173   - <!-- jsr-??? api -->
174   - <dependency>
  174 + <!-- jsr-341 api and impl-->
  175 + <!--<dependency>
175 176 <groupId>javax.el</groupId>
176 177 <artifactId>el-api</artifactId>
177 178 <version>${el.version}</version>
178   - </dependency>
179   -
180   - <!-- jsr-??? api -->
181   - <dependency>
  179 + </dependency>-->
  180 + <!--<dependency>
182 181 <groupId>org.glassfish.web</groupId>
183 182 <artifactId>el-impl</artifactId>
184 183 <version>${el.version}</version>
  184 + </dependency>-->
  185 + <dependency>
  186 + <groupId>org.glassfish</groupId>
  187 + <artifactId>javax.el</artifactId>
  188 + <version>${el.version}</version>
185 189 </dependency>
186 190  
187   - <!-- jsr-314 api -->
  191 + <!-- jsr-344 api -->
188 192 <dependency>
189 193 <groupId>com.sun.faces</groupId>
190 194 <artifactId>jsf-api</artifactId>
191 195 <version>${jsf.version}</version>
192 196 </dependency>
193 197  
194   - <!-- jsr-314 impl -->
  198 + <!-- jsr-344 impl -->
195 199 <dependency>
196 200 <groupId>com.sun.faces</groupId>
197 201 <artifactId>jsf-impl</artifactId>
... ... @@ -210,35 +214,35 @@
210 214 <version>${javaee.version}</version>
211 215 </dependency>
212 216  
213   - <!-- jsr-??? api -->
214   - <dependency>
  217 + <!-- jsr-340 api -->
  218 + <!--<dependency>
215 219 <groupId>javax.servlet</groupId>
216 220 <artifactId>servlet-api</artifactId>
217 221 <version>${servlet.version}</version>
218   - </dependency>
  222 + </dependency>-->
219 223 <dependency>
220 224 <groupId>javax.servlet</groupId>
221 225 <artifactId>javax.servlet-api</artifactId>
222   - <version>3.0.1</version>
  226 + <version>${servlet.version}</version>
223 227 </dependency>
224 228 <dependency>
225 229 <groupId>javax.servlet</groupId>
226 230 <artifactId>jstl</artifactId>
227   - <version>1.2</version>
  231 + <version>${jstl.version}</version>
228 232 </dependency>
229 233  
230   - <!-- jsr-317 api -->
  234 + <!-- jsr-338 api -->
231 235 <dependency>
232 236 <groupId>org.eclipse.persistence</groupId>
233 237 <artifactId>javax.persistence</artifactId>
234 238 <version>${persistence.version}</version>
235 239 </dependency>
236 240  
237   - <!-- jsr-317 impl -->
  241 + <!-- jsr-338 impl -->
238 242 <dependency>
239 243 <groupId>org.eclipse.persistence</groupId>
240 244 <artifactId>eclipselink</artifactId>
241   - <version>2.1.0</version>
  245 + <version>2.6.2</version>
242 246 </dependency>
243 247 <dependency>
244 248 <groupId>org.hibernate</groupId>
... ... @@ -247,19 +251,31 @@
247 251 </dependency>
248 252  
249 253 <!-- jsr-907 api -->
250   - <dependency>
  254 + <!--<dependency>
251 255 <groupId>javax.transaction</groupId>
252 256 <artifactId>jta</artifactId>
253 257 <version>${transaction.version}</version>
  258 + </dependency>-->
  259 + <dependency>
  260 + <groupId>javax.transaction</groupId>
  261 + <artifactId>javax.transaction-api</artifactId>
  262 + <version>${transaction.version}</version>
254 263 </dependency>
255 264  
256   - <!-- jsr-311 api -->
  265 + <!-- jsr-339 api -->
257 266 <dependency>
258 267 <groupId>javax.ws.rs</groupId>
259   - <artifactId>jsr311-api</artifactId>
  268 + <artifactId>javax.ws.rs-api</artifactId>
260 269 <version>${rest.version}</version>
261 270 </dependency>
262 271  
  272 + <!-- jsr-236 api -->
  273 + <dependency>
  274 + <groupId>javax.enterprise.concurrent</groupId>
  275 + <artifactId>javax.enterprise.concurrent-api</artifactId>
  276 + <version>${concurrent.version}</version>
  277 + </dependency>
  278 +
263 279 <!-- logger api -->
264 280 <dependency>
265 281 <groupId>org.slf4j</groupId>
... ... @@ -307,7 +323,7 @@
307 323 <artifactId>commons-dbcp</artifactId>
308 324 <version>${commons.dbcp.version}</version>
309 325 </dependency>
310   -
  326 +
311 327 <!-- embedded database -->
312 328 <dependency>
313 329 <groupId>hsqldb</groupId>
... ... @@ -347,7 +363,7 @@
347 363 <artifactId>easymock</artifactId>
348 364 <version>${easymock.version}</version>
349 365 </dependency>
350   -
  366 +
351 367 <!-- arquillian -->
352 368 <!--
353 369 -->
... ... @@ -402,21 +418,23 @@
402 418 </repositories>
403 419  
404 420 <properties>
405   - <javaee.version>6.0</javaee.version>
406   - <cdi.version>1.0-SP4</cdi.version>
407   - <validation.version>1.0.0.GA</validation.version>
  421 + <javaee.version>7.0</javaee.version>
  422 + <cdi.version>1.1</cdi.version>
  423 + <validation.version>1.1.0.Final</validation.version>
408 424 <transaction.version>1.1</transaction.version>
409   - <jsf.version>2.1.11</jsf.version>
410   - <el.version>2.2</el.version>
411   - <servlet.version>2.5</servlet.version>
412   - <persistence.version>2.0.0</persistence.version>
413   - <rest.version>1.1.1</rest.version>
  425 + <jsf.version>2.2.13</jsf.version>
  426 + <jstl.version>1.2</jstl.version>
  427 + <el.version>3.0.0</el.version>
  428 + <servlet.version>3.1.0</servlet.version>
  429 + <persistence.version>2.1.0</persistence.version>
  430 + <rest.version>2.0</rest.version>
  431 + <concurrent.version>1.0</concurrent.version>
414 432  
415   - <hibernate.version>4.1.7.Final</hibernate.version>
416   - <hibernate.validator.version>4.2.0.Final</hibernate.validator.version>
  433 + <hibernate.version>5.1.0.Final</hibernate.version>
  434 + <hibernate.validator.version>5.2.4.Final</hibernate.validator.version>
417 435  
418 436 <!--
419   - <arquillian.bom.version>1.1.1.Final</arquillian.bom.version>
  437 + <arquillian.bom.version>1.1.11.Final</arquillian.bom.version>
420 438 -->
421 439 <arquillian.weld.version>1.0.0.CR7</arquillian.weld.version>
422 440 <arquillian.container.glassfish.version>1.0.0.CR4</arquillian.container.glassfish.version>
... ... @@ -429,13 +447,13 @@
429 447 <maven.surefire.plugin.version>2.16</maven.surefire.plugin.version>
430 448  
431 449 <powermock.version>1.4.6</powermock.version>
432   - <slf4j.version>1.6.1</slf4j.version>
  450 + <slf4j.version>1.7.21</slf4j.version>
433 451 <weld.version>1.1.8.Final</weld.version>
434   - <commons.configuration.version>1.9</commons.configuration.version>
  452 + <commons.configuration.version>20041012.002804</commons.configuration.version>
435 453 <commons.dbcp.version>1.4</commons.dbcp.version>
436 454 <hsqldb.version>1.8.0.10</hsqldb.version>
437 455 <jasperreports.version>4.0.1</jasperreports.version>
438 456 <mail.version>1.4.4</mail.version>
439   - <javassist.version>3.14.0-GA</javassist.version>
  457 + <javassist.version>3.20.0-GA</javassist.version>
440 458 </properties>
441 459 </project>
... ...
parent/framework/pom.xml
  Diff comments   View file @3208108
... ... @@ -45,7 +45,7 @@
45 45 <parent>
46 46 <groupId>br.gov.frameworkdemoiselle</groupId>
47 47 <artifactId>demoiselle-parent</artifactId>
48   - <version>10</version>
  48 + <version>11-SNAPSHOT</version>
49 49 <relativePath>../../../internal/parent/demoiselle</relativePath>
50 50 </parent>
51 51  
... ...
parent/jsf/pom.xml
  Diff comments   View file @3208108
... ... @@ -77,7 +77,7 @@
77 77  
78 78 <profiles>
79 79 <!-- Os profiles foram replicados do parent pois o Maven 2 não suporta herança de profile. Provavelmente isto estará corrigido no Maven 3 -->
80   - <profile>
  80 + <!--<profile>
81 81 <id>tomcat6</id>
82 82 <dependencies>
83 83 <dependency>
... ... @@ -149,6 +149,19 @@
149 149 <scope>provided</scope>
150 150 </dependency>
151 151 </dependencies>
  152 + </profile>-->
  153 + <profile>
  154 + <id>wildfly8</id>
  155 + <activation>
  156 + <activeByDefault>true</activeByDefault>
  157 + </activation>
  158 + <dependencies>
  159 + <dependency>
  160 + <groupId>com.sun.faces</groupId>
  161 + <artifactId>jsf-api</artifactId>
  162 + <scope>provided</scope>
  163 + </dependency>
  164 + </dependencies>
152 165 </profile>
153 166 </profiles>
154 167  
... ...
parent/rest/pom.xml
  Diff comments   View file @3208108
... ... @@ -143,7 +143,7 @@
143 143 <dependencies>
144 144 <dependency>
145 145 <groupId>javax.ws.rs</groupId>
146   - <artifactId>jsr311-api</artifactId>
  146 + <artifactId>javax.ws.rs-api</artifactId>
147 147 <scope>provided</scope>
148 148 </dependency>
149 149  
... ...
parent/servlet/pom.xml
  Diff comments   View file @3208108
... ... @@ -104,7 +104,7 @@
104 104 </dependencies>
105 105  
106 106 <profiles>
107   - <profile>
  107 + <!--<profile>
108 108 <id>tomcat6</id>
109 109 <dependencies>
110 110 <dependency>
... ... @@ -361,6 +361,54 @@
361 361 <scope>test</scope>
362 362 </dependency>
363 363 </dependencies>
  364 + </profile>-->
  365 + <profile>
  366 + <id>wildfly8</id>
  367 + <activation>
  368 + <activeByDefault>true</activeByDefault>
  369 + </activation>
  370 + <dependencies>
  371 + <dependency>
  372 + <groupId>javax.servlet</groupId>
  373 + <artifactId>javax.servlet-api</artifactId>
  374 + <scope>provided</scope>
  375 + </dependency>
  376 + <dependency>
  377 + <groupId>javax.enterprise</groupId>
  378 + <artifactId>cdi-api</artifactId>
  379 + <scope>provided</scope>
  380 + </dependency>
  381 + <dependency>
  382 + <groupId>org.javassist</groupId>
  383 + <artifactId>javassist</artifactId>
  384 + <scope>provided</scope>
  385 + </dependency>
  386 + <dependency>
  387 + <artifactId>validation-api</artifactId>
  388 + <groupId>javax.validation</groupId>
  389 + <scope>provided</scope>
  390 + </dependency>
  391 + <dependency>
  392 + <groupId>javax.transaction</groupId>
  393 + <artifactId>javax.transaction-api</artifactId>
  394 + <scope>provided</scope>
  395 + </dependency>
  396 + <dependency>
  397 + <groupId>org.eclipse.persistence</groupId>
  398 + <artifactId>javax.persistence</artifactId>
  399 + <scope>provided</scope>
  400 + </dependency>
  401 + <dependency>
  402 + <groupId>hsqldb</groupId>
  403 + <artifactId>hsqldb</artifactId>
  404 + <scope>provided</scope>
  405 + </dependency>
  406 + <dependency>
  407 + <groupId>org.hibernate</groupId>
  408 + <artifactId>hibernate-entitymanager</artifactId>
  409 + <scope>test</scope>
  410 + </dependency>
  411 + </dependencies>
364 412 </profile>
365 413 </profiles>
366 414  
... ...