From 395f7dfc8d2e2e174194b10852d7b9d92565579b Mon Sep 17 00:00:00 2001
From: Kevin Walls <kevin.walls@oracle.com>
Date: Thu, 23 Jan 2025 15:21:58 +0000
Subject: [PATCH] 8336017: Deprecate java.util.logging.LoggingMXBean, its
 implementation, and accessor method for removal

---
 .../share/classes/java/util/logging/LogManager.java   | 11 ++++++-----
 .../share/classes/java/util/logging/Logging.java      |  5 +++--
 .../classes/java/util/logging/LoggingMXBean.java      |  6 +++---
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/java.logging/share/classes/java/util/logging/LogManager.java b/src/java.logging/share/classes/java/util/logging/LogManager.java
index 9c9c708a06243..fec8414562152 100644
--- a/src/java.logging/share/classes/java/util/logging/LogManager.java
+++ b/src/java.logging/share/classes/java/util/logging/LogManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -2406,16 +2406,17 @@ private void setLevelsOnExistingLoggers() {
      * @return a {@link LoggingMXBean} object.
      *
      * @deprecated {@code java.util.logging.LoggingMXBean} is deprecated and
-     *      replaced with {@code java.lang.management.PlatformLoggingMXBean}. Use
-     *      {@link java.management/java.lang.management.ManagementFactory#getPlatformMXBean(Class)
+     *      replaced with {@code java.lang.management.PlatformLoggingMXBean}.
+     *      This method will be removed.
+     *      Use {@link java.management/java.lang.management.ManagementFactory#getPlatformMXBean(Class)
      *      ManagementFactory.getPlatformMXBean}(PlatformLoggingMXBean.class)
      *      instead.
      *
      * @see java.management/java.lang.management.PlatformLoggingMXBean
      * @since 1.5
      */
-    @Deprecated(since="9")
-    @SuppressWarnings("doclint:reference")
+    @Deprecated(since="9", forRemoval=true)
+    @SuppressWarnings({"doclint:reference", "removal"})
     public static synchronized LoggingMXBean getLoggingMXBean() {
         return Logging.getInstance();
     }
diff --git a/src/java.logging/share/classes/java/util/logging/Logging.java b/src/java.logging/share/classes/java/util/logging/Logging.java
index 716e8bc150d6b..465fcb21ed9d0 100644
--- a/src/java.logging/share/classes/java/util/logging/Logging.java
+++ b/src/java.logging/share/classes/java/util/logging/Logging.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -44,7 +44,8 @@
  * @see Logger
  * @see LogManager
  */
-@SuppressWarnings("deprecation") // implements LoggingMXBean
+@Deprecated(since="25", forRemoval=true)
+@SuppressWarnings("removal") // implements LoggingMXBean
 final class Logging implements LoggingMXBean {
 
     private static LogManager logManager = LogManager.getLogManager();
diff --git a/src/java.logging/share/classes/java/util/logging/LoggingMXBean.java b/src/java.logging/share/classes/java/util/logging/LoggingMXBean.java
index 9c6347e148302..db62fa0c627ae 100644
--- a/src/java.logging/share/classes/java/util/logging/LoggingMXBean.java
+++ b/src/java.logging/share/classes/java/util/logging/LoggingMXBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -43,7 +43,7 @@
  * with {@link java.management/java.lang.management.PlatformLoggingMXBean}.
  * It will not register in the platform {@code MBeanServer}.
  * Use {@code ManagementFactory.getPlatformMXBean(PlatformLoggingMXBean.class)}
- * instead.
+ * instead.  This class will be removed.
  *
  * @author  Ron Mann
  * @author  Mandy Chung
@@ -51,7 +51,7 @@
  *
  * @see java.management/java.lang.management.PlatformLoggingMXBean
  */
-@Deprecated(since="9")
+@Deprecated(since="9", forRemoval=true)
 @SuppressWarnings("doclint:reference")
 public interface LoggingMXBean {