diff --git a/src/java.desktop/share/classes/java/beans/Beans.java b/src/java.desktop/share/classes/java/beans/Beans.java
index 165aba4708b39..d24b9c8ea7b6e 100644
--- a/src/java.desktop/share/classes/java/beans/Beans.java
+++ b/src/java.desktop/share/classes/java/beans/Beans.java
@@ -103,7 +103,8 @@ public static Object instantiate(ClassLoader cls, String beanName) throws IOExce
      * @throws IOException if an I/O error occurs.
      * @since 1.2
      */
-    @SuppressWarnings("deprecation")
+    @Deprecated(since = "23", forRemoval = true)
+    @SuppressWarnings({"deprecation", "removal"})
     public static Object instantiate(ClassLoader cls, String beanName,
                                      BeanContext beanContext)
             throws IOException, ClassNotFoundException {
@@ -352,7 +353,8 @@ public static Object instantiate(ClassLoader cls, String beanName,
         return result;
     }
 
-    @SuppressWarnings("unchecked")
+    @Deprecated(since = "23", forRemoval = true)
+    @SuppressWarnings({ "unchecked", "removal" })
     private static void unsafeBeanContextAdd(BeanContext beanContext, Object res) {
         beanContext.add(res);
     }
diff --git a/src/java.desktop/share/classes/java/beans/beancontext/BeanContext.java b/src/java.desktop/share/classes/java/beans/beancontext/BeanContext.java
index abc686f963cbb..6c6e2c3878076 100644
--- a/src/java.desktop/share/classes/java/beans/beancontext/BeanContext.java
+++ b/src/java.desktop/share/classes/java/beans/beancontext/BeanContext.java
@@ -53,7 +53,8 @@
  * @see java.util.Collection
  */
 
-@SuppressWarnings("rawtypes")
+@Deprecated(forRemoval=true, since="23")
+@SuppressWarnings({"rawtypes", "removal"})
 public interface BeanContext extends BeanContextChild, Collection, DesignMode, Visibility {
 
     /**
diff --git a/src/java.desktop/share/classes/java/beans/beancontext/BeanContextChild.java b/src/java.desktop/share/classes/java/beans/beancontext/BeanContextChild.java
index c1e92715875f0..c4fc178190a3f 100644
--- a/src/java.desktop/share/classes/java/beans/beancontext/BeanContextChild.java
+++ b/src/java.desktop/share/classes/java/beans/beancontext/BeanContextChild.java
@@ -65,6 +65,8 @@
  * @see java.beans.VetoableChangeListener
  */
 
+@SuppressWarnings("removal")
+@Deprecated(forRemoval=true, since="23")
 public interface BeanContextChild {
 
     /**
diff --git a/src/java.desktop/share/classes/java/beans/beancontext/BeanContextChildComponentProxy.java b/src/java.desktop/share/classes/java/beans/beancontext/BeanContextChildComponentProxy.java
index 8bab751490858..d6363acc57904 100644
--- a/src/java.desktop/share/classes/java/beans/beancontext/BeanContextChildComponentProxy.java
+++ b/src/java.desktop/share/classes/java/beans/beancontext/BeanContextChildComponentProxy.java
@@ -41,6 +41,8 @@
  * @see java.beans.beancontext.BeanContextSupport
  */
 
+@SuppressWarnings("removal")
+@Deprecated(forRemoval=true, since="23")
 public interface BeanContextChildComponentProxy {
 
     /**
diff --git a/src/java.desktop/share/classes/java/beans/beancontext/BeanContextChildSupport.java b/src/java.desktop/share/classes/java/beans/beancontext/BeanContextChildSupport.java
index e3a213a8dfabc..bc7bc901dbc3c 100644
--- a/src/java.desktop/share/classes/java/beans/beancontext/BeanContextChildSupport.java
+++ b/src/java.desktop/share/classes/java/beans/beancontext/BeanContextChildSupport.java
@@ -54,6 +54,8 @@
  * @see java.beans.beancontext.BeanContextChild
  */
 
+@SuppressWarnings("removal")
+@Deprecated(forRemoval=true, since="23")
 public class BeanContextChildSupport implements BeanContextChild, BeanContextServicesListener, Serializable {
 
     /**
diff --git a/src/java.desktop/share/classes/java/beans/beancontext/BeanContextContainerProxy.java b/src/java.desktop/share/classes/java/beans/beancontext/BeanContextContainerProxy.java
index 3934d0afadd33..b0d001691a28e 100644
--- a/src/java.desktop/share/classes/java/beans/beancontext/BeanContextContainerProxy.java
+++ b/src/java.desktop/share/classes/java/beans/beancontext/BeanContextContainerProxy.java
@@ -40,6 +40,8 @@
  * @see java.beans.beancontext.BeanContextSupport
  */
 
+@SuppressWarnings("removal")
+@Deprecated(forRemoval=true, since="23")
 public interface BeanContextContainerProxy {
 
     /**
diff --git a/src/java.desktop/share/classes/java/beans/beancontext/BeanContextEvent.java b/src/java.desktop/share/classes/java/beans/beancontext/BeanContextEvent.java
index 9e4c2f3a53e68..0dbb5384ba10a 100644
--- a/src/java.desktop/share/classes/java/beans/beancontext/BeanContextEvent.java
+++ b/src/java.desktop/share/classes/java/beans/beancontext/BeanContextEvent.java
@@ -46,6 +46,8 @@
  * @see         java.beans.beancontext.BeanContext
  */
 
+@SuppressWarnings("removal")
+@Deprecated(forRemoval=true, since="23")
 public abstract class BeanContextEvent extends EventObject {
 
     /**
diff --git a/src/java.desktop/share/classes/java/beans/beancontext/BeanContextMembershipEvent.java b/src/java.desktop/share/classes/java/beans/beancontext/BeanContextMembershipEvent.java
index 466c4fa44a2f4..a46e6f7d05f1f 100644
--- a/src/java.desktop/share/classes/java/beans/beancontext/BeanContextMembershipEvent.java
+++ b/src/java.desktop/share/classes/java/beans/beancontext/BeanContextMembershipEvent.java
@@ -50,6 +50,9 @@
  * @see         java.beans.beancontext.BeanContextEvent
  * @see         java.beans.beancontext.BeanContextMembershipListener
  */
+
+@SuppressWarnings("removal")
+@Deprecated(forRemoval=true, since="23")
 public class BeanContextMembershipEvent extends BeanContextEvent {
 
     /**
diff --git a/src/java.desktop/share/classes/java/beans/beancontext/BeanContextMembershipListener.java b/src/java.desktop/share/classes/java/beans/beancontext/BeanContextMembershipListener.java
index 8f68792fcb202..0390a0b81a222 100644
--- a/src/java.desktop/share/classes/java/beans/beancontext/BeanContextMembershipListener.java
+++ b/src/java.desktop/share/classes/java/beans/beancontext/BeanContextMembershipListener.java
@@ -40,6 +40,8 @@
  * @see         java.beans.beancontext.BeanContext
  */
 
+@SuppressWarnings("removal")
+@Deprecated(forRemoval=true, since="23")
 public interface BeanContextMembershipListener extends EventListener {
 
     /**
diff --git a/src/java.desktop/share/classes/java/beans/beancontext/BeanContextProxy.java b/src/java.desktop/share/classes/java/beans/beancontext/BeanContextProxy.java
index cff8e7624fddc..d62845504b482 100644
--- a/src/java.desktop/share/classes/java/beans/beancontext/BeanContextProxy.java
+++ b/src/java.desktop/share/classes/java/beans/beancontext/BeanContextProxy.java
@@ -72,6 +72,8 @@
  * @see java.beans.beancontext.BeanContextChildSupport
  */
 
+@SuppressWarnings("removal")
+@Deprecated(forRemoval=true, since="23")
 public interface BeanContextProxy {
 
     /**
diff --git a/src/java.desktop/share/classes/java/beans/beancontext/BeanContextServiceAvailableEvent.java b/src/java.desktop/share/classes/java/beans/beancontext/BeanContextServiceAvailableEvent.java
index 1521f8e01edce..ada29605a0dcb 100644
--- a/src/java.desktop/share/classes/java/beans/beancontext/BeanContextServiceAvailableEvent.java
+++ b/src/java.desktop/share/classes/java/beans/beancontext/BeanContextServiceAvailableEvent.java
@@ -35,6 +35,8 @@
  * </p>
  */
 
+@SuppressWarnings("removal")
+@Deprecated(forRemoval=true, since="23")
 public class BeanContextServiceAvailableEvent extends BeanContextEvent {
 
     /**
diff --git a/src/java.desktop/share/classes/java/beans/beancontext/BeanContextServiceProvider.java b/src/java.desktop/share/classes/java/beans/beancontext/BeanContextServiceProvider.java
index f3de87b4344ce..cc4647a48fd26 100644
--- a/src/java.desktop/share/classes/java/beans/beancontext/BeanContextServiceProvider.java
+++ b/src/java.desktop/share/classes/java/beans/beancontext/BeanContextServiceProvider.java
@@ -49,6 +49,8 @@
  * </p>
  */
 
+@SuppressWarnings("removal")
+@Deprecated(forRemoval=true, since="23")
 public interface BeanContextServiceProvider {
 
    /**
diff --git a/src/java.desktop/share/classes/java/beans/beancontext/BeanContextServiceProviderBeanInfo.java b/src/java.desktop/share/classes/java/beans/beancontext/BeanContextServiceProviderBeanInfo.java
index 298be756e2689..a1dec4755b04c 100644
--- a/src/java.desktop/share/classes/java/beans/beancontext/BeanContextServiceProviderBeanInfo.java
+++ b/src/java.desktop/share/classes/java/beans/beancontext/BeanContextServiceProviderBeanInfo.java
@@ -35,6 +35,8 @@
  * services.
  */
 
+@SuppressWarnings("removal")
+@Deprecated(forRemoval=true, since="23")
 public interface BeanContextServiceProviderBeanInfo extends BeanInfo {
 
     /**
diff --git a/src/java.desktop/share/classes/java/beans/beancontext/BeanContextServiceRevokedEvent.java b/src/java.desktop/share/classes/java/beans/beancontext/BeanContextServiceRevokedEvent.java
index 3b8c9f2d7566f..3849f39cfddbd 100644
--- a/src/java.desktop/share/classes/java/beans/beancontext/BeanContextServiceRevokedEvent.java
+++ b/src/java.desktop/share/classes/java/beans/beancontext/BeanContextServiceRevokedEvent.java
@@ -34,6 +34,9 @@
  * identify the service being revoked.
  * </p>
  */
+
+@SuppressWarnings("removal")
+@Deprecated(forRemoval=true, since="23")
 public class BeanContextServiceRevokedEvent extends BeanContextEvent {
 
     /**
diff --git a/src/java.desktop/share/classes/java/beans/beancontext/BeanContextServiceRevokedListener.java b/src/java.desktop/share/classes/java/beans/beancontext/BeanContextServiceRevokedListener.java
index 9a1a70863b105..c179cdf9ed270 100644
--- a/src/java.desktop/share/classes/java/beans/beancontext/BeanContextServiceRevokedListener.java
+++ b/src/java.desktop/share/classes/java/beans/beancontext/BeanContextServiceRevokedListener.java
@@ -34,6 +34,9 @@
  * interested in processing a {@code BeanContextServiceRevokedEvent}
  * implements this interface.
  */
+
+@SuppressWarnings("removal")
+@Deprecated(forRemoval=true, since="23")
 public interface BeanContextServiceRevokedListener extends EventListener {
 
     /**
diff --git a/src/java.desktop/share/classes/java/beans/beancontext/BeanContextServices.java b/src/java.desktop/share/classes/java/beans/beancontext/BeanContextServices.java
index b132ee069ca2c..e97532820b8b5 100644
--- a/src/java.desktop/share/classes/java/beans/beancontext/BeanContextServices.java
+++ b/src/java.desktop/share/classes/java/beans/beancontext/BeanContextServices.java
@@ -42,6 +42,9 @@
  * to expose generic "services" to the BeanContextChild objects within.
  * </p>
  */
+
+@SuppressWarnings("removal")
+@Deprecated(forRemoval=true, since="23")
 public interface BeanContextServices extends BeanContext, BeanContextServicesListener {
 
     /**
diff --git a/src/java.desktop/share/classes/java/beans/beancontext/BeanContextServicesListener.java b/src/java.desktop/share/classes/java/beans/beancontext/BeanContextServicesListener.java
index 247c4f44b190a..1bd92db75adf0 100644
--- a/src/java.desktop/share/classes/java/beans/beancontext/BeanContextServicesListener.java
+++ b/src/java.desktop/share/classes/java/beans/beancontext/BeanContextServicesListener.java
@@ -35,6 +35,9 @@
  * A class that is interested in processing a
  * {@code BeanContextServiceAvailableEvent} implements this interface.
  */
+
+@SuppressWarnings("removal")
+@Deprecated(forRemoval=true, since="23")
 public interface BeanContextServicesListener extends BeanContextServiceRevokedListener {
 
     /**
diff --git a/src/java.desktop/share/classes/java/beans/beancontext/BeanContextServicesSupport.java b/src/java.desktop/share/classes/java/beans/beancontext/BeanContextServicesSupport.java
index 21e136ba9e5e3..7ccf8c0c0936d 100644
--- a/src/java.desktop/share/classes/java/beans/beancontext/BeanContextServicesSupport.java
+++ b/src/java.desktop/share/classes/java/beans/beancontext/BeanContextServicesSupport.java
@@ -54,6 +54,9 @@
  * @author Laurence P. G. Cable
  * @since 1.2
  */
+
+@SuppressWarnings("removal")
+@Deprecated(forRemoval=true, since="23")
 public class      BeanContextServicesSupport extends BeanContextSupport
        implements BeanContextServices {
 
diff --git a/src/java.desktop/share/classes/java/beans/beancontext/BeanContextSupport.java b/src/java.desktop/share/classes/java/beans/beancontext/BeanContextSupport.java
index cc61cc7861268..143b77d793354 100644
--- a/src/java.desktop/share/classes/java/beans/beancontext/BeanContextSupport.java
+++ b/src/java.desktop/share/classes/java/beans/beancontext/BeanContextSupport.java
@@ -59,6 +59,9 @@
  * @author Laurence P. G. Cable
  * @since 1.2
  */
+
+@SuppressWarnings("removal")
+@Deprecated(forRemoval=true, since="23")
 public class      BeanContextSupport extends BeanContextChildSupport
        implements BeanContext,
                   Serializable,
diff --git a/src/java.desktop/share/classes/java/beans/beancontext/package-info.java b/src/java.desktop/share/classes/java/beans/beancontext/package-info.java
index f1b22cf7da0a4..6011a0a470be8 100644
--- a/src/java.desktop/share/classes/java/beans/beancontext/package-info.java
+++ b/src/java.desktop/share/classes/java/beans/beancontext/package-info.java
@@ -33,4 +33,5 @@
  *
  * @since 1.2
  */
+
 package java.beans.beancontext;