From 090eeb5c861239391d174d8375994269afd8887b Mon Sep 17 00:00:00 2001
From: Goetz Lindenmaier <Goetz.Lindenmaier@sap.com>
Date: Fri, 17 Oct 2025 14:19:52 +0200
Subject: [PATCH 1/2] backport test parts of 8312072: Deprecate for removal the
 -Xnoagent option

---
 make/ide/netbeans/langtools/build.xml                         | 4 ++--
 .../nsk/jdi/AttachingConnector/attach/attach001.java          | 4 ++--
 .../nsk/jdi/AttachingConnector/attach/attach002.java          | 4 ++--
 .../attachnosuspend/attachnosuspend001.java                   | 4 ++--
 .../nsk/jdi/LaunchingConnector/launch/launch003.java          | 4 ++--
 .../nsk/jdi/LaunchingConnector/launch/launch004.java          | 4 ++--
 .../nsk/jdi/ListeningConnector/accept/accept001.java          | 4 ++--
 .../nsk/jdi/ListeningConnector/accept/accept002.java          | 4 ++--
 .../listennosuspend/listennosuspend001.java                   | 4 ++--
 .../jdi/ListeningConnector/startListening/startlis001.java    | 4 ++--
 .../jdi/ListeningConnector/startListening/startlis002.java    | 4 ++--
 11 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/make/ide/netbeans/langtools/build.xml b/make/ide/netbeans/langtools/build.xml
index b23614649b8..16e1a129e98 100644
--- a/make/ide/netbeans/langtools/build.xml
+++ b/make/ide/netbeans/langtools/build.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
- Copyright (c) 2007, 2016, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2007, 2023, Oracle and/or its affiliates. All rights reserved.
 
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions
@@ -242,7 +242,7 @@
                 </nbjpdastart>
                 <property
                     name="@{jpda.jvmargs.property}"
