Commit c9a5f85ccd8c4e06a106c31398744c350181dc42
Exists in
master
Merge branch 'master' of git@github.com:demoiselle/framework.git
Showing
1 changed file
with
43 additions
and
0 deletions
Show diff stats
parent/jsf/pom.xml
| @@ -79,6 +79,17 @@ | @@ -79,6 +79,17 @@ | ||
| 79 | </dependencies> | 79 | </dependencies> |
| 80 | </dependencyManagement> | 80 | </dependencyManagement> |
| 81 | 81 | ||
| 82 | + <dependencyManagement> | ||
| 83 | + <dependencies> | ||
| 84 | + <dependency> | ||
| 85 | + <groupId>javax.servlet</groupId> | ||
| 86 | + <artifactId>javax.servlet-api</artifactId> | ||
| 87 | + <version>3.0.1</version> | ||
| 88 | + <scope>provided</scope> | ||
| 89 | + </dependency> | ||
| 90 | + </dependencies> | ||
| 91 | + </dependencyManagement> | ||
| 92 | + | ||
| 82 | <profiles> | 93 | <profiles> |
| 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 --> | 94 | <!-- Os profiles foram replicados do parent pois o Maven 2 não suporta herança de profile. Provavelmente isto estará corrigido no Maven 3 --> |
| 84 | <profile> | 95 | <profile> |
| @@ -170,6 +181,22 @@ | @@ -170,6 +181,22 @@ | ||
| 170 | <artifactId>hsqldb</artifactId> | 181 | <artifactId>hsqldb</artifactId> |
| 171 | <scope>compile</scope> | 182 | <scope>compile</scope> |
| 172 | </dependency> | 183 | </dependency> |
| 184 | + <dependency> | ||
| 185 | + <groupId>br.gov.frameworkdemoiselle</groupId> | ||
| 186 | + <artifactId>demoiselle-jsf</artifactId> | ||
| 187 | + <scope>compile</scope> | ||
| 188 | + <exclusions> | ||
| 189 | + <exclusion> | ||
| 190 | + <artifactId>servlet-api</artifactId> | ||
| 191 | + <groupId>javax.servlet</groupId> | ||
| 192 | + </exclusion> | ||
| 193 | + </exclusions> | ||
| 194 | + </dependency> | ||
| 195 | + <dependency> | ||
| 196 | + <groupId>javax.servlet</groupId> | ||
| 197 | + <artifactId>javax.servlet-api</artifactId> | ||
| 198 | + <scope>provided</scope> | ||
| 199 | + </dependency> | ||
| 173 | </dependencies> | 200 | </dependencies> |
| 174 | </profile> | 201 | </profile> |
| 175 | <profile> | 202 | <profile> |
| @@ -239,6 +266,22 @@ | @@ -239,6 +266,22 @@ | ||
| 239 | <artifactId>hsqldb</artifactId> | 266 | <artifactId>hsqldb</artifactId> |
| 240 | <scope>provided</scope> | 267 | <scope>provided</scope> |
| 241 | </dependency> | 268 | </dependency> |
| 269 | + <dependency> | ||
| 270 | + <groupId>br.gov.frameworkdemoiselle</groupId> | ||
| 271 | + <artifactId>demoiselle-jsf</artifactId> | ||
| 272 | + <scope>compile</scope> | ||
| 273 | + <exclusions> | ||
| 274 | + <exclusion> | ||
| 275 | + <artifactId>servlet-api</artifactId> | ||
| 276 | + <groupId>javax.servlet</groupId> | ||
| 277 | + </exclusion> | ||
| 278 | + </exclusions> | ||
| 279 | + </dependency> | ||
| 280 | + <dependency> | ||
| 281 | + <groupId>javax.servlet</groupId> | ||
| 282 | + <artifactId>javax.servlet-api</artifactId> | ||
| 283 | + <scope>provided</scope> | ||
| 284 | + </dependency> | ||
| 242 | 285 | ||
| 243 | <dependency> | 286 | <dependency> |
| 244 | <groupId>org.hibernate</groupId> | 287 | <groupId>org.hibernate</groupId> |