Author: coheigea
Date: Wed May 15 13:07:17 2013
New Revision: 1482803
URL: http://svn.apache.org/r1482803
Log:
Updating some dependencies
Conflicts:
pom.xml
Modified:
webservices/wss4j/trunk/parent/pom.xml
webservices/wss4j/trunk/ws-security-common/pom.xml
webservices/wss4j/trunk/ws-security-dom/pom.xml
webservices/wss4j/trunk/ws-security-stax/pom.xml
Modified: webservices/wss4j/trunk/parent/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/wss4j/trunk/parent/pom.xml?rev=1482803&r1=1482802&r2=1482803&view=diff
==============================================================================
--- webservices/wss4j/trunk/parent/pom.xml (original)
+++ webservices/wss4j/trunk/parent/pom.xml Wed May 15 13:07:17 2013
@@ -46,7 +46,7 @@
<xmlsec.version>2.0.0-SNAPSHOT</xmlsec.version>
<opensaml.version>2.5.3</opensaml.version>
<testng.version>6.5.2</testng.version>
- <junit.version>4.8.2</junit.version>
+ <junit.version>4.11</junit.version>
<xml.apis.version>1.3.04</xml.apis.version>
<wsdl4j.version>1.6.2</wsdl4j.version>
<xmlunit.version>1.3</xmlunit.version>
Modified: webservices/wss4j/trunk/ws-security-common/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-common/pom.xml?rev=1482803&r1=1482802&r2=1482803&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-common/pom.xml (original)
+++ webservices/wss4j/trunk/ws-security-common/pom.xml Wed May 15 13:07:17 2013
@@ -139,6 +139,10 @@
<artifactId>velocity</artifactId>
</exclusion>
<exclusion>
+ <groupId>org.apache.velocity</groupId>
+ <artifactId>velocity</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>org.owasp.esapi</groupId>
<artifactId>esapi</artifactId>
</exclusion>
@@ -179,14 +183,26 @@
<artifactId>xercesImpl</artifactId>
</exclusion>
<exclusion>
+ <groupId>org.apache.xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
</exclusion>
<exclusion>
+ <groupId>org.apache.xerces</groupId>
+ <artifactId>xml-apis</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>xalan</groupId>
<artifactId>xalan</artifactId>
</exclusion>
<exclusion>
+ <groupId>org.apache.xerces</groupId>
+ <artifactId>serializer</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
</exclusion>
Modified: webservices/wss4j/trunk/ws-security-dom/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/pom.xml?rev=1482803&r1=1482802&r2=1482803&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/pom.xml (original)
+++ webservices/wss4j/trunk/ws-security-dom/pom.xml Wed May 15 13:07:17 2013
@@ -143,6 +143,10 @@
<artifactId>velocity</artifactId>
</exclusion>
<exclusion>
+ <groupId>org.apache.velocity</groupId>
+ <artifactId>velocity</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>org.owasp.esapi</groupId>
<artifactId>esapi</artifactId>
</exclusion>
@@ -183,14 +187,26 @@
<artifactId>xercesImpl</artifactId>
</exclusion>
<exclusion>
+ <groupId>org.apache.xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
</exclusion>
<exclusion>
+ <groupId>org.apache.xerces</groupId>
+ <artifactId>xml-apis</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>xalan</groupId>
<artifactId>xalan</artifactId>
</exclusion>
<exclusion>
+ <groupId>org.apache.xerces</groupId>
+ <artifactId>serializer</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
</exclusion>
Modified: webservices/wss4j/trunk/ws-security-stax/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/pom.xml?rev=1482803&r1=1482802&r2=1482803&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-stax/pom.xml (original)
+++ webservices/wss4j/trunk/ws-security-stax/pom.xml Wed May 15 13:07:17 2013
@@ -78,6 +78,10 @@
<artifactId>velocity</artifactId>
</exclusion>
<exclusion>
+ <groupId>org.apache.velocity</groupId>
+ <artifactId>velocity</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>org.slf4j</groupId>
<artifactId>log4j-over-slf4j</artifactId>
</exclusion>
@@ -114,10 +118,26 @@
<artifactId>xercesImpl</artifactId>
</exclusion>
<exclusion>
+ <groupId>org.apache.xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.xerces</groupId>
+ <artifactId>xml-apis</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>xalan</groupId>
<artifactId>xalan</artifactId>
</exclusion>
<exclusion>
+ <groupId>org.apache.xerces</groupId>
+ <artifactId>serializer</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
</exclusion>
