Skip to content

sap: Merge 3f11594584cd62ee2a7e1a18a2e9b6e7cd8c048a #141

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 1 commit into from
Jan 29, 2026
Merged

sap: Merge 3f11594584cd62ee2a7e1a18a2e9b6e7cd8c048a #141

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion application/org.openjdk.jmc.jolokia/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Automatic-Module-Name: org.openjdk.jmc.jolokia
Bundle-RequiredExecutionEnvironment: JavaSE-21
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.ui,
org.jolokia.client-jmx-adapter.standalone;visibility:=reexport,
org.jolokia.client-jmx-adapter.standalone;bundle-version="2.4.2";visibility:=reexport,
org.openjdk.jmc.common,
org.openjdk.jmc.rjmx,
org.openjdk.jmc.ui,
Expand Down
4 changes: 2 additions & 2 deletions ...rg.openjdk.jmc.jolokia/src/main/java/org/openjdk/jmc/jolokia/JmcJolokiaJmxConnection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
import javax.management.modelmbean.DescriptorSupport;
import javax.management.openmbean.TabularData;

import org.jolokia.client.J4pClient;
import org.jolokia.client.JolokiaClient;
import org.jolokia.client.jmxadapter.RemoteJmxAdapter;
import org.jolokia.service.serializer.JolokiaSerializer;
import org.jolokia.server.core.service.serializer.SerializeOptions;
Expand All @@ -75,7 +75,7 @@ public class JmcJolokiaJmxConnection extends RemoteJmxAdapter {
private static final String ARGUMENT_OPTION = PREFIX + "arg.isOption"; //$NON-NLS-1$
private static final String ARGUMENT_MULITPLE = PREFIX + "arg.isMultiple"; //$NON-NLS-1$

public JmcJolokiaJmxConnection(J4pClient client) throws IOException {
public JmcJolokiaJmxConnection(JolokiaClient client) throws IOException {
super(client);
}

Expand Down
4 changes: 2 additions & 2 deletions ...org.openjdk.jmc.jolokia/src/main/java/org/openjdk/jmc/jolokia/JmcJolokiaJmxConnector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@

import javax.management.remote.JMXServiceURL;

import org.jolokia.client.J4pClientBuilder;
import org.jolokia.client.JolokiaClientBuilder;
import org.jolokia.client.jmxadapter.JolokiaJmxConnector;
import org.jolokia.client.jmxadapter.RemoteJmxAdapter;

Expand All @@ -49,7 +49,7 @@ public JmcJolokiaJmxConnector(JMXServiceURL serviceURL, Map<String, ?> environme
}

@Override
protected RemoteJmxAdapter instantiateAdapter(J4pClientBuilder clientBuilder, Map<String, Object> mergedEnv)
protected RemoteJmxAdapter instantiateAdapter(JolokiaClientBuilder clientBuilder, Map<String, Object> mergedEnv)
throws IOException {
return new JmcJolokiaJmxConnection(clientBuilder.build());
}
Expand Down
2 changes: 1 addition & 1 deletion ...ation/org.openjdk.jmc.jolokia/src/main/java/org/openjdk/jmc/jolokia/JmcJolokiaPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ public JolokiaContext getJolokiaContext() {
StaticConfiguration configuration = new StaticConfiguration(ConfigKey.AGENT_ID, "jmc");//$NON-NLS-1$
JolokiaServiceManager serviceManager = JolokiaServiceManagerFactory.createJolokiaServiceManager(configuration,
new JulLogHandler(PLUGIN_ID), new AllowAllRestrictor(),
() -> new TreeSet<ServerDetector>(Arrays.asList(ServerDetector.FALLBACK)));
logHandler -> new TreeSet<ServerDetector>(Arrays.asList(ServerDetector.FALLBACK)));
return serviceManager.start();
}

Expand Down
2 changes: 1 addition & 1 deletion application/tests/org.openjdk.jmc.jolokia.test/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@

<properties>
<jmc.config.path>${project.basedir}/../../../configuration</jmc.config.path>
<jolokia.agent.version>2.0.2</jolokia.agent.version>
<jolokia.agent.version>2.4.2</jolokia.agent.version>
</properties>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion ...tests/org.openjdk.jmc.jolokia.test/src/test/java/org/openjdk/jmc/jolokia/JolokiaTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ public JolokiaContext getJolokiaContext() {
StaticConfiguration configuration = new StaticConfiguration(ConfigKey.AGENT_ID, "jolokiatest");
JolokiaServiceManager serviceManager = JolokiaServiceManagerFactory.createJolokiaServiceManager(configuration,
new StdoutLogHandler(true), new AllowAllRestrictor(),
() -> new TreeSet<ServerDetector>(Arrays.asList(ServerDetector.FALLBACK)));
logHandler -> new TreeSet<ServerDetector>(Arrays.asList(ServerDetector.FALLBACK)));
return serviceManager.start();
}

