summaryrefslogtreecommitdiffstats
path: root/sca-java-2.x/trunk
diff options
context:
space:
mode:
Diffstat (limited to 'sca-java-2.x/trunk')
-rw-r--r--sca-java-2.x/trunk/distribution/all/src/main/release/bin/LICENSE2
-rw-r--r--sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/pom.xml30
-rw-r--r--sca-java-2.x/trunk/samples/getting-started/helloworld-webapp/pom.xml19
-rw-r--r--sca-java-2.x/trunk/testing/itest/properties/pom.xml2
4 files changed, 46 insertions, 7 deletions
diff --git a/sca-java-2.x/trunk/distribution/all/src/main/release/bin/LICENSE b/sca-java-2.x/trunk/distribution/all/src/main/release/bin/LICENSE
index a0ccc2e351..f8d61db3f7 100644
--- a/sca-java-2.x/trunk/distribution/all/src/main/release/bin/LICENSE
+++ b/sca-java-2.x/trunk/distribution/all/src/main/release/bin/LICENSE
@@ -326,7 +326,7 @@ The following components come under Apache Software License 2.0
xmlbeans-2.3.0.jar
XmlSchema-1.4.3.jar
xmlsec-1.4.4.jar
- xmltooling-1.2.0.jar
+ xmltooling-1.3.1.jar
===============================================================================
The serp-1.13.1.jar is distributed under the BSD license with the following copyright:
diff --git a/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/pom.xml b/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/pom.xml
index 8d673d0d38..30c4fb6509 100644
--- a/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/pom.xml
+++ b/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/pom.xml
@@ -84,14 +84,14 @@
axiom-dom-1.2.10.jar,
mex-1.5.4-impl.jar,
not-yet-commons-ssl-0.3.9.jar,
- opensaml-2.2.3.jar,
- openws-1.2.2.jar,
+ opensaml-2.4.1.jar,
+ openws-1.4.1.jar,
rampart-core-1.5.1.jar,
rampart-policy-1.5.1.jar,
rampart-trust-1.5.1.jar,
wss4j-1.5.10.jar,
xmlsec-1.4.4.jar,
- xmltooling-1.2.0.jar
+ xmltooling-1.3.1.jar
-->
<exclusion>
<groupId>org.apache.axis2</groupId>
@@ -225,7 +225,11 @@
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>log4j-over-slf4j</artifactId>
- </exclusion>
+ </exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jul-to-slf4j</artifactId>
+ </exclusion>
<exclusion>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
@@ -243,10 +247,18 @@
<artifactId>bcprov-ext-jdk15</artifactId>
</exclusion>
<exclusion>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcprov-jdk15</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>org.apache.commons.ssl</groupId>
<artifactId>not-yet-commons-ssl</artifactId>
</exclusion>
<exclusion>
+ <groupId>ca.juliusdavies</groupId>
+ <artifactId>not-yet-commons-ssl</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
</exclusion>
@@ -277,7 +289,15 @@
<exclusion>
<groupId>org.apache.xalan</groupId>
<artifactId>xalan</artifactId>
- </exclusion>
+ </exclusion>
+ <exclusion>
+ <groupId>xalan</groupId>
+ <artifactId>xalan</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>xml-resolver</groupId>
+ <artifactId>xml-resolver</artifactId>
+ </exclusion>
</exclusions>
</dependency>
diff --git a/sca-java-2.x/trunk/samples/getting-started/helloworld-webapp/pom.xml b/sca-java-2.x/trunk/samples/getting-started/helloworld-webapp/pom.xml
index 8bb8d1e161..d239f4a50c 100644
--- a/sca-java-2.x/trunk/samples/getting-started/helloworld-webapp/pom.xml
+++ b/sca-java-2.x/trunk/samples/getting-started/helloworld-webapp/pom.xml
@@ -58,8 +58,27 @@
<artifactId>htmlunit</artifactId>
<version>2.6</version>
<scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>xalan</groupId>
+ <artifactId>xalan</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
+ <!-- replace HTMLUnit dependency with verstion that Tuscany is using -->
+ <dependency>
+ <groupId>xalan</groupId>
+ <artifactId>xalan</artifactId>
+ <version>2.7.0</version>
+ <exclusions>
+ <exclusion>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
</dependencies>
<build>
diff --git a/sca-java-2.x/trunk/testing/itest/properties/pom.xml b/sca-java-2.x/trunk/testing/itest/properties/pom.xml
index ec04cdba99..ba8a3deaab 100644
--- a/sca-java-2.x/trunk/testing/itest/properties/pom.xml
+++ b/sca-java-2.x/trunk/testing/itest/properties/pom.xml
@@ -53,7 +53,7 @@
<dependency>
<groupId>xalan</groupId>
<artifactId>xalan</artifactId>
- <version>2.7.1</version>
+ <version>2.7.0</version>
<scope>test</scope>
</dependency>