diff --git a/metadata/com.hazelcast/hazelcast/5.2.1/jni-config.json b/metadata/com.hazelcast/hazelcast/5.2.1/jni-config.json
index 2c10e77a..be6f2236 100644
--- a/metadata/com.hazelcast/hazelcast/5.2.1/jni-config.json
+++ b/metadata/com.hazelcast/hazelcast/5.2.1/jni-config.json
@@ -1,108 +1,4 @@
 [
-  {
-    "condition": {
-      "typeReachable": "com.hazelcast.internal.metrics.impl.MetricsService"
-    },
-    "name": "[Lcom.sun.management.internal.DiagnosticCommandArgumentInfo;"
-  },
-  {
-    "condition": {
-      "typeReachable": "com.hazelcast.internal.metrics.impl.MetricsService"
-    },
-    "name": "[Lcom.sun.management.internal.DiagnosticCommandInfo;"
-  },
-  {
-    "condition": {
-      "typeReachable": "com.hazelcast.internal.util.JVMUtil"
-    },
-    "name": "com.sun.management.VMOption$Origin",
-    "fields": [
-      {
-        "name": "ATTACH_ON_DEMAND"
-      },
-      {
-        "name": "CONFIG_FILE"
-      },
-      {
-        "name": "DEFAULT"
-      },
-      {
-        "name": "ENVIRON_VAR"
-      },
-      {
-        "name": "ERGONOMIC"
-      },
-      {
-        "name": "MANAGEMENT"
-      },
-      {
-        "name": "OTHER"
-      },
-      {
-        "name": "VM_CREATION"
-      }
-    ]
-  },
-  {
-    "condition": {
-      "typeReachable": "com.hazelcast.internal.metrics.impl.MetricsService"
-    },
-    "name": "com.sun.management.internal.DiagnosticCommandArgumentInfo",
-    "methods": [
-      {
-        "name": "<init>",
-        "parameterTypes": [
-          "java.lang.String",
-          "java.lang.String",
-          "java.lang.String",
-          "java.lang.String",
-          "boolean",
-          "boolean",
-          "boolean",
-          "int"
-        ]
-      }
-    ]
-  },
-  {
-    "condition": {
-      "typeReachable": "com.hazelcast.internal.metrics.impl.MetricsService"
-    },
-    "name": "com.sun.management.internal.DiagnosticCommandInfo",
-    "methods": [
-      {
-        "name": "<init>",
-        "parameterTypes": [
-          "java.lang.String",
-          "java.lang.String",
-          "java.lang.String",
-          "java.lang.String",
-          "java.lang.String",
-          "java.lang.String",
-          "boolean",
-          "java.util.List"
-        ]
-      }
-    ]
-  },
-  {
-    "condition": {
-      "typeReachable": "com.hazelcast.internal.util.JVMUtil"
-    },
-    "name": "com.sun.management.internal.Flag",
-    "methods": [
-      {
-        "name": "<init>",
-        "parameterTypes": [
-          "java.lang.String",
-          "java.lang.Object",
-          "boolean",
-          "boolean",
-          "com.sun.management.VMOption$Origin"
-        ]
-      }
-    ]
-  },
   {
     "condition": {
       "typeReachable": "com.hazelcast.internal.util.JVMUtil"
@@ -130,37 +26,5 @@
         ]
       }
     ]
-  },
-  {
-    "condition": {
-      "typeReachable": "com.hazelcast.spi.impl.NodeEngineImpl"
-    },
-    "name": "sun.management.VMManagementImpl",
-    "fields": [
-      {
-        "name": "compTimeMonitoringSupport"
-      },
-      {
-        "name": "currentThreadCpuTimeSupport"
-      },
-      {
-        "name": "objectMonitorUsageSupport"
-      },
-      {
-        "name": "otherThreadCpuTimeSupport"
-      },
-      {
-        "name": "remoteDiagnosticCommandsSupport"
-      },
-      {
-        "name": "synchronizerUsageSupport"
-      },
-      {
-        "name": "threadAllocatedMemorySupport"
-      },
-      {
-        "name": "threadContentionMonitoringSupport"
-      }
-    ]
   }
 ]
