Download as
Browse Code »

Commit fc18147cf55d853694912847b736f016504610ff

Authored by Cleverson Sacramento
1 parent 6e907d2a
Exists in master

Ajuste na dependência do Servlet 3

Showing 1 changed file with 50 additions and 6 deletions   Show diff stats
parent/jsf/pom.xml
  Diff comments   View file @fc18147
@@ -34,7 +34,8 @@ @@ -34,7 +34,8 @@
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" 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 <modelVersion>4.0.0</modelVersion> 40 <modelVersion>4.0.0</modelVersion>
40 41
@@ -61,23 +62,34 @@ @@ -61,23 +62,34 @@
61 <scope>compile</scope> 62 <scope>compile</scope>
62 </dependency> 63 </dependency>
63 <dependency> 64 <dependency>
64 - <groupId>javax.servlet</groupId>  
65 - <artifactId>servlet-api</artifactId>  
66 - <scope>provided</scope>  
67 - </dependency>  
68 - <dependency>  
69 <groupId>javax.el</groupId> 65 <groupId>javax.el</groupId>
70 <artifactId>el-api</artifactId> 66 <artifactId>el-api</artifactId>
71 <scope>provided</scope> 67 <scope>provided</scope>
72 </dependency> 68 </dependency>
73 </dependencies> 69 </dependencies>
74 70
  71 + <dependencyManagement>
  72 + <dependencies>
  73 + <dependency>
  74 + <groupId>javax.servlet</groupId>
  75 + <artifactId>javax.servlet-api</artifactId>
  76 + <version>3.0.1</version>
  77 + <scope>provided</scope>
  78 + </dependency>
  79 + </dependencies>
  80 + </dependencyManagement>
  81 +
75 <profiles> 82 <profiles>
76 <!-- Os profiles foram replicados do parent pois o Maven 2 não suporta herança de profile. Provavelmente isto estará corrigido no Maven 3 --> 83 <!-- Os profiles foram replicados do parent pois o Maven 2 não suporta herança de profile. Provavelmente isto estará corrigido no Maven 3 -->
77 <profile> 84 <profile>
78 <id>tomcat6</id> 85 <id>tomcat6</id>
79 <dependencies> 86 <dependencies>
80 <dependency> 87 <dependency>
  88 + <groupId>javax.servlet</groupId>
  89 + <artifactId>servlet-api</artifactId>
  90 + <scope>provided</scope>
  91 + </dependency>
  92 + <dependency>
81 <groupId>org.jboss.weld</groupId> 93 <groupId>org.jboss.weld</groupId>
82 <artifactId>weld-core</artifactId> 94 <artifactId>weld-core</artifactId>
83 <scope>runtime</scope> 95 <scope>runtime</scope>
@@ -113,6 +125,22 @@ @@ -113,6 +125,22 @@
113 <id>tomcat7</id> 125 <id>tomcat7</id>
114 <dependencies> 126 <dependencies>
115 <dependency> 127 <dependency>
  128 + <groupId>br.gov.frameworkdemoiselle</groupId>
  129 + <artifactId>demoiselle-jsf</artifactId>
  130 + <scope>compile</scope>
  131 + <exclusions>
  132 + <exclusion>
  133 + <artifactId>servlet-api</artifactId>
  134 + <groupId>javax.servlet</groupId>
  135 + </exclusion>
  136 + </exclusions>
  137 + </dependency>
  138 + <dependency>
  139 + <groupId>javax.servlet</groupId>
  140 + <artifactId>javax.servlet-api</artifactId>
  141 + <scope>provided</scope>
  142 + </dependency>
  143 + <dependency>
116 <groupId>org.jboss.weld</groupId> 144 <groupId>org.jboss.weld</groupId>
117 <artifactId>weld-core</artifactId> 145 <artifactId>weld-core</artifactId>
118 <scope>runtime</scope> 146 <scope>runtime</scope>
@@ -151,6 +179,22 @@ @@ -151,6 +179,22 @@
151 </activation> 179 </activation>
152 <dependencies> 180 <dependencies>
153 <dependency> 181 <dependency>
  182 + <groupId>br.gov.frameworkdemoiselle</groupId>
  183 + <artifactId>demoiselle-jsf</artifactId>
  184 + <scope>compile</scope>
  185 + <exclusions>
  186 + <exclusion>
  187 + <artifactId>servlet-api</artifactId>
  188 + <groupId>javax.servlet</groupId>
  189 + </exclusion>
  190 + </exclusions>
  191 + </dependency>
  192 + <dependency>
  193 + <groupId>javax.servlet</groupId>
  194 + <artifactId>javax.servlet-api</artifactId>
  195 + <scope>provided</scope>
  196 + </dependency>
  197 + <dependency>
154 <groupId>javax.enterprise</groupId> 198 <groupId>javax.enterprise</groupId>
155 <artifactId>cdi-api</artifactId> 199 <artifactId>cdi-api</artifactId>
156 <scope>provided</scope> 200 <scope>provided</scope>