Expand Down
6 changes: 3 additions & 3 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 @@ -45,9 +45,9 @@
<unit id="org.adoptopenjdk.jemmy-browser" version="2.0.0"/>
<unit id="org.adoptopenjdk.jemmy-core" version="2.0.0"/>
<unit id="org.adoptopenjdk.jemmy-swt" version="2.0.0"/>
<unit id="org.jolokia.client-jmx-adapter.standalone" version="2.0.2"/>
<unit id="org.jolokia.service.discovery" version="2.0.2"/>
<unit id="org.jolokia.server.core" version="2.0.2"/>
<unit id="org.jolokia.client-jmx-adapter.standalone" version="2.4.2"/>
<unit id="org.jolokia.service.discovery" version="2.4.2"/>
<unit id="org.jolokia.server.core" version="2.4.2"/>
<unit id="com.github.tomakehurst.wiremock-standalone" version="2.27.2"/>
<unit id="org.eclipse.jetty.websocket.api" version="12.1.0"/>
<unit id="org.eclipse.jetty.ee9.websocket.api" version="12.1.0"/>
Expand Down
6 changes: 3 additions & 3 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 @@ -45,9 +45,9 @@
<unit id="org.adoptopenjdk.jemmy-browser" version="2.0.0"/>
<unit id="org.adoptopenjdk.jemmy-core" version="2.0.0"/>
<unit id="org.adoptopenjdk.jemmy-swt" version="2.0.0"/>
<unit id="org.jolokia.client-jmx-adapter.standalone" version="2.0.2"/>
<unit id="org.jolokia.service.discovery" version="2.0.2"/>
<unit id="org.jolokia.server.core" version="2.0.2"/>
<unit id="org.jolokia.client-jmx-adapter.standalone" version="2.4.2"/>
<unit id="org.jolokia.service.discovery" version="2.4.2"/>
<unit id="org.jolokia.server.core" version="2.4.2"/>
<unit id="com.github.tomakehurst.wiremock-standalone" version="2.27.2"/>
<unit id="org.eclipse.jetty.websocket.api" version="12.1.0"/>
<unit id="org.eclipse.jetty.ee9.websocket.api" version="12.1.0"/>
Expand Down
6 changes: 3 additions & 3 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 @@ -45,9 +45,9 @@
<unit id="org.adoptopenjdk.jemmy-browser" version="2.0.0"/>
<unit id="org.adoptopenjdk.jemmy-core" version="2.0.0"/>
<unit id="org.adoptopenjdk.jemmy-swt" version="2.0.0"/>
<unit id="org.jolokia.client-jmx-adapter.standalone" version="2.0.2"/>
<unit id="org.jolokia.service.discovery" version="2.0.2"/>
<unit id="org.jolokia.server.core" version="2.0.2"/>
<unit id="org.jolokia.client-jmx-adapter.standalone" version="2.4.2"/>
<unit id="org.jolokia.service.discovery" version="2.4.2"/>
<unit id="org.jolokia.server.core" version="2.4.2"/>
<unit id="com.github.tomakehurst.wiremock-standalone" version="2.27.2"/>
<unit id="org.eclipse.jetty.websocket.api" version="12.1.0"/>
<unit id="org.eclipse.jetty.ee9.websocket.api" version="12.1.0"/>
Expand Down
6 changes: 3 additions & 3 deletions releng/platform-definitions/platform-definition-2025-09/platform-definition-2025-09.target
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,9 @@
<unit id="org.adoptopenjdk.jemmy-browser" version="2.0.0"/>
<unit id="org.adoptopenjdk.jemmy-core" version="2.0.0"/>
<unit id="org.adoptopenjdk.jemmy-swt" version="2.0.0"/>
<unit id="org.jolokia.client-jmx-adapter.standalone" version="2.0.2"/>
<unit id="org.jolokia.service.discovery" version="2.0.2"/>
<unit id="org.jolokia.server.core" version="2.0.2"/>
<unit id="org.jolokia.client-jmx-adapter.standalone" version="2.4.2"/>
<unit id="org.jolokia.service.discovery" version="2.4.2"/>
<unit id="org.jolokia.server.core" version="2.4.2"/>
<unit id="com.github.tomakehurst.wiremock-standalone" version="2.27.2"/>
<unit id="org.eclipse.jetty.websocket.api" version="12.1.0"/>
<unit id="org.eclipse.jetty.ee9.websocket.api" version="12.1.0"/>
Expand Down
2 changes: 1 addition & 1 deletion releng/third-party/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
<jemmy.version>2.0.0</jemmy.version>
<jetty.version>12.1.0</jetty.version>
<spifly.version>1.3.7</spifly.version>
<jolokia.version>2.0.2</jolokia.version>
<jolokia.version>2.4.2</jolokia.version>
<wiremock.version>2.27.2</wiremock.version>
<fireplace.version>0.0.1-rc.9</fireplace.version>
<radiance.version>7.5.0</radiance.version>
Expand Down