diff --git a/parent/pom.xml b/parent/pom.xml
index 6b2c6c04..df166a31 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -483,40 +483,15 @@
             </dependency>
             <!-- WS-Security dependencies -->
             <dependency>
-                <groupId>com.sun.xml.wss</groupId>
+                <groupId>com.sun.xml.wsit</groupId>
                 <artifactId>xws-security</artifactId>
-                <version>3.0</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>javax.xml.parsers</groupId>
-                        <artifactId>jaxp-api</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>javax.xml.bind</groupId>
-                        <artifactId>jaxb-api</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>javax.xml.ws</groupId>
-                        <artifactId>jaxws-api</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>javax.xml</groupId>
-                        <artifactId>jaxrpc-api</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>javax.xml.soap</groupId>
-                        <artifactId>saaj-api</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>javax.mail</groupId>
-                        <artifactId>mail</artifactId>
-                    </exclusion>
-                </exclusions>
+                <!-- Version 1.3.1 is actually XWSS 3.0 -->
+                <version>1.3.1</version>
             </dependency>
             <dependency>
-                <groupId>com.sun.org.apache.xml.security</groupId>
-                <artifactId>xmlsec</artifactId>
-                <version>2.0</version>
+              <groupId>com.sun.xml.wsit</groupId>
+              <artifactId>wsit-rt</artifactId>
+              <version>1.1</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.ws.security</groupId>
@@ -549,7 +524,7 @@
             <dependency>
                 <groupId>org.springframework.security</groupId>
                 <artifactId>spring-security-core</artifactId>
-                <version>3.0.2.RELEASE</version>
+                <version>3.0.4.RELEASE</version>
                 <exclusions>
                     <exclusion>
                         <groupId>org.springframework</groupId>
@@ -560,7 +535,7 @@
             <dependency>
                 <groupId>org.springframework.security</groupId>
                 <artifactId>spring-security-core</artifactId>
-                <version>3.0.2.RELEASE</version>
+                <version>3.0.4.RELEASE</version>
                 <classifier>tests</classifier>
                 <exclusions>
                     <exclusion>
@@ -572,7 +547,7 @@
             <dependency>
                 <groupId>org.springframework.security</groupId>
                 <artifactId>spring-security-config</artifactId>
-                <version>3.0.2.RELEASE</version>
+                <version>3.0.4.RELEASE</version>
             </dependency>
             <!-- X.509 dependencies -->
             <dependency>
diff --git a/pom.xml b/pom.xml
index ada17c5a..e85e8de7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -163,7 +163,7 @@
                                     <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
                                 </manifest>
                                 <manifestEntries>
-                                    <Spring-WS-Version>${pom.version}</Spring-WS-Version>
+                                    <Spring-WS-Version>${project.version}</Spring-WS-Version>
                                 </manifestEntries>
                             </archive>
                             <descriptors>
@@ -183,7 +183,7 @@
                                     <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
                                 </manifest>
                                 <manifestEntries>
-                                    <Spring-WS-Version>${pom.version}</Spring-WS-Version>
+                                    <Spring-WS-Version>${project.version}</Spring-WS-Version>
                                 </manifestEntries>
                             </archive>
                             <descriptors>
diff --git a/samples/airline/client/saaj/pom.xml b/samples/airline/client/saaj/pom.xml
index 99e2e02f..85879105 100644
--- a/samples/airline/client/saaj/pom.xml
+++ b/samples/airline/client/saaj/pom.xml
@@ -39,10 +39,9 @@
     </profiles>
     <repositories>
         <repository>
-            <id>java.net</id>
-            <name>Java.net Repository for Maven2</name>
-            <url>http://download.java.net/maven/1/</url>
-            <layout>legacy</layout>
+            <id>jboss.repository.releases.public</id>
+            <name>JBoss Repo Public</name>
+            <url>http://repository.jboss.org/nexus/content/groups/public-jboss</url>
         </repository>
     </repositories>
     <build>
@@ -65,8 +64,12 @@
     </build>
     <dependencies>
         <dependency>
-            <groupId>com.sun.xml.wss</groupId>
+            <groupId>com.sun.xml.wsit</groupId>
             <artifactId>xws-security</artifactId>
         </dependency>
+        <dependency>
+          <groupId>com.sun.xml.wsit</groupId>
+          <artifactId>wsit-rt</artifactId>
+        </dependency>
     </dependencies>
 </project>
diff --git a/samples/airline/server/pom.xml b/samples/airline/server/pom.xml
index aaf233a4..6358c4f2 100644
--- a/samples/airline/server/pom.xml
+++ b/samples/airline/server/pom.xml
@@ -117,7 +117,6 @@
         <dependency>
             <groupId>org.springframework.ws</groupId>
             <artifactId>spring-ws-security</artifactId>
-            <scope>runtime</scope>
             <exclusions>
                 <exclusion>
                     <groupId>org.apache.ws.security</groupId>
diff --git a/samples/echo/client/saaj/pom.xml b/samples/echo/client/saaj/pom.xml
index fd088e7c..68e29d85 100644
--- a/samples/echo/client/saaj/pom.xml
+++ b/samples/echo/client/saaj/pom.xml
@@ -30,6 +30,7 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>exec-maven-plugin</artifactId>
+                <version>1.2</version>
                 <executions>
                     <execution>
                         <goals>
