TUSCANY-2432 - resolve some dependencies to a single version

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@672731 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
slaws 2008-06-30 09:13:25 +00:00
parent 9aa066a618
commit eb340a208f
5 changed files with 43 additions and 5 deletions

View file

@ -229,6 +229,11 @@
<groupId>mx4j</groupId>
<artifactId>mx4j-remote</artifactId>
</exclusion>
<exclusion>
<!-- exclude backport-util-concurrent-2.2.jar since we are using version 3.0 -->
<groupId>backport-util-concurrent</groupId>
<artifactId>backport-util-concurrent</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>

View file

@ -357,6 +357,10 @@
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
</exclusion>
<exclusion>
<groupId>backport-util-concurrent</groupId>
<artifactId>backport-util-concurrent</artifactId>
</exclusion>
</exclusions>
</dependency>
@ -388,9 +392,18 @@
<exclusion>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
</exclusion>
</exclusion>
<exclusion>
<groupId>backport-util-concurrent</groupId>
<artifactId>backport-util-concurrent</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>backport-util-concurrent</groupId>
<artifactId>backport-util-concurrent</artifactId>
<version>3.0</version>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>

View file

@ -80,7 +80,7 @@
<dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
<version>1.2</version>
<version>1.1.1</version>
</dependency>
<dependency>

View file

@ -74,8 +74,17 @@
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
</exclusion>
<exclusion>
<groupId>backport-util-concurrent</groupId>
<artifactId>backport-util-concurrent</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>backport-util-concurrent</groupId>
<artifactId>backport-util-concurrent</artifactId>
<version>3.0</version>
</dependency>
<dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-adb</artifactId>

View file

@ -80,12 +80,23 @@
<version>1.2.5</version>
</dependency>
<dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-kernel</artifactId>
<version>1.3</version>
<version>1.3</version>
<exclusions>
<exclusion>
<groupId>backport-util-concurrent</groupId>
<artifactId>backport-util-concurrent</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>backport-util-concurrent</groupId>
<artifactId>backport-util-concurrent</artifactId>
<version>3.0</version>
<scope>test</scope>
</dependency>
<dependency>