Commit 3b3e5e216975faf1f8a4b6310cf5b9e6b04c8cde
1 parent
6e907d2a
Exists in
master
Ajuste na dependência do Servlet 3
Showing
1 changed file
with
45 additions
and
6 deletions
Show diff stats
parent/jsf/pom.xml
... | ... | @@ -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 | |
... | ... | @@ -61,17 +62,23 @@ |
61 | 62 | <scope>compile</scope> |
62 | 63 | </dependency> |
63 | 64 | <dependency> |
64 | - <groupId>javax.servlet</groupId> | |
65 | - <artifactId>servlet-api</artifactId> | |
66 | - <scope>provided</scope> | |
67 | - </dependency> | |
68 | - <dependency> | |
69 | 65 | <groupId>javax.el</groupId> |
70 | 66 | <artifactId>el-api</artifactId> |
71 | 67 | <scope>provided</scope> |
72 | 68 | </dependency> |
73 | 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 | 82 | <profiles> |
76 | 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 | 84 | <profile> |
... | ... | @@ -142,6 +149,22 @@ |
142 | 149 | <artifactId>hsqldb</artifactId> |
143 | 150 | <scope>compile</scope> |
144 | 151 | </dependency> |
152 | + <dependency> | |
153 | + <groupId>br.gov.frameworkdemoiselle</groupId> | |
154 | + <artifactId>demoiselle-jsf</artifactId> | |
155 | + <scope>compile</scope> | |
156 | + <exclusions> | |
157 | + <exclusion> | |
158 | + <artifactId>servlet-api</artifactId> | |
159 | + <groupId>javax.servlet</groupId> | |
160 | + </exclusion> | |
161 | + </exclusions> | |
162 | + </dependency> | |
163 | + <dependency> | |
164 | + <groupId>javax.servlet</groupId> | |
165 | + <artifactId>javax.servlet-api</artifactId> | |
166 | + <scope>provided</scope> | |
167 | + </dependency> | |
145 | 168 | </dependencies> |
146 | 169 | </profile> |
147 | 170 | <profile> |
... | ... | @@ -195,6 +218,22 @@ |
195 | 218 | <artifactId>hsqldb</artifactId> |
196 | 219 | <scope>provided</scope> |
197 | 220 | </dependency> |
221 | + <dependency> | |
222 | + <groupId>br.gov.frameworkdemoiselle</groupId> | |
223 | + <artifactId>demoiselle-jsf</artifactId> | |
224 | + <scope>compile</scope> | |
225 | + <exclusions> | |
226 | + <exclusion> | |
227 | + <artifactId>servlet-api</artifactId> | |
228 | + <groupId>javax.servlet</groupId> | |
229 | + </exclusion> | |
230 | + </exclusions> | |
231 | + </dependency> | |
232 | + <dependency> | |
233 | + <groupId>javax.servlet</groupId> | |
234 | + <artifactId>javax.servlet-api</artifactId> | |
235 | + <scope>provided</scope> | |
236 | + </dependency> | |
198 | 237 | |
199 | 238 | <dependency> |
200 | 239 | <groupId>org.hibernate</groupId> | ... | ... |