-                    value="-Xdebug -Xnoagent -Djava.compiler=none -Xrunjdwp:transport=dt_socket,address=${jpda.address}"
+                    value="-Xdebug -Xrunjdwp:transport=dt_socket,address=${jpda.address}"
                 />
             </sequential>
         </macrodef>
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/AttachingConnector/attach/attach001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/AttachingConnector/attach/attach001.java
index 8203095e3fc..e8eaf772695 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/AttachingConnector/attach/attach001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/AttachingConnector/attach/attach001.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2023, 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
@@ -97,7 +97,7 @@ private int runIt(String argv[], PrintStream out) {
         String java = argHandler.getLaunchExecPath()
                         + " " + argHandler.getLaunchOptions();
         String cmd = java
-                + " -Xdebug -Xnoagent -Xrunjdwp:transport=dt_socket,server=y,address=0"
+                + " -Xdebug -Xrunjdwp:transport=dt_socket,server=y,address=0"
                 + " " + DEBUGEE_CLASS;
 
         Binder binder = new Binder(argHandler, log);
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/AttachingConnector/attach/attach002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/AttachingConnector/attach/attach002.java
index 22720edadc1..d62659a9dfb 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/AttachingConnector/attach/attach002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/AttachingConnector/attach/attach002.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2023, 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
@@ -102,7 +102,7 @@ private int runIt(String argv[], PrintStream out) {
         String java = argHandler.getLaunchExecPath()
                           + " " + argHandler.getLaunchOptions();
         String cmd = java +
-            " -Xdebug -Xnoagent -Xrunjdwp:transport=dt_shmem,server=y,address=" +
+            " -Xdebug -Xrunjdwp:transport=dt_shmem,server=y,address=" +
             name + " " + DEBUGEE_CLASS;
 
         Binder binder = new Binder(argHandler, log);
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/AttachingConnector/attachnosuspend/attachnosuspend001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/AttachingConnector/attachnosuspend/attachnosuspend001.java
index e5bd791b1ed..6ba44eb9b42 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/AttachingConnector/attachnosuspend/attachnosuspend001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/AttachingConnector/attachnosuspend/attachnosuspend001.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2023, 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
@@ -97,7 +97,7 @@ private int runIt(String argv[], PrintStream out) {
         String java = argHandler.getLaunchExecPath()
                         + " " + argHandler.getLaunchOptions();
         String cmd = java
-                + " -Xdebug -Xnoagent -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=0"
+                + " -Xdebug -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=0"
                 + " " + DEBUGEE_CLASS;
 
         Binder binder = new Binder(argHandler, log);
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LaunchingConnector/launch/launch003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LaunchingConnector/launch/launch003.java
index 05d1dffeadb..aeb21e4b4a7 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LaunchingConnector/launch/launch003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LaunchingConnector/launch/launch003.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2023, 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
@@ -134,7 +134,7 @@ private Map<String,? extends com.sun.jdi.connect.Connector.Argument> setupConnec
             Connector.Argument a = (Connector.Argument) cava[i];
             if (a.name().equals("command"))
                 a.setValue(java +
-                " -Xdebug -Xnoagent -Xrunjdwp:suspend=y,transport=" +
+                " -Xdebug -Xrunjdwp:suspend=y,transport=" +
                 TRANSPORT_NAME +
                 ",address=" + host + ":" + port +
                 " " + DEBUGEE_CLASS);
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LaunchingConnector/launch/launch004.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LaunchingConnector/launch/launch004.java
index 7822023ac94..3febb3b9733 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LaunchingConnector/launch/launch004.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LaunchingConnector/launch/launch004.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2023, 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
@@ -133,7 +133,7 @@ private Map<java.lang.String,? extends com.sun.jdi.connect.Connector.Argument> s
             Connector.Argument a = (Connector.Argument) cava[i];
             if (a.name().equals("command"))
                 a.setValue(java +
-                " -Xdebug -Xnoagent -Xrunjdwp:suspend=y,transport=" +
+                " -Xdebug -Xrunjdwp:suspend=y,transport=" +
                 TRANSPORT_NAME +
                 ",address=" + name +
                 " " + DEBUGEE_CLASS);
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/accept/accept001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/accept/accept001.java
index 450ad57f8e4..c38279031b8 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/accept/accept001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/accept/accept001.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2023, 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
@@ -81,7 +81,7 @@ private int runIt(String argv[], PrintStream out) {
         String java = argHandler.getLaunchExecPath()
                           + " " + argHandler.getLaunchOptions();
         String cmd = java +
-            " -Xdebug -Xnoagent -Xrunjdwp:transport=dt_socket,server=n,address=" +
+            " -Xdebug -Xrunjdwp:transport=dt_socket,server=n,address=" +
             connAddr + " " + DEBUGEE_CLASS;
 
         Binder binder = new Binder(argHandler, log);
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/accept/accept002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/accept/accept002.java
index 5eeabb30a97..1e80e07ae74 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/accept/accept002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/accept/accept002.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2023, 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
@@ -82,7 +82,7 @@ private int runIt(String argv[], PrintStream out) {
         String java = argHandler.getLaunchExecPath()
                           + " " + argHandler.getLaunchOptions();
         String cmd = java +
-            " -Xdebug -Xnoagent -Xrunjdwp:transport=dt_shmem,server=n,address=" +
+            " -Xdebug -Xrunjdwp:transport=dt_shmem,server=n,address=" +
             connAddr + " " + DEBUGEE_CLASS;
 
         Binder binder = new Binder(argHandler, log);
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/listennosuspend/listennosuspend001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/listennosuspend/listennosuspend001.java
index cff662f9296..3ea73669bc9 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/listennosuspend/listennosuspend001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/listennosuspend/listennosuspend001.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2023, 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
@@ -81,7 +81,7 @@ private int runIt(String argv[], PrintStream out) {
         String java = argHandler.getLaunchExecPath()
                           + " " + argHandler.getLaunchOptions();
         String cmd = java +
-            " -Xdebug -Xnoagent -Xrunjdwp:transport=dt_socket,server=n,suspend=n,address=" +
+            " -Xdebug -Xrunjdwp:transport=dt_socket,server=n,suspend=n,address=" +
             connAddr + " " + DEBUGEE_CLASS;
 
         Binder binder = new Binder(argHandler, log);
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/startListening/startlis001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/startListening/startlis001.java
index 877b17cd7f9..5e736560fc5 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/startListening/startlis001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/startListening/startlis001.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2023, 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
@@ -157,7 +157,7 @@ private int runIt(String argv[], PrintStream out) {
                           + " " + argHandler.getLaunchOptions();
 
         String cmd = java +
-            " -Xdebug -Xnoagent -Xrunjdwp:transport=dt_socket,server=n,address=" +
+            " -Xdebug -Xrunjdwp:transport=dt_socket,server=n,address=" +
             addr + " " + DEBUGEE_CLASS;
 
         Binder binder = new Binder(argHandler, log);
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/startListening/startlis002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/startListening/startlis002.java
index 0b3eb3656af..7abdfb0156b 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/startListening/startlis002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/startListening/startlis002.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2023, 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
@@ -132,7 +132,7 @@ private int runIt(String argv[], PrintStream out) {
                           + " " + argHandler.getLaunchOptions();
 
         String cmd = java +
-            " -Xdebug -Xnoagent -Xrunjdwp:transport=dt_shmem,server=n,address=" +
+            " -Xdebug -Xrunjdwp:transport=dt_shmem,server=n,address=" +
             addr + " " + DEBUGEE_CLASS;
 
         Binder binder = new Binder(argHandler, log);

From 8a171f52717538702be2520c614ee621103f56ab Mon Sep 17 00:00:00 2001
From: Goetz Lindenmaier <Goetz.Lindenmaier@sap.com>
Date: Fri, 17 Oct 2025 14:21:32 +0200
Subject: [PATCH 2/2] backport usages of flag -Xdebug, see 8227229: Deprecate
 the launcher -Xdebug/-debug flags that have not done anything since Java 6

---
 make/ide/netbeans/langtools/build.xml                       | 2 +-
 .../classes/com/sun/tools/jdi/SunCommandLineLauncher.java   | 1 -
 .../hotspot/jtreg/runtime/6294277/SourceDebugExtension.java | 6 +++---
 .../nsk/jdi/AttachingConnector/attach/attach001.java        | 2 +-
 .../nsk/jdi/AttachingConnector/attach/attach002.java        | 2 +-
 .../attachnosuspend/attachnosuspend001.java                 | 2 +-
 .../nsk/jdi/LaunchingConnector/launch/launch003.java        | 2 +-
 .../nsk/jdi/LaunchingConnector/launch/launch004.java        | 2 +-
 .../nsk/jdi/ListeningConnector/accept/accept001.java        | 2 +-
 .../nsk/jdi/ListeningConnector/accept/accept002.java        | 2 +-
 .../listennosuspend/listennosuspend001.java                 | 2 +-
 .../jdi/ListeningConnector/startListening/startlis001.java  | 2 +-
 .../jdi/ListeningConnector/startListening/startlis002.java  | 2 +-
 .../createVirtualMachine/createVM002.java                   | 4 ++--
 .../createVirtualMachine/createVM003.java                   | 4 ++--
 .../createVirtualMachine/createVM004.java                   | 4 ++--
 .../createVirtualMachine/createVM005.java                   | 4 ++--
 .../com/sun/jdi/connect/spi/SimpleLaunchingConnector.java   | 4 ++--
 .../awt/Clipboard/HTMLTransferTest/HTMLTransferTest.java    | 4 ++--
 .../DragUnicodeBetweenJVMTest.java                          | 4 ++--
 20 files changed, 28 insertions(+), 29 deletions(-)

diff --git a/make/ide/netbeans/langtools/build.xml b/make/ide/netbeans/langtools/build.xml
index 16e1a129e98..f417b256eb6 100644
--- a/make/ide/netbeans/langtools/build.xml
+++ b/make/ide/netbeans/langtools/build.xml
@@ -242,7 +242,7 @@
                 </nbjpdastart>
                 <property
                     name="@{jpda.jvmargs.property}"
-                    value="-Xdebug -Xrunjdwp:transport=dt_socket,address=${jpda.address}"
+                    value="-Xrunjdwp:transport=dt_socket,address=${jpda.address}"
                 />
             </sequential>
         </macrodef>
diff --git a/src/jdk.jdi/share/classes/com/sun/tools/jdi/SunCommandLineLauncher.java b/src/jdk.jdi/share/classes/com/sun/tools/jdi/SunCommandLineLauncher.java
index 8049f3b9a5a..26393537dc4 100644
--- a/src/jdk.jdi/share/classes/com/sun/tools/jdi/SunCommandLineLauncher.java
+++ b/src/jdk.jdi/share/classes/com/sun/tools/jdi/SunCommandLineLauncher.java
@@ -225,7 +225,6 @@ static boolean hasWhitespace(String string) {
 
             String command = exePath + ' ' +
                              options + ' ' +
-                             "-Xdebug " +
                              "-Xrunjdwp:" + xrun + ' ' +
                              mainClassAndArgs;
 
diff --git a/test/hotspot/jtreg/runtime/6294277/SourceDebugExtension.java b/test/hotspot/jtreg/runtime/6294277/SourceDebugExtension.java
index 9b86c86cee2..f7dc35af9ab 100644
--- a/test/hotspot/jtreg/runtime/6294277/SourceDebugExtension.java
+++ b/test/hotspot/jtreg/runtime/6294277/SourceDebugExtension.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2023, 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
@@ -25,8 +25,8 @@
  * @test
  * @bug 6294277
  * @requires vm.jvmti
- * @summary java -Xdebug crashes on SourceDebugExtension attribute larger than 64K
- * @run main/othervm -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n SourceDebugExtension
+ * @summary verify that the JVM doesn't crash when SourceDebugExtension attribute is larger than 64K
+ * @run main/othervm -Xrunjdwp:transport=dt_socket,server=y,suspend=n SourceDebugExtension
  */
 import java.io.*;
 
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/AttachingConnector/attach/attach001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/AttachingConnector/attach/attach001.java
index e8eaf772695..b4ba572147f 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/AttachingConnector/attach/attach001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/AttachingConnector/attach/attach001.java
@@ -97,7 +97,7 @@ private int runIt(String argv[], PrintStream out) {
         String java = argHandler.getLaunchExecPath()
                         + " " + argHandler.getLaunchOptions();
         String cmd = java
-                + " -Xdebug -Xrunjdwp:transport=dt_socket,server=y,address=0"
+                + " -Xrunjdwp:transport=dt_socket,server=y,address=0"
                 + " " + DEBUGEE_CLASS;
 
         Binder binder = new Binder(argHandler, log);
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/AttachingConnector/attach/attach002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/AttachingConnector/attach/attach002.java
index d62659a9dfb..56c68e64b16 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/AttachingConnector/attach/attach002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/AttachingConnector/attach/attach002.java
@@ -102,7 +102,7 @@ private int runIt(String argv[], PrintStream out) {
         String java = argHandler.getLaunchExecPath()
                           + " " + argHandler.getLaunchOptions();
         String cmd = java +
-            " -Xdebug -Xrunjdwp:transport=dt_shmem,server=y,address=" +
+            " -Xrunjdwp:transport=dt_shmem,server=y,address=" +
             name + " " + DEBUGEE_CLASS;
 
         Binder binder = new Binder(argHandler, log);
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/AttachingConnector/attachnosuspend/attachnosuspend001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/AttachingConnector/attachnosuspend/attachnosuspend001.java
index 6ba44eb9b42..a3e68fe4c9b 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/AttachingConnector/attachnosuspend/attachnosuspend001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/AttachingConnector/attachnosuspend/attachnosuspend001.java
@@ -97,7 +97,7 @@ private int runIt(String argv[], PrintStream out) {
         String java = argHandler.getLaunchExecPath()
                         + " " + argHandler.getLaunchOptions();
         String cmd = java
-                + " -Xdebug -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=0"
+                + " -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=0"
                 + " " + DEBUGEE_CLASS;
 
         Binder binder = new Binder(argHandler, log);
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LaunchingConnector/launch/launch003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LaunchingConnector/launch/launch003.java
index aeb21e4b4a7..2cc3fa73806 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LaunchingConnector/launch/launch003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LaunchingConnector/launch/launch003.java
@@ -134,7 +134,7 @@ private Map<String,? extends com.sun.jdi.connect.Connector.Argument> setupConnec
             Connector.Argument a = (Connector.Argument) cava[i];
             if (a.name().equals("command"))
                 a.setValue(java +
-                " -Xdebug -Xrunjdwp:suspend=y,transport=" +
+                " -Xrunjdwp:suspend=y,transport=" +
                 TRANSPORT_NAME +
                 ",address=" + host + ":" + port +
                 " " + DEBUGEE_CLASS);
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LaunchingConnector/launch/launch004.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LaunchingConnector/launch/launch004.java
index 3febb3b9733..f4b57109c10 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LaunchingConnector/launch/launch004.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LaunchingConnector/launch/launch004.java
@@ -133,7 +133,7 @@ private Map<java.lang.String,? extends com.sun.jdi.connect.Connector.Argument> s
             Connector.Argument a = (Connector.Argument) cava[i];
             if (a.name().equals("command"))
                 a.setValue(java +
-                " -Xdebug -Xrunjdwp:suspend=y,transport=" +
+                " -Xrunjdwp:suspend=y,transport=" +
                 TRANSPORT_NAME +
                 ",address=" + name +
                 " " + DEBUGEE_CLASS);
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/accept/accept001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/accept/accept001.java
index c38279031b8..3d700abbf62 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/accept/accept001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/accept/accept001.java
@@ -81,7 +81,7 @@ private int runIt(String argv[], PrintStream out) {
         String java = argHandler.getLaunchExecPath()
                           + " " + argHandler.getLaunchOptions();
         String cmd = java +
-            " -Xdebug -Xrunjdwp:transport=dt_socket,server=n,address=" +
+            " -Xrunjdwp:transport=dt_socket,server=n,address=" +
             connAddr + " " + DEBUGEE_CLASS;
 
         Binder binder = new Binder(argHandler, log);
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/accept/accept002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/accept/accept002.java
index 1e80e07ae74..a3bbf3f8c94 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/accept/accept002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/accept/accept002.java
@@ -82,7 +82,7 @@ private int runIt(String argv[], PrintStream out) {
         String java = argHandler.getLaunchExecPath()
                           + " " + argHandler.getLaunchOptions();
         String cmd = java +
-            " -Xdebug -Xrunjdwp:transport=dt_shmem,server=n,address=" +
+            " -Xrunjdwp:transport=dt_shmem,server=n,address=" +
             connAddr + " " + DEBUGEE_CLASS;
 
         Binder binder = new Binder(argHandler, log);
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/listennosuspend/listennosuspend001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/listennosuspend/listennosuspend001.java
index 3ea73669bc9..fc381e86c1d 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/listennosuspend/listennosuspend001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/listennosuspend/listennosuspend001.java
@@ -81,7 +81,7 @@ private int runIt(String argv[], PrintStream out) {
         String java = argHandler.getLaunchExecPath()
                           + " " + argHandler.getLaunchOptions();
         String cmd = java +
-            " -Xdebug -Xrunjdwp:transport=dt_socket,server=n,suspend=n,address=" +
+            " -Xrunjdwp:transport=dt_socket,server=n,suspend=n,address=" +
             connAddr + " " + DEBUGEE_CLASS;
 
         Binder binder = new Binder(argHandler, log);
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/startListening/startlis001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/startListening/startlis001.java
index 5e736560fc5..43e3b9fa700 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/startListening/startlis001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/startListening/startlis001.java
@@ -157,7 +157,7 @@ private int runIt(String argv[], PrintStream out) {
                           + " " + argHandler.getLaunchOptions();
 
         String cmd = java +
-            " -Xdebug -Xrunjdwp:transport=dt_socket,server=n,address=" +
+            " -Xrunjdwp:transport=dt_socket,server=n,address=" +
             addr + " " + DEBUGEE_CLASS;
 
         Binder binder = new Binder(argHandler, log);
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/startListening/startlis002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/startListening/startlis002.java
index 7abdfb0156b..262d628e20b 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/startListening/startlis002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ListeningConnector/startListening/startlis002.java
@@ -132,7 +132,7 @@ private int runIt(String argv[], PrintStream out) {
                           + " " + argHandler.getLaunchOptions();
 
         String cmd = java +
-            " -Xdebug -Xrunjdwp:transport=dt_shmem,server=n,address=" +
+            " -Xrunjdwp:transport=dt_shmem,server=n,address=" +
             addr + " " + DEBUGEE_CLASS;
 
         Binder binder = new Binder(argHandler, log);
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/createVirtualMachine/createVM002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/createVirtualMachine/createVM002.java
index e49fc7460cf..efe4f6fac92 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/createVirtualMachine/createVM002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/createVirtualMachine/createVM002.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2023, 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
@@ -131,7 +131,7 @@ private int runThis (String argv[], PrintStream out) {
 
         String targetJava = argsHandler.getLaunchExecPath()
                                     + " " + argsHandler.getLaunchOptions();
-        String commandToRun = targetJava + " -Xdebug -Xrunjdwp:transport=dt_socket,address=" +
+        String commandToRun = targetJava + " -Xrunjdwp:transport=dt_socket,address=" +
                 testTransportServiceListenKey.address() +
                 // Addind "suspend=n' option helps avoid debugee hang. See 6803636.
                 ",suspend=n" +
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/createVirtualMachine/createVM003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/createVirtualMachine/createVM003.java
index 92bed251e41..5df26b6ab37 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/createVirtualMachine/createVM003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/createVirtualMachine/createVM003.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2023, 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
@@ -136,7 +136,7 @@ private int runThis (String argv[], PrintStream out) {
 
         String targetJava = argsHandler.getLaunchExecPath()
                                     + " " + argsHandler.getLaunchOptions();
-        String commandToRun = targetJava + " -Xdebug -Xrunjdwp:transport=dt_socket,address=" +
+        String commandToRun = targetJava + " -Xrunjdwp:transport=dt_socket,address=" +
             testTransportServiceListenKey.address() + " " + targetVMClassName;
 
         Binder binder = new Binder(argsHandler, logHandler);
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/createVirtualMachine/createVM004.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/createVirtualMachine/createVM004.java
index 4a485e21d21..4673ad23fcc 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/createVirtualMachine/createVM004.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/createVirtualMachine/createVM004.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2023, 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
@@ -139,7 +139,7 @@ private int runThis (String argv[], PrintStream out) {
 
         String targetJava = argsHandler.getLaunchExecPath()
                                     + " " + argsHandler.getLaunchOptions();
-        String commandToRun = targetJava + " -Xdebug -Xrunjdwp:transport=dt_socket,address=" +
+        String commandToRun = targetJava + " -Xrunjdwp:transport=dt_socket,address=" +
             testTransportServiceListenKey.address() + " " + targetVMClassName;
 
         Binder binder = new Binder(argsHandler, logHandler);
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/createVirtualMachine/createVM005.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/createVirtualMachine/createVM005.java
index 2b47fede424..e7a4e15f93c 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/createVirtualMachine/createVM005.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/VirtualMachineManager/createVirtualMachine/createVM005.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2023, 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
@@ -135,7 +135,7 @@ private int runThis (String argv[], PrintStream out) {
 
         String targetJava = argsHandler.getLaunchExecPath()
                                     + " " + argsHandler.getLaunchOptions();
-        String commandToRun = targetJava + " -Xdebug -Xrunjdwp:transport=dt_socket,address=" +
+        String commandToRun = targetJava + " -Xrunjdwp:transport=dt_socket,address=" +
             testTransportServiceListenKey.address() + " " + targetVMClassName;
 
         Binder binder = new Binder(argsHandler, logHandler);
diff --git a/test/jdk/com/sun/jdi/connect/spi/SimpleLaunchingConnector.java b/test/jdk/com/sun/jdi/connect/spi/SimpleLaunchingConnector.java
index 5d23b9f1287..7970a4d63db 100644
--- a/test/jdk/com/sun/jdi/connect/spi/SimpleLaunchingConnector.java
+++ b/test/jdk/com/sun/jdi/connect/spi/SimpleLaunchingConnector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2023, 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
@@ -144,7 +144,7 @@ public VirtualMachine launch(Map<String, ? extends Connector.Argument> arguments
 
         String exe = System.getProperty("java.home") + File.separator + "bin" +
             File.separator + "java";
-        String cmd = exe + " -Xdebug -Xrunjdwp:transport=dt_socket,timeout=15000,address=" +
+        String cmd = exe + " -Xrunjdwp:transport=dt_socket,timeout=15000,address=" +
             key.address() +
             " -classpath " + System.getProperty("test.classes") +
             " " + className;
diff --git a/test/jdk/java/awt/Clipboard/HTMLTransferTest/HTMLTransferTest.java b/test/jdk/java/awt/Clipboard/HTMLTransferTest/HTMLTransferTest.java
index 6df01cca1c9..f20ceec0ec0 100644
--- a/test/jdk/java/awt/Clipboard/HTMLTransferTest/HTMLTransferTest.java
+++ b/test/jdk/java/awt/Clipboard/HTMLTransferTest/HTMLTransferTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, 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
@@ -90,7 +90,7 @@ public void start() {
             String javaPath = System.getProperty("java.home", "");
             String cmd = javaPath + File.separator + "bin" + File.separator
                 + "java -cp " + System.getProperty("test.classes", ".") +
-                //+ "-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 "
+                //+ "-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 "
                 " THTMLConsumer"
                 //+ stFormats
                 ;
diff --git a/test/jdk/java/awt/datatransfer/DragUnicodeBetweenJVMTest/DragUnicodeBetweenJVMTest.java b/test/jdk/java/awt/datatransfer/DragUnicodeBetweenJVMTest/DragUnicodeBetweenJVMTest.java
index a61493b6a58..18159dce64f 100644
--- a/test/jdk/java/awt/datatransfer/DragUnicodeBetweenJVMTest/DragUnicodeBetweenJVMTest.java
+++ b/test/jdk/java/awt/datatransfer/DragUnicodeBetweenJVMTest/DragUnicodeBetweenJVMTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2023, 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
@@ -79,7 +79,7 @@ public void windowClosing(WindowEvent e) {
 
 
        ProcessResults processResults =
-                // ProcessCommunicator.executeChildProcess(this.getClass()," -cp \"C:\\Documents and Settings\\df153228\\IdeaProjects\\UnicodeTestDebug\\out\\production\\UnicodeTestDebug\" -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005 ", args);
+                // ProcessCommunicator.executeChildProcess(this.getClass()," -cp \"C:\\Documents and Settings\\df153228\\IdeaProjects\\UnicodeTestDebug\\out\\production\\UnicodeTestDebug\" -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005 ", args);
                 ProcessCommunicator.executeChildProcess(this.getClass(), args);
 
         verifyTestResults(processResults);