diff options
| author | rfeng <rfeng@13f79535-47bb-0310-9956-ffa450edef68> | 2009-10-26 23:44:59 +0000 |
|---|---|---|
| committer | rfeng <rfeng@13f79535-47bb-0310-9956-ffa450edef68> | 2009-10-26 23:44:59 +0000 |
| commit | 71a7cba384b8ae7f4578fb9ab1f725d5ce616074 (patch) | |
| tree | 98bbc7c066d037a8d9ea1fea7a3ccfa64419ab11 /branches/sca-java-1.x/modules/host-webapp/pom.xml | |
| parent | 01a38d872dc2692d2a31f07f9c8f8098aa078853 (diff) | |
Merge all changes from 1.5.2 branch into trunk
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@830026 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to '')
| -rw-r--r-- | branches/sca-java-1.x/modules/host-webapp/pom.xml | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/branches/sca-java-1.x/modules/host-webapp/pom.xml b/branches/sca-java-1.x/modules/host-webapp/pom.xml index e7feac7caa..de8a945ce5 100644 --- a/branches/sca-java-1.x/modules/host-webapp/pom.xml +++ b/branches/sca-java-1.x/modules/host-webapp/pom.xml @@ -49,6 +49,22 @@ </dependency> <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>1.1.1</version> + <exclusions> + <exclusion> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + </exclusion> + <exclusion> + <groupId>avalon-framework</groupId> + <artifactId>avalon-framework</artifactId> + </exclusion> + </exclusions> + </dependency> + + <dependency> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> <version>2.4</version> <!-- to keep compatible with older servlet containers --> @@ -62,22 +78,6 @@ <scope>provided</scope> </dependency> - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - <version>1.1.1</version> - <exclusions> - <exclusion> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - </exclusion> - <exclusion> - <groupId>avalon-framework</groupId> - <artifactId>avalon-framework</artifactId> - </exclusion> - </exclusions> - </dependency> - </dependencies> <build> |