Commit 8f2f1f0470f0758417fdbcd86cf238a432e373fd
1 parent
c9a5f85c
Exists in
master
Remoção de linhas duplicadas
Showing
1 changed file
with
2 additions
and
45 deletions
Show diff stats
parent/jsf/pom.xml
| @@ -79,17 +79,6 @@ | @@ -79,17 +79,6 @@ | ||
| 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 | - | ||
| 93 | <profiles> | 82 | <profiles> |
| 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 --> | 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 --> |
| 95 | <profile> | 84 | <profile> |
| @@ -141,8 +130,8 @@ | @@ -141,8 +130,8 @@ | ||
| 141 | <scope>compile</scope> | 130 | <scope>compile</scope> |
| 142 | <exclusions> | 131 | <exclusions> |
| 143 | <exclusion> | 132 | <exclusion> |
| 144 | - <artifactId>servlet-api</artifactId> | ||
| 145 | <groupId>javax.servlet</groupId> | 133 | <groupId>javax.servlet</groupId> |
| 134 | + <artifactId>servlet-api</artifactId> | ||
| 146 | </exclusion> | 135 | </exclusion> |
| 147 | </exclusions> | 136 | </exclusions> |
| 148 | </dependency> | 137 | </dependency> |
| @@ -181,22 +170,6 @@ | @@ -181,22 +170,6 @@ | ||
| 181 | <artifactId>hsqldb</artifactId> | 170 | <artifactId>hsqldb</artifactId> |
| 182 | <scope>compile</scope> | 171 | <scope>compile</scope> |
| 183 | </dependency> | 172 | </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> | ||
| 200 | </dependencies> | 173 | </dependencies> |
| 201 | </profile> | 174 | </profile> |
| 202 | <profile> | 175 | <profile> |
| @@ -211,8 +184,8 @@ | @@ -211,8 +184,8 @@ | ||
| 211 | <scope>compile</scope> | 184 | <scope>compile</scope> |
| 212 | <exclusions> | 185 | <exclusions> |
| 213 | <exclusion> | 186 | <exclusion> |
| 214 | - <artifactId>servlet-api</artifactId> | ||
| 215 | <groupId>javax.servlet</groupId> | 187 | <groupId>javax.servlet</groupId> |
| 188 | + <artifactId>servlet-api</artifactId> | ||
| 216 | </exclusion> | 189 | </exclusion> |
| 217 | </exclusions> | 190 | </exclusions> |
| 218 | </dependency> | 191 | </dependency> |
| @@ -266,22 +239,6 @@ | @@ -266,22 +239,6 @@ | ||
| 266 | <artifactId>hsqldb</artifactId> | 239 | <artifactId>hsqldb</artifactId> |
| 267 | <scope>provided</scope> | 240 | <scope>provided</scope> |
| 268 | </dependency> | 241 | </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> | ||
| 285 | 242 | ||
| 286 | <dependency> | 243 | <dependency> |
| 287 | <groupId>org.hibernate</groupId> | 244 | <groupId>org.hibernate</groupId> |