diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/common/QueueingThreadPoolExecutor.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/common/QueueingThreadPoolExecutor.java
index ba68e3857..c56ad2828 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/common/QueueingThreadPoolExecutor.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/common/QueueingThreadPoolExecutor.java
@@ -31,7 +31,7 @@ import org.slf4j.LoggerFactory;
  * This is a thread pool executor service, which works as a developer would expect it to work.
  * The default {@link ThreadPoolExecutor} does the following (see
  * <a href=
- * "https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/ThreadPoolExecutor.html">the
+ * "https://docs.oracle.com/en/java/javase/21/docs/api/java.base/java/util/concurrent/ThreadPoolExecutor.html">the
  * official JavaDoc)</a>:
  * <ul>
  * <li>If fewer than corePoolSize threads are running, the Executor always prefers adding a new thread rather than
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/events/TopicEventFilter.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/events/TopicEventFilter.java
index 33f25f276..9f4426c0d 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/events/TopicEventFilter.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/events/TopicEventFilter.java
@@ -31,7 +31,7 @@ public class TopicEventFilter implements EventFilter {
      * Constructs a new topic event filter.
      *
      * @param topicRegex the regular expression of a topic
-     * @see <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/regex/Pattern.html">Java
+     * @see <a href="https://docs.oracle.com/en/java/javase/21/docs/api/java.base/java/util/regex/Pattern.html">Java
      *      Regex</a>
      */
     public TopicEventFilter(String topicRegex) {
diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/events/TopicGlobEventFilter.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/events/TopicGlobEventFilter.java
index 7f1257be4..d43851c31 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/events/TopicGlobEventFilter.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/events/TopicGlobEventFilter.java
@@ -23,7 +23,7 @@ import org.eclipse.jdt.annotation.NonNullByDefault;
  * of events based on an event topic.
  * 
  * The syntax for the filter is the glob syntax documented at
- * https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/nio/file/FileSystem.html#getPathMatcher(java.lang.String)
+ * https://docs.oracle.com/en/java/javase/21/docs/api/java.base/java/nio/file/FileSystem.html#getPathMatcher(java.lang.String)
  *
  * @author Cody Cutrer - Initial contribution
  */
@@ -37,7 +37,7 @@ public class TopicGlobEventFilter implements EventFilter {
      *
      * @param topicGlob the glob
      * @see <a href=
-     *      "https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/nio/file/FileSystem.html#getPathMatcher(java.lang.String)">Java
+     *      "https://docs.oracle.com/en/java/javase/21/docs/api/java.base/java/nio/file/FileSystem.html#getPathMatcher(java.lang.String)">Java
      *      Glob</a>
      */
     public TopicGlobEventFilter(String topicGlob) {