From 3f11594584cd62ee2a7e1a18a2e9b6e7cd8c048a Mon Sep 17 00:00:00 2001 From: Martin Skarsaune Date: Thu, 22 Jan 2026 21:18:40 +0000 Subject: [PATCH] 8479: Update jolokia third party for JMC 10.0.0 Reviewed-by: schaturvedi --- application/org.openjdk.jmc.jolokia/META-INF/MANIFEST.MF | 2 +- .../org/openjdk/jmc/jolokia/JmcJolokiaJmxConnection.java | 4 ++-- .../org/openjdk/jmc/jolokia/JmcJolokiaJmxConnector.java | 4 ++-- .../main/java/org/openjdk/jmc/jolokia/JmcJolokiaPlugin.java | 2 +- application/tests/org.openjdk.jmc.jolokia.test/pom.xml | 2 +- .../src/test/java/org/openjdk/jmc/jolokia/JolokiaTest.java | 2 +- .../platform-definition-2024-12.target | 6 +++--- .../platform-definition-2025-03.target | 6 +++--- .../platform-definition-2025-06.target | 6 +++--- .../platform-definition-2025-09.target | 6 +++--- releng/third-party/pom.xml | 2 +- 11 files changed, 21 insertions(+), 21 deletions(-) diff --git a/application/org.openjdk.jmc.jolokia/META-INF/MANIFEST.MF b/application/org.openjdk.jmc.jolokia/META-INF/MANIFEST.MF index 73136b598..390b3b80d 100644 --- a/application/org.openjdk.jmc.jolokia/META-INF/MANIFEST.MF +++ b/application/org.openjdk.jmc.jolokia/META-INF/MANIFEST.MF @@ -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, diff --git a/application/org.openjdk.jmc.jolokia/src/main/java/org/openjdk/jmc/jolokia/JmcJolokiaJmxConnection.java b/application/org.openjdk.jmc.jolokia/src/main/java/org/openjdk/jmc/jolokia/JmcJolokiaJmxConnection.java index 630811025..6ce14ce39 100644 --- a/application/org.openjdk.jmc.jolokia/src/main/java/org/openjdk/jmc/jolokia/JmcJolokiaJmxConnection.java +++ b/application/org.openjdk.jmc.jolokia/src/main/java/org/openjdk/jmc/jolokia/JmcJolokiaJmxConnection.java @@ -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; @@ -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); } diff --git a/application/org.openjdk.jmc.jolokia/src/main/java/org/openjdk/jmc/jolokia/JmcJolokiaJmxConnector.java b/application/org.openjdk.jmc.jolokia/src/main/java/org/openjdk/jmc/jolokia/JmcJolokiaJmxConnector.java index 259b3aa9a..13b93bf5e 100644 --- a/application/org.openjdk.jmc.jolokia/src/main/java/org/openjdk/jmc/jolokia/JmcJolokiaJmxConnector.java +++ b/application/org.openjdk.jmc.jolokia/src/main/java/org/openjdk/jmc/jolokia/JmcJolokiaJmxConnector.java @@ -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; @@ -49,7 +49,7 @@ public JmcJolokiaJmxConnector(JMXServiceURL serviceURL, Map environme } @Override - protected RemoteJmxAdapter instantiateAdapter(J4pClientBuilder clientBuilder, Map mergedEnv) + protected RemoteJmxAdapter instantiateAdapter(JolokiaClientBuilder clientBuilder, Map mergedEnv) throws IOException { return new JmcJolokiaJmxConnection(clientBuilder.build()); } diff --git a/application/org.openjdk.jmc.jolokia/src/main/java/org/openjdk/jmc/jolokia/JmcJolokiaPlugin.java b/application/org.openjdk.jmc.jolokia/src/main/java/org/openjdk/jmc/jolokia/JmcJolokiaPlugin.java index a013f2568..47e2e9bb1 100644 --- a/application/org.openjdk.jmc.jolokia/src/main/java/org/openjdk/jmc/jolokia/JmcJolokiaPlugin.java +++ b/application/org.openjdk.jmc.jolokia/src/main/java/org/openjdk/jmc/jolokia/JmcJolokiaPlugin.java @@ -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(Arrays.asList(ServerDetector.FALLBACK))); + logHandler -> new TreeSet(Arrays.asList(ServerDetector.FALLBACK))); return serviceManager.start(); } diff --git a/application/tests/org.openjdk.jmc.jolokia.test/pom.xml b/application/tests/org.openjdk.jmc.jolokia.test/pom.xml index bedcfa1fb..530cee570 100644 --- a/application/tests/org.openjdk.jmc.jolokia.test/pom.xml +++ b/application/tests/org.openjdk.jmc.jolokia.test/pom.xml @@ -46,7 +46,7 @@ ${project.basedir}/../../../configuration - 2.0.2 + 2.4.2 diff --git a/application/tests/org.openjdk.jmc.jolokia.test/src/test/java/org/openjdk/jmc/jolokia/JolokiaTest.java b/application/tests/org.openjdk.jmc.jolokia.test/src/test/java/org/openjdk/jmc/jolokia/JolokiaTest.java index bd1f2ceba..9f6da1517 100644 --- a/application/tests/org.openjdk.jmc.jolokia.test/src/test/java/org/openjdk/jmc/jolokia/JolokiaTest.java +++ b/application/tests/org.openjdk.jmc.jolokia.test/src/test/java/org/openjdk/jmc/jolokia/JolokiaTest.java @@ -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(Arrays.asList(ServerDetector.FALLBACK))); + logHandler -> new TreeSet(Arrays.asList(ServerDetector.FALLBACK))); return serviceManager.start(); } diff --git a/releng/platform-definitions/platform-definition-2024-12/platform-definition-2024-12.target b/releng/platform-definitions/platform-definition-2024-12/platform-definition-2024-12.target index a5d2cd883..aa2214e3f 100644 --- a/releng/platform-definitions/platform-definition-2024-12/platform-definition-2024-12.target +++ b/releng/platform-definitions/platform-definition-2024-12/platform-definition-2024-12.target @@ -45,9 +45,9 @@ - - - + + + diff --git a/releng/platform-definitions/platform-definition-2025-03/platform-definition-2025-03.target b/releng/platform-definitions/platform-definition-2025-03/platform-definition-2025-03.target index 2f19bc93e..88183f8f9 100644 --- a/releng/platform-definitions/platform-definition-2025-03/platform-definition-2025-03.target +++ b/releng/platform-definitions/platform-definition-2025-03/platform-definition-2025-03.target @@ -45,9 +45,9 @@ - - - + + + diff --git a/releng/platform-definitions/platform-definition-2025-06/platform-definition-2025-06.target b/releng/platform-definitions/platform-definition-2025-06/platform-definition-2025-06.target index 36b291839..f95d085dc 100644 --- a/releng/platform-definitions/platform-definition-2025-06/platform-definition-2025-06.target +++ b/releng/platform-definitions/platform-definition-2025-06/platform-definition-2025-06.target @@ -45,9 +45,9 @@ - - - + + + diff --git a/releng/platform-definitions/platform-definition-2025-09/platform-definition-2025-09.target b/releng/platform-definitions/platform-definition-2025-09/platform-definition-2025-09.target index 69de27b73..9cb7e8d8c 100644 --- a/releng/platform-definitions/platform-definition-2025-09/platform-definition-2025-09.target +++ b/releng/platform-definitions/platform-definition-2025-09/platform-definition-2025-09.target @@ -44,9 +44,9 @@ - - - + + + diff --git a/releng/third-party/pom.xml b/releng/third-party/pom.xml index fed65a8cd..e8d42c551 100644 --- a/releng/third-party/pom.xml +++ b/releng/third-party/pom.xml @@ -61,7 +61,7 @@ 2.0.0 12.1.0 1.3.7 - 2.0.2 + 2.4.2 2.27.2 0.0.1-rc.9 7.5.0