diff --git a/build.gradle b/build.gradle
index 688946c7..9b99ce78 100644
--- a/build.gradle
+++ b/build.gradle
@@ -24,7 +24,7 @@ configure(allprojects) {
 		"-Xlint:dep-ann", "-Xlint:divzero", "-Xlint:empty", "-Xlint:finally",
 		"-Xlint:overrides", "-Xlint:path", "-Xlint:processing", "-Xlint:static",
 		"-Xlint:try", "-Xlint:fallthrough", "-Xlint:rawtypes", "-Xlint:deprecation",
-		"-Xlint:unchecked", "-Xlint:-options", "-Werror"
+		"-Xlint:unchecked", "-Xlint:-options"
 	]
 
 	compileTestJava.options*.compilerArgs = [
diff --git a/spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j/Wss4jHandler.java b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j/Wss4jHandler.java
index 9f5d9a14..a8ca645a 100644
--- a/spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j/Wss4jHandler.java
+++ b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j/Wss4jHandler.java
@@ -19,8 +19,6 @@ package org.springframework.ws.soap.security.wss4j;
 import java.util.List;
 import java.util.Properties;
 
-import org.springframework.ws.context.MessageContext;
-
 import org.apache.ws.security.WSSecurityEngineResult;
 import org.apache.ws.security.WSSecurityException;
 import org.apache.ws.security.components.crypto.Crypto;
@@ -29,11 +27,15 @@ import org.apache.ws.security.handler.WSHandler;
 import org.apache.ws.security.handler.WSHandlerConstants;
 import org.w3c.dom.Document;
 
+import org.springframework.ws.context.MessageContext;
+
 /**
  * @author Tareq Abed Rabbo
  * @author Arjen Poutsma
  * @since 1.5.0
+ * @deprecated Transition to {@link org.springframework.ws.soap.security.wss4j2.Wss4jHandler}.
  */
+@Deprecated
 class Wss4jHandler extends WSHandler {
 
 	/** Keys are constants from {@link WSHandlerConstants}; values are strings. */
diff --git a/spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j/Wss4jSecurityFaultException.java b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j/Wss4jSecurityFaultException.java
index e2941679..ab4c6c4b 100644
--- a/spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j/Wss4jSecurityFaultException.java
+++ b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j/Wss4jSecurityFaultException.java
@@ -26,8 +26,10 @@ import org.springframework.ws.soap.security.WsSecurityFaultException;
  * @author Tareq Abed Rabbo
  * @author Arjen Poutsma
  * @since 1.5.0
+ * @deprecated Transition to {@link org.springframework.ws.soap.security.wss4j2.Wss4jSecurityFaultException}
  */
 @SuppressWarnings("serial")
+@Deprecated
 public class Wss4jSecurityFaultException extends WsSecurityFaultException {
 
 	public Wss4jSecurityFaultException(QName faultCode, String faultString, String faultActor) {
diff --git a/spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j/Wss4jSecurityInterceptor.java b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j/Wss4jSecurityInterceptor.java
index 529f927a..a37ea082 100644
--- a/spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j/Wss4jSecurityInterceptor.java
+++ b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j/Wss4jSecurityInterceptor.java
@@ -96,7 +96,9 @@ import org.springframework.ws.soap.security.wss4j.callback.UsernameTokenPrincipa
  * @author Greg Turnquist
  * @see <a href="http://ws.apache.org/wss4j/">Apache WSS4J</a>
  * @since 1.5.0
+ * @deprecated Transition to {@link org.springframework.ws.soap.security.wss4j2.Wss4jSecurityInterceptor}
  */
+@Deprecated
 public class Wss4jSecurityInterceptor extends AbstractWsSecurityInterceptor implements InitializingBean {
 
 	public static final String SECUREMENT_USER_PROPERTY_NAME = "Wss4jSecurityInterceptor.securementUser";
diff --git a/spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j/Wss4jSecuritySecurementException.java b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j/Wss4jSecuritySecurementException.java
index 18a8bdc0..291c9cf0 100644
--- a/spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j/Wss4jSecuritySecurementException.java
+++ b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j/Wss4jSecuritySecurementException.java
@@ -24,8 +24,10 @@ import org.springframework.ws.soap.security.WsSecuritySecurementException;
  * @author Tareq Abed Rabbo
  * @author Arjen Poutsma
  * @since 1.5.0
+ * @deprecated Transition to {@link org.springframework.ws.soap.security.wss4j2.Wss4jSecuritySecurementException}
  */
 @SuppressWarnings("serial")
+@Deprecated
 public class Wss4jSecuritySecurementException extends WsSecuritySecurementException {
 
 	public Wss4jSecuritySecurementException(String msg) {
diff --git a/spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j/Wss4jSecurityValidationException.java b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j/Wss4jSecurityValidationException.java
index 45c00d3c..ae10f2d0 100644
--- a/spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j/Wss4jSecurityValidationException.java
+++ b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j/Wss4jSecurityValidationException.java
@@ -24,8 +24,10 @@ import org.springframework.ws.soap.security.WsSecurityValidationException;
  * @author Tareq Abed Rabbo
  * @author Arjen Poutsma
  * @since 1.5.0
+ * @deprecated Transition to {@link org.springframework.ws.soap.security.wss4j2.Wss4jSecurityValidationException}
  */
 @SuppressWarnings("serial")
+@Deprecated
 public class Wss4jSecurityValidationException extends WsSecurityValidationException {
 
 	public Wss4jSecurityValidationException(String msg) {
diff --git a/spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j/callback/AbstractWsPasswordCallbackHandler.java b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j/callback/AbstractWsPasswordCallbackHandler.java
index 2f782ce0..f3de66bd 100644
--- a/spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j/callback/AbstractWsPasswordCallbackHandler.java
+++ b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j/callback/AbstractWsPasswordCallbackHandler.java
@@ -20,18 +20,20 @@ import java.io.IOException;
 import javax.security.auth.callback.Callback;
 import javax.security.auth.callback.UnsupportedCallbackException;
 
+import org.apache.ws.security.WSPasswordCallback;
+
 import org.springframework.ws.soap.security.callback.AbstractCallbackHandler;
 import org.springframework.ws.soap.security.callback.CleanupCallback;
 
-import org.apache.ws.security.WSPasswordCallback;
-
 /**
  * Abstract base class for {@link javax.security.auth.callback.CallbackHandler} implementations that handle {@link
  * WSPasswordCallback} callbacks.
  *
  * @author Arjen Poutsma
  * @since 1.5.0
+ * @deprecated Transition to {@link org.springframework.ws.soap.security.wss4j2.callback.AbstractWsPasswordCallbackHandler}
  */
+@Deprecated
 public abstract class AbstractWsPasswordCallbackHandler extends AbstractCallbackHandler {
 
 	/**
diff --git a/spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j/callback/KeyStoreCallbackHandler.java b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j/callback/KeyStoreCallbackHandler.java
index ce53c0f6..9ba9771a 100644
--- a/spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j/callback/KeyStoreCallbackHandler.java
+++ b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j/callback/KeyStoreCallbackHandler.java
@@ -36,7 +36,9 @@ import org.springframework.ws.soap.security.support.KeyStoreUtils;
  * @author Arjen Poutsma
  * @see org.springframework.ws.soap.security.support.KeyStoreFactoryBean
  * @since 1.5.0
+ * @deprecated Transition to {@link org.springframework.ws.soap.security.wss4j2.callback.KeyStoreCallbackHandler}
  */
+@Deprecated
 public class KeyStoreCallbackHandler extends AbstractWsPasswordCallbackHandler implements InitializingBean {
 
 	private String privateKeyPassword;
diff --git a/spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j/callback/SimplePasswordValidationCallbackHandler.java b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j/callback/SimplePasswordValidationCallbackHandler.java
index ec706502..6a6e3b5e 100644
--- a/spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j/callback/SimplePasswordValidationCallbackHandler.java
+++ b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j/callback/SimplePasswordValidationCallbackHandler.java
@@ -35,7 +35,9 @@ import org.springframework.util.Assert;
  * @author Arjen Poutsma
  * @see #setUsers(java.util.Properties)
  * @since 1.5.0
+ * @deprecated Transition to {@link org.springframework.ws.soap.security.wss4j2.callback.SimplePasswordValidationCallbackHandler}
  */
+@Deprecated
 public class SimplePasswordValidationCallbackHandler extends AbstractWsPasswordCallbackHandler
 		implements InitializingBean {
 
diff --git a/spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j/callback/SpringSecurityPasswordValidationCallbackHandler.java b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j/callback/SpringSecurityPasswordValidationCallbackHandler.java
index 301cd499..9ad660fb 100644
--- a/spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j/callback/SpringSecurityPasswordValidationCallbackHandler.java
+++ b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j/callback/SpringSecurityPasswordValidationCallbackHandler.java
@@ -43,7 +43,9 @@ import org.springframework.ws.soap.security.support.SpringSecurityUtils;
  *
  * @author Arjen Poutsma
  * @since 2.1
+ * @deprecated Transition to {@link org.springframework.ws.soap.security.wss4j2.callback.SpringSecurityPasswordValidationCallbackHandler}
  */
+@Deprecated
 public class SpringSecurityPasswordValidationCallbackHandler extends AbstractWsPasswordCallbackHandler
 		implements InitializingBean {
 
diff --git a/spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j/callback/UsernameTokenPrincipalCallback.java b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j/callback/UsernameTokenPrincipalCallback.java
index 85242845..ecc753e4 100644
--- a/spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j/callback/UsernameTokenPrincipalCallback.java
+++ b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j/callback/UsernameTokenPrincipalCallback.java
@@ -29,7 +29,9 @@ import org.apache.ws.security.WSUsernameTokenPrincipal;
  * @author Arjen Poutsma
  * @see WSUsernameTokenPrincipal
  * @since 1.5.0
+ * @deprecated Transition to {@link org.springframework.ws.soap.security.wss4j2.callback.UsernameTokenPrincipalCallback}
  */
+@Deprecated
 public class UsernameTokenPrincipalCallback implements Callback, Serializable {
 
 	private static final long serialVersionUID = -3022202225157082715L;
diff --git a/spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j/callback/package.html b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j/callback/package.html
index 7bf2f27b..1d1c4a69 100644
--- a/spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j/callback/package.html
+++ b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j/callback/package.html
@@ -1,5 +1,5 @@
 <html>
 <body>
-Contains <code>CallbackHandler</code> implementations for WSS4J.
+Contains <code>CallbackHandler</code> implementations for WSS4J (deprecated as of Spring WS 2.3).
 </body>
 </html>
\ No newline at end of file
diff --git a/spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j/package.html b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j/package.html
index a6e7beca..add5a944 100644
--- a/spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j/package.html
+++ b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j/package.html
@@ -1,6 +1,6 @@
 <html>
 <body>
 Contains classes for using the <a href="http://ws.apache.org/wss4j/">Apache WSS4J</a> WS-Security implementation within
-Spring-WS.
+Spring-WS (deprecated as of Spring WS 2.3).
 </body>
 </html>
\ No newline at end of file
diff --git a/spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j/support/CryptoFactoryBean.java b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j/support/CryptoFactoryBean.java
index afa49993..c21220f3 100644
--- a/spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j/support/CryptoFactoryBean.java
+++ b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j/support/CryptoFactoryBean.java
@@ -41,7 +41,9 @@ import org.springframework.util.Assert;
  * @author Arjen Poutsma
  * @see org.apache.ws.security.components.crypto.Crypto
  * @since 1.5.0
+ * @deprecated Transition to {@link org.springframework.ws.soap.security.wss4j2.support.CryptoFactoryBean}
  */
+@Deprecated
 public class CryptoFactoryBean implements FactoryBean<Crypto>, BeanClassLoaderAware, InitializingBean {
 
 	private Properties configuration = new Properties();
diff --git a/spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j/support/package.html b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j/support/package.html
index e06c6873..adc038ee 100644
--- a/spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j/support/package.html
+++ b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j/support/package.html
@@ -1,5 +1,5 @@
 <html>
 <body>
-Contains support classes for working with WSS4J.
+Contains support classes for working with WSS4J (deprecated as of Spring WS 2.3).
 </body>
 </html>
\ No newline at end of file