diff --git a/metadata/com.hazelcast/hazelcast/5.2.1/reflect-config.json b/metadata/com.hazelcast/hazelcast/5.2.1/reflect-config.json
index 51b9e9d6..adb173d1 100644
--- a/metadata/com.hazelcast/hazelcast/5.2.1/reflect-config.json
+++ b/metadata/com.hazelcast/hazelcast/5.2.1/reflect-config.json
@@ -65,12 +65,6 @@
     },
     "name": "[Ljava.lang.String;"
   },
-  {
-    "condition": {
-      "typeReachable": "com.hazelcast.internal.metrics.impl.MetricsService"
-    },
-    "name": "[Ljavax.management.openmbean.CompositeData;"
-  },
   {
     "condition": {
       "typeReachable": "com.hazelcast.internal.util.phonehome.PhoneHome"
@@ -3939,338 +3933,6 @@
       }
     ]
   },
-  {
-    "condition": {
-      "typeReachable": "com.hazelcast.internal.metrics.impl.MetricsService"
-    },
-    "name": "com.sun.management.GarbageCollectorMXBean",
-    "queryAllPublicMethods": true
-  },
-  {
-    "condition": {
-      "typeReachable": "com.hazelcast.internal.metrics.impl.MetricsService"
-    },
-    "name": "com.sun.management.GcInfo",
-    "queryAllPublicMethods": true
-  },
-  {
-    "condition": {
-      "typeReachable": "com.hazelcast.internal.metrics.impl.MetricsService"
-    },
-    "name": "com.sun.management.HotSpotDiagnosticMXBean",
-    "queryAllPublicMethods": true
-  },
-  {
-    "condition": {
-      "typeReachable": "com.hazelcast.internal.util.JVMUtil"
-    },
-    "name": "com.sun.management.HotSpotDiagnosticMXBean",
-    "methods": [
-      {
-        "name": "getVMOption",
-        "parameterTypes": [
-          "java.lang.String"
-        ]
-      }
-    ]
-  },
-  {
-    "condition": {
-      "typeReachable": "com.hazelcast.internal.diagnostics.HealthMonitor$HealthMetrics"
-    },
-    "name": "com.sun.management.OperatingSystemMXBean",
-    "methods": [
-      {
-        "name": "getFreePhysicalMemorySize",
-        "parameterTypes": []
-      },
-      {
-        "name": "getTotalPhysicalMemorySize",
-        "parameterTypes": []
-      }
-    ]
-  },
-  {
-    "condition": {
-      "typeReachable": "com.hazelcast.internal.memory.MemoryStatsSupport"
-    },
-    "name": "com.sun.management.OperatingSystemMXBean",
-    "methods": [
-      {
-        "name": "getFreePhysicalMemorySize",
-        "parameterTypes": []
-      },
-      {
-        "name": "getTotalPhysicalMemorySize",
-        "parameterTypes": []
-      }
-    ]
-  },
-  {
-    "condition": {
-      "typeReachable": "com.hazelcast.internal.metrics.impl.LongGaugeImpl"
-    },
-    "name": "com.sun.management.OperatingSystemMXBean",
-    "methods": [
-      {
-        "name": "getFreePhysicalMemorySize",
-        "parameterTypes": []
-      },
-      {
-        "name": "getTotalPhysicalMemorySize",
-        "parameterTypes": []
-      }
-    ]
-  },
-  {
-    "condition": {
-      "typeReachable": "com.hazelcast.internal.metrics.impl.MetricsCollectionCycle"
-    },
-    "name": "com.sun.management.OperatingSystemMXBean",
-    "methods": [
-      {
-        "name": "getFreePhysicalMemorySize",
-        "parameterTypes": []
-      },
-      {
-        "name": "getTotalPhysicalMemorySize",
-        "parameterTypes": []
-      }
-    ]
-  },
-  {
-    "condition": {
-      "typeReachable": "com.hazelcast.internal.metrics.metricsets.OperatingSystemMetricSet"
-    },
-    "name": "com.sun.management.OperatingSystemMXBean",
-    "methods": [
-      {
-        "name": "getFreePhysicalMemorySize",
-        "parameterTypes": []
-      },
-      {
-        "name": "getSystemCpuLoad",
-        "parameterTypes": []
-      },
-      {
-        "name": "getTotalPhysicalMemorySize",
-        "parameterTypes": []
-      }
-    ]
-  },
-  {
-    "condition": {
-      "typeReachable": "com.hazelcast.internal.util.OperatingSystemMXBeanSupport"
-    },
-    "name": "com.sun.management.OperatingSystemMXBean"
-  },
-  {
-    "condition": {
-      "typeReachable": "com.hazelcast.internal.metrics.impl.MetricsService"
-    },
-    "name": "com.sun.management.ThreadMXBean",
-    "queryAllPublicMethods": true
-  },
-  {
-    "condition": {
-      "typeReachable": "com.hazelcast.internal.metrics.impl.MetricsService"
-    },
-    "name": "com.sun.management.UnixOperatingSystemMXBean",
-    "queryAllPublicMethods": true
-  },
-  {
-    "condition": {
-      "typeReachable": "com.hazelcast.internal.metrics.impl.MetricsService"
-    },
-    "name": "com.sun.management.VMOption",
-    "queryAllPublicMethods": true
-  },
-  {
-    "condition": {
-      "typeReachable": "com.hazelcast.internal.util.JVMUtil"
-    },
-    "name": "com.sun.management.VMOption",
-    "methods": [
-      {
-        "name": "getName",
-        "parameterTypes": []
-      },
-      {
-        "name": "getOrigin",
-        "parameterTypes": []
-      },
-      {
-        "name": "getValue",
-        "parameterTypes": []
-      },
-      {
-        "name": "isWriteable",
-        "parameterTypes": []
-      }
-    ]
-  },
-  {
-    "condition": {
-      "typeReachable": "com.hazelcast.internal.metrics.impl.MetricsService"
-    },
-    "name": "com.sun.management.internal.GarbageCollectorExtImpl",
-    "queryAllPublicConstructors": true
-  },
-  {
-    "condition": {
-      "typeReachable": "com.hazelcast.internal.metrics.impl.MetricsService"
-    },
-    "name": "com.sun.management.internal.HotSpotDiagnostic",
-    "queryAllPublicConstructors": true
-  },
-  {
-    "condition": {
-      "typeReachable": "com.hazelcast.internal.metrics.impl.MetricsService"
-    },
-    "name": "com.sun.management.internal.HotSpotThreadImpl",
-    "queryAllPublicConstructors": true
-  },
-  {
-    "condition": {
-      "typeReachable": "com.hazelcast.internal.diagnostics.HealthMonitor$HealthMetrics"
-    },
-    "name": "com.sun.management.internal.OperatingSystemImpl",
-    "methods": [
-      {
-        "name": "getFreeSwapSpaceSize",
-        "parameterTypes": []
-      },
-      {
-        "name": "getTotalSwapSpaceSize",
-        "parameterTypes": []
-      }
-    ]
-  },
-  {
-    "condition": {
-      "typeReachable": "com.hazelcast.internal.memory.MemoryStatsSupport"
-    },
-    "name": "com.sun.management.internal.OperatingSystemImpl",
-    "methods": [
-      {
-        "name": "getTotalSwapSpaceSize",
-        "parameterTypes": []
-      }
-    ]
-  },
-  {
-    "condition": {
-      "typeReachable": "com.hazelcast.internal.metrics.impl.LongGaugeImpl"
-    },
-    "name": "com.sun.management.internal.OperatingSystemImpl",
-    "methods": [
-      {
-        "name": "getCommittedVirtualMemorySize",
-        "parameterTypes": []
-      },
-      {
-        "name": "getFreeSwapSpaceSize",
-        "parameterTypes": []
-      },
-      {
-        "name": "getMaxFileDescriptorCount",
-        "parameterTypes": []
-      },
-      {
-        "name": "getOpenFileDescriptorCount",
-        "parameterTypes": []
-      },
-      {
-        "name": "getProcessCpuTime",
-        "parameterTypes": []
-      },
-      {
-        "name": "getTotalSwapSpaceSize",
-        "parameterTypes": []
-      }
-    ]
-  },
-  {
-    "condition": {
-      "typeReachable": "com.hazelcast.internal.metrics.impl.MetricsCollectionCycle"
-    },
-    "name": "com.sun.management.internal.OperatingSystemImpl",
-    "methods": [
-      {
-        "name": "getCommittedVirtualMemorySize",
-        "parameterTypes": []
-      },
-      {
-        "name": "getFreeSwapSpaceSize",
-        "parameterTypes": []
-      },
-      {
-        "name": "getMaxFileDescriptorCount",
-        "parameterTypes": []
-      },
-      {
-        "name": "getOpenFileDescriptorCount",
-        "parameterTypes": []
-      },
-      {
-        "name": "getProcessCpuTime",
-        "parameterTypes": []
-      },
-      {
-        "name": "getTotalSwapSpaceSize",
-        "parameterTypes": []
-      }
-    ]
-  },
-  {
-    "condition": {
-      "typeReachable": "com.hazelcast.internal.metrics.impl.MetricsService"
-    },
-    "name": "com.sun.management.internal.OperatingSystemImpl",
-    "queryAllPublicConstructors": true
-  },
-  {
-    "condition": {
-      "typeReachable": "com.hazelcast.internal.metrics.metricsets.OperatingSystemMetricSet"
-    },
-    "name": "com.sun.management.internal.OperatingSystemImpl",
-    "methods": [
-      {
-        "name": "getCommittedVirtualMemorySize",
-        "parameterTypes": []
-      },
-      {
-        "name": "getFreeSwapSpaceSize",
-        "parameterTypes": []
-      },
-      {
-        "name": "getMaxFileDescriptorCount",
-        "parameterTypes": []
-      },
-      {
-        "name": "getOpenFileDescriptorCount",
-        "parameterTypes": []
-      },
-      {
-        "name": "getProcessCpuLoad",
-        "parameterTypes": []
-      },
-      {
-        "name": "getProcessCpuTime",
-        "parameterTypes": []
-      },
-      {
-        "name": "getTotalSwapSpaceSize",
-        "parameterTypes": []
-      }
-    ]
-  },
-  {
-    "condition": {
-      "typeReachable": "com.hazelcast.internal.util.OperatingSystemMXBeanSupport"
-    },
-    "name": "com.sun.management.internal.OperatingSystemImpl"
-  },
   {
     "condition": {
       "typeReachable": "com.hazelcast.internal.util.XmlUtil"
@@ -5420,55 +5082,6 @@
     },
     "name": "javax.cache.processor.EntryProcessorException"
   },
