Skip to content

sap: Merge 103487344f7d6dc94a8064b12b2b604103029770 #138

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
RealCLanger merged 2 commits into from
Dec 11, 2025
Merged

sap: Merge 103487344f7d6dc94a8064b12b2b604103029770 #138

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
39ddd13
8473: JMC silently connects to its own runtime if target runtime does…
aymane-harmaz Dec 4, 2025
1034873
8474: Eclipse platform upgrade to 2025_09
viragpurnam123 Dec 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ...rowser.attach/src/main/java/org/openjdk/jmc/browser/attach/LocalConnectionDescriptor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ public Void call() throws Exception {
}

private void setAddress(String address) {
if (isSelfMonitoring() || address == null) {
if (isSelfMonitoring()) {
// If we're attempting to monitor ourselves, use the local
// JVM (since the poor agent currently may go into infinite
// recursion otherwise).
Expand All @@ -160,7 +160,7 @@ private void setAddress(String address) {
// Not going to happen...
LOGGER.log(Level.SEVERE, "Failed to parse url", e);
}
} else {
} else if (address != null) {
try {
url = new JMXServiceURL(address);
} catch (MalformedURLException e) {
Expand Down
2 changes: 1 addition & 1 deletion ...njdk.jmc.browser.attach/src/main/java/org/openjdk/jmc/browser/attach/LocalJVMToolkit.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -527,7 +527,7 @@ public static synchronized DiscoveryEntry[] getAttachableJVMs() {
*/
public static String executeCommandForPid(String pid, String command)
throws AttachNotSupportedException, IOException, AgentLoadException {
return executeCommandForPid(pid, command, false);
return executeCommandForPid(pid, command, true);
}

/**
Expand Down
15 changes: 6 additions & 9 deletions ....console.agent/src/main/java/org/openjdk/jmc/console/agent/actions/AgentEditorOpener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@
import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.jface.dialogs.IDialogConstants;
import org.eclipse.jface.wizard.WizardDialog;
import org.eclipse.osgi.util.NLS;
import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Display;
Expand All @@ -52,7 +51,6 @@
import org.openjdk.jmc.common.action.Executable;
import org.openjdk.jmc.common.io.IOToolkit;
import org.openjdk.jmc.console.agent.AgentJmxHelper;
import org.openjdk.jmc.console.agent.AgentPlugin;
import org.openjdk.jmc.console.agent.editor.AgentEditor;
import org.openjdk.jmc.console.agent.editor.AgentEditorInput;
import org.openjdk.jmc.console.agent.messages.internal.Messages;
Expand Down Expand Up @@ -97,13 +95,12 @@ protected IStatus run(IProgressMonitor monitor) {
helper.removeConnectionChangedListener(this);
return ret;
} catch (ConnectionException e) {
IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
DialogToolkit.showException(window.getShell(), Messages.AgentEditorOpener_MESSAGE_COULD_NOT_CONNECT, e);

return new Status(IStatus.ERROR, AgentPlugin.PLUGIN_ID, IStatus.ERROR,
NLS.bind(Messages.AgentEditorOpener_MESSAGE_COULD_NOT_CONNECT,
serverHandle.getServerDescriptor().getDisplayName(), e.getMessage()),
e);
DisplayToolkit.safeAsyncExec(Display.getDefault(), () -> {
IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
DialogToolkit.showException(window.getShell(), Messages.AgentEditorOpener_MESSAGE_COULD_NOT_CONNECT,
e);
});
return Status.CANCEL_STATUS;
}
}

Expand Down
37 changes: 8 additions & 29 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@
</distributionManagement>
<profiles>
<profile>
<id>2025-06</id>
<id>2025-09</id>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
Expand All @@ -139,7 +139,7 @@
<target>
<artifact>
<groupId>org.openjdk.jmc</groupId>
<artifactId>platform-definition-2025-06</artifactId>
<artifactId>platform-definition-2025-09</artifactId>
<version>${revision}${changelist}</version>
</artifact>
</target>
Expand All @@ -149,28 +149,7 @@
</build>
</profile>
<profile>
<id>2025-03</id>
<build>
<plugins>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>target-platform-configuration</artifactId>
<version>${tycho.version}</version>
<configuration>
<target>
<artifact>
<groupId>org.openjdk.jmc</groupId>
<artifactId>platform-definition-2025-03</artifactId>
<version>${revision}${changelist}</version>
</artifact>
</target>
</configuration>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>2024-12</id>
<id>2025-06</id>
<build>
<plugins>
<plugin>
Expand All @@ -181,7 +160,7 @@
<target>
<artifact>
<groupId>org.openjdk.jmc</groupId>
<artifactId>platform-definition-2024-12</artifactId>
<artifactId>platform-definition-2025-06</artifactId>
<version>${revision}${changelist}</version>
</artifact>
</target>
Expand All @@ -191,7 +170,7 @@
</build>
</profile>
<profile>
<id>2024-09</id>
<id>2025-03</id>
<build>
<plugins>
<plugin>
Expand All @@ -202,7 +181,7 @@
<target>
<artifact>
<groupId>org.openjdk.jmc</groupId>
<artifactId>platform-definition-2024-09</artifactId>
<artifactId>platform-definition-2025-03</artifactId>
<version>${revision}${changelist}</version>
</artifact>
</target>
Expand All @@ -212,7 +191,7 @@
</build>
</profile>
<profile>
<id>2024-06</id>
<id>2024-12</id>
<build>
<plugins>
<plugin>
Expand All @@ -223,7 +202,7 @@
<target>
<artifact>
<groupId>org.openjdk.jmc</groupId>
<artifactId>platform-definition-2024-06</artifactId>
<artifactId>platform-definition-2024-12</artifactId>
<version>${revision}${changelist}</version>
</artifact>
</target>
Expand Down
99 changes: 0 additions & 99 deletions releng/platform-definitions/platform-definition-2024-06/platform-definition-2024-06.target
View file
Open in desktop

This file was deleted.

47 changes: 0 additions & 47 deletions releng/platform-definitions/platform-definition-2024-09/pom.xml
View file
Open in desktop

This file was deleted.

18 changes: 9 additions & 9 deletions releng/platform-definitions/platform-definition-2024-12/platform-definition-2024-12.target
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,15 +49,15 @@
<unit id="org.jolokia.service.discovery" version="2.0.2"/>
<unit id="org.jolokia.server.core" version="2.0.2"/>
<unit id="com.github.tomakehurst.wiremock-standalone" version="2.27.2"/>
<unit id="org.eclipse.jetty.websocket.api" version="12.0.21"/>
<unit id="org.eclipse.jetty.ee9.websocket.api" version="12.0.21"/>
<unit id="org.eclipse.jetty.ee9.websocket.server" version="12.0.21"/>
<unit id="org.eclipse.jetty.websocket.server" version="12.0.21"/>
<unit id="org.eclipse.jetty.ee9.servlet" version="12.0.21"/>
<unit id="org.eclipse.jetty.ee9.server" version="12.0.21"/>
<unit id="org.eclipse.jetty.ee9.websocket.servlet" version="12.0.21"/>
<unit id="org.eclipse.jetty.alpn.client" version="12.0.21"/>
<unit id="org.eclipse.jetty.websocket.core.client" version="12.0.21"/>
<unit id="org.eclipse.jetty.websocket.api" version="12.1.0"/>
<unit id="org.eclipse.jetty.ee9.websocket.api" version="12.1.0"/>
<unit id="org.eclipse.jetty.ee9.websocket.server" version="12.1.0"/>
<unit id="org.eclipse.jetty.websocket.server" version="12.1.0"/>
<unit id="org.eclipse.jetty.ee9.servlet" version="12.1.0"/>
<unit id="org.eclipse.jetty.ee9.server" version="12.1.0"/>
<unit id="org.eclipse.jetty.ee9.websocket.servlet" version="12.1.0"/>
<unit id="org.eclipse.jetty.alpn.client" version="12.1.0"/>
<unit id="org.eclipse.jetty.websocket.core.client" version="12.1.0"/>
<unit id="org.eclipse.jetty.servlet-api" version="5.0.2"/>
<unit id="jakarta.annotation-api" version="3.0.0"/>
<unit id="org.apache.aries.spifly.dynamic.bundle" version="1.3.7"/>
Expand Down
18 changes: 9 additions & 9 deletions releng/platform-definitions/platform-definition-2025-03/platform-definition-2025-03.target
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,15 +49,15 @@
<unit id="org.jolokia.service.discovery" version="2.0.2"/>
<unit id="org.jolokia.server.core" version="2.0.2"/>
<unit id="com.github.tomakehurst.wiremock-standalone" version="2.27.2"/>
<unit id="org.eclipse.jetty.websocket.api" version="12.0.21"/>
<unit id="org.eclipse.jetty.ee9.websocket.api" version="12.0.21"/>
<unit id="org.eclipse.jetty.ee9.websocket.server" version="12.0.21"/>
<unit id="org.eclipse.jetty.websocket.server" version="12.0.21"/>
<unit id="org.eclipse.jetty.ee9.servlet" version="12.0.21"/>
<unit id="org.eclipse.jetty.ee9.server" version="12.0.21"/>
<unit id="org.eclipse.jetty.ee9.websocket.servlet" version="12.0.21"/>
<unit id="org.eclipse.jetty.alpn.client" version="12.0.21"/>
<unit id="org.eclipse.jetty.websocket.core.client" version="12.0.21"/>
<unit id="org.eclipse.jetty.websocket.api" version="12.1.0"/>
<unit id="org.eclipse.jetty.ee9.websocket.api" version="12.1.0"/>
<unit id="org.eclipse.jetty.ee9.websocket.server" version="12.1.0"/>
<unit id="org.eclipse.jetty.websocket.server" version="12.1.0"/>
<unit id="org.eclipse.jetty.ee9.servlet" version="12.1.0"/>
<unit id="org.eclipse.jetty.ee9.server" version="12.1.0"/>
<unit id="org.eclipse.jetty.ee9.websocket.servlet" version="12.1.0"/>
<unit id="org.eclipse.jetty.alpn.client" version="12.1.0"/>
<unit id="org.eclipse.jetty.websocket.core.client" version="12.1.0"/>
<unit id="org.eclipse.jetty.servlet-api" version="5.0.2"/>
<unit id="jakarta.annotation-api" version="3.0.0"/>
<unit id="org.apache.aries.spifly.dynamic.bundle" version="1.3.7"/>
Expand Down
18 changes: 9 additions & 9 deletions releng/platform-definitions/platform-definition-2025-06/platform-definition-2025-06.target
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,15 +49,15 @@
<unit id="org.jolokia.service.discovery" version="2.0.2"/>
<unit id="org.jolokia.server.core" version="2.0.2"/>
<unit id="com.github.tomakehurst.wiremock-standalone" version="2.27.2"/>
<unit id="org.eclipse.jetty.websocket.api" version="12.0.21"/>
<unit id="org.eclipse.jetty.ee9.websocket.api" version="12.0.21"/>
<unit id="org.eclipse.jetty.ee9.websocket.server" version="12.0.21"/>
<unit id="org.eclipse.jetty.websocket.server" version="12.0.21"/>
<unit id="org.eclipse.jetty.ee9.servlet" version="12.0.21"/>
<unit id="org.eclipse.jetty.ee9.server" version="12.0.21"/>
<unit id="org.eclipse.jetty.ee9.websocket.servlet" version="12.0.21"/>
<unit id="org.eclipse.jetty.alpn.client" version="12.0.21"/>
<unit id="org.eclipse.jetty.websocket.core.client" version="12.0.21"/>
<unit id="org.eclipse.jetty.websocket.api" version="12.1.0"/>
<unit id="org.eclipse.jetty.ee9.websocket.api" version="12.1.0"/>
<unit id="org.eclipse.jetty.ee9.websocket.server" version="12.1.0"/>
<unit id="org.eclipse.jetty.websocket.server" version="12.1.0"/>
<unit id="org.eclipse.jetty.ee9.servlet" version="12.1.0"/>
<unit id="org.eclipse.jetty.ee9.server" version="12.1.0"/>
<unit id="org.eclipse.jetty.ee9.websocket.servlet" version="12.1.0"/>
<unit id="org.eclipse.jetty.alpn.client" version="12.1.0"/>
<unit id="org.eclipse.jetty.websocket.core.client" version="12.1.0"/>
<unit id="org.eclipse.jetty.servlet-api" version="5.0.2"/>
<unit id="jakarta.annotation-api" version="3.0.0"/>
<unit id="org.apache.aries.spifly.dynamic.bundle" version="1.3.7"/>
Expand Down
Loading