From 606ad37588473845c233c30a05f70c54d415f577 Mon Sep 17 00:00:00 2001
From: Arjen Poutsma <apoutsma@vmware.com>
Date: Tue, 27 Jan 2009 14:29:34 +0000
Subject: [PATCH] SWS-477: Upgrade to Wss4j 1.5.5

---
 parent/pom.xml   | 23 ++---------------------
 pom.xml          |  4 ++--
 security/pom.xml |  7 ++-----
 3 files changed, 6 insertions(+), 28 deletions(-)

diff --git a/parent/pom.xml b/parent/pom.xml
index ebe17c2c..f45ec908 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -87,20 +87,6 @@
                     </archive>
                 </configuration>
             </plugin>
-            <!-- IDEs -->
-            <plugin>
-                <artifactId>maven-eclipse-plugin</artifactId>
-                <configuration>
-                    <downloadSources>true</downloadSources>
-                </configuration>
-            </plugin>
-            <plugin>
-                <artifactId>maven-idea-plugin</artifactId>
-                <configuration>
-                    <downloadSources>true</downloadSources>
-                    <downloadJavadocs>true</downloadJavadocs>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
     <reporting>
@@ -522,15 +508,10 @@
                 <artifactId>xmlsec</artifactId>
                 <version>2.0</version>
             </dependency>
-            <dependency>
-                <groupId>org.apache.santuario</groupId>
-                <artifactId>xmlsec</artifactId>
-                <version>1.4.1</version>
-            </dependency>
             <dependency>
                 <groupId>org.apache.ws.security</groupId>
                 <artifactId>wss4j</artifactId>
-                <version>1.5.4</version>
+                <version>1.5.5</version>
                 <exclusions>
                     <exclusion>
                         <groupId>axis</groupId>
@@ -542,7 +523,7 @@
                     </exclusion>
                     <exclusion>
                         <groupId>xerces</groupId>
-                        <artifactId>xercecImpl</artifactId>
+                        <artifactId>xercesImpl</artifactId>
                     </exclusion>
                     <exclusion>
                         <groupId>xml-apis</groupId>
diff --git a/pom.xml b/pom.xml
index 39bb911c..3a441f18 100644
--- a/pom.xml
+++ b/pom.xml
@@ -393,13 +393,13 @@
                                         <artifactItem>
                                             <groupId>org.apache.ws.security</groupId>
                                             <artifactId>wss4j</artifactId>
-                                            <version>1.5.4</version>
+                                            <version>1.5.5</version>
                                             <outputDirectory>${project.build.directory}/dependency/wss4j/</outputDirectory>
                                         </artifactItem>
                                         <artifactItem>
                                             <groupId>org.apache.santuario</groupId>
                                             <artifactId>xmlsec</artifactId>
-                                            <version>1.4.1</version>
+                                            <version>1.4.2</version>
                                             <outputDirectory>${project.build.directory}/dependency/wss4j/</outputDirectory>
                                         </artifactItem>
                                         <artifactItem>
diff --git a/security/pom.xml b/security/pom.xml
index 1866a2c6..1b494c11 100644
--- a/security/pom.xml
+++ b/security/pom.xml
@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <parent>
         <artifactId>spring-ws-parent</artifactId>
         <groupId>org.springframework.ws</groupId>
@@ -117,10 +118,6 @@
             <groupId>com.sun.xml.wss</groupId>
             <artifactId>xws-security</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.apache.santuario</groupId>
-            <artifactId>xmlsec</artifactId>
-        </dependency>
         <!-- WSS4J dependencies -->
         <dependency>
             <groupId>org.apache.ws.security</groupId>