-  {
-    "condition": {
-      "typeReachable": "com.hazelcast.internal.metrics.impl.MetricsService"
-    },
-    "name": "javax.management.MBeanOperationInfo",
-    "queryAllPublicMethods": true,
-    "methods": [
-      {
-        "name": "getSignature",
-        "parameterTypes": []
-      }
-    ]
-  },
-  {
-    "condition": {
-      "typeReachable": "com.hazelcast.internal.metrics.impl.MetricsService"
-    },
-    "name": "javax.management.MBeanServerBuilder",
-    "methods": [
-      {
-        "name": "<init>",
-        "parameterTypes": []
-      }
-    ]
-  },
-  {
-    "condition": {
-      "typeReachable": "com.hazelcast.internal.metrics.impl.MetricsService"
-    },
-    "name": "javax.management.ObjectName"
-  },
-  {
-    "condition": {
-      "typeReachable": "com.hazelcast.internal.metrics.impl.MetricsService"
-    },
-    "name": "javax.management.openmbean.CompositeData"
-  },
-  {
-    "condition": {
-      "typeReachable": "com.hazelcast.internal.metrics.impl.MetricsService"
-    },
-    "name": "javax.management.openmbean.OpenMBeanOperationInfoSupport"
-  },
-  {
-    "condition": {
-      "typeReachable": "com.hazelcast.internal.metrics.impl.MetricsService"
-    },
-    "name": "javax.management.openmbean.TabularData"
-  },
   {
     "condition": {
       "typeReachable": "com.hazelcast.internal.util.phonehome.PhoneHome"
@@ -5530,62 +5143,6 @@
     "name": "jdk.management.jfr.SettingDescriptorInfo",
     "queryAllPublicMethods": true
   },
-  {
-    "condition": {
-      "typeReachable": "com.hazelcast.internal.metrics.impl.MetricsService"
-    },
-    "name": "sun.management.ClassLoadingImpl",
-    "queryAllPublicConstructors": true
-  },
-  {
-    "condition": {
-      "typeReachable": "com.hazelcast.internal.metrics.impl.MetricsService"
-    },
-    "name": "sun.management.CompilationImpl",
-    "queryAllPublicConstructors": true
-  },
-  {
-    "condition": {
-      "typeReachable": "com.hazelcast.internal.metrics.impl.MetricsService"
-    },
-    "name": "sun.management.ManagementFactoryHelper$1",
-    "queryAllPublicConstructors": true
-  },
-  {
-    "condition": {
-      "typeReachable": "com.hazelcast.internal.metrics.impl.MetricsService"
-    },
-    "name": "sun.management.ManagementFactoryHelper$PlatformLoggingImpl",
-    "queryAllPublicConstructors": true
-  },
-  {
-    "condition": {
-      "typeReachable": "com.hazelcast.internal.metrics.impl.MetricsService"
-    },
-    "name": "sun.management.MemoryImpl",
-    "queryAllPublicConstructors": true
-  },
-  {
-    "condition": {
-      "typeReachable": "com.hazelcast.internal.metrics.impl.MetricsService"
-    },
-    "name": "sun.management.MemoryManagerImpl",
-    "queryAllPublicConstructors": true
-  },
-  {
-    "condition": {
-      "typeReachable": "com.hazelcast.internal.metrics.impl.MetricsService"
-    },
-    "name": "sun.management.MemoryPoolImpl",
-    "queryAllPublicConstructors": true
-  },
-  {
-    "condition": {
-      "typeReachable": "com.hazelcast.internal.metrics.impl.MetricsService"
-    },
-    "name": "sun.management.RuntimeImpl",
-    "queryAllPublicConstructors": true
-  },
   {
     "condition": {
       "typeReachable": "com.hazelcast.internal.memory.impl.UnsafeUtil$1"
diff --git a/tests/src/com.hazelcast/hazelcast/5.2.1/src/test/java/com_hazelcast/hazelcast/HazelcastTest.java b/tests/src/com.hazelcast/hazelcast/5.2.1/src/test/java/com_hazelcast/hazelcast/HazelcastTest.java
index 20f88ab6..90839abf 100644
--- a/tests/src/com.hazelcast/hazelcast/5.2.1/src/test/java/com_hazelcast/hazelcast/HazelcastTest.java
+++ b/tests/src/com.hazelcast/hazelcast/5.2.1/src/test/java/com_hazelcast/hazelcast/HazelcastTest.java
@@ -186,6 +186,8 @@ void testLock() {
             map.get("key");
             map.putIfAbsent("someKey", "someValue");
             map.replace("key", "value", "newValue");
+            assertThat(map.get("someKey")).isEqualTo("someValue");
+            assertThat(map.get("key")).isEqualTo("newValue");
         } finally {
             lock.unlock();
         }