summaryrefslogtreecommitdiffstats
path: root/java/sca/modules
diff options
context:
space:
mode:
Diffstat (limited to 'java/sca/modules')
-rw-r--r--java/sca/modules/binding-ws-axis2/pom.xml15
-rw-r--r--java/sca/modules/domain-manager/pom.xml2
-rw-r--r--java/sca/modules/interface-wsdl-java2wsdl/pom.xml9
-rw-r--r--java/sca/modules/policy-security-ws/pom.xml17
4 files changed, 38 insertions, 5 deletions
diff --git a/java/sca/modules/binding-ws-axis2/pom.xml b/java/sca/modules/binding-ws-axis2/pom.xml
index 946493ba3c..8d2c7eb27e 100644
--- a/java/sca/modules/binding-ws-axis2/pom.xml
+++ b/java/sca/modules/binding-ws-axis2/pom.xml
@@ -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,10 +392,19 @@
<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>
<version>1.2.12</version>
diff --git a/java/sca/modules/domain-manager/pom.xml b/java/sca/modules/domain-manager/pom.xml
index a3bd04a5eb..70b4e39302 100644
--- a/java/sca/modules/domain-manager/pom.xml
+++ b/java/sca/modules/domain-manager/pom.xml
@@ -80,7 +80,7 @@
<dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
- <version>1.2</version>
+ <version>1.1.1</version>
</dependency>
<dependency>
diff --git a/java/sca/modules/interface-wsdl-java2wsdl/pom.xml b/java/sca/modules/interface-wsdl-java2wsdl/pom.xml
index 4f18f4444b..77cb0b8d64 100644
--- a/java/sca/modules/interface-wsdl-java2wsdl/pom.xml
+++ b/java/sca/modules/interface-wsdl-java2wsdl/pom.xml
@@ -74,9 +74,18 @@
<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>
<version>1.3</version>
diff --git a/java/sca/modules/policy-security-ws/pom.xml b/java/sca/modules/policy-security-ws/pom.xml
index 6acc208f38..39451178f3 100644
--- a/java/sca/modules/policy-security-ws/pom.xml
+++ b/java/sca/modules/policy-security-ws/pom.xml
@@ -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>