diff --git a/samples/echo/client/spring-ws/pom.xml b/samples/echo/client/spring-ws/pom.xml
index dd8f05fb..a4c4d8ab 100644
--- a/samples/echo/client/spring-ws/pom.xml
+++ b/samples/echo/client/spring-ws/pom.xml
@@ -30,6 +30,7 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>exec-maven-plugin</artifactId>
+                <version>1.2</version>
                 <executions>
                     <execution>
                         <goals>
diff --git a/samples/mtom/server/pom.xml b/samples/mtom/server/pom.xml
index 65f84908..5a0727de 100644
--- a/samples/mtom/server/pom.xml
+++ b/samples/mtom/server/pom.xml
@@ -11,14 +11,6 @@
    <packaging>war</packaging>
    <name>Spring WS MTOM Sample - Server</name>
    <description>This sample shows how to use MTOM and JAXB2.</description>
-   <pluginRepositories>
-       <pluginRepository>
-           <id>java.net</id>
-           <name>Java.net Repository for Maven2</name>
-           <url>http://download.java.net/maven/1/</url>
-           <layout>legacy</layout>
-       </pluginRepository>
-   </pluginRepositories>   
     <profiles>
         <profile>
             <id>jdk15</id>
diff --git a/samples/pom.xml b/samples/pom.xml
index 6ce263ea..dbf7159d 100644
--- a/samples/pom.xml
+++ b/samples/pom.xml
@@ -19,17 +19,34 @@
         <module>airline</module>
     </modules>
     <build>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.codehaus.mojo</groupId>
+                    <artifactId>exec-maven-plugin</artifactId>
+                    <version>1.2</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.mortbay.jetty</groupId>
+                    <artifactId>maven-jetty-plugin</artifactId>
+                    <version>6.1.26</version>
+                </plugin>
+                <plugin>
+                    <artifactId>maven-war-plugin</artifactId>
+                    <version>2.1.1</version>
+                    <configuration>
+                        <warName>${project.artifactId}</warName>
+                    </configuration>
+                </plugin>
+            </plugins>
+        </pluginManagement>
         <plugins>
             <plugin>
                 <groupId>org.mortbay.jetty</groupId>
                 <artifactId>maven-jetty-plugin</artifactId>
             </plugin>
             <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-war-plugin</artifactId>
-                <configuration>
-                    <warName>${pom.artifactId}</warName>
-                </configuration>
             </plugin>
         </plugins>
     </build>
diff --git a/samples/stockquote/server/pom.xml b/samples/stockquote/server/pom.xml
index 6243a0e6..79ea8b77 100644
--- a/samples/stockquote/server/pom.xml
+++ b/samples/stockquote/server/pom.xml
@@ -61,5 +61,9 @@
             <groupId>org.springframework.ws</groupId>
             <artifactId>spring-ws-support</artifactId>
         </dependency>
+        <dependency>
+            <groupId>log4j</groupId>
+            <artifactId>log4j</artifactId>
+        </dependency>
     </dependencies>
 </project>
diff --git a/security/pom.xml b/security/pom.xml
index 510f404b..933a42f4 100644
--- a/security/pom.xml
+++ b/security/pom.xml
@@ -12,21 +12,9 @@
     <description>Spring-WS WS-Security implementation</description>
     <repositories>
         <repository>
-            <id>java.net</id>
-            <name>Java.net Repository for Maven2</name>
-            <url>http://download.java.net/maven/1/</url>
-            <layout>legacy</layout>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-            <releases>
-                <enabled>true</enabled>
-            </releases>
-        </repository>
-        <repository>
-            <id>spring-ext</id>
-            <name>Spring External Dependencies Repository</name>
-            <url>https://springframework.svn.sourceforge.net/svnroot/springframework/repos/repo-ext/</url>
+            <id>jboss.repository.releases.public</id>
+            <name>JBoss Repo Public</name>
+            <url>http://repository.jboss.org/nexus/content/groups/public-jboss</url>
         </repository>
     </repositories>
     <profiles>
@@ -101,9 +89,13 @@
         </dependency>
         <!-- XWSS dependencies -->
         <dependency>
-            <groupId>com.sun.xml.wss</groupId>
+            <groupId>com.sun.xml.wsit</groupId>
             <artifactId>xws-security</artifactId>
         </dependency>
+        <dependency>
+          <groupId>com.sun.xml.wsit</groupId>
+          <artifactId>wsit-rt</artifactId>
+        </dependency>
         <!-- WSS4J dependencies -->
         <dependency>
             <groupId>org.apache.ws.security</groupId>
@@ -133,5 +125,10 @@
             <classifier>tests</classifier>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.codehaus.woodstox</groupId>
+            <artifactId>woodstox-core-asl</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 </project>
diff --git a/support/pom.xml b/support/pom.xml
index 9800bd38..0d981fca 100644
--- a/support/pom.xml
+++ b/support/pom.xml
@@ -60,10 +60,6 @@
             <groupId>org.springframework.ws</groupId>
             <artifactId>spring-ws-core</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.springframework.ws</groupId>
-            <artifactId>spring-ws-core</artifactId>
-        </dependency>
         <!-- Spring dependencies -->
         <dependency>
             <groupId>org.springframework</groupId>