diff --git a/ldap/src/main/java/org/springframework/security/ldap/server/ApacheDSContainer.java b/ldap/src/main/java/org/springframework/security/ldap/server/ApacheDSContainer.java
index 0a1f38f65f..317efb9905 100644
--- a/ldap/src/main/java/org/springframework/security/ldap/server/ApacheDSContainer.java
+++ b/ldap/src/main/java/org/springframework/security/ldap/server/ApacheDSContainer.java
@@ -15,12 +15,13 @@
  */
 package org.springframework.security.ldap.server;
 
-import java.io.File;
-import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
+import java.io.File;
+import java.io.IOException;
+
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.directory.server.core.DefaultDirectoryService;
@@ -68,7 +69,10 @@ import org.springframework.util.Assert;
  * @author Luke Taylor
  * @author Rob Winch
  * @author Gunnar Hillert
+ * @deprecated Use {@link UnboundIdContainer} instead because ApacheDS 1.x is no longer 
+ * supported with no GA version to replace it.
  */
+@Deprecated
 public class ApacheDSContainer implements InitializingBean, DisposableBean, Lifecycle,
 		ApplicationContextAware {
 	private final Log logger = LogFactory.getLog(getClass());