You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by re...@apache.org on 2022/12/15 13:34:15 UTC

[cxf] branch 3.6.x-fixes updated: CXF-8743: Update to GraalVM 22.3 (#1041)

This is an automated email from the ASF dual-hosted git repository.

reta pushed a commit to branch 3.6.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git


The following commit(s) were added to refs/heads/3.6.x-fixes by this push:
     new 8d51dc8111 CXF-8743: Update to GraalVM 22.3 (#1041)
8d51dc8111 is described below

commit 8d51dc8111e0083f1bbba311b9676872c8178a8a
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Thu Dec 15 08:34:07 2022 -0500

    CXF-8743: Update to GraalVM 22.3 (#1041)
---
 .../samples/jax_rs/graalvm_basic/README.txt        |   2 +-
 .../release/samples/jax_rs/graalvm_basic/pom.xml   |  16 +-
 .../src/graalvm/client/jni-config.json             |   7 +-
 .../src/graalvm/client/reflect-config.json         | 107 ++++++---
 .../src/graalvm/client/resource-config.json        | 139 +++++++++---
 .../src/graalvm/server/jni-config.json             |   7 +-
 .../src/graalvm/server/proxy-config.json           |   4 +-
 .../src/graalvm/server/reflect-config.json         | 212 ++++++++++-------
 .../src/graalvm/server/resource-config.json        | 156 ++++++++++---
 .../src/main/java/demo/jaxrs/server/Server.java    |   2 +-
 .../main/release/samples/jaxws_graalvm/README.txt  |   2 +-
 .../src/main/release/samples/jaxws_graalvm/pom.xml |  16 +-
 .../src/graalvm/client/jni-config.json             |   7 +-
 .../src/graalvm/client/proxy-config.json           |  52 +++--
 .../src/graalvm/client/reflect-config.json         | 229 +++++++++++++------
 .../src/graalvm/client/resource-config.json        | 237 ++++++++++++++-----
 .../src/graalvm/client/serialization-config.json   |  10 +-
 .../src/graalvm/server/jni-config.json             |   7 +-
 .../src/graalvm/server/proxy-config.json           |  80 +++++--
 .../src/graalvm/server/reflect-config.json         | 252 +++++++++++++++------
 .../src/graalvm/server/resource-config.json        | 232 +++++++++++++++----
 .../src/graalvm/server/serialization-config.json   |  10 +-
 .../samples/jaxws_graalvm_dynamic/README.txt       |   4 +-
 .../samples/jaxws_graalvm_dynamic/client/pom.xml   |   8 +-
 .../jaxws_graalvm_dynamic_client/jni-config.json   |   7 +-
 .../jaxws_graalvm_dynamic_client/proxy-config.json |  32 ++-
 .../reflect-config.json                            | 194 +++++++++++-----
 .../resource-config.json                           | 228 +++++++++++++++----
 .../serialization-config.json                      |  10 +-
 .../samples/jaxws_graalvm_dynamic/server/pom.xml   |   8 +-
 .../jaxws_graalvm_dynamic_server/jni-config.json   |   7 +-
 .../jaxws_graalvm_dynamic_server/proxy-config.json |  80 +++++--
 .../reflect-config.json                            | 246 ++++++++++++++------
 .../resource-config.json                           | 232 +++++++++++++++----
 .../serialization-config.json                      |  10 +-
 distribution/src/main/release/samples/pom.xml      |   1 -
 36 files changed, 2093 insertions(+), 760 deletions(-)

diff --git a/distribution/src/main/release/samples/jax_rs/graalvm_basic/README.txt b/distribution/src/main/release/samples/jax_rs/graalvm_basic/README.txt
index 06f7311ab6..6ce05563ce 100644
--- a/distribution/src/main/release/samples/jax_rs/graalvm_basic/README.txt
+++ b/distribution/src/main/release/samples/jax_rs/graalvm_basic/README.txt
@@ -52,7 +52,7 @@ JAX-RS (JSR-311) APIs.
 Pre-requisites
 ---------------------------------------
 
-GraalVM 20.3.0 or later distribution should be installed and pre-configured as 
+GraalVM 22.3.0/JDK11+ or later distribution should be installed and pre-configured as 
 default JVM runtime (using JAVA_HOME), see please instructions at [1].
 
 The GraalVM's native-image tool should be installed, see please 
diff --git a/distribution/src/main/release/samples/jax_rs/graalvm_basic/pom.xml b/distribution/src/main/release/samples/jax_rs/graalvm_basic/pom.xml
index 30b318234c..cecd937ea6 100644
--- a/distribution/src/main/release/samples/jax_rs/graalvm_basic/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/graalvm_basic/pom.xml
@@ -65,13 +65,13 @@
                         </executions>
                     </plugin>
                     <plugin>
-                        <groupId>org.graalvm.nativeimage</groupId>
-                        <artifactId>native-image-maven-plugin</artifactId>
-                        <version>${graalvm.version}</version>
+                        <groupId>org.graalvm.buildtools</groupId>
+                        <artifactId>native-maven-plugin</artifactId>
+                        <version>0.9.19</version>
                         <executions>
                             <execution>
                                 <goals>
-                                    <goal>native-image</goal>
+                                    <goal>compile-no-fork</goal>
                                 </goals>
                                 <phase>package</phase>
                             </execution>
@@ -123,13 +123,13 @@
                         </executions>
                     </plugin>
                     <plugin>
-                        <groupId>org.graalvm.nativeimage</groupId>
-                        <artifactId>native-image-maven-plugin</artifactId>
-                        <version>${graalvm.version}</version>
+                        <groupId>org.graalvm.buildtools</groupId>
+                        <artifactId>native-maven-plugin</artifactId>
+                        <version>0.9.19</version>
                         <executions>
                             <execution>
                                 <goals>
-                                    <goal>native-image</goal>
+                                    <goal>compile-no-fork</goal>
                                 </goals>
                                 <phase>package</phase>
                             </execution>
diff --git a/distribution/src/main/release/samples/jax_rs/graalvm_basic/src/graalvm/client/jni-config.json b/distribution/src/main/release/samples/jax_rs/graalvm_basic/src/graalvm/client/jni-config.json
index 0218ccbee6..086802cc08 100644
--- a/distribution/src/main/release/samples/jax_rs/graalvm_basic/src/graalvm/client/jni-config.json
+++ b/distribution/src/main/release/samples/jax_rs/graalvm_basic/src/graalvm/client/jni-config.json
@@ -1,10 +1,7 @@
 [
 {
-  "name":"java.lang.ClassLoader",
-  "methods":[{"name":"getPlatformClassLoader","parameterTypes":[] }]
-},
-{
-  "name":"java.lang.NoSuchMethodError"
+  "name":"java.lang.Boolean",
+  "methods":[{"name":"getBoolean","parameterTypes":["java.lang.String"] }]
 },
 {
   "name":"sun.management.VMManagementImpl",
diff --git a/distribution/src/main/release/samples/jax_rs/graalvm_basic/src/graalvm/client/reflect-config.json b/distribution/src/main/release/samples/jax_rs/graalvm_basic/src/graalvm/client/reflect-config.json
index 3dd0d519ea..e8d82b11f5 100644
--- a/distribution/src/main/release/samples/jax_rs/graalvm_basic/src/graalvm/client/reflect-config.json
+++ b/distribution/src/main/release/samples/jax_rs/graalvm_basic/src/graalvm/client/reflect-config.json
@@ -9,20 +9,20 @@
 },
 {
   "name":"io.netty.util.internal.shaded.org.jctools.queues.BaseMpscLinkedArrayQueueColdProducerFields",
-  "fields":[{"name":"producerLimit", "allowUnsafeAccess":true}]
+  "fields":[{"name":"producerLimit"}]
 },
 {
   "name":"io.netty.util.internal.shaded.org.jctools.queues.BaseMpscLinkedArrayQueueConsumerFields",
-  "fields":[{"name":"consumerIndex", "allowUnsafeAccess":true}]
+  "fields":[{"name":"consumerIndex"}]
 },
 {
   "name":"io.netty.util.internal.shaded.org.jctools.queues.BaseMpscLinkedArrayQueueProducerFields",
-  "fields":[{"name":"producerIndex", "allowUnsafeAccess":true}]
+  "fields":[{"name":"producerIndex"}]
 },
 {
   "name":"java.lang.Object",
   "allDeclaredFields":true,
-  "allDeclaredMethods":true
+  "queryAllDeclaredMethods":true
 },
 {
   "name":"java.lang.invoke.MethodHandles",
@@ -50,7 +50,11 @@
 },
 {
   "name":"java.nio.Buffer",
-  "fields":[{"name":"address", "allowUnsafeAccess":true}]
+  "fields":[{"name":"address"}]
+},
+{
+  "name":"java.nio.ByteBuffer",
+  "methods":[{"name":"alignedSlice","parameterTypes":["int"] }]
 },
 {
   "name":"java.nio.DirectByteBuffer",
@@ -62,20 +66,26 @@
 {
   "name":"java.security.SecureRandomParameters"
 },
+{
+  "name":"javax.activation.DataSource"
+},
 {
   "name":"javax.annotation.Priority",
   "methods":[{"name":"value","parameterTypes":[] }]
 },
+{
+  "name":"javax.security.auth.Policy"
+},
 {
   "name":"javax.security.auth.login.Configuration"
 },
 {
   "name":"javax.ws.rs.ext.MessageBodyReader",
-  "allPublicMethods":true
+  "queryAllPublicMethods":true
 },
 {
   "name":"javax.ws.rs.ext.MessageBodyWriter",
-  "allPublicMethods":true
+  "queryAllPublicMethods":true
 },
 {
   "name":"javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter"
@@ -125,6 +135,9 @@
 {
   "name":"org.apache.cxf.bus.resource.ResourceManagerImpl"
 },
+{
+  "name":"org.apache.cxf.bus.spring.SpringBusFactory"
+},
 {
   "name":"org.apache.cxf.buslifecycle.BusLifeCycleManager"
 },
@@ -146,8 +159,8 @@
 {
   "name":"org.apache.cxf.ext.logging.LoggingBusLifecycleListener",
   "allDeclaredFields":true,
-  "allDeclaredMethods":true,
-  "allPublicMethods":true,
+  "queryAllDeclaredMethods":true,
+  "queryAllPublicMethods":true,
   "methods":[{"name":"<init>","parameterTypes":["org.apache.cxf.Bus"] }]
 },
 {
@@ -163,65 +176,72 @@
 {
   "name":"org.apache.cxf.jaxrs.provider.AbstractConfigurableProvider",
   "allDeclaredFields":true,
-  "allPublicMethods":true
+  "queryAllPublicMethods":true,
+  "methods":[{"name":"setBus","parameterTypes":["org.apache.cxf.Bus"] }]
 },
 {
   "name":"org.apache.cxf.jaxrs.provider.AbstractJAXBProvider",
   "allDeclaredFields":true,
-  "allPublicMethods":true
+  "queryAllPublicMethods":true
 },
 {
   "name":"org.apache.cxf.jaxrs.provider.BinaryDataProvider",
   "allDeclaredFields":true,
-  "allPublicMethods":true
+  "queryAllPublicMethods":true
 },
 {
   "name":"org.apache.cxf.jaxrs.provider.DataSourceProvider",
   "allDeclaredFields":true,
-  "allPublicMethods":true,
-  "allPublicConstructors":true,
+  "queryAllPublicMethods":true,
+  "queryAllPublicConstructors":true,
   "methods":[{"name":"<init>","parameterTypes":[] }]
 },
 {
   "name":"org.apache.cxf.jaxrs.provider.FormEncodingProvider",
   "allDeclaredFields":true,
-  "allPublicMethods":true
+  "queryAllPublicMethods":true
 },
 {
   "name":"org.apache.cxf.jaxrs.provider.JAXBElementProvider",
   "allDeclaredFields":true,
-  "allPublicMethods":true,
-  "allPublicConstructors":true,
-  "methods":[{"name":"<init>","parameterTypes":[] }]
+  "queryAllPublicMethods":true,
+  "queryAllPublicConstructors":true,
+  "methods":[
+    {"name":"<init>","parameterTypes":[] }, 
+    {"name":"setMessageContext","parameterTypes":["org.apache.cxf.jaxrs.ext.MessageContext"] }
+  ]
 },
 {
   "name":"org.apache.cxf.jaxrs.provider.JAXBElementTypedProvider",
   "allDeclaredFields":true,
-  "allPublicMethods":true,
-  "allPublicConstructors":true,
+  "queryAllPublicMethods":true,
+  "queryAllPublicConstructors":true,
   "methods":[{"name":"<init>","parameterTypes":[] }]
 },
 {
   "name":"org.apache.cxf.jaxrs.provider.MultipartProvider",
   "allDeclaredFields":true,
-  "allPublicMethods":true,
-  "allPublicConstructors":true,
+  "queryAllPublicMethods":true,
+  "queryAllPublicConstructors":true,
   "methods":[{"name":"<init>","parameterTypes":[] }]
 },
 {
   "name":"org.apache.cxf.jaxrs.provider.PrimitiveTextProvider",
   "allDeclaredFields":true,
-  "allPublicMethods":true
+  "queryAllPublicMethods":true
 },
 {
   "name":"org.apache.cxf.jaxrs.provider.SourceProvider",
   "allDeclaredFields":true,
-  "allPublicMethods":true
+  "queryAllPublicMethods":true
 },
 {
   "name":"org.apache.cxf.jaxrs.provider.StringTextProvider",
   "allDeclaredFields":true,
-  "allPublicMethods":true
+  "queryAllPublicMethods":true
+},
+{
+  "name":"org.apache.cxf.jaxrs.provider.json.JSONProvider"
 },
 {
   "name":"org.apache.cxf.phase.PhaseManager"
@@ -232,7 +252,7 @@
 {
   "name":"org.apache.cxf.transport.AbstractTransportFactory",
   "allDeclaredFields":true,
-  "allDeclaredMethods":true
+  "queryAllDeclaredMethods":true
 },
 {
   "name":"org.apache.cxf.transport.http.HTTPTransportFactory",
@@ -246,8 +266,26 @@
 {
   "name":"org.apache.cxf.transport.http.netty.client.NettyHttpConduitFactory",
   "allDeclaredFields":true,
-  "allDeclaredMethods":true,
-  "allPublicMethods":true,
+  "queryAllDeclaredMethods":true,
+  "queryAllPublicMethods":true,
+  "methods":[{"name":"<init>","parameterTypes":[] }]
+},
+{
+  "name":"org.apache.cxf.transport.http.netty.client.NettyHttpTransportFactory"
+},
+{
+  "name":"org.apache.cxf.transport.http.netty.server.NettyHttpDestinationFactory"
+},
+{
+  "name":"org.apache.cxf.transport.http.netty.server.NettyHttpServerEngineFactory",
+  "fields":[{"name":"bus"}],
+  "methods":[{"name":"<init>","parameterTypes":["org.apache.cxf.Bus"] }]
+},
+{
+  "name":"org.apache.cxf.transport.http.netty.server.NettyHttpTransportFactory",
+  "allDeclaredFields":true,
+  "queryAllDeclaredMethods":true,
+  "queryAllPublicMethods":true,
   "methods":[{"name":"<init>","parameterTypes":[] }]
 },
 {
@@ -257,6 +295,9 @@
 {
   "name":"org.slf4j.impl.StaticLoggerBinder"
 },
+{
+  "name":"sun.misc.GC"
+},
 {
   "name":"sun.misc.Unsafe",
   "fields":[{"name":"theUnsafe"}],
@@ -264,14 +305,18 @@
     {"name":"copyMemory","parameterTypes":["java.lang.Object","long","java.lang.Object","long","long"] }, 
     {"name":"getAndAddLong","parameterTypes":["java.lang.Object","long","long"] }, 
     {"name":"getAndSetObject","parameterTypes":["java.lang.Object","long","java.lang.Object"] }, 
-    {"name":"invokeCleaner","parameterTypes":["java.nio.ByteBuffer"] }
+    {"name":"invokeCleaner","parameterTypes":["java.nio.ByteBuffer"] }, 
+    {"name":"storeFence","parameterTypes":[] }
   ]
 },
+{
+  "name":"sun.misc.VM"
+},
 {
   "name":"sun.nio.ch.SelectorImpl",
   "fields":[
-    {"name":"publicSelectedKeys", "allowUnsafeAccess":true}, 
-    {"name":"selectedKeys", "allowUnsafeAccess":true}
+    {"name":"publicSelectedKeys"}, 
+    {"name":"selectedKeys"}
   ]
 },
 {
diff --git a/distribution/src/main/release/samples/jax_rs/graalvm_basic/src/graalvm/client/resource-config.json b/distribution/src/main/release/samples/jax_rs/graalvm_basic/src/graalvm/client/resource-config.json
index a406f3f497..4c5855bfa3 100644
--- a/distribution/src/main/release/samples/jax_rs/graalvm_basic/src/graalvm/client/resource-config.json
+++ b/distribution/src/main/release/samples/jax_rs/graalvm_basic/src/graalvm/client/resource-config.json
@@ -1,36 +1,117 @@
 {
   "resources":{
   "includes":[
-    {"pattern":"\\QMETA-INF/cxf/bus-extensions.txt\\E"}, 
-    {"pattern":"\\QMETA-INF/io.netty.versions.properties\\E"}, 
-    {"pattern":"\\QMETA-INF/services/javax.ws.rs.client.ClientBuilder\\E"}, 
-    {"pattern":"\\QMETA-INF/services/javax.ws.rs.ext.RuntimeDelegate\\E"}, 
-    {"pattern":"\\QMETA-INF/services/org.apache.cxf.bus.factory\\E"}, 
-    {"pattern":"\\Qadd_customer.xml\\E"}, 
-    {"pattern":"\\Qorg/apache/cxf/transport/http/ReferencingAuthenticator.class\\E"}, 
-    {"pattern":"\\Qorg/apache/cxf/version/version.properties\\E"}, 
-    {"pattern":"\\Qorg/slf4j/impl/StaticLoggerBinder.class\\E"}, 
-    {"pattern":"\\Qupdate_customer.xml\\E"}
+    {
+      "pattern":"\\QMETA-INF/cxf/bus-extensions.txt\\E"
+    }, 
+    {
+      "pattern":"\\QMETA-INF/io.netty.versions.properties\\E"
+    }, 
+    {
+      "pattern":"\\QMETA-INF/services/javax.ws.rs.client.ClientBuilder\\E"
+    }, 
+    {
+      "pattern":"\\QMETA-INF/services/javax.ws.rs.ext.RuntimeDelegate\\E"
+    }, 
+    {
+      "pattern":"\\QMETA-INF/services/org.apache.cxf.bus.factory\\E"
+    }, 
+    {
+      "pattern":"\\Qadd_customer.xml\\E"
+    }, 
+    {
+      "pattern":"\\Qorg/apache/cxf/transport/http/ReferencingAuthenticator.class\\E"
+    }, 
+    {
+      "pattern":"\\Qorg/apache/cxf/version/version.properties\\E"
+    }, 
+    {
+      "pattern":"\\Qorg/slf4j/impl/StaticLoggerBinder.class\\E"
+    }, 
+    {
+      "pattern":"\\Qupdate_customer.xml\\E"
+    }
   ]},
   "bundles":[
-    {"name":"org.apache.cxf.Messages"}, 
-    {"name":"org.apache.cxf.bus.extension.Messages"}, 
-    {"name":"org.apache.cxf.bus.managers.Messages"}, 
-    {"name":"org.apache.cxf.common.annotation.Messages"}, 
-    {"name":"org.apache.cxf.common.injection.Messages"}, 
-    {"name":"org.apache.cxf.common.util.Messages"}, 
-    {"name":"org.apache.cxf.endpoint.Messages"}, 
-    {"name":"org.apache.cxf.interceptor.Messages"}, 
-    {"name":"org.apache.cxf.jaxrs.Messages"}, 
-    {"name":"org.apache.cxf.jaxrs.client.Messages"}, 
-    {"name":"org.apache.cxf.jaxrs.impl.Messages"}, 
-    {"name":"org.apache.cxf.jaxrs.interceptor.Messages"}, 
-    {"name":"org.apache.cxf.jaxrs.provider.Messages"}, 
-    {"name":"org.apache.cxf.jaxrs.utils.Messages"}, 
-    {"name":"org.apache.cxf.resource.Messages"}, 
-    {"name":"org.apache.cxf.service.factory.Messages"}, 
-    {"name":"org.apache.cxf.service.model.Messages"}, 
-    {"name":"org.apache.cxf.transport.http.Messages"}, 
-    {"name":"org.apache.cxf.transport.https.Messages"}
+    {
+      "name":"org.apache.cxf.Messages",
+      "locales":[""]
+    }, 
+    {
+      "name":"org.apache.cxf.bus.extension.Messages",
+      "locales":[""]
+    }, 
+    {
+      "name":"org.apache.cxf.bus.managers.Messages",
+      "locales":[""]
+    }, 
+    {
+      "name":"org.apache.cxf.common.annotation.Messages",
+      "locales":[""]
+    }, 
+    {
+      "name":"org.apache.cxf.common.injection.Messages",
+      "locales":[""]
+    }, 
+    {
+      "name":"org.apache.cxf.common.util.Messages",
+      "locales":[""]
+    }, 
+    {
+      "name":"org.apache.cxf.endpoint.Messages",
+      "locales":[""]
+    }, 
+    {
+      "name":"org.apache.cxf.interceptor.Messages",
+      "locales":[""]
+    }, 
+    {
+      "name":"org.apache.cxf.jaxrs.Messages",
+      "locales":[""]
+    }, 
+    {
+      "name":"org.apache.cxf.jaxrs.client.Messages",
+      "locales":[""]
+    }, 
+    {
+      "name":"org.apache.cxf.jaxrs.impl.Messages",
+      "locales":[""]
+    }, 
+    {
+      "name":"org.apache.cxf.jaxrs.interceptor.Messages",
+      "locales":[""]
+    }, 
+    {
+      "name":"org.apache.cxf.jaxrs.provider.Messages",
+      "locales":[""]
+    }, 
+    {
+      "name":"org.apache.cxf.jaxrs.utils.Messages",
+      "locales":[""]
+    }, 
+    {
+      "name":"org.apache.cxf.resource.Messages",
+      "locales":[""]
+    }, 
+    {
+      "name":"org.apache.cxf.service.factory.Messages",
+      "locales":[""]
+    }, 
+    {
+      "name":"org.apache.cxf.service.model.Messages",
+      "locales":[""]
+    }, 
+    {
+      "name":"org.apache.cxf.transport.http.Messages",
+      "locales":[""]
+    }, 
+    {
+      "name":"org.apache.cxf.transport.http.netty.server.Messages",
+      "locales":[""]
+    }, 
+    {
+      "name":"org.apache.cxf.transport.https.Messages",
+      "locales":[""]
+    }
   ]
 }
diff --git a/distribution/src/main/release/samples/jax_rs/graalvm_basic/src/graalvm/server/jni-config.json b/distribution/src/main/release/samples/jax_rs/graalvm_basic/src/graalvm/server/jni-config.json
index 0218ccbee6..086802cc08 100644
--- a/distribution/src/main/release/samples/jax_rs/graalvm_basic/src/graalvm/server/jni-config.json
+++ b/distribution/src/main/release/samples/jax_rs/graalvm_basic/src/graalvm/server/jni-config.json
@@ -1,10 +1,7 @@
 [
 {
-  "name":"java.lang.ClassLoader",
-  "methods":[{"name":"getPlatformClassLoader","parameterTypes":[] }]
-},
-{
-  "name":"java.lang.NoSuchMethodError"
+  "name":"java.lang.Boolean",
+  "methods":[{"name":"getBoolean","parameterTypes":["java.lang.String"] }]
 },
 {
   "name":"sun.management.VMManagementImpl",
diff --git a/distribution/src/main/release/samples/jax_rs/graalvm_basic/src/graalvm/server/proxy-config.json b/distribution/src/main/release/samples/jax_rs/graalvm_basic/src/graalvm/server/proxy-config.json
index ed259d4a8b..36564d9013 100644
--- a/distribution/src/main/release/samples/jax_rs/graalvm_basic/src/graalvm/server/proxy-config.json
+++ b/distribution/src/main/release/samples/jax_rs/graalvm_basic/src/graalvm/server/proxy-config.json
@@ -1,3 +1,5 @@
 [
-  ["com.sun.xml.bind.marshaller.CharacterEscapeHandler"]
+  {
+    "interfaces":["com.sun.xml.bind.marshaller.CharacterEscapeHandler"]
+  }
 ]
diff --git a/distribution/src/main/release/samples/jax_rs/graalvm_basic/src/graalvm/server/reflect-config.json b/distribution/src/main/release/samples/jax_rs/graalvm_basic/src/graalvm/server/reflect-config.json
index 33d070430d..a2f80505d4 100644
--- a/distribution/src/main/release/samples/jax_rs/graalvm_basic/src/graalvm/server/reflect-config.json
+++ b/distribution/src/main/release/samples/jax_rs/graalvm_basic/src/graalvm/server/reflect-config.json
@@ -1,6 +1,6 @@
 [
 {
-  "name":"char[]"
+  "name":"[C"
 },
 {
   "name":"com.sun.org.apache.xerces.internal.jaxp.DocumentBuilderFactoryImpl",
@@ -8,43 +8,50 @@
 },
 {
   "name":"com.sun.xml.bind.marshaller.CharacterEscapeHandler",
-  "allPublicMethods":true
+  "queryAllPublicMethods":true,
+  "methods":[{"name":"escape","parameterTypes":["char[]","int","int","boolean","java.io.Writer"] }]
 },
 {
   "name":"com.sun.xml.bind.marshaller.MinimumEscapeHandler",
   "fields":[{"name":"theInstance"}]
 },
+{
+  "name":"com.sun.xml.bind.v2.ContextFactory",
+  "methods":[{"name":"createContext","parameterTypes":["java.lang.Class[]","java.util.Map"] }]
+},
 {
   "name":"com.sun.xml.bind.v2.model.nav.ReflectionNavigator",
   "methods":[{"name":"getInstance","parameterTypes":[] }]
 },
 {
   "name":"com.sun.xml.bind.v2.runtime.property.ArrayElementLeafProperty",
-  "allPublicConstructors":true
+  "queryAllPublicConstructors":true
 },
 {
   "name":"com.sun.xml.bind.v2.runtime.property.ArrayElementNodeProperty",
-  "allPublicConstructors":true
+  "queryAllPublicConstructors":true
 },
 {
   "name":"com.sun.xml.bind.v2.runtime.property.ArrayReferenceNodeProperty",
-  "allPublicConstructors":true
+  "queryAllPublicConstructors":true
 },
 {
   "name":"com.sun.xml.bind.v2.runtime.property.SingleElementLeafProperty",
-  "allPublicConstructors":true
+  "queryAllPublicConstructors":true,
+  "methods":[{"name":"<init>","parameterTypes":["com.sun.xml.bind.v2.runtime.JAXBContextImpl","com.sun.xml.bind.v2.model.runtime.RuntimeElementPropertyInfo"] }]
 },
 {
   "name":"com.sun.xml.bind.v2.runtime.property.SingleElementNodeProperty",
-  "allPublicConstructors":true
+  "queryAllPublicConstructors":true,
+  "methods":[{"name":"<init>","parameterTypes":["com.sun.xml.bind.v2.runtime.JAXBContextImpl","com.sun.xml.bind.v2.model.runtime.RuntimeElementPropertyInfo"] }]
 },
 {
   "name":"com.sun.xml.bind.v2.runtime.property.SingleMapNodeProperty",
-  "allPublicConstructors":true
+  "queryAllPublicConstructors":true
 },
 {
   "name":"com.sun.xml.bind.v2.runtime.property.SingleReferenceNodeProperty",
-  "allPublicConstructors":true
+  "queryAllPublicConstructors":true
 },
 {
   "name":"com.sun.xml.bind.v2.runtime.unmarshaller.StAXExConnector",
@@ -53,23 +60,40 @@
 {
   "name":"demo.jaxrs.server.Customer",
   "allDeclaredFields":true,
-  "allDeclaredMethods":true,
-  "methods":[{"name":"<init>","parameterTypes":[] }]
+  "queryAllDeclaredMethods":true,
+  "methods":[
+    {"name":"<init>","parameterTypes":[] }, 
+    {"name":"getId","parameterTypes":[] }, 
+    {"name":"getName","parameterTypes":[] }, 
+    {"name":"setId","parameterTypes":["long"] }, 
+    {"name":"setName","parameterTypes":["java.lang.String"] }
+  ]
 },
 {
   "name":"demo.jaxrs.server.CustomerService",
   "allDeclaredFields":true,
-  "allPublicMethods":true
+  "queryAllPublicMethods":true,
+  "methods":[
+    {"name":"addCustomer","parameterTypes":["demo.jaxrs.server.Customer"] }, 
+    {"name":"getCustomer","parameterTypes":["java.lang.String"] }, 
+    {"name":"getOrder","parameterTypes":["java.lang.String"] }, 
+    {"name":"updateCustomer","parameterTypes":["demo.jaxrs.server.Customer"] }
+  ]
 },
 {
   "name":"demo.jaxrs.server.Order",
-  "allPublicMethods":true
+  "queryAllPublicMethods":true,
+  "methods":[{"name":"getProduct","parameterTypes":["int"] }]
 },
 {
   "name":"demo.jaxrs.server.Product",
   "allDeclaredFields":true,
-  "allDeclaredMethods":true,
-  "methods":[{"name":"<init>","parameterTypes":[] }]
+  "queryAllDeclaredMethods":true,
+  "methods":[
+    {"name":"<init>","parameterTypes":[] }, 
+    {"name":"getDescription","parameterTypes":[] }, 
+    {"name":"getId","parameterTypes":[] }
+  ]
 },
 {
   "name":"io.netty.bootstrap.ServerBootstrap$1"
@@ -83,11 +107,11 @@
 },
 {
   "name":"io.netty.buffer.AbstractByteBufAllocator",
-  "allDeclaredMethods":true
+  "queryAllDeclaredMethods":true
 },
 {
   "name":"io.netty.buffer.AbstractReferenceCountedByteBuf",
-  "fields":[{"name":"refCnt", "allowUnsafeAccess":true}]
+  "fields":[{"name":"refCnt"}]
 },
 {
   "name":"io.netty.channel.ChannelDuplexHandler",
@@ -174,9 +198,6 @@
     {"name":"userEventTriggered","parameterTypes":["io.netty.channel.ChannelHandlerContext","java.lang.Object"] }
   ]
 },
-{
-  "name":"io.netty.channel.embedded.EmbeddedChannel$2"
-},
 {
   "name":"io.netty.channel.socket.nio.NioServerSocketChannel",
   "methods":[{"name":"<init>","parameterTypes":[] }]
@@ -196,10 +217,6 @@
     {"name":"channelReadComplete","parameterTypes":["io.netty.channel.ChannelHandlerContext"] }
   ]
 },
-{
-  "name":"io.netty.handler.codec.MessageToByteEncoder",
-  "methods":[{"name":"write","parameterTypes":["io.netty.channel.ChannelHandlerContext","java.lang.Object","io.netty.channel.ChannelPromise"] }]
-},
 {
   "name":"io.netty.handler.codec.MessageToMessageCodec",
   "methods":[
@@ -211,14 +228,6 @@
   "name":"io.netty.handler.codec.MessageToMessageDecoder",
   "methods":[{"name":"channelRead","parameterTypes":["io.netty.channel.ChannelHandlerContext","java.lang.Object"] }]
 },
-{
-  "name":"io.netty.handler.codec.MessageToMessageEncoder",
-  "methods":[{"name":"write","parameterTypes":["io.netty.channel.ChannelHandlerContext","java.lang.Object","io.netty.channel.ChannelPromise"] }]
-},
-{
-  "name":"io.netty.handler.codec.compression.JdkZlibEncoder",
-  "methods":[{"name":"close","parameterTypes":["io.netty.channel.ChannelHandlerContext","io.netty.channel.ChannelPromise"] }]
-},
 {
   "name":"io.netty.handler.codec.http.HttpContentCompressor"
 },
@@ -233,6 +242,10 @@
   "name":"io.netty.handler.codec.http.HttpObjectDecoder",
   "methods":[{"name":"userEventTriggered","parameterTypes":["io.netty.channel.ChannelHandlerContext","java.lang.Object"] }]
 },
+{
+  "name":"io.netty.handler.codec.http.HttpObjectEncoder",
+  "methods":[{"name":"write","parameterTypes":["io.netty.channel.ChannelHandlerContext","java.lang.Object","io.netty.channel.ChannelPromise"] }]
+},
 {
   "name":"io.netty.handler.codec.http.HttpRequestDecoder"
 },
@@ -252,31 +265,31 @@
 },
 {
   "name":"io.netty.util.ReferenceCountUtil",
-  "allDeclaredMethods":true
+  "queryAllDeclaredMethods":true
 },
 {
   "name":"io.netty.util.internal.shaded.org.jctools.queues.BaseMpscLinkedArrayQueueColdProducerFields",
-  "fields":[{"name":"producerLimit", "allowUnsafeAccess":true}]
+  "fields":[{"name":"producerLimit"}]
 },
 {
   "name":"io.netty.util.internal.shaded.org.jctools.queues.BaseMpscLinkedArrayQueueConsumerFields",
-  "fields":[{"name":"consumerIndex", "allowUnsafeAccess":true}]
+  "fields":[{"name":"consumerIndex"}]
 },
 {
   "name":"io.netty.util.internal.shaded.org.jctools.queues.BaseMpscLinkedArrayQueueProducerFields",
-  "fields":[{"name":"producerIndex", "allowUnsafeAccess":true}]
+  "fields":[{"name":"producerIndex"}]
 },
 {
   "name":"io.netty.util.internal.shaded.org.jctools.queues.MpscArrayQueueConsumerIndexField",
-  "fields":[{"name":"consumerIndex", "allowUnsafeAccess":true}]
+  "fields":[{"name":"consumerIndex"}]
 },
 {
   "name":"io.netty.util.internal.shaded.org.jctools.queues.MpscArrayQueueProducerIndexField",
-  "fields":[{"name":"producerIndex", "allowUnsafeAccess":true}]
+  "fields":[{"name":"producerIndex"}]
 },
 {
   "name":"io.netty.util.internal.shaded.org.jctools.queues.MpscArrayQueueProducerLimitField",
-  "fields":[{"name":"producerLimit", "allowUnsafeAccess":true}]
+  "fields":[{"name":"producerLimit"}]
 },
 {
   "name":"java.io.Writer"
@@ -284,7 +297,14 @@
 {
   "name":"java.lang.Object",
   "allDeclaredFields":true,
-  "allDeclaredMethods":true
+  "queryAllDeclaredMethods":true
+},
+{
+  "name":"java.lang.ProcessHandle",
+  "methods":[
+    {"name":"current","parameterTypes":[] }, 
+    {"name":"pid","parameterTypes":[] }
+  ]
 },
 {
   "name":"java.lang.management.ManagementFactory",
@@ -292,10 +312,7 @@
 },
 {
   "name":"java.lang.management.RuntimeMXBean",
-  "methods":[
-    {"name":"getInputArguments","parameterTypes":[] }, 
-    {"name":"getName","parameterTypes":[] }
-  ]
+  "methods":[{"name":"getInputArguments","parameterTypes":[] }]
 },
 {
   "name":"java.nio.Bits",
@@ -303,7 +320,11 @@
 },
 {
   "name":"java.nio.Buffer",
-  "fields":[{"name":"address", "allowUnsafeAccess":true}]
+  "fields":[{"name":"address"}]
+},
+{
+  "name":"java.nio.ByteBuffer",
+  "methods":[{"name":"alignedSlice","parameterTypes":["int"] }]
 },
 {
   "name":"java.nio.DirectByteBuffer",
@@ -319,20 +340,26 @@
   "name":"javax.annotation.Priority",
   "methods":[{"name":"value","parameterTypes":[] }]
 },
+{
+  "name":"javax.security.auth.Policy"
+},
 {
   "name":"javax.security.auth.login.Configuration"
 },
+{
+  "name":"javax.servlet.WriteListener"
+},
 {
   "name":"javax.ws.rs.ext.ExceptionMapper",
-  "allPublicMethods":true
+  "queryAllPublicMethods":true
 },
 {
   "name":"javax.ws.rs.ext.MessageBodyReader",
-  "allPublicMethods":true
+  "queryAllPublicMethods":true
 },
 {
   "name":"javax.ws.rs.ext.MessageBodyWriter",
-  "allPublicMethods":true
+  "queryAllPublicMethods":true
 },
 {
   "name":"javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter"
@@ -382,6 +409,9 @@
 {
   "name":"org.apache.cxf.bus.resource.ResourceManagerImpl"
 },
+{
+  "name":"org.apache.cxf.bus.spring.SpringBusFactory"
+},
 {
   "name":"org.apache.cxf.buslifecycle.BusLifeCycleManager"
 },
@@ -403,22 +433,22 @@
 {
   "name":"org.apache.cxf.ext.logging.LoggingBusLifecycleListener",
   "allDeclaredFields":true,
-  "allDeclaredMethods":true,
-  "allPublicMethods":true,
+  "queryAllDeclaredMethods":true,
+  "queryAllPublicMethods":true,
   "methods":[{"name":"<init>","parameterTypes":["org.apache.cxf.Bus"] }]
 },
 {
   "name":"org.apache.cxf.ext.logging.LoggingFactoryBeanListener",
   "allDeclaredFields":true,
-  "allDeclaredMethods":true,
-  "allPublicMethods":true,
+  "queryAllDeclaredMethods":true,
+  "queryAllPublicMethods":true,
   "methods":[{"name":"<init>","parameterTypes":[] }]
 },
 {
   "name":"org.apache.cxf.ext.logging.OldLoggingFactoryBeanListener",
   "allDeclaredFields":true,
-  "allDeclaredMethods":true,
-  "allPublicMethods":true,
+  "queryAllDeclaredMethods":true,
+  "queryAllPublicMethods":true,
   "methods":[{"name":"<init>","parameterTypes":["org.apache.cxf.Bus"] }]
 },
 {
@@ -428,75 +458,85 @@
 {
   "name":"org.apache.cxf.jaxrs.impl.WebApplicationExceptionMapper",
   "allDeclaredFields":true,
-  "allPublicMethods":true
+  "queryAllPublicMethods":true
+},
+{
+  "name":"org.apache.cxf.jaxrs.model.wadl.WadlGenerator"
 },
 {
   "name":"org.apache.cxf.jaxrs.nio.NioMessageBodyWriter",
   "allDeclaredFields":true,
-  "allPublicMethods":true
+  "queryAllPublicMethods":true
 },
 {
   "name":"org.apache.cxf.jaxrs.provider.AbstractConfigurableProvider",
   "allDeclaredFields":true,
-  "allPublicMethods":true
+  "queryAllPublicMethods":true,
+  "methods":[{"name":"setBus","parameterTypes":["org.apache.cxf.Bus"] }]
 },
 {
   "name":"org.apache.cxf.jaxrs.provider.AbstractJAXBProvider",
   "allDeclaredFields":true,
-  "allPublicMethods":true
+  "queryAllPublicMethods":true
 },
 {
   "name":"org.apache.cxf.jaxrs.provider.BinaryDataProvider",
   "allDeclaredFields":true,
-  "allPublicMethods":true
+  "queryAllPublicMethods":true
 },
 {
   "name":"org.apache.cxf.jaxrs.provider.DataSourceProvider",
   "allDeclaredFields":true,
-  "allPublicMethods":true,
-  "allPublicConstructors":true,
+  "queryAllPublicMethods":true,
+  "queryAllPublicConstructors":true,
   "methods":[{"name":"<init>","parameterTypes":[] }]
 },
 {
   "name":"org.apache.cxf.jaxrs.provider.FormEncodingProvider",
   "allDeclaredFields":true,
-  "allPublicMethods":true
+  "queryAllPublicMethods":true
 },
 {
   "name":"org.apache.cxf.jaxrs.provider.JAXBElementProvider",
   "allDeclaredFields":true,
-  "allPublicMethods":true,
-  "allPublicConstructors":true,
-  "methods":[{"name":"<init>","parameterTypes":[] }]
+  "queryAllPublicMethods":true,
+  "queryAllPublicConstructors":true,
+  "methods":[
+    {"name":"<init>","parameterTypes":[] }, 
+    {"name":"setMessageContext","parameterTypes":["org.apache.cxf.jaxrs.ext.MessageContext"] }
+  ]
 },
 {
   "name":"org.apache.cxf.jaxrs.provider.JAXBElementTypedProvider",
   "allDeclaredFields":true,
-  "allPublicMethods":true,
-  "allPublicConstructors":true,
+  "queryAllPublicMethods":true,
+  "queryAllPublicConstructors":true,
   "methods":[{"name":"<init>","parameterTypes":[] }]
 },
 {
   "name":"org.apache.cxf.jaxrs.provider.MultipartProvider",
   "allDeclaredFields":true,
-  "allPublicMethods":true,
-  "allPublicConstructors":true,
+  "queryAllPublicMethods":true,
+  "queryAllPublicConstructors":true,
   "methods":[{"name":"<init>","parameterTypes":[] }]
 },
 {
   "name":"org.apache.cxf.jaxrs.provider.PrimitiveTextProvider",
   "allDeclaredFields":true,
-  "allPublicMethods":true
+  "queryAllPublicMethods":true
 },
 {
   "name":"org.apache.cxf.jaxrs.provider.SourceProvider",
   "allDeclaredFields":true,
-  "allPublicMethods":true
+  "queryAllPublicMethods":true
 },
 {
   "name":"org.apache.cxf.jaxrs.provider.StringTextProvider",
   "allDeclaredFields":true,
-  "allPublicMethods":true
+  "queryAllPublicMethods":true
+},
+{
+  "name":"org.apache.cxf.jaxrs.provider.json.JSONProvider"
 },
 {
   "name":"org.apache.cxf.phase.PhaseManager"
@@ -509,12 +549,18 @@
 {
   "name":"org.apache.cxf.transport.AbstractTransportFactory",
   "allDeclaredFields":true,
-  "allDeclaredMethods":true
+  "queryAllDeclaredMethods":true
 },
 {
   "name":"org.apache.cxf.transport.http.HTTPTransportFactory",
   "methods":[{"name":"<init>","parameterTypes":[] }]
 },
+{
+  "name":"org.apache.cxf.transport.http.netty.client.NettyHttpConduitFactory"
+},
+{
+  "name":"org.apache.cxf.transport.http.netty.client.NettyHttpTransportFactory"
+},
 {
   "name":"org.apache.cxf.transport.http.netty.server.NettyHttpDestinationFactory",
   "methods":[{"name":"<init>","parameterTypes":[] }]
@@ -540,10 +586,13 @@
 {
   "name":"org.apache.cxf.transport.http.netty.server.NettyHttpTransportFactory",
   "allDeclaredFields":true,
-  "allDeclaredMethods":true,
-  "allPublicMethods":true,
+  "queryAllDeclaredMethods":true,
+  "queryAllPublicMethods":true,
   "methods":[{"name":"<init>","parameterTypes":[] }]
 },
+{
+  "name":"org.jvnet.fastinfoset.stax.FastInfosetStreamReader"
+},
 {
   "name":"org.jvnet.staxex.XMLStreamReaderEx"
 },
@@ -554,6 +603,9 @@
 {
   "name":"org.slf4j.impl.StaticLoggerBinder"
 },
+{
+  "name":"sun.misc.GC"
+},
 {
   "name":"sun.misc.Unsafe",
   "fields":[{"name":"theUnsafe"}],
@@ -561,14 +613,18 @@
     {"name":"copyMemory","parameterTypes":["java.lang.Object","long","java.lang.Object","long","long"] }, 
     {"name":"getAndAddLong","parameterTypes":["java.lang.Object","long","long"] }, 
     {"name":"getAndSetObject","parameterTypes":["java.lang.Object","long","java.lang.Object"] }, 
-    {"name":"invokeCleaner","parameterTypes":["java.nio.ByteBuffer"] }
+    {"name":"invokeCleaner","parameterTypes":["java.nio.ByteBuffer"] }, 
+    {"name":"storeFence","parameterTypes":[] }
   ]
 },
+{
+  "name":"sun.misc.VM"
+},
 {
   "name":"sun.nio.ch.SelectorImpl",
   "fields":[
-    {"name":"publicSelectedKeys", "allowUnsafeAccess":true}, 
-    {"name":"selectedKeys", "allowUnsafeAccess":true}
+    {"name":"publicSelectedKeys"}, 
+    {"name":"selectedKeys"}
   ]
 },
 {
diff --git a/distribution/src/main/release/samples/jax_rs/graalvm_basic/src/graalvm/server/resource-config.json b/distribution/src/main/release/samples/jax_rs/graalvm_basic/src/graalvm/server/resource-config.json
index 460b9e3015..254fac7f8d 100644
--- a/distribution/src/main/release/samples/jax_rs/graalvm_basic/src/graalvm/server/resource-config.json
+++ b/distribution/src/main/release/samples/jax_rs/graalvm_basic/src/graalvm/server/resource-config.json
@@ -1,40 +1,130 @@
 {
   "resources":{
   "includes":[
-    {"pattern":"\\QMETA-INF/cxf/bus-extensions.txt\\E"}, 
-    {"pattern":"\\QMETA-INF/io.netty.versions.properties\\E"}, 
-    {"pattern":"\\QMETA-INF/services/javax.ws.rs.ext.RuntimeDelegate\\E"}, 
-    {"pattern":"\\QMETA-INF/services/javax.xml.bind.JAXBContextFactory\\E"}, 
-    {"pattern":"\\QMETA-INF/services/javax.xml.stream.XMLInputFactory\\E"}, 
-    {"pattern":"\\QMETA-INF/services/javax.xml.stream.XMLOutputFactory\\E"}, 
-    {"pattern":"\\QMETA-INF/services/org.apache.cxf.bus.factory\\E"}, 
-    {"pattern":"\\Qorg/apache/cxf/version/version.properties\\E"}, 
-    {"pattern":"\\Qorg/slf4j/impl/StaticLoggerBinder.class\\E"}
+    {
+      "pattern":"\\QMETA-INF/cxf/bus-extensions.txt\\E"
+    }, 
+    {
+      "pattern":"\\QMETA-INF/io.netty.versions.properties\\E"
+    }, 
+    {
+      "pattern":"\\QMETA-INF/services/javax.ws.rs.ext.RuntimeDelegate\\E"
+    }, 
+    {
+      "pattern":"\\QMETA-INF/services/javax.xml.bind.JAXBContext\\E"
+    }, 
+    {
+      "pattern":"\\QMETA-INF/services/javax.xml.stream.XMLInputFactory\\E"
+    }, 
+    {
+      "pattern":"\\QMETA-INF/services/javax.xml.stream.XMLOutputFactory\\E"
+    }, 
+    {
+      "pattern":"\\QMETA-INF/services/org.apache.cxf.bus.factory\\E"
+    }, 
+    {
+      "pattern":"\\Qorg/apache/cxf/version/version.properties\\E"
+    }, 
+    {
+      "pattern":"\\Qorg/slf4j/impl/StaticLoggerBinder.class\\E"
+    }
   ]},
   "bundles":[
-    {"name":"javax.servlet.LocalStrings"}, 
-    {"name":"org.apache.cxf.Messages"}, 
-    {"name":"org.apache.cxf.bus.extension.Messages"}, 
-    {"name":"org.apache.cxf.bus.managers.Messages"}, 
-    {"name":"org.apache.cxf.common.annotation.Messages"}, 
-    {"name":"org.apache.cxf.common.injection.Messages"}, 
-    {"name":"org.apache.cxf.common.jaxb.Messages"}, 
-    {"name":"org.apache.cxf.common.util.Messages"}, 
-    {"name":"org.apache.cxf.endpoint.Messages"}, 
-    {"name":"org.apache.cxf.interceptor.Messages"}, 
-    {"name":"org.apache.cxf.jaxrs.Messages"}, 
-    {"name":"org.apache.cxf.jaxrs.impl.Messages"}, 
-    {"name":"org.apache.cxf.jaxrs.interceptor.Messages"}, 
-    {"name":"org.apache.cxf.jaxrs.provider.Messages"}, 
-    {"name":"org.apache.cxf.jaxrs.utils.Messages"}, 
-    {"name":"org.apache.cxf.resource.Messages"}, 
-    {"name":"org.apache.cxf.service.factory.Messages"}, 
-    {"name":"org.apache.cxf.service.invoker.Messages"}, 
-    {"name":"org.apache.cxf.service.model.Messages"}, 
-    {"name":"org.apache.cxf.staxutils.Messages"}, 
-    {"name":"org.apache.cxf.transport.http.Messages"}, 
-    {"name":"org.apache.cxf.transport.http.netty.server.Messages"}, 
-    {"name":"org.apache.cxf.transport.https.Messages"}, 
-    {"name":"org.apache.cxf.ws.addressing.Messages"}
+    {
+      "name":"javax.servlet.LocalStrings",
+      "locales":[""]
+    }, 
+    {
+      "name":"org.apache.cxf.Messages",
+      "locales":[""]
+    }, 
+    {
+      "name":"org.apache.cxf.bus.extension.Messages",
+      "locales":[""]
+    }, 
+    {
+      "name":"org.apache.cxf.bus.managers.Messages",
+      "locales":[""]
+    }, 
+    {
+      "name":"org.apache.cxf.common.annotation.Messages",
+      "locales":[""]
+    }, 
+    {
+      "name":"org.apache.cxf.common.injection.Messages",
+      "locales":[""]
+    }, 
+    {
+      "name":"org.apache.cxf.common.jaxb.Messages",
+      "locales":[""]
+    }, 
+    {
+      "name":"org.apache.cxf.common.util.Messages",
+      "locales":[""]
+    }, 
+    {
+      "name":"org.apache.cxf.endpoint.Messages",
+      "locales":[""]
+    }, 
+    {
+      "name":"org.apache.cxf.interceptor.Messages",
+      "locales":[""]
+    }, 
+    {
+      "name":"org.apache.cxf.jaxrs.Messages",
+      "locales":[""]
+    }, 
+    {
+      "name":"org.apache.cxf.jaxrs.impl.Messages",
+      "locales":[""]
+    }, 
+    {
+      "name":"org.apache.cxf.jaxrs.interceptor.Messages",
+      "locales":[""]
+    }, 
+    {
+      "name":"org.apache.cxf.jaxrs.provider.Messages",
+      "locales":[""]
+    }, 
+    {
+      "name":"org.apache.cxf.jaxrs.utils.Messages",
+      "locales":[""]
+    }, 
+    {
+      "name":"org.apache.cxf.resource.Messages",
+      "locales":[""]
+    }, 
+    {
+      "name":"org.apache.cxf.service.factory.Messages",
+      "locales":[""]
+    }, 
+    {
+      "name":"org.apache.cxf.service.invoker.Messages",
+      "locales":[""]
+    }, 
+    {
+      "name":"org.apache.cxf.service.model.Messages",
+      "locales":[""]
+    }, 
+    {
+      "name":"org.apache.cxf.staxutils.Messages",
+      "locales":[""]
+    }, 
+    {
+      "name":"org.apache.cxf.transport.http.Messages",
+      "locales":[""]
+    }, 
+    {
+      "name":"org.apache.cxf.transport.http.netty.server.Messages",
+      "locales":[""]
+    }, 
+    {
+      "name":"org.apache.cxf.transport.https.Messages",
+      "locales":[""]
+    }, 
+    {
+      "name":"org.apache.cxf.ws.addressing.Messages",
+      "locales":[""]
+    }
   ]
 }
diff --git a/distribution/src/main/release/samples/jax_rs/graalvm_basic/src/main/java/demo/jaxrs/server/Server.java b/distribution/src/main/release/samples/jax_rs/graalvm_basic/src/main/java/demo/jaxrs/server/Server.java
index affb7b0c18..52bf8ca49e 100644
--- a/distribution/src/main/release/samples/jax_rs/graalvm_basic/src/main/java/demo/jaxrs/server/Server.java
+++ b/distribution/src/main/release/samples/jax_rs/graalvm_basic/src/main/java/demo/jaxrs/server/Server.java
@@ -38,7 +38,7 @@ public class Server {
         new Server();
         System.out.println("Server ready...");
 
-        Thread.sleep(5 * 6000 * 1000);
+        Thread.sleep(5 * 60 * 1000);
         System.out.println("Server exiting");
         System.exit(0);
     }
diff --git a/distribution/src/main/release/samples/jaxws_graalvm/README.txt b/distribution/src/main/release/samples/jaxws_graalvm/README.txt
index d30d4a4e8f..7639070b3b 100644
--- a/distribution/src/main/release/samples/jaxws_graalvm/README.txt
+++ b/distribution/src/main/release/samples/jaxws_graalvm/README.txt
@@ -7,7 +7,7 @@ capabilities and be packaged as native executables.
 Pre-requisites
 ---------------------------------------
 
-GraalVM 20.3.0 or later distribution should be installed and pre-configured as 
+GraalVM 22.3.0/JDK11+ or later distribution should be installed and pre-configured as 
 default JVM runtime (using JAVA_HOME), see please instructions at [1].
 
 The GraalVM's native-image tool should be installed, see please 
diff --git a/distribution/src/main/release/samples/jaxws_graalvm/pom.xml b/distribution/src/main/release/samples/jaxws_graalvm/pom.xml
index 601f92a75d..1339e6553c 100644
--- a/distribution/src/main/release/samples/jaxws_graalvm/pom.xml
+++ b/distribution/src/main/release/samples/jaxws_graalvm/pom.xml
@@ -90,13 +90,13 @@
                         </executions>
                     </plugin>
                     <plugin>
-                        <groupId>org.graalvm.nativeimage</groupId>
-                        <artifactId>native-image-maven-plugin</artifactId>
-                        <version>${graalvm.version}</version>
+                        <groupId>org.graalvm.buildtools</groupId>
+                        <artifactId>native-maven-plugin</artifactId>
+                        <version>0.9.19</version>
                         <executions>
                             <execution>
                                 <goals>
-                                    <goal>native-image</goal>
+                                    <goal>compile-no-fork</goal>
                                 </goals>
                                 <phase>package</phase>
                             </execution>
@@ -144,13 +144,13 @@
                         </executions>
                     </plugin>
                     <plugin>
-                        <groupId>org.graalvm.nativeimage</groupId>
-                        <artifactId>native-image-maven-plugin</artifactId>
-                        <version>${graalvm.version}</version>
+                        <groupId>org.graalvm.buildtools</groupId>
+                        <artifactId>native-maven-plugin</artifactId>
+                        <version>0.9.19</version>
                         <executions>
                             <execution>
                                 <goals>
-                                    <goal>native-image</goal>
+                                    <goal>compile-no-fork</goal>
                                 </goals>
                                 <phase>package</phase>
                             </execution>
diff --git a/distribution/src/main/release/samples/jaxws_graalvm/src/graalvm/client/jni-config.json b/distribution/src/main/release/samples/jaxws_graalvm/src/graalvm/client/jni-config.json
index 0218ccbee6..086802cc08 100644
--- a/distribution/src/main/release/samples/jaxws_graalvm/src/graalvm/client/jni-config.json
+++ b/distribution/src/main/release/samples/jaxws_graalvm/src/graalvm/client/jni-config.json
@@ -1,10 +1,7 @@
 [
 {
-  "name":"java.lang.ClassLoader",
-  "methods":[{"name":"getPlatformClassLoader","parameterTypes":[] }]
-},
-{
-  "name":"java.lang.NoSuchMethodError"
+  "name":"java.lang.Boolean",
+  "methods":[{"name":"getBoolean","parameterTypes":["java.lang.String"] }]
 },
 {
   "name":"sun.management.VMManagementImpl",
diff --git a/distribution/src/main/release/samples/jaxws_graalvm/src/graalvm/client/proxy-config.json b/distribution/src/main/release/samples/jaxws_graalvm/src/graalvm/client/proxy-config.json
index fb9c728dd5..699bf10455 100644
--- a/distribution/src/main/release/samples/jaxws_graalvm/src/graalvm/client/proxy-config.json
+++ b/distribution/src/main/release/samples/jaxws_graalvm/src/graalvm/client/proxy-config.json
@@ -1,15 +1,41 @@
 [
-  ["com.sun.xml.bind.marshaller.CharacterEscapeHandler"],
-  ["javax.xml.bind.annotation.XmlAccessorType","com.sun.xml.bind.v2.model.annotation.Locatable"],
-  ["javax.xml.bind.annotation.XmlRegistry","com.sun.xml.bind.v2.model.annotation.Locatable"],
-  ["org.apache.cxf.binding.soap.wsdl.extensions.SoapAddress"],
-  ["org.apache.cxf.binding.soap.wsdl.extensions.SoapBinding"],
-  ["org.apache.cxf.binding.soap.wsdl.extensions.SoapBody"],
-  ["org.apache.cxf.binding.soap.wsdl.extensions.SoapOperation"],
-  ["org.apache.cxf.common.jaxb.JAXBContextProxy"],
-  ["org.apache.cxf.common.util.ASMHelper$AnnotationVisitor"],
-  ["org.apache.cxf.common.util.ASMHelper$ClassWriter"],
-  ["org.apache.cxf.common.util.ASMHelper$FieldVisitor"],
-  ["org.apache.cxf.common.util.ASMHelper$MethodVisitor"],
-  ["org.apache.handlers.AddNumbers","javax.xml.ws.BindingProvider","java.io.Closeable","org.apache.cxf.endpoint.Client"]
+  {
+    "interfaces":["com.sun.xml.bind.marshaller.CharacterEscapeHandler"]
+  },
+  {
+    "interfaces":["javax.xml.bind.annotation.XmlAccessorType","com.sun.xml.bind.v2.model.annotation.Locatable"]
+  },
+  {
+    "interfaces":["javax.xml.bind.annotation.XmlRegistry","com.sun.xml.bind.v2.model.annotation.Locatable"]
+  },
+  {
+    "interfaces":["org.apache.cxf.binding.soap.wsdl.extensions.SoapAddress"]
+  },
+  {
+    "interfaces":["org.apache.cxf.binding.soap.wsdl.extensions.SoapBinding"]
+  },
+  {
+    "interfaces":["org.apache.cxf.binding.soap.wsdl.extensions.SoapBody"]
+  },
+  {
+    "interfaces":["org.apache.cxf.binding.soap.wsdl.extensions.SoapOperation"]
+  },
+  {
+    "interfaces":["org.apache.cxf.common.jaxb.JAXBContextProxy"]
+  },
+  {
+    "interfaces":["org.apache.cxf.common.util.ASMHelper$AnnotationVisitor"]
+  },
+  {
+    "interfaces":["org.apache.cxf.common.util.ASMHelper$ClassWriter"]
+  },
+  {
+    "interfaces":["org.apache.cxf.common.util.ASMHelper$FieldVisitor"]
+  },
+  {
+    "interfaces":["org.apache.cxf.common.util.ASMHelper$MethodVisitor"]
+  },
+  {
+    "interfaces":["org.apache.handlers.AddNumbers","javax.xml.ws.BindingProvider","java.io.Closeable","org.apache.cxf.endpoint.Client"]
+  }
 ]
diff --git a/distribution/src/main/release/samples/jaxws_graalvm/src/graalvm/client/reflect-config.json b/distribution/src/main/release/samples/jaxws_graalvm/src/graalvm/client/reflect-config.json
index 668c8baefc..6b854822cd 100644
--- a/distribution/src/main/release/samples/jaxws_graalvm/src/graalvm/client/reflect-config.json
+++ b/distribution/src/main/release/samples/jaxws_graalvm/src/graalvm/client/reflect-config.json
@@ -1,6 +1,9 @@
 [
 {
-  "name":"char[]"
+  "name":"[C"
+},
+{
+  "name":"[Ljava.lang.Object;"
 },
 {
   "name":"com.ibm.wsdl.extensions.schema.SchemaImpl",
@@ -44,7 +47,8 @@
 },
 {
   "name":"com.sun.xml.bind.marshaller.CharacterEscapeHandler",
-  "allPublicMethods":true
+  "queryAllPublicMethods":true,
+  "methods":[{"name":"escape","parameterTypes":["char[]","int","int","boolean","java.io.Writer"] }]
 },
 {
   "name":"com.sun.xml.bind.marshaller.MinimumEscapeHandler",
@@ -56,7 +60,7 @@
 },
 {
   "name":"com.sun.xml.bind.v2.ContextFactory",
-  "methods":[{"name":"createContext","parameterTypes":["java.lang.Class[]", "java.util.Map"]}]
+  "methods":[{"name":"createContext","parameterTypes":["java.lang.Class[]","java.util.Map"] }]
 },
 {
   "name":"com.sun.xml.bind.v2.model.nav.ReflectionNavigator",
@@ -68,31 +72,33 @@
 },
 {
   "name":"com.sun.xml.bind.v2.runtime.property.ArrayElementLeafProperty",
-  "allPublicConstructors":true
+  "queryAllPublicConstructors":true
 },
 {
   "name":"com.sun.xml.bind.v2.runtime.property.ArrayElementNodeProperty",
-  "allPublicConstructors":true
+  "queryAllPublicConstructors":true
 },
 {
   "name":"com.sun.xml.bind.v2.runtime.property.ArrayReferenceNodeProperty",
-  "allPublicConstructors":true
+  "queryAllPublicConstructors":true
 },
 {
   "name":"com.sun.xml.bind.v2.runtime.property.SingleElementLeafProperty",
-  "allPublicConstructors":true
+  "queryAllPublicConstructors":true,
+  "methods":[{"name":"<init>","parameterTypes":["com.sun.xml.bind.v2.runtime.JAXBContextImpl","com.sun.xml.bind.v2.model.runtime.RuntimeElementPropertyInfo"] }]
 },
 {
   "name":"com.sun.xml.bind.v2.runtime.property.SingleElementNodeProperty",
-  "allPublicConstructors":true
+  "queryAllPublicConstructors":true,
+  "methods":[{"name":"<init>","parameterTypes":["com.sun.xml.bind.v2.runtime.JAXBContextImpl","com.sun.xml.bind.v2.model.runtime.RuntimeElementPropertyInfo"] }]
 },
 {
   "name":"com.sun.xml.bind.v2.runtime.property.SingleMapNodeProperty",
-  "allPublicConstructors":true
+  "queryAllPublicConstructors":true
 },
 {
   "name":"com.sun.xml.bind.v2.runtime.property.SingleReferenceNodeProperty",
-  "allPublicConstructors":true
+  "queryAllPublicConstructors":true
 },
 {
   "name":"com.sun.xml.bind.v2.runtime.unmarshaller.StAXExConnector",
@@ -100,11 +106,11 @@
 },
 {
   "name":"com.sun.xml.messaging.saaj.soap.SOAPDocumentImpl",
-  "allPublicMethods":true
+  "queryAllPublicMethods":true
 },
 {
   "name":"int",
-  "allDeclaredConstructors":true
+  "queryAllDeclaredConstructors":true
 },
 {
   "name":"io.netty.channel.socket.nio.NioSocketChannel",
@@ -112,19 +118,19 @@
 },
 {
   "name":"io.netty.util.internal.shaded.org.jctools.queues.BaseMpscLinkedArrayQueueColdProducerFields",
-  "fields":[{"name":"producerLimit", "allowUnsafeAccess":true}]
+  "fields":[{"name":"producerLimit"}]
 },
 {
   "name":"io.netty.util.internal.shaded.org.jctools.queues.BaseMpscLinkedArrayQueueConsumerFields",
-  "fields":[{"name":"consumerIndex", "allowUnsafeAccess":true}]
+  "fields":[{"name":"consumerIndex"}]
 },
 {
   "name":"io.netty.util.internal.shaded.org.jctools.queues.BaseMpscLinkedArrayQueueProducerFields",
-  "fields":[{"name":"producerIndex", "allowUnsafeAccess":true}]
+  "fields":[{"name":"producerIndex"}]
 },
 {
   "name":"java.io.Closeable",
-  "allPublicMethods":true
+  "queryAllPublicMethods":true
 },
 {
   "name":"java.io.Writer"
@@ -135,10 +141,7 @@
 {
   "name":"java.lang.Object",
   "allDeclaredFields":true,
-  "allDeclaredMethods":true
-},
-{
-  "name":"java.lang.Object[]"
+  "queryAllDeclaredMethods":true
 },
 {
   "name":"java.lang.String"
@@ -169,7 +172,11 @@
 },
 {
   "name":"java.nio.Buffer",
-  "fields":[{"name":"address", "allowUnsafeAccess":true}]
+  "fields":[{"name":"address"}]
+},
+{
+  "name":"java.nio.ByteBuffer",
+  "methods":[{"name":"alignedSlice","parameterTypes":["int"] }]
 },
 {
   "name":"java.nio.DirectByteBuffer",
@@ -190,11 +197,47 @@
 {
   "name":"java.util.concurrent.Executor"
 },
+{
+  "name":"javax.security.auth.Policy"
+},
 {
   "name":"javax.security.auth.login.Configuration"
 },
 {
-  "name":"javax.xml.bind.annotation.XmlAccessorType"
+  "name":"javax.wsdl.extensions.ExtensibilityElement",
+  "methods":[{"name":"getElementType","parameterTypes":[] }]
+},
+{
+  "name":"javax.wsdl.extensions.soap.SOAPAddress",
+  "methods":[
+    {"name":"getLocationURI","parameterTypes":[] }, 
+    {"name":"setLocationURI","parameterTypes":["java.lang.String"] }
+  ]
+},
+{
+  "name":"javax.wsdl.extensions.soap.SOAPBinding",
+  "methods":[
+    {"name":"getStyle","parameterTypes":[] }, 
+    {"name":"getTransportURI","parameterTypes":[] }
+  ]
+},
+{
+  "name":"javax.wsdl.extensions.soap.SOAPBody",
+  "methods":[
+    {"name":"getParts","parameterTypes":[] }, 
+    {"name":"getUse","parameterTypes":[] }
+  ]
+},
+{
+  "name":"javax.wsdl.extensions.soap.SOAPOperation",
+  "methods":[
+    {"name":"getSoapActionURI","parameterTypes":[] }, 
+    {"name":"getStyle","parameterTypes":[] }
+  ]
+},
+{
+  "name":"javax.xml.bind.annotation.XmlAccessorType",
+  "methods":[{"name":"value","parameterTypes":[] }]
 },
 {
   "name":"javax.xml.bind.annotation.XmlElement",
@@ -219,7 +262,7 @@
 },
 {
   "name":"javax.xml.ws.BindingProvider",
-  "allPublicMethods":true
+  "queryAllPublicMethods":true
 },
 {
   "name":"javax.xml.ws.EndpointReference"
@@ -228,6 +271,9 @@
   "name":"jdk.internal.misc.Unsafe",
   "methods":[{"name":"getUnsafe","parameterTypes":[] }]
 },
+{
+  "name":"org.apache.axiom.om.OMElement"
+},
 {
   "name":"org.apache.cxf.Bus"
 },
@@ -255,7 +301,7 @@
 },
 {
   "name":"org.apache.cxf.bindings.xformat.ObjectFactory",
-  "allDeclaredMethods":true
+  "queryAllDeclaredMethods":true
 },
 {
   "name":"org.apache.cxf.bindings.xformat.XMLBindingMessageFormat",
@@ -313,8 +359,8 @@
 {
   "name":"org.apache.cxf.common.util.ASMHelperImpl",
   "allDeclaredFields":true,
-  "allDeclaredMethods":true,
-  "allPublicMethods":true,
+  "queryAllDeclaredMethods":true,
+  "queryAllPublicMethods":true,
   "methods":[{"name":"<init>","parameterTypes":[] }]
 },
 {
@@ -330,7 +376,7 @@
 },
 {
   "name":"org.apache.cxf.endpoint.Client",
-  "allPublicMethods":true
+  "queryAllPublicMethods":true
 },
 {
   "name":"org.apache.cxf.endpoint.Client$Contexts"
@@ -356,15 +402,15 @@
 {
   "name":"org.apache.cxf.ext.logging.LoggingFactoryBeanListener",
   "allDeclaredFields":true,
-  "allDeclaredMethods":true,
-  "allPublicMethods":true,
+  "queryAllDeclaredMethods":true,
+  "queryAllPublicMethods":true,
   "methods":[{"name":"<init>","parameterTypes":[] }]
 },
 {
   "name":"org.apache.cxf.ext.logging.OldLoggingFactoryBeanListener",
   "allDeclaredFields":true,
-  "allDeclaredMethods":true,
-  "allPublicMethods":true,
+  "queryAllDeclaredMethods":true,
+  "queryAllPublicMethods":true,
   "methods":[{"name":"<init>","parameterTypes":["org.apache.cxf.Bus"] }]
 },
 {
@@ -380,8 +426,8 @@
 {
   "name":"org.apache.cxf.jaxb.WrapperHelperProxyService",
   "allDeclaredFields":true,
-  "allDeclaredMethods":true,
-  "allPublicMethods":true,
+  "queryAllDeclaredMethods":true,
+  "queryAllPublicMethods":true,
   "methods":[{"name":"<init>","parameterTypes":["org.apache.cxf.Bus"] }]
 },
 {
@@ -395,8 +441,8 @@
 {
   "name":"org.apache.cxf.jaxws.spi.WrapperClassCreatorProxyService",
   "allDeclaredFields":true,
-  "allDeclaredMethods":true,
-  "allPublicMethods":true,
+  "queryAllDeclaredMethods":true,
+  "queryAllPublicMethods":true,
   "methods":[{"name":"<init>","parameterTypes":["org.apache.cxf.Bus"] }]
 },
 {
@@ -438,10 +484,22 @@
 {
   "name":"org.apache.cxf.transport.http.netty.client.NettyHttpConduitFactory",
   "allDeclaredFields":true,
-  "allDeclaredMethods":true,
-  "allPublicMethods":true,
+  "queryAllDeclaredMethods":true,
+  "queryAllPublicMethods":true,
   "methods":[{"name":"<init>","parameterTypes":[] }]
 },
+{
+  "name":"org.apache.cxf.transport.http.netty.client.NettyHttpTransportFactory"
+},
+{
+  "name":"org.apache.cxf.transport.http.netty.server.NettyHttpDestinationFactory"
+},
+{
+  "name":"org.apache.cxf.transport.http.netty.server.NettyHttpServerEngineFactory"
+},
+{
+  "name":"org.apache.cxf.transport.http.netty.server.NettyHttpTransportFactory"
+},
 {
   "name":"org.apache.cxf.transport.http.policy.HTTPClientAssertionBuilder"
 },
@@ -461,7 +519,7 @@
 },
 {
   "name":"org.apache.cxf.transports.http.configuration.ObjectFactory",
-  "allDeclaredMethods":true
+  "queryAllDeclaredMethods":true
 },
 {
   "name":"org.apache.cxf.ws.addressing.impl.AddressingFeatureApplier"
@@ -484,7 +542,7 @@
 },
 {
   "name":"org.apache.cxf.ws.addressing.wsdl.ObjectFactory",
-  "allDeclaredMethods":true
+  "queryAllDeclaredMethods":true
 },
 {
   "name":"org.apache.cxf.ws.addressing.wsdl.UsingAddressing",
@@ -501,8 +559,8 @@
 {
   "name":"org.apache.cxf.ws.policy.PolicyAnnotationListener",
   "allDeclaredFields":true,
-  "allDeclaredMethods":true,
-  "allPublicMethods":true,
+  "queryAllDeclaredMethods":true,
+  "queryAllPublicMethods":true,
   "methods":[{"name":"<init>","parameterTypes":["org.apache.cxf.Bus"] }]
 },
 {
@@ -515,8 +573,8 @@
 {
   "name":"org.apache.cxf.ws.policy.PolicyDataEngineImpl",
   "allDeclaredFields":true,
-  "allDeclaredMethods":true,
-  "allPublicMethods":true,
+  "queryAllDeclaredMethods":true,
+  "queryAllPublicMethods":true,
   "methods":[{"name":"<init>","parameterTypes":["org.apache.cxf.Bus"] }]
 },
 {
@@ -564,8 +622,8 @@
 {
   "name":"org.apache.cxf.wsdl.ExtensionClassCreatorProxyService",
   "allDeclaredFields":true,
-  "allDeclaredMethods":true,
-  "allPublicMethods":true,
+  "queryAllDeclaredMethods":true,
+  "queryAllPublicMethods":true,
   "methods":[{"name":"<init>","parameterTypes":["org.apache.cxf.Bus"] }]
 },
 {
@@ -577,52 +635,70 @@
 },
 {
   "name":"org.apache.cxf.wsdl.http.ObjectFactory",
-  "allDeclaredMethods":true
+  "queryAllDeclaredMethods":true
 },
 {
   "name":"org.apache.cxf.wsdl11.WSDLManagerImpl",
   "allDeclaredFields":true,
-  "allDeclaredMethods":true,
-  "methods":[{"name":"<init>","parameterTypes":[] }]
+  "queryAllDeclaredMethods":true,
+  "methods":[
+    {"name":"<init>","parameterTypes":[] }, 
+    {"name":"setBus","parameterTypes":["org.apache.cxf.Bus"] }
+  ]
 },
 {
   "name":"org.apache.handlers.AddNumbers",
-  "allPublicMethods":true
+  "queryAllPublicMethods":true
 },
 {
   "name":"org.apache.handlers.AddNumbersFault",
-  "allPublicConstructors":true,
-  "methods":[{"name":"getFaultInfo","parameterTypes":[] }]
+  "queryAllPublicConstructors":true,
+  "methods":[
+    {"name":"<init>","parameterTypes":["java.lang.String","org.apache.handlers.types.FaultDetail"] }, 
+    {"name":"getFaultInfo","parameterTypes":[] }
+  ]
 },
 {
   "name":"org.apache.handlers.types.AddNumbers",
   "allDeclaredFields":true,
-  "allDeclaredMethods":true,
-  "allPublicMethods":true,
-  "methods":[{"name":"<init>","parameterTypes":[] }]
+  "queryAllDeclaredMethods":true,
+  "queryAllPublicMethods":true,
+  "methods":[
+    {"name":"<init>","parameterTypes":[] }, 
+    {"name":"getArg0","parameterTypes":[] }, 
+    {"name":"getArg1","parameterTypes":[] }, 
+    {"name":"setArg0","parameterTypes":["int"] }, 
+    {"name":"setArg1","parameterTypes":["int"] }
+  ]
 },
 {
   "name":"org.apache.handlers.types.AddNumbersResponse",
   "allDeclaredFields":true,
-  "allDeclaredMethods":true,
-  "allPublicMethods":true,
-  "methods":[{"name":"<init>","parameterTypes":[] }]
+  "queryAllDeclaredMethods":true,
+  "queryAllPublicMethods":true,
+  "methods":[
+    {"name":"<init>","parameterTypes":[] }, 
+    {"name":"getReturn","parameterTypes":[] }
+  ]
 },
 {
   "name":"org.apache.handlers.types.FaultDetail",
   "allDeclaredFields":true,
-  "allDeclaredMethods":true,
+  "queryAllDeclaredMethods":true,
   "methods":[{"name":"<init>","parameterTypes":[] }]
 },
 {
   "name":"org.apache.handlers.types.ObjectFactory",
-  "allDeclaredMethods":true,
-  "allPublicMethods":true,
+  "queryAllDeclaredMethods":true,
+  "queryAllPublicMethods":true,
   "methods":[{"name":"<init>","parameterTypes":[] }]
 },
 {
   "name":"org.apache.xml.resolver.CatalogManager"
 },
+{
+  "name":"org.jvnet.fastinfoset.stax.FastInfosetStreamReader"
+},
 {
   "name":"org.jvnet.staxex.XMLStreamReaderEx"
 },
@@ -660,7 +736,25 @@
 },
 {
   "name":"org.objectweb.asm.MethodWriter",
-  "allPublicMethods":true
+  "queryAllPublicMethods":true,
+  "methods":[
+    {"name":"visitAnnotation","parameterTypes":["java.lang.String","boolean"] }, 
+    {"name":"visitCode","parameterTypes":[] }, 
+    {"name":"visitEnd","parameterTypes":[] }, 
+    {"name":"visitFieldInsn","parameterTypes":["int","java.lang.String","java.lang.String","java.lang.String"] }, 
+    {"name":"visitFrame","parameterTypes":["int","int","java.lang.Object[]","int","java.lang.Object[]"] }, 
+    {"name":"visitInsn","parameterTypes":["int"] }, 
+    {"name":"visitIntInsn","parameterTypes":["int","int"] }, 
+    {"name":"visitJumpInsn","parameterTypes":["int","org.objectweb.asm.Label"] }, 
+    {"name":"visitLabel","parameterTypes":["org.objectweb.asm.Label"] }, 
+    {"name":"visitLdcInsn","parameterTypes":["java.lang.Object"] }, 
+    {"name":"visitLineNumber","parameterTypes":["int","org.objectweb.asm.Label"] }, 
+    {"name":"visitLocalVariable","parameterTypes":["java.lang.String","java.lang.String","java.lang.String","org.objectweb.asm.Label","org.objectweb.asm.Label","int"] }, 
+    {"name":"visitMaxs","parameterTypes":["int","int"] }, 
+    {"name":"visitMethodInsn","parameterTypes":["int","java.lang.String","java.lang.String","java.lang.String","boolean"] }, 
+    {"name":"visitTypeInsn","parameterTypes":["int","java.lang.String"] }, 
+    {"name":"visitVarInsn","parameterTypes":["int","int"] }
+  ]
 },
 {
   "name":"org.objectweb.asm.Opcodes",
@@ -733,6 +827,9 @@
 {
   "name":"org.w3c.dom.UserDataHandler"
 },
+{
+  "name":"sun.misc.GC"
+},
 {
   "name":"sun.misc.Unsafe",
   "fields":[{"name":"theUnsafe"}],
@@ -740,14 +837,18 @@
     {"name":"copyMemory","parameterTypes":["java.lang.Object","long","java.lang.Object","long","long"] }, 
     {"name":"getAndAddLong","parameterTypes":["java.lang.Object","long","long"] }, 
     {"name":"getAndSetObject","parameterTypes":["java.lang.Object","long","java.lang.Object"] }, 
-    {"name":"invokeCleaner","parameterTypes":["java.nio.ByteBuffer"] }
+    {"name":"invokeCleaner","parameterTypes":["java.nio.ByteBuffer"] }, 
+    {"name":"storeFence","parameterTypes":[] }
   ]
 },
+{
+  "name":"sun.misc.VM"
+},
 {
   "name":"sun.nio.ch.SelectorImpl",
   "fields":[
-    {"name":"publicSelectedKeys", "allowUnsafeAccess":true}, 
-    {"name":"selectedKeys", "allowUnsafeAccess":true}
+    {"name":"publicSelectedKeys"}, 
+    {"name":"selectedKeys"}
   ]
 },
 {
diff --git a/distribution/src/main/release/samples/jaxws_graalvm/src/graalvm/client/resource-config.json b/distribution/src/main/release/samples/jaxws_graalvm/src/graalvm/client/resource-config.json
index 3a801312b9..3d601ccd9b 100644
--- a/distribution/src/main/release/samples/jaxws_graalvm/src/graalvm/client/resource-config.json
+++ b/distribution/src/main/release/samples/jaxws_graalvm/src/graalvm/client/resource-config.json
@@ -1,58 +1,193 @@
 {
   "resources":{
   "includes":[
-    {"pattern":"\\QMETA-INF/cxf/bus-extensions.txt\\E"}, 
-    {"pattern":"\\QMETA-INF/io.netty.versions.properties\\E"}, 
-    {"pattern":"\\QMETA-INF/mailcap.default\\E"}, 
-    {"pattern":"\\QMETA-INF/services/javax.xml.bind.JAXBContextFactory\\E"}, 
-    {"pattern":"\\QMETA-INF/services/javax.xml.stream.XMLEventFactory\\E"}, 
-    {"pattern":"\\QMETA-INF/services/javax.xml.stream.XMLInputFactory\\E"}, 
-    {"pattern":"\\QMETA-INF/services/javax.xml.stream.XMLOutputFactory\\E"}, 
-    {"pattern":"\\QMETA-INF/services/javax.xml.ws.spi.Provider\\E"}, 
-    {"pattern":"\\Qorg/apache/cxf/transport/http/ReferencingAuthenticator.class\\E"}, 
-    {"pattern":"\\Qorg/apache/cxf/version/version.properties\\E"}, 
-    {"pattern":"\\Qorg/apache/xml/resolver/etc/catalog.dtd\\E"}, 
-    {"pattern":"\\Qorg/apache/xml/resolver/etc/catalog.rng\\E"}, 
-    {"pattern":"\\Qorg/apache/xml/resolver/etc/catalog.xsd\\E"}, 
-    {"pattern":"\\Qorg/apache/xml/resolver/etc/xcatalog.dtd\\E"}, 
-    {"pattern":"\\Qorg/slf4j/impl/StaticLoggerBinder.class\\E"}, 
-    {"pattern":"\\Qschemas/wsdl/ws-addr-wsdl.xsd\\E"}, 
-    {"pattern":"\\Qschemas/wsdl/ws-addr.xsd\\E"}, 
-    {"pattern":"\\Qschemas/wsdl/wsrm.xsd\\E"}
+    {
+      "pattern":"\\QMETA-INF/cxf/bus-extensions.txt\\E"
+    }, 
+    {
+      "pattern":"\\QMETA-INF/io.netty.versions.properties\\E"
+    }, 
+    {
+      "pattern":"\\QMETA-INF/mailcap.default\\E"
+    }, 
+    {
+      "pattern":"\\QMETA-INF/services/javax.xml.bind.JAXBContext\\E"
+    }, 
+    {
+      "pattern":"\\QMETA-INF/services/javax.xml.stream.XMLEventFactory\\E"
+    }, 
+    {
+      "pattern":"\\QMETA-INF/services/javax.xml.stream.XMLInputFactory\\E"
+    }, 
+    {
+      "pattern":"\\QMETA-INF/services/javax.xml.stream.XMLOutputFactory\\E"
+    }, 
+    {
+      "pattern":"\\QMETA-INF/services/javax.xml.ws.spi.Provider\\E"
+    }, 
+    {
+      "pattern":"\\Qorg/apache/cxf/transport/http/ReferencingAuthenticator.class\\E"
+    }, 
+    {
+      "pattern":"\\Qorg/apache/cxf/version/version.properties\\E"
+    }, 
+    {
+      "pattern":"\\Qorg/apache/xml/resolver/etc/catalog.dtd\\E"
+    }, 
+    {
+      "pattern":"\\Qorg/apache/xml/resolver/etc/catalog.rng\\E"
+    }, 
+    {
+      "pattern":"\\Qorg/apache/xml/resolver/etc/catalog.xsd\\E"
+    }, 
+    {
+      "pattern":"\\Qorg/apache/xml/resolver/etc/xcatalog.dtd\\E"
+    }, 
+    {
+      "pattern":"\\Qorg/slf4j/impl/StaticLoggerBinder.class\\E"
+    }, 
+    {
+      "pattern":"\\Qschemas/wsdl/ws-addr-wsdl.xsd\\E"
+    }, 
+    {
+      "pattern":"\\Qschemas/wsdl/ws-addr.xsd\\E"
+    }, 
+    {
+      "pattern":"\\Qschemas/wsdl/wsrm.xsd\\E"
+    }
   ]},
   "bundles":[
-    {"name":"org.apache.cxf.Messages"}, 
-    {"name":"org.apache.cxf.binding.soap.interceptor.Messages"}, 
-    {"name":"org.apache.cxf.binding.soap.saaj.Messages"}, 
-    {"name":"org.apache.cxf.bus.extension.Messages"}, 
-    {"name":"org.apache.cxf.bus.managers.Messages"}, 
-    {"name":"org.apache.cxf.common.annotation.Messages"}, 
-    {"name":"org.apache.cxf.common.injection.Messages"}, 
-    {"name":"org.apache.cxf.common.jaxb.Messages"}, 
-    {"name":"org.apache.cxf.common.util.Messages"}, 
-    {"name":"org.apache.cxf.endpoint.Messages"}, 
-    {"name":"org.apache.cxf.frontend.Messages"}, 
-    {"name":"org.apache.cxf.interceptor.Messages"}, 
-    {"name":"org.apache.cxf.jaxb.Messages"}, 
-    {"name":"org.apache.cxf.jaxb.attachment.Messages"}, 
-    {"name":"org.apache.cxf.jaxws.Messages"}, 
-    {"name":"org.apache.cxf.jaxws.binding.soap.Messages"}, 
-    {"name":"org.apache.cxf.jaxws.handler.Messages"}, 
-    {"name":"org.apache.cxf.jaxws.interceptors.Messages"}, 
-    {"name":"org.apache.cxf.jaxws.spi.Messages"}, 
-    {"name":"org.apache.cxf.jaxws.support.Messages"}, 
-    {"name":"org.apache.cxf.resource.Messages"}, 
-    {"name":"org.apache.cxf.service.factory.Messages"}, 
-    {"name":"org.apache.cxf.service.model.Messages"}, 
-    {"name":"org.apache.cxf.staxutils.Messages"}, 
-    {"name":"org.apache.cxf.transport.http.Messages"}, 
-    {"name":"org.apache.cxf.transport.https.Messages"}, 
-    {"name":"org.apache.cxf.ws.policy.APIMessages"}, 
-    {"name":"org.apache.cxf.ws.policy.Messages"}, 
-    {"name":"org.apache.cxf.ws.policy.attachment.Messages"}, 
-    {"name":"org.apache.cxf.wsdl.Messages"}, 
-    {"name":"org.apache.cxf.wsdl.interceptors.Messages"}, 
-    {"name":"org.apache.cxf.wsdl.service.factory.Messages"}, 
-    {"name":"org.apache.cxf.wsdl11.Messages"}
+    {
+      "name":"org.apache.cxf.Messages",
+      "locales":[""]
+    }, 
+    {
+      "name":"org.apache.cxf.binding.soap.interceptor.Messages",
+      "locales":[""]
+    }, 
+    {
+      "name":"org.apache.cxf.binding.soap.saaj.Messages",
+      "locales":[""]
+    }, 
+    {
+      "name":"org.apache.cxf.bus.extension.Messages",
+      "locales":[""]
+    }, 
+    {
+      "name":"org.apache.cxf.bus.managers.Messages",
+      "locales":[""]
+    }, 
+    {
+      "name":"org.apache.cxf.common.annotation.Messages",
+      "locales":[""]
+    }, 
+    {
+      "name":"org.apache.cxf.common.injection.Messages",
+      "locales":[""]
+    }, 
+    {
+      "name":"org.apache.cxf.common.jaxb.Messages",
+      "locales":[""]
+    }, 
+    {
+      "name":"org.apache.cxf.common.util.Messages",
+      "locales":[""]
+    }, 
+    {
+      "name":"org.apache.cxf.endpoint.Messages",
+      "locales":[""]
+    }, 
+    {
+      "name":"org.apache.cxf.frontend.Messages",
+      "locales":[""]
+    }, 
+    {
+      "name":"org.apache.cxf.interceptor.Messages",
+      "locales":[""]
+    }, 
+    {
+      "name":"org.apache.cxf.jaxb.Messages",
+      "locales":[""]
+    }, 
+    {
+      "name":"org.apache.cxf.jaxb.attachment.Messages",
+      "locales":[""]
+    }, 
+    {
+      "name":"org.apache.cxf.jaxws.Messages",
+      "locales":[""]
+    }, 
+    {
+      "name":"org.apache.cxf.jaxws.binding.soap.Messages",
+      "locales":[""]
+    }, 
+    {
+      "name":"org.apache.cxf.jaxws.handler.Messages",
+      "locales":[""]
+    }, 
+    {
+      "name":"org.apache.cxf.jaxws.interceptors.Messages",
+      "locales":[""]
+    }, 
+    {
+      "name":"org.apache.cxf.jaxws.spi.Messages",
+      "locales":[""]
+    }, 
+    {
+      "name":"org.apache.cxf.jaxws.support.Messages",
+      "locales":[""]
+    }, 
+    {
+      "name":"org.apache.cxf.resource.Messages",
+      "locales":[""]
+    }, 
+    {
+      "name":"org.apache.cxf.service.factory.Messages",
+      "locales":[""]
+    }, 
+    {
+      "name":"org.apache.cxf.service.model.Messages",
+      "locales":[""]
+    }, 
+    {
+      "name":"org.apache.cxf.staxutils.Messages",
+      "locales":[""]
+    }, 
+    {
+      "name":"org.apache.cxf.transport.http.Messages",
+      "locales":[""]
+    }, 
+    {
+      "name":"org.apache.cxf.transport.https.Messages",
+      "locales":[""]
+    }, 
+    {
+      "name":"org.apache.cxf.ws.policy.APIMessages",
+      "locales":[""]
+    }, 
+    {
+      "name":"org.apache.cxf.ws.policy.Messages",
+      "locales":[""]
+    }, 
+    {
+      "name":"org.apache.cxf.ws.policy.attachment.Messages",
+      "locales":[""]
+    }, 
+    {
+      "name":"org.apache.cxf.wsdl.Messages",
+      "locales":[""]
+    }, 
+    {
+      "name":"org.apache.cxf.wsdl.interceptors.Messages",
+      "locales":[""]
+    }, 
+    {
+      "name":"org.apache.cxf.wsdl.service.factory.Messages",
+      "locales":[""]
+    }, 
+    {
+      "name":"org.apache.cxf.wsdl11.Messages",
+      "locales":[""]
+    }
   ]
 }
diff --git a/distribution/src/main/release/samples/jaxws_graalvm/src/graalvm/client/serialization-config.json b/distribution/src/main/release/samples/jaxws_graalvm/src/graalvm/client/serialization-config.json
index 0d4f101c7a..f3d7e06e33 100644
--- a/distribution/src/main/release/samples/jaxws_graalvm/src/graalvm/client/serialization-config.json
+++ b/distribution/src/main/release/samples/jaxws_graalvm/src/graalvm/client/serialization-config.json
@@ -1,2 +1,8 @@
-[
-]
+{
+  "types":[
+  ],
+  "lambdaCapturingTypes":[
+  ],
+  "proxies":[
+  ]
+}
diff --git a/distribution/src/main/release/samples/jaxws_graalvm/src/graalvm/server/jni-config.json b/distribution/src/main/release/samples/jaxws_graalvm/src/graalvm/server/jni-config.json
index 0218ccbee6..086802cc08 100644
--- a/distribution/src/main/release/samples/jaxws_graalvm/src/graalvm/server/jni-config.json
+++ b/distribution/src/main/release/samples/jaxws_graalvm/src/graalvm/server/jni-config.json
@@ -1,10 +1,7 @@
 [
 {
-  "name":"java.lang.ClassLoader",
-  "methods":[{"name":"getPlatformClassLoader","parameterTypes":[] }]
-},
-{
-  "name":"java.lang.NoSuchMethodError"
+  "name":"java.lang.Boolean",
+  "methods":[{"name":"getBoolean","parameterTypes":["java.lang.String"] }]
 },
 {
   "name":"sun.management.VMManagementImpl",
diff --git a/distribution/src/main/release/samples/jaxws_graalvm/src/graalvm/server/proxy-config.json b/distribution/src/main/release/samples/jaxws_graalvm/src/graalvm/server/proxy-config.json
index 9e5ed4d9b0..04e59febcd 100644
--- a/distribution/src/main/release/samples/jaxws_graalvm/src/graalvm/server/proxy-config.json
+++ b/distribution/src/main/release/samples/jaxws_graalvm/src/graalvm/server/proxy-config.json
@@ -1,22 +1,62 @@
 [
-  ["com.sun.xml.bind.marshaller.CharacterEscapeHandler"],
-  ["com.sun.xml.bind.v2.schemagen.xmlschema.ComplexType"],
-  ["com.sun.xml.bind.v2.schemagen.xmlschema.ContentModelContainer"],
-  ["com.sun.xml.bind.v2.schemagen.xmlschema.LocalElement"],
-  ["com.sun.xml.bind.v2.schemagen.xmlschema.Particle"],
-  ["com.sun.xml.bind.v2.schemagen.xmlschema.Schema"],
-  ["com.sun.xml.bind.v2.schemagen.xmlschema.TopLevelElement"],
-  ["javax.xml.bind.annotation.XmlAccessorType","com.sun.xml.bind.v2.model.annotation.Locatable"],
-  ["javax.xml.bind.annotation.XmlRegistry","com.sun.xml.bind.v2.model.annotation.Locatable"],
-  ["org.apache.cxf.binding.soap.wsdl.extensions.SoapAddress"],
-  ["org.apache.cxf.binding.soap.wsdl.extensions.SoapBinding"],
-  ["org.apache.cxf.binding.soap.wsdl.extensions.SoapBody"],
-  ["org.apache.cxf.binding.soap.wsdl.extensions.SoapFault"],
-  ["org.apache.cxf.binding.soap.wsdl.extensions.SoapOperation"],
-  ["org.apache.cxf.common.jaxb.JAXBBeanInfo"],
-  ["org.apache.cxf.common.jaxb.JAXBContextProxy"],
-  ["org.apache.cxf.common.util.ASMHelper$AnnotationVisitor"],
-  ["org.apache.cxf.common.util.ASMHelper$ClassWriter"],
-  ["org.apache.cxf.common.util.ASMHelper$FieldVisitor"],
-  ["org.apache.cxf.common.util.ASMHelper$MethodVisitor"]
+  {
+    "interfaces":["com.sun.xml.bind.marshaller.CharacterEscapeHandler"]
+  },
+  {
+    "interfaces":["com.sun.xml.bind.v2.schemagen.xmlschema.ComplexType"]
+  },
+  {
+    "interfaces":["com.sun.xml.bind.v2.schemagen.xmlschema.ContentModelContainer"]
+  },
+  {
+    "interfaces":["com.sun.xml.bind.v2.schemagen.xmlschema.LocalElement"]
+  },
+  {
+    "interfaces":["com.sun.xml.bind.v2.schemagen.xmlschema.Particle"]
+  },
+  {
+    "interfaces":["com.sun.xml.bind.v2.schemagen.xmlschema.Schema"]
+  },
+  {
+    "interfaces":["com.sun.xml.bind.v2.schemagen.xmlschema.TopLevelElement"]
+  },
+  {
+    "interfaces":["javax.xml.bind.annotation.XmlAccessorType","com.sun.xml.bind.v2.model.annotation.Locatable"]
+  },
+  {
+    "interfaces":["javax.xml.bind.annotation.XmlRegistry","com.sun.xml.bind.v2.model.annotation.Locatable"]
+  },
+  {
+    "interfaces":["org.apache.cxf.binding.soap.wsdl.extensions.SoapAddress"]
+  },
+  {
+    "interfaces":["org.apache.cxf.binding.soap.wsdl.extensions.SoapBinding"]
+  },
+  {
+    "interfaces":["org.apache.cxf.binding.soap.wsdl.extensions.SoapBody"]
+  },
+  {
+    "interfaces":["org.apache.cxf.binding.soap.wsdl.extensions.SoapFault"]
+  },
+  {
+    "interfaces":["org.apache.cxf.binding.soap.wsdl.extensions.SoapOperation"]
+  },
+  {
+    "interfaces":["org.apache.cxf.common.jaxb.JAXBBeanInfo"]
+  },
+  {
+    "interfaces":["org.apache.cxf.common.jaxb.JAXBContextProxy"]
+  },
+  {
+    "interfaces":["org.apache.cxf.common.util.ASMHelper$AnnotationVisitor"]
+  },
+  {
+    "interfaces":["org.apache.cxf.common.util.ASMHelper$ClassWriter"]
+  },
+  {
+    "interfaces":["org.apache.cxf.common.util.ASMHelper$FieldVisitor"]
+  },
+  {
+    "interfaces":["org.apache.cxf.common.util.ASMHelper$MethodVisitor"]
+  }
 ]
diff --git a/distribution/src/main/release/samples/jaxws_graalvm/src/graalvm/server/reflect-config.json b/distribution/src/main/release/samples/jaxws_graalvm/src/graalvm/server/reflect-config.json
index 681100092b..7bf785e008 100644
--- a/distribution/src/main/release/samples/jaxws_graalvm/src/graalvm/server/reflect-config.json
+++ b/distribution/src/main/release/samples/jaxws_graalvm/src/graalvm/server/reflect-config.json
@@ -1,6 +1,6 @@
 [
 {
-  "name":"char[]"
+  "name":"[C"
 },
 {
   "name":"com.ibm.wsdl.extensions.soap.SOAPAddressImpl",
@@ -36,7 +36,8 @@
 },
 {
   "name":"com.sun.xml.bind.marshaller.CharacterEscapeHandler",
-  "allPublicMethods":true
+  "queryAllPublicMethods":true,
+  "methods":[{"name":"escape","parameterTypes":["char[]","int","int","boolean","java.io.Writer"] }]
 },
 {
   "name":"com.sun.xml.bind.marshaller.MinimumEscapeHandler",
@@ -48,7 +49,7 @@
 },
 {
   "name":"com.sun.xml.bind.v2.ContextFactory",
-  "methods":[{"name":"createContext","parameterTypes":["java.lang.Class[]", "java.util.Map"]}]
+  "methods":[{"name":"createContext","parameterTypes":["java.lang.Class[]","java.util.Map"] }]
 },
 {
   "name":"com.sun.xml.bind.v2.model.nav.ReflectionNavigator",
@@ -77,31 +78,33 @@
 },
 {
   "name":"com.sun.xml.bind.v2.runtime.property.ArrayElementLeafProperty",
-  "allPublicConstructors":true
+  "queryAllPublicConstructors":true
 },
 {
   "name":"com.sun.xml.bind.v2.runtime.property.ArrayElementNodeProperty",
-  "allPublicConstructors":true
+  "queryAllPublicConstructors":true
 },
 {
   "name":"com.sun.xml.bind.v2.runtime.property.ArrayReferenceNodeProperty",
-  "allPublicConstructors":true
+  "queryAllPublicConstructors":true
 },
 {
   "name":"com.sun.xml.bind.v2.runtime.property.SingleElementLeafProperty",
-  "allPublicConstructors":true
+  "queryAllPublicConstructors":true,
+  "methods":[{"name":"<init>","parameterTypes":["com.sun.xml.bind.v2.runtime.JAXBContextImpl","com.sun.xml.bind.v2.model.runtime.RuntimeElementPropertyInfo"] }]
 },
 {
   "name":"com.sun.xml.bind.v2.runtime.property.SingleElementNodeProperty",
-  "allPublicConstructors":true
+  "queryAllPublicConstructors":true,
+  "methods":[{"name":"<init>","parameterTypes":["com.sun.xml.bind.v2.runtime.JAXBContextImpl","com.sun.xml.bind.v2.model.runtime.RuntimeElementPropertyInfo"] }]
 },
 {
   "name":"com.sun.xml.bind.v2.runtime.property.SingleMapNodeProperty",
-  "allPublicConstructors":true
+  "queryAllPublicConstructors":true
 },
 {
   "name":"com.sun.xml.bind.v2.runtime.property.SingleReferenceNodeProperty",
-  "allPublicConstructors":true
+  "queryAllPublicConstructors":true
 },
 {
   "name":"com.sun.xml.bind.v2.runtime.unmarshaller.StAXExConnector",
@@ -109,17 +112,29 @@
 },
 {
   "name":"com.sun.xml.messaging.saaj.soap.SOAPDocumentImpl",
-  "allPublicMethods":true
+  "queryAllPublicMethods":true
+},
+{
+  "name":"com.sun.xml.txw2.TypedXmlWriter",
+  "methods":[
+    {"name":"_attribute","parameterTypes":["java.lang.String","java.lang.Object"] }, 
+    {"name":"_cast","parameterTypes":["java.lang.Class"] }, 
+    {"name":"_element","parameterTypes":["java.lang.String","java.lang.Class"] }, 
+    {"name":"_namespace","parameterTypes":["java.lang.String","java.lang.String"] }, 
+    {"name":"_pcdata","parameterTypes":["java.lang.Object"] }, 
+    {"name":"commit","parameterTypes":[] }
+  ]
 },
 {
   "name":"demo.jaxws.server.AddNumbersImpl",
   "allDeclaredFields":true,
-  "allDeclaredMethods":true,
-  "allPublicMethods":true
+  "queryAllDeclaredMethods":true,
+  "queryAllPublicMethods":true,
+  "methods":[{"name":"addNumbers","parameterTypes":["int","int"] }]
 },
 {
   "name":"int",
-  "allDeclaredConstructors":true
+  "queryAllDeclaredConstructors":true
 },
 {
   "name":"io.netty.bootstrap.ServerBootstrap$1"
@@ -133,11 +148,11 @@
 },
 {
   "name":"io.netty.buffer.AbstractByteBufAllocator",
-  "allDeclaredMethods":true
+  "queryAllDeclaredMethods":true
 },
 {
   "name":"io.netty.buffer.AbstractReferenceCountedByteBuf",
-  "fields":[{"name":"refCnt", "allowUnsafeAccess":true}]
+  "fields":[{"name":"refCnt"}]
 },
 {
   "name":"io.netty.channel.ChannelDuplexHandler",
@@ -254,10 +269,6 @@
   "name":"io.netty.handler.codec.MessageToMessageDecoder",
   "methods":[{"name":"channelRead","parameterTypes":["io.netty.channel.ChannelHandlerContext","java.lang.Object"] }]
 },
-{
-  "name":"io.netty.handler.codec.MessageToMessageEncoder",
-  "methods":[{"name":"write","parameterTypes":["io.netty.channel.ChannelHandlerContext","java.lang.Object","io.netty.channel.ChannelPromise"] }]
-},
 {
   "name":"io.netty.handler.codec.http.HttpContentCompressor"
 },
@@ -272,6 +283,10 @@
   "name":"io.netty.handler.codec.http.HttpObjectDecoder",
   "methods":[{"name":"userEventTriggered","parameterTypes":["io.netty.channel.ChannelHandlerContext","java.lang.Object"] }]
 },
+{
+  "name":"io.netty.handler.codec.http.HttpObjectEncoder",
+  "methods":[{"name":"write","parameterTypes":["io.netty.channel.ChannelHandlerContext","java.lang.Object","io.netty.channel.ChannelPromise"] }]
+},
 {
   "name":"io.netty.handler.codec.http.HttpRequestDecoder"
 },
@@ -291,31 +306,31 @@
 },
 {
   "name":"io.netty.util.ReferenceCountUtil",
-  "allDeclaredMethods":true
+  "queryAllDeclaredMethods":true
 },
 {
   "name":"io.netty.util.internal.shaded.org.jctools.queues.BaseMpscLinkedArrayQueueColdProducerFields",
-  "fields":[{"name":"producerLimit", "allowUnsafeAccess":true}]
+  "fields":[{"name":"producerLimit"}]
 },
 {
   "name":"io.netty.util.internal.shaded.org.jctools.queues.BaseMpscLinkedArrayQueueConsumerFields",
-  "fields":[{"name":"consumerIndex", "allowUnsafeAccess":true}]
+  "fields":[{"name":"consumerIndex"}]
 },
 {
   "name":"io.netty.util.internal.shaded.org.jctools.queues.BaseMpscLinkedArrayQueueProducerFields",
-  "fields":[{"name":"producerIndex", "allowUnsafeAccess":true}]
+  "fields":[{"name":"producerIndex"}]
 },
 {
   "name":"io.netty.util.internal.shaded.org.jctools.queues.MpscArrayQueueConsumerIndexField",
-  "fields":[{"name":"consumerIndex", "allowUnsafeAccess":true}]
+  "fields":[{"name":"consumerIndex"}]
 },
 {
   "name":"io.netty.util.internal.shaded.org.jctools.queues.MpscArrayQueueProducerIndexField",
-  "fields":[{"name":"producerIndex", "allowUnsafeAccess":true}]
+  "fields":[{"name":"producerIndex"}]
 },
 {
   "name":"io.netty.util.internal.shaded.org.jctools.queues.MpscArrayQueueProducerLimitField",
-  "fields":[{"name":"producerLimit", "allowUnsafeAccess":true}]
+  "fields":[{"name":"producerLimit"}]
 },
 {
   "name":"java.io.Writer"
@@ -323,7 +338,14 @@
 {
   "name":"java.lang.Object",
   "allDeclaredFields":true,
-  "allDeclaredMethods":true
+  "queryAllDeclaredMethods":true
+},
+{
+  "name":"java.lang.ProcessHandle",
+  "methods":[
+    {"name":"current","parameterTypes":[] }, 
+    {"name":"pid","parameterTypes":[] }
+  ]
 },
 {
   "name":"java.lang.management.ManagementFactory",
@@ -331,10 +353,7 @@
 },
 {
   "name":"java.lang.management.RuntimeMXBean",
-  "methods":[
-    {"name":"getInputArguments","parameterTypes":[] }, 
-    {"name":"getName","parameterTypes":[] }
-  ]
+  "methods":[{"name":"getInputArguments","parameterTypes":[] }]
 },
 {
   "name":"java.nio.Bits",
@@ -342,7 +361,11 @@
 },
 {
   "name":"java.nio.Buffer",
-  "fields":[{"name":"address", "allowUnsafeAccess":true}]
+  "fields":[{"name":"address"}]
+},
+{
+  "name":"java.nio.ByteBuffer",
+  "methods":[{"name":"alignedSlice","parameterTypes":["int"] }]
 },
 {
   "name":"java.nio.DirectByteBuffer",
@@ -354,11 +377,49 @@
 {
   "name":"java.security.SecureRandomParameters"
 },
+{
+  "name":"javax.security.auth.Policy"
+},
 {
   "name":"javax.security.auth.login.Configuration"
 },
 {
-  "name":"javax.xml.bind.annotation.XmlAccessorType"
+  "name":"javax.wsdl.extensions.ExtensibilityElement",
+  "methods":[{"name":"getElementType","parameterTypes":[] }]
+},
+{
+  "name":"javax.wsdl.extensions.soap.SOAPAddress",
+  "methods":[{"name":"setLocationURI","parameterTypes":["java.lang.String"] }]
+},
+{
+  "name":"javax.wsdl.extensions.soap.SOAPBinding",
+  "methods":[
+    {"name":"setStyle","parameterTypes":["java.lang.String"] }, 
+    {"name":"setTransportURI","parameterTypes":["java.lang.String"] }
+  ]
+},
+{
+  "name":"javax.wsdl.extensions.soap.SOAPBody",
+  "methods":[{"name":"setUse","parameterTypes":["java.lang.String"] }]
+},
+{
+  "name":"javax.wsdl.extensions.soap.SOAPFault",
+  "methods":[
+    {"name":"setName","parameterTypes":["java.lang.String"] }, 
+    {"name":"setUse","parameterTypes":["java.lang.String"] }
+  ]
+},
+{
+  "name":"javax.wsdl.extensions.soap.SOAPOperation",
+  "methods":[
+    {"name":"getStyle","parameterTypes":[] }, 
+    {"name":"setSoapActionURI","parameterTypes":["java.lang.String"] }, 
+    {"name":"setStyle","parameterTypes":["java.lang.String"] }
+  ]
+},
+{
+  "name":"javax.xml.bind.annotation.XmlAccessorType",
+  "methods":[{"name":"value","parameterTypes":[] }]
 },
 {
   "name":"javax.xml.bind.annotation.XmlElement",
@@ -391,6 +452,9 @@
   "name":"jdk.internal.misc.Unsafe",
   "methods":[{"name":"getUnsafe","parameterTypes":[] }]
 },
+{
+  "name":"org.apache.axiom.om.OMElement"
+},
 {
   "name":"org.apache.cxf.binding.AbstractBindingFactory",
   "fields":[{"name":"bus"}]
@@ -415,7 +479,7 @@
 },
 {
   "name":"org.apache.cxf.bindings.xformat.ObjectFactory",
-  "allDeclaredMethods":true
+  "queryAllDeclaredMethods":true
 },
 {
   "name":"org.apache.cxf.bindings.xformat.XMLBindingMessageFormat",
@@ -473,8 +537,8 @@
 {
   "name":"org.apache.cxf.common.util.ASMHelperImpl",
   "allDeclaredFields":true,
-  "allDeclaredMethods":true,
-  "allPublicMethods":true,
+  "queryAllDeclaredMethods":true,
+  "queryAllPublicMethods":true,
   "methods":[{"name":"<init>","parameterTypes":[] }]
 },
 {
@@ -503,15 +567,15 @@
 {
   "name":"org.apache.cxf.ext.logging.LoggingFactoryBeanListener",
   "allDeclaredFields":true,
-  "allDeclaredMethods":true,
-  "allPublicMethods":true,
+  "queryAllDeclaredMethods":true,
+  "queryAllPublicMethods":true,
   "methods":[{"name":"<init>","parameterTypes":[] }]
 },
 {
   "name":"org.apache.cxf.ext.logging.OldLoggingFactoryBeanListener",
   "allDeclaredFields":true,
-  "allDeclaredMethods":true,
-  "allPublicMethods":true,
+  "queryAllDeclaredMethods":true,
+  "queryAllPublicMethods":true,
   "methods":[{"name":"<init>","parameterTypes":["org.apache.cxf.Bus"] }]
 },
 {
@@ -527,8 +591,8 @@
 {
   "name":"org.apache.cxf.jaxb.WrapperHelperProxyService",
   "allDeclaredFields":true,
-  "allDeclaredMethods":true,
-  "allPublicMethods":true,
+  "queryAllDeclaredMethods":true,
+  "queryAllPublicMethods":true,
   "methods":[{"name":"<init>","parameterTypes":["org.apache.cxf.Bus"] }]
 },
 {
@@ -542,8 +606,8 @@
 {
   "name":"org.apache.cxf.jaxws.spi.WrapperClassCreatorProxyService",
   "allDeclaredFields":true,
-  "allDeclaredMethods":true,
-  "allPublicMethods":true,
+  "queryAllDeclaredMethods":true,
+  "queryAllPublicMethods":true,
   "methods":[{"name":"<init>","parameterTypes":["org.apache.cxf.Bus"] }]
 },
 {
@@ -566,6 +630,12 @@
   "name":"org.apache.cxf.transport.http.HTTPWSDLExtensionLoader",
   "methods":[{"name":"<init>","parameterTypes":["org.apache.cxf.Bus"] }]
 },
+{
+  "name":"org.apache.cxf.transport.http.netty.client.NettyHttpConduitFactory"
+},
+{
+  "name":"org.apache.cxf.transport.http.netty.client.NettyHttpTransportFactory"
+},
 {
   "name":"org.apache.cxf.transport.http.netty.server.NettyHttpDestinationFactory",
   "methods":[{"name":"<init>","parameterTypes":[] }]
@@ -610,7 +680,7 @@
 },
 {
   "name":"org.apache.cxf.transports.http.configuration.ObjectFactory",
-  "allDeclaredMethods":true
+  "queryAllDeclaredMethods":true
 },
 {
   "name":"org.apache.cxf.ws.addressing.impl.AddressingFeatureApplier"
@@ -633,7 +703,7 @@
 },
 {
   "name":"org.apache.cxf.ws.addressing.wsdl.ObjectFactory",
-  "allDeclaredMethods":true
+  "queryAllDeclaredMethods":true
 },
 {
   "name":"org.apache.cxf.ws.addressing.wsdl.UsingAddressing",
@@ -650,8 +720,8 @@
 {
   "name":"org.apache.cxf.ws.policy.PolicyAnnotationListener",
   "allDeclaredFields":true,
-  "allDeclaredMethods":true,
-  "allPublicMethods":true,
+  "queryAllDeclaredMethods":true,
+  "queryAllPublicMethods":true,
   "methods":[{"name":"<init>","parameterTypes":["org.apache.cxf.Bus"] }]
 },
 {
@@ -664,8 +734,8 @@
 {
   "name":"org.apache.cxf.ws.policy.PolicyDataEngineImpl",
   "allDeclaredFields":true,
-  "allDeclaredMethods":true,
-  "allPublicMethods":true,
+  "queryAllDeclaredMethods":true,
+  "queryAllPublicMethods":true,
   "methods":[{"name":"<init>","parameterTypes":["org.apache.cxf.Bus"] }]
 },
 {
@@ -713,8 +783,8 @@
 {
   "name":"org.apache.cxf.wsdl.ExtensionClassCreatorProxyService",
   "allDeclaredFields":true,
-  "allDeclaredMethods":true,
-  "allPublicMethods":true,
+  "queryAllDeclaredMethods":true,
+  "queryAllPublicMethods":true,
   "methods":[{"name":"<init>","parameterTypes":["org.apache.cxf.Bus"] }]
 },
 {
@@ -726,17 +796,20 @@
 },
 {
   "name":"org.apache.cxf.wsdl.http.ObjectFactory",
-  "allDeclaredMethods":true
+  "queryAllDeclaredMethods":true
 },
 {
   "name":"org.apache.cxf.wsdl11.WSDLManagerImpl",
   "allDeclaredFields":true,
-  "allDeclaredMethods":true,
-  "methods":[{"name":"<init>","parameterTypes":[] }]
+  "queryAllDeclaredMethods":true,
+  "methods":[
+    {"name":"<init>","parameterTypes":[] }, 
+    {"name":"setBus","parameterTypes":["org.apache.cxf.Bus"] }
+  ]
 },
 {
   "name":"org.apache.handlers.AddNumbers",
-  "allPublicMethods":true
+  "queryAllPublicMethods":true
 },
 {
   "name":"org.apache.handlers.AddNumbersFault",
@@ -745,29 +818,43 @@
 {
   "name":"org.apache.handlers.types.AddNumbers",
   "allDeclaredFields":true,
-  "allDeclaredMethods":true,
-  "allPublicMethods":true,
-  "methods":[{"name":"<init>","parameterTypes":[] }]
+  "queryAllDeclaredMethods":true,
+  "queryAllPublicMethods":true,
+  "methods":[
+    {"name":"<init>","parameterTypes":[] }, 
+    {"name":"getArg0","parameterTypes":[] }, 
+    {"name":"getArg1","parameterTypes":[] }
+  ]
 },
 {
   "name":"org.apache.handlers.types.AddNumbersResponse",
   "allDeclaredFields":true,
-  "allDeclaredMethods":true,
-  "allPublicMethods":true,
-  "methods":[{"name":"<init>","parameterTypes":[] }]
+  "queryAllDeclaredMethods":true,
+  "queryAllPublicMethods":true,
+  "methods":[
+    {"name":"<init>","parameterTypes":[] }, 
+    {"name":"getReturn","parameterTypes":[] }, 
+    {"name":"setReturn","parameterTypes":["int"] }
+  ]
 },
 {
   "name":"org.apache.handlers.types.FaultDetail",
   "allDeclaredFields":true,
-  "allDeclaredMethods":true,
+  "queryAllDeclaredMethods":true,
   "methods":[{"name":"<init>","parameterTypes":[] }]
 },
 {
   "name":"org.apache.handlers.types.ObjectFactory",
-  "allDeclaredMethods":true,
-  "allPublicMethods":true,
+  "queryAllDeclaredMethods":true,
+  "queryAllPublicMethods":true,
   "methods":[{"name":"<init>","parameterTypes":[] }]
 },
+{
+  "name":"org.jvnet.fastinfoset.stax.FastInfosetStreamReader"
+},
+{
+  "name":"org.jvnet.fastinfoset.stax.LowLevelFastInfosetStreamWriter"
+},
 {
   "name":"org.jvnet.staxex.XMLStreamReaderEx"
 },
@@ -808,7 +895,25 @@
 },
 {
   "name":"org.objectweb.asm.MethodWriter",
-  "allPublicMethods":true
+  "queryAllPublicMethods":true,
+  "methods":[
+    {"name":"visitAnnotation","parameterTypes":["java.lang.String","boolean"] }, 
+    {"name":"visitCode","parameterTypes":[] }, 
+    {"name":"visitEnd","parameterTypes":[] }, 
+    {"name":"visitFieldInsn","parameterTypes":["int","java.lang.String","java.lang.String","java.lang.String"] }, 
+    {"name":"visitFrame","parameterTypes":["int","int","java.lang.Object[]","int","java.lang.Object[]"] }, 
+    {"name":"visitInsn","parameterTypes":["int"] }, 
+    {"name":"visitIntInsn","parameterTypes":["int","int"] }, 
+    {"name":"visitJumpInsn","parameterTypes":["int","org.objectweb.asm.Label"] }, 
+    {"name":"visitLabel","parameterTypes":["org.objectweb.asm.Label"] }, 
+    {"name":"visitLdcInsn","parameterTypes":["java.lang.Object"] }, 
+    {"name":"visitLineNumber","parameterTypes":["int","org.objectweb.asm.Label"] }, 
+    {"name":"visitLocalVariable","parameterTypes":["java.lang.String","java.lang.String","java.lang.String","org.objectweb.asm.Label","org.objectweb.asm.Label","int"] }, 
+    {"name":"visitMaxs","parameterTypes":["int","int"] }, 
+    {"name":"visitMethodInsn","parameterTypes":["int","java.lang.String","java.lang.String","java.lang.String","boolean"] }, 
+    {"name":"visitTypeInsn","parameterTypes":["int","java.lang.String"] }, 
+    {"name":"visitVarInsn","parameterTypes":["int","int"] }
+  ]
 },
 {
   "name":"org.objectweb.asm.Opcodes",
@@ -881,6 +986,9 @@
 {
   "name":"org.w3c.dom.UserDataHandler"
 },
+{
+  "name":"sun.misc.GC"
+},
 {
   "name":"sun.misc.Unsafe",
   "fields":[{"name":"theUnsafe"}],
@@ -888,14 +996,18 @@
     {"name":"copyMemory","parameterTypes":["java.lang.Object","long","java.lang.Object","long","long"] }, 
     {"name":"getAndAddLong","parameterTypes":["java.lang.Object","long","long"] }, 
     {"name":"getAndSetObject","parameterTypes":["java.lang.Object","long","java.lang.Object"] }, 
-    {"name":"invokeCleaner","parameterTypes":["java.nio.ByteBuffer"] }
+    {"name":"invokeCleaner","parameterTypes":["java.nio.ByteBuffer"] }, 
+    {"name":"storeFence","parameterTypes":[] }
   ]
 },
+{
+  "name":"sun.misc.VM"
+},
 {
   "name":"sun.nio.ch.SelectorImpl",
   "fields":[
-    {"name":"publicSelectedKeys", "allowUnsafeAccess":true}, 
-    {"name":"selectedKeys", "allowUnsafeAccess":true}
+    {"name":"publicSelectedKeys"}, 
+    {"name":"selectedKeys"}
   ]
 },
 {
diff --git a/distribution/src/main/release/samples/jaxws_graalvm/src/graalvm/server/resource-config.json b/distribution/src/main/release/samples/jaxws_graalvm/src/graalvm/server/resource-config.json
index 4de452aca2..55885e2517 100644
--- a/distribution/src/main/release/samples/jaxws_graalvm/src/graalvm/server/resource-config.json
+++ b/distribution/src/main/release/samples/jaxws_graalvm/src/graalvm/server/resource-config.json
@@ -1,56 +1,190 @@
 {
   "resources":{
   "includes":[
-    {"pattern":"\\QMETA-INF/cxf/bus-extensions.txt\\E"}, 
-    {"pattern":"\\QMETA-INF/io.netty.versions.properties\\E"}, 
-    {"pattern":"\\QMETA-INF/mailcap.default\\E"}, 
-    {"pattern":"\\QMETA-INF/services/javax.xml.bind.JAXBContextFactory\\E"}, 
-    {"pattern":"\\QMETA-INF/services/javax.xml.stream.XMLEventFactory\\E"}, 
-    {"pattern":"\\QMETA-INF/services/javax.xml.stream.XMLInputFactory\\E"}, 
-    {"pattern":"\\QMETA-INF/services/javax.xml.stream.XMLOutputFactory\\E"}, 
-    {"pattern":"\\QMETA-INF/services/javax.xml.ws.spi.Provider\\E"}, 
-    {"pattern":"\\Qorg/apache/cxf/version/version.properties\\E"}, 
-    {"pattern":"\\Qorg/slf4j/impl/StaticLoggerBinder.class\\E"}, 
-    {"pattern":"\\Qschemas/wsdl/ws-addr-wsdl.xsd\\E"}, 
-    {"pattern":"\\Qschemas/wsdl/ws-addr.xsd\\E"}, 
-    {"pattern":"\\Qschemas/wsdl/wsrm.xsd\\E"}
+    {
+      "pattern":"\\QMETA-INF/cxf/bus-extensions.txt\\E"
+    }, 
+    {
+      "pattern":"\\QMETA-INF/io.netty.versions.properties\\E"
+    }, 
+    {
+      "pattern":"\\QMETA-INF/mailcap.default\\E"
+    }, 
+    {
+      "pattern":"\\QMETA-INF/services/javax.xml.bind.JAXBContext\\E"
+    }, 
+    {
+      "pattern":"\\QMETA-INF/services/javax.xml.stream.XMLEventFactory\\E"
+    }, 
+    {
+      "pattern":"\\QMETA-INF/services/javax.xml.stream.XMLInputFactory\\E"
+    }, 
+    {
+      "pattern":"\\QMETA-INF/services/javax.xml.stream.XMLOutputFactory\\E"
+    }, 
+    {
+      "pattern":"\\QMETA-INF/services/javax.xml.ws.spi.Provider\\E"
+    }, 
+    {
+      "pattern":"\\Qorg/apache/cxf/version/version.properties\\E"
+    }, 
+    {
+      "pattern":"\\Qorg/slf4j/impl/StaticLoggerBinder.class\\E"
+    }, 
+    {
+      "pattern":"\\Qschemas/wsdl/ws-addr-wsdl.xsd\\E"
+    }, 
+    {
+      "pattern":"\\Qschemas/wsdl/ws-addr.xsd\\E"
+    }, 
+    {
+      "pattern":"\\Qschemas/wsdl/wsrm.xsd\\E"
+    }
   ]},
   "bundles":[
-    {"name":"javax.servlet.LocalStrings"}, 
-    {"name":"org.apache.cxf.Messages"}, 
-    {"name":"org.apache.cxf.binding.soap.interceptor.Messages"}, 
-    {"name":"org.apache.cxf.binding.soap.saaj.Messages"}, 
-    {"name":"org.apache.cxf.bus.extension.Messages"}, 
-    {"name":"org.apache.cxf.bus.managers.Messages"}, 
-    {"name":"org.apache.cxf.common.annotation.Messages"}, 
-    {"name":"org.apache.cxf.common.injection.Messages"}, 
-    {"name":"org.apache.cxf.common.jaxb.Messages"}, 
-    {"name":"org.apache.cxf.common.util.Messages"}, 
-    {"name":"org.apache.cxf.endpoint.Messages"}, 
-    {"name":"org.apache.cxf.frontend.Messages"}, 
-    {"name":"org.apache.cxf.interceptor.Messages"}, 
-    {"name":"org.apache.cxf.jaxb.Messages"}, 
-    {"name":"org.apache.cxf.jaxb.attachment.Messages"}, 
-    {"name":"org.apache.cxf.jaxws.Messages"}, 
-    {"name":"org.apache.cxf.jaxws.binding.soap.Messages"}, 
-    {"name":"org.apache.cxf.jaxws.context.Messages"}, 
-    {"name":"org.apache.cxf.jaxws.handler.Messages"}, 
-    {"name":"org.apache.cxf.jaxws.interceptors.Messages"}, 
-    {"name":"org.apache.cxf.jaxws.spi.Messages"}, 
-    {"name":"org.apache.cxf.jaxws.support.Messages"}, 
-    {"name":"org.apache.cxf.resource.Messages"}, 
-    {"name":"org.apache.cxf.service.factory.Messages"}, 
-    {"name":"org.apache.cxf.service.invoker.Messages"}, 
-    {"name":"org.apache.cxf.service.model.Messages"}, 
-    {"name":"org.apache.cxf.staxutils.Messages"}, 
-    {"name":"org.apache.cxf.transport.http.Messages"}, 
-    {"name":"org.apache.cxf.transport.http.netty.server.Messages"}, 
-    {"name":"org.apache.cxf.transport.https.Messages"}, 
-    {"name":"org.apache.cxf.ws.addressing.Messages"}, 
-    {"name":"org.apache.cxf.ws.policy.Messages"}, 
-    {"name":"org.apache.cxf.ws.policy.attachment.Messages"}, 
-    {"name":"org.apache.cxf.wsdl.Messages"}, 
-    {"name":"org.apache.cxf.wsdl.interceptors.Messages"}, 
-    {"name":"org.apache.cxf.wsdl.service.factory.Messages"}
+    {
+      "name":"javax.servlet.LocalStrings",
+      "locales":[""]
+    }, 
+    {
+      "name":"org.apache.cxf.Messages",
+      "locales":[""]
+    }, 
+    {
+      "name":"org.apache.cxf.binding.soap.interceptor.Messages",
+      "locales":[""]
+    }, 
+    {
+      "name":"org.apache.cxf.binding.soap.saaj.Messages",
+      "locales":[""]
+    }, 
+    {
+      "name":"org.apache.cxf.bus.extension.Messages",
+      "locales":[""]
+    }, 
+    {
+      "name":"org.apache.cxf.bus.managers.Messages",
+      "locales":[""]
+    }, 
+    {
+      "name":"org.apache.cxf.common.annotation.Messages",
+      "locales":[""]
+    }, 
+    {
+      "name":"org.apache.cxf.common.injection.Messages",
+      "locales":[""]
+    }, 
+    {
+      "name":"org.apache.cxf.common.jaxb.Messages",
+      "locales":[""]
+    }, 
+    {
+      "name":"org.apache.cxf.common.util.Messages",
+      "locales":[""]
+    }, 
+    {
+      "name":"org.apache.cxf.endpoint.Messages",
+      "locales":[""]
+    }, 
+    {
+      "name":"org.apache.cxf.frontend.Messages",
+      "locales":[""]
+    }, 
+    {
+      "name":"org.apache.cxf.interceptor.Messages",
+      "locales":[""]
+    }, 
+    {
+      "name":"org.apache.cxf.jaxb.Messages",
+      "locales":[""]
+    }, 
+    {
+      "name":"org.apache.cxf.jaxb.attachment.Messages",
+      "locales":[""]
+    }, 
+    {
+      "name":"org.apache.cxf.jaxws.Messages",
+      "locales":[""]
+    }, 
+    {
+      "name":"org.apache.cxf.jaxws.binding.soap.Messages",
+      "locales":[""]
+    }, 
+    {
+      "name":"org.apache.cxf.jaxws.context.Messages",
+      "locales":[""]
+    }, 
+    {
+      "name":"org.apache.cxf.jaxws.handler.Messages",
+      "locales":[""]
+    }, 
+    {
+      "name":"org.apache.cxf.jaxws.interceptors.Messages",
+      "locales":[""]
+    }, 
+    {
+      "name":"org.apache.cxf.jaxws.spi.Messages",
+      "locales":[""]
+    }, 
+    {
+      "name":"org.apache.cxf.jaxws.support.Messages",
+      "locales":[""]
+    }, 
+    {
+      "name":"org.apache.cxf.resource.Messages",
+      "locales":[""]
+    }, 
+    {
+      "name":"org.apache.cxf.service.factory.Messages",
+      "locales":[""]
+    }, 
+    {
+      "name":"org.apache.cxf.service.invoker.Messages",
+      "locales":[""]
+    }, 
+    {
+      "name":"org.apache.cxf.service.model.Messages",
+      "locales":[""]
+    }, 
+    {
+      "name":"org.apache.cxf.staxutils.Messages",
+      "locales":[""]
+    }, 
+    {
+      "name":"org.apache.cxf.transport.http.Messages",
+      "locales":[""]
+    }, 
+    {
+      "name":"org.apache.cxf.transport.http.netty.server.Messages",
+      "locales":[""]
+    }, 
+    {
+      "name":"org.apache.cxf.transport.https.Messages",
+      "locales":[""]
+    }, 
+    {
+      "name":"org.apache.cxf.ws.addressing.Messages",
+      "locales":[""]
+    }, 
+    {
+      "name":"org.apache.cxf.ws.policy.Messages",
+      "locales":[""]
+    }, 
+    {
+      "name":"org.apache.cxf.ws.policy.attachment.Messages",
+      "locales":[""]
+    }, 
+    {
+      "name":"org.apache.cxf.wsdl.Messages",
+      "locales":[""]
+    }, 
+    {
+      "name":"org.apache.cxf.wsdl.interceptors.Messages",
+      "locales":[""]
+    }, 
+    {
+      "name":"org.apache.cxf.wsdl.service.factory.Messages",
+      "locales":[""]
+    }
   ]
 }
diff --git a/distribution/src/main/release/samples/jaxws_graalvm/src/graalvm/server/serialization-config.json b/distribution/src/main/release/samples/jaxws_graalvm/src/graalvm/server/serialization-config.json
index 0d4f101c7a..f3d7e06e33 100644
--- a/distribution/src/main/release/samples/jaxws_graalvm/src/graalvm/server/serialization-config.json
+++ b/distribution/src/main/release/samples/jaxws_graalvm/src/graalvm/server/serialization-config.json
@@ -1,2 +1,8 @@
-[
-]
+{
+  "types":[
+  ],
+  "lambdaCapturingTypes":[
+  ],
+  "proxies":[
+  ]
+}
diff --git a/distribution/src/main/release/samples/jaxws_graalvm_dynamic/README.txt b/distribution/src/main/release/samples/jaxws_graalvm_dynamic/README.txt
index fc16edf0f8..015e0d5b20 100644
--- a/distribution/src/main/release/samples/jaxws_graalvm_dynamic/README.txt
+++ b/distribution/src/main/release/samples/jaxws_graalvm_dynamic/README.txt
@@ -8,7 +8,7 @@ techniques to deal with dynamic class generation.
 Pre-requisites
 ---------------------------------------
 
-GraalVM 20.3.0 or later distribution should be installed and pre-configured as 
+GraalVM 22.3.0/JDK11+ or later distribution should be installed and pre-configured as 
 default JVM runtime (using JAVA_HOME), see please instructions at [1].
 
 The GraalVM's native-image tool should be installed, see please 
@@ -43,7 +43,7 @@ Than build the client:
 This goal will produce 'client/target/jaxws-demo-client' executable (platform-dependent) 
 which could be run right away: 
 
-  On Windows: client\target\jaxws-demo-client.exe client\	src\main\resources\addNumbers.wsdl
+  On Windows: client\target\jaxws-demo-client.exe client\src\main\resources\addNumbers.wsdl
   On Linux: ./client/target/jaxws-demo-client client/src/main/resources/addNumbers.wsdl
 
 The command should produce the following output (assuming the server is up and running):
diff --git a/distribution/src/main/release/samples/jaxws_graalvm_dynamic/client/pom.xml b/distribution/src/main/release/samples/jaxws_graalvm_dynamic/client/pom.xml
index 139a785061..0e47c23c03 100644
--- a/distribution/src/main/release/samples/jaxws_graalvm_dynamic/client/pom.xml
+++ b/distribution/src/main/release/samples/jaxws_graalvm_dynamic/client/pom.xml
@@ -39,13 +39,13 @@
             <build>
                 <plugins>
                     <plugin>
-                        <groupId>org.graalvm.nativeimage</groupId>
-                        <artifactId>native-image-maven-plugin</artifactId>
-                        <version>${graalvm.version}</version>
+                        <groupId>org.graalvm.buildtools</groupId>
+                        <artifactId>native-maven-plugin</artifactId>
+                        <version>0.9.19</version>
                         <executions>
                             <execution>
                                 <goals>
-                                    <goal>native-image</goal>
+                                    <goal>compile-no-fork</goal>
                                 </goals>
                                 <phase>package</phase>
                             </execution>
diff --git a/distribution/src/main/release/samples/jaxws_graalvm_dynamic/client/src/main/resources/META-INF/native-image/org.apache.cxf.samples/jaxws_graalvm_dynamic_client/jni-config.json b/distribution/src/main/release/samples/jaxws_graalvm_dynamic/client/src/main/resources/META-INF/native-image/org.apache.cxf.samples/jaxws_graalvm_dynamic_client/jni-config.json
index 0218ccbee6..086802cc08 100644
--- a/distribution/src/main/release/samples/jaxws_graalvm_dynamic/client/src/main/resources/META-INF/native-image/org.apache.cxf.samples/jaxws_graalvm_dynamic_client/jni-config.json
+++ b/distribution/src/main/release/samples/jaxws_graalvm_dynamic/client/src/main/resources/META-INF/native-image/org.apache.cxf.samples/jaxws_graalvm_dynamic_client/jni-config.json
@@ -1,10 +1,7 @@
 [
 {
-  "name":"java.lang.ClassLoader",
-  "methods":[{"name":"getPlatformClassLoader","parameterTypes":[] }]
-},
-{
-  "name":"java.lang.NoSuchMethodError"
+  "name":"java.lang.Boolean",
+  "methods":[{"name":"getBoolean","parameterTypes":["java.lang.String"] }]
 },
 {
   "name":"sun.management.VMManagementImpl",
diff --git a/distribution/src/main/release/samples/jaxws_graalvm_dynamic/client/src/main/resources/META-INF/native-image/org.apache.cxf.samples/jaxws_graalvm_dynamic_client/proxy-config.json b/distribution/src/main/release/samples/jaxws_graalvm_dynamic/client/src/main/resources/META-INF/native-image/org.apache.cxf.samples/jaxws_graalvm_dynamic_client/proxy-config.json
index f32f043205..890e892f0f 100644
--- a/distribution/src/main/release/samples/jaxws_graalvm_dynamic/client/src/main/resources/META-INF/native-image/org.apache.cxf.samples/jaxws_graalvm_dynamic_client/proxy-config.json
+++ b/distribution/src/main/release/samples/jaxws_graalvm_dynamic/client/src/main/resources/META-INF/native-image/org.apache.cxf.samples/jaxws_graalvm_dynamic_client/proxy-config.json
@@ -1,10 +1,26 @@
 [
-  ["com.sun.xml.bind.marshaller.CharacterEscapeHandler"],
-  ["javax.xml.bind.annotation.XmlAccessorType","com.sun.xml.bind.v2.model.annotation.Locatable"],
-  ["org.apache.cxf.binding.soap.wsdl.extensions.SoapAddress"],
-  ["org.apache.cxf.binding.soap.wsdl.extensions.SoapBinding"],
-  ["org.apache.cxf.binding.soap.wsdl.extensions.SoapBody"],
-  ["org.apache.cxf.binding.soap.wsdl.extensions.SoapOperation"],
-  ["org.apache.cxf.common.jaxb.JAXBContextProxy"],
-  ["org.apache.handlers.AddNumbers","javax.xml.ws.BindingProvider","java.io.Closeable","org.apache.cxf.endpoint.Client"]
+  {
+    "interfaces":["com.sun.xml.bind.marshaller.CharacterEscapeHandler"]
+  },
+  {
+    "interfaces":["javax.xml.bind.annotation.XmlAccessorType","com.sun.xml.bind.v2.model.annotation.Locatable"]
+  },
+  {
+    "interfaces":["org.apache.cxf.binding.soap.wsdl.extensions.SoapAddress"]
+  },
+  {
+    "interfaces":["org.apache.cxf.binding.soap.wsdl.extensions.SoapBinding"]
+  },
+  {
+    "interfaces":["org.apache.cxf.binding.soap.wsdl.extensions.SoapBody"]
+  },
+  {
+    "interfaces":["org.apache.cxf.binding.soap.wsdl.extensions.SoapOperation"]
+  },
+  {
+    "interfaces":["org.apache.cxf.common.jaxb.JAXBContextProxy"]
+  },
+  {
+    "interfaces":["org.apache.handlers.AddNumbers","javax.xml.ws.BindingProvider","java.io.Closeable","org.apache.cxf.endpoint.Client"]
+  }
 ]
diff --git a/distribution/src/main/release/samples/jaxws_graalvm_dynamic/client/src/main/resources/META-INF/native-image/org.apache.cxf.samples/jaxws_graalvm_dynamic_client/reflect-config.json b/distribution/src/main/release/samples/jaxws_graalvm_dynamic/client/src/main/resources/META-INF/native-image/org.apache.cxf.samples/jaxws_graalvm_dynamic_client/reflect-config.json
index c215fc8263..29c5871114 100644
--- a/distribution/src/main/release/samples/jaxws_graalvm_dynamic/client/src/main/resources/META-INF/native-image/org.apache.cxf.samples/jaxws_graalvm_dynamic_client/reflect-config.json
+++ b/distribution/src/main/release/samples/jaxws_graalvm_dynamic/client/src/main/resources/META-INF/native-image/org.apache.cxf.samples/jaxws_graalvm_dynamic_client/reflect-config.json
@@ -1,6 +1,9 @@
 [
 {
-  "name":"char[]"
+  "name":"[C"
+},
+{
+  "name":"[Ljava.lang.Object;"
 },
 {
   "name":"com.ibm.wsdl.extensions.schema.SchemaImpl",
@@ -44,7 +47,8 @@
 },
 {
   "name":"com.sun.xml.bind.marshaller.CharacterEscapeHandler",
-  "allPublicMethods":true
+  "queryAllPublicMethods":true,
+  "methods":[{"name":"escape","parameterTypes":["char[]","int","int","boolean","java.io.Writer"] }]
 },
 {
   "name":"com.sun.xml.bind.marshaller.MinimumEscapeHandler",
@@ -56,7 +60,7 @@
 },
 {
   "name":"com.sun.xml.bind.v2.ContextFactory",
-  "methods":[{"name":"createContext","parameterTypes":["java.lang.Class[]", "java.util.Map"]}]
+  "methods":[{"name":"createContext","parameterTypes":["java.lang.Class[]","java.util.Map"] }]
 },
 {
   "name":"com.sun.xml.bind.v2.model.nav.ReflectionNavigator",
@@ -68,31 +72,33 @@
 },
 {
   "name":"com.sun.xml.bind.v2.runtime.property.ArrayElementLeafProperty",
-  "allPublicConstructors":true
+  "queryAllPublicConstructors":true
 },
 {
   "name":"com.sun.xml.bind.v2.runtime.property.ArrayElementNodeProperty",
-  "allPublicConstructors":true
+  "queryAllPublicConstructors":true
 },
 {
   "name":"com.sun.xml.bind.v2.runtime.property.ArrayReferenceNodeProperty",
-  "allPublicConstructors":true
+  "queryAllPublicConstructors":true
 },
 {
   "name":"com.sun.xml.bind.v2.runtime.property.SingleElementLeafProperty",
-  "allPublicConstructors":true
+  "queryAllPublicConstructors":true,
+  "methods":[{"name":"<init>","parameterTypes":["com.sun.xml.bind.v2.runtime.JAXBContextImpl","com.sun.xml.bind.v2.model.runtime.RuntimeElementPropertyInfo"] }]
 },
 {
   "name":"com.sun.xml.bind.v2.runtime.property.SingleElementNodeProperty",
-  "allPublicConstructors":true
+  "queryAllPublicConstructors":true,
+  "methods":[{"name":"<init>","parameterTypes":["com.sun.xml.bind.v2.runtime.JAXBContextImpl","com.sun.xml.bind.v2.model.runtime.RuntimeElementPropertyInfo"] }]
 },
 {
   "name":"com.sun.xml.bind.v2.runtime.property.SingleMapNodeProperty",
-  "allPublicConstructors":true
+  "queryAllPublicConstructors":true
 },
 {
   "name":"com.sun.xml.bind.v2.runtime.property.SingleReferenceNodeProperty",
-  "allPublicConstructors":true
+  "queryAllPublicConstructors":true
 },
 {
   "name":"com.sun.xml.bind.v2.runtime.unmarshaller.StAXExConnector",
@@ -100,11 +106,11 @@
 },
 {
   "name":"com.sun.xml.messaging.saaj.soap.SOAPDocumentImpl",
-  "allPublicMethods":true
+  "queryAllPublicMethods":true
 },
 {
   "name":"int",
-  "allDeclaredConstructors":true
+  "queryAllDeclaredConstructors":true
 },
 {
   "name":"io.netty.channel.socket.nio.NioSocketChannel",
@@ -112,19 +118,19 @@
 },
 {
   "name":"io.netty.util.internal.shaded.org.jctools.queues.BaseMpscLinkedArrayQueueColdProducerFields",
-  "fields":[{"name":"producerLimit", "allowUnsafeAccess":true}]
+  "fields":[{"name":"producerLimit"}]
 },
 {
   "name":"io.netty.util.internal.shaded.org.jctools.queues.BaseMpscLinkedArrayQueueConsumerFields",
-  "fields":[{"name":"consumerIndex", "allowUnsafeAccess":true}]
+  "fields":[{"name":"consumerIndex"}]
 },
 {
   "name":"io.netty.util.internal.shaded.org.jctools.queues.BaseMpscLinkedArrayQueueProducerFields",
-  "fields":[{"name":"producerIndex", "allowUnsafeAccess":true}]
+  "fields":[{"name":"producerIndex"}]
 },
 {
   "name":"java.io.Closeable",
-  "allPublicMethods":true
+  "queryAllPublicMethods":true
 },
 {
   "name":"java.io.Writer"
@@ -135,10 +141,7 @@
 {
   "name":"java.lang.Object",
   "allDeclaredFields":true,
-  "allDeclaredMethods":true
-},
-{
-  "name":"java.lang.Object[]"
+  "queryAllDeclaredMethods":true
 },
 {
   "name":"java.lang.String"
@@ -169,7 +172,11 @@
 },
 {
   "name":"java.nio.Buffer",
-  "fields":[{"name":"address", "allowUnsafeAccess":true}]
+  "fields":[{"name":"address"}]
+},
+{
+  "name":"java.nio.ByteBuffer",
+  "methods":[{"name":"alignedSlice","parameterTypes":["int"] }]
 },
 {
   "name":"java.nio.DirectByteBuffer",
@@ -190,11 +197,47 @@
 {
   "name":"java.util.concurrent.Executor"
 },
+{
+  "name":"javax.security.auth.Policy"
+},
 {
   "name":"javax.security.auth.login.Configuration"
 },
 {
-  "name":"javax.xml.bind.annotation.XmlAccessorType"
+  "name":"javax.wsdl.extensions.ExtensibilityElement",
+  "methods":[{"name":"getElementType","parameterTypes":[] }]
+},
+{
+  "name":"javax.wsdl.extensions.soap.SOAPAddress",
+  "methods":[
+    {"name":"getLocationURI","parameterTypes":[] }, 
+    {"name":"setLocationURI","parameterTypes":["java.lang.String"] }
+  ]
+},
+{
+  "name":"javax.wsdl.extensions.soap.SOAPBinding",
+  "methods":[
+    {"name":"getStyle","parameterTypes":[] }, 
+    {"name":"getTransportURI","parameterTypes":[] }
+  ]
+},
+{
+  "name":"javax.wsdl.extensions.soap.SOAPBody",
+  "methods":[
+    {"name":"getParts","parameterTypes":[] }, 
+    {"name":"getUse","parameterTypes":[] }
+  ]
+},
+{
+  "name":"javax.wsdl.extensions.soap.SOAPOperation",
+  "methods":[
+    {"name":"getSoapActionURI","parameterTypes":[] }, 
+    {"name":"getStyle","parameterTypes":[] }
+  ]
+},
+{
+  "name":"javax.xml.bind.annotation.XmlAccessorType",
+  "methods":[{"name":"value","parameterTypes":[] }]
 },
 {
   "name":"javax.xml.bind.annotation.XmlElement",
@@ -212,7 +255,7 @@
 },
 {
   "name":"javax.xml.ws.BindingProvider",
-  "allPublicMethods":true
+  "queryAllPublicMethods":true
 },
 {
   "name":"javax.xml.ws.EndpointReference"
@@ -221,6 +264,9 @@
   "name":"jdk.internal.misc.Unsafe",
   "methods":[{"name":"getUnsafe","parameterTypes":[] }]
 },
+{
+  "name":"org.apache.axiom.om.OMElement"
+},
 {
   "name":"org.apache.cxf.Bus"
 },
@@ -248,7 +294,7 @@
 },
 {
   "name":"org.apache.cxf.bindings.xformat.ObjectFactory",
-  "allDeclaredMethods":true
+  "queryAllDeclaredMethods":true
 },
 {
   "name":"org.apache.cxf.bindings.xformat.XMLBindingMessageFormatExtensibility"
@@ -303,7 +349,7 @@
 },
 {
   "name":"org.apache.cxf.endpoint.Client",
-  "allPublicMethods":true
+  "queryAllPublicMethods":true
 },
 {
   "name":"org.apache.cxf.endpoint.Client$Contexts"
@@ -329,15 +375,15 @@
 {
   "name":"org.apache.cxf.ext.logging.LoggingFactoryBeanListener",
   "allDeclaredFields":true,
-  "allDeclaredMethods":true,
-  "allPublicMethods":true,
+  "queryAllDeclaredMethods":true,
+  "queryAllPublicMethods":true,
   "methods":[{"name":"<init>","parameterTypes":[] }]
 },
 {
   "name":"org.apache.cxf.ext.logging.OldLoggingFactoryBeanListener",
   "allDeclaredFields":true,
-  "allDeclaredMethods":true,
-  "allPublicMethods":true,
+  "queryAllDeclaredMethods":true,
+  "queryAllPublicMethods":true,
   "methods":[{"name":"<init>","parameterTypes":["org.apache.cxf.Bus"] }]
 },
 {
@@ -397,8 +443,8 @@
 {
   "name":"org.apache.cxf.transport.http.netty.client.NettyHttpConduitFactory",
   "allDeclaredFields":true,
-  "allDeclaredMethods":true,
-  "allPublicMethods":true,
+  "queryAllDeclaredMethods":true,
+  "queryAllPublicMethods":true,
   "methods":[{"name":"<init>","parameterTypes":[] }]
 },
 {
@@ -421,7 +467,7 @@
 },
 {
   "name":"org.apache.cxf.transports.http.configuration.ObjectFactory",
-  "allDeclaredMethods":true
+  "queryAllDeclaredMethods":true
 },
 {
   "name":"org.apache.cxf.ws.addressing.impl.AddressingFeatureApplier"
@@ -444,7 +490,7 @@
 },
 {
   "name":"org.apache.cxf.ws.addressing.wsdl.ObjectFactory",
-  "allDeclaredMethods":true
+  "queryAllDeclaredMethods":true
 },
 {
   "name":"org.apache.cxf.ws.addressing.wsdl.UsingAddressingExtensibility"
@@ -460,8 +506,8 @@
 {
   "name":"org.apache.cxf.ws.policy.PolicyAnnotationListener",
   "allDeclaredFields":true,
-  "allDeclaredMethods":true,
-  "allPublicMethods":true,
+  "queryAllDeclaredMethods":true,
+  "queryAllPublicMethods":true,
   "methods":[{"name":"<init>","parameterTypes":["org.apache.cxf.Bus"] }]
 },
 {
@@ -474,8 +520,8 @@
 {
   "name":"org.apache.cxf.ws.policy.PolicyDataEngineImpl",
   "allDeclaredFields":true,
-  "allDeclaredMethods":true,
-  "allPublicMethods":true,
+  "queryAllDeclaredMethods":true,
+  "queryAllPublicMethods":true,
   "methods":[{"name":"<init>","parameterTypes":["org.apache.cxf.Bus"] }]
 },
 {
@@ -528,36 +574,51 @@
 },
 {
   "name":"org.apache.cxf.wsdl.http.ObjectFactory",
-  "allDeclaredMethods":true
+  "queryAllDeclaredMethods":true
 },
 {
   "name":"org.apache.cxf.wsdl11.WSDLManagerImpl",
   "allDeclaredFields":true,
-  "allDeclaredMethods":true,
-  "methods":[{"name":"<init>","parameterTypes":[] }]
+  "queryAllDeclaredMethods":true,
+  "methods":[
+    {"name":"<init>","parameterTypes":[] }, 
+    {"name":"setBus","parameterTypes":["org.apache.cxf.Bus"] }
+  ]
 },
 {
   "name":"org.apache.handlers.AddNumbers",
-  "allPublicMethods":true
+  "queryAllPublicMethods":true
 },
 {
   "name":"org.apache.handlers.AddNumbersFault",
-  "allPublicConstructors":true,
-  "methods":[{"name":"getFaultInfo","parameterTypes":[] }]
+  "queryAllPublicConstructors":true,
+  "methods":[
+    {"name":"<init>","parameterTypes":["java.lang.String","org.apache.handlers.types.FaultDetail"] }, 
+    {"name":"getFaultInfo","parameterTypes":[] }
+  ]
 },
 {
   "name":"org.apache.handlers.jaxws_asm.AddNumbers",
   "allDeclaredFields":true,
-  "allDeclaredMethods":true,
-  "allPublicMethods":true,
-  "methods":[{"name":"<init>","parameterTypes":[] }]
+  "queryAllDeclaredMethods":true,
+  "queryAllPublicMethods":true,
+  "methods":[
+    {"name":"<init>","parameterTypes":[] }, 
+    {"name":"getArg0","parameterTypes":[] }, 
+    {"name":"getArg1","parameterTypes":[] }, 
+    {"name":"setArg0","parameterTypes":["int"] }, 
+    {"name":"setArg1","parameterTypes":["int"] }
+  ]
 },
 {
   "name":"org.apache.handlers.jaxws_asm.AddNumbersResponse",
   "allDeclaredFields":true,
-  "allDeclaredMethods":true,
-  "allPublicMethods":true,
-  "methods":[{"name":"<init>","parameterTypes":[] }]
+  "queryAllDeclaredMethods":true,
+  "queryAllPublicMethods":true,
+  "methods":[
+    {"name":"<init>","parameterTypes":[] }, 
+    {"name":"getReturn","parameterTypes":[] }
+  ]
 },
 {
   "name":"org.apache.handlers.jaxws_asm.AddNumbersResponse_WrapperTypeHelper1"
@@ -565,18 +626,30 @@
 {
   "name":"org.apache.handlers.jaxws_asm.AddNumbers_WrapperTypeHelper1"
 },
+{
+  "name":"org.apache.handlers.jaxws_asm.ObjectFactory"
+},
+{
+  "name":"org.apache.handlers.types.AddNumbers"
+},
+{
+  "name":"org.apache.handlers.types.AddNumbersResponse"
+},
 {
   "name":"org.apache.handlers.types.FaultDetail",
   "allDeclaredFields":true,
-  "allDeclaredMethods":true,
-  "methods":[
-    {"name":"<init>","parameterTypes":[] }, 
-    {"name":"getMessage","parameterTypes":[] }
-  ]
+  "queryAllDeclaredMethods":true,
+  "methods":[{"name":"<init>","parameterTypes":[] }]
+},
+{
+  "name":"org.apache.handlers.types.ObjectFactory"
 },
 {
   "name":"org.apache.xml.resolver.CatalogManager"
 },
+{
+  "name":"org.jvnet.fastinfoset.stax.FastInfosetStreamReader"
+},
 {
   "name":"org.jvnet.staxex.XMLStreamReaderEx"
 },
@@ -597,6 +670,9 @@
 {
   "name":"org.w3c.dom.UserDataHandler"
 },
+{
+  "name":"sun.misc.GC"
+},
 {
   "name":"sun.misc.Unsafe",
   "fields":[{"name":"theUnsafe"}],
@@ -604,14 +680,18 @@
     {"name":"copyMemory","parameterTypes":["java.lang.Object","long","java.lang.Object","long","long"] }, 
     {"name":"getAndAddLong","parameterTypes":["java.lang.Object","long","long"] }, 
     {"name":"getAndSetObject","parameterTypes":["java.lang.Object","long","java.lang.Object"] }, 
-    {"name":"invokeCleaner","parameterTypes":["java.nio.ByteBuffer"] }
+    {"name":"invokeCleaner","parameterTypes":["java.nio.ByteBuffer"] }, 
+    {"name":"storeFence","parameterTypes":[] }
   ]
 },
+{
+  "name":"sun.misc.VM"
+},
 {
   "name":"sun.nio.ch.SelectorImpl",
   "fields":[
-    {"name":"publicSelectedKeys", "allowUnsafeAccess":true}, 
-    {"name":"selectedKeys", "allowUnsafeAccess":true}
+    {"name":"publicSelectedKeys"}, 
+    {"name":"selectedKeys"}
   ]
 },
 {
diff --git a/distribution/src/main/release/samples/jaxws_graalvm_dynamic/client/src/main/resources/META-INF/native-image/org.apache.cxf.samples/jaxws_graalvm_dynamic_client/resource-config.json b/distribution/src/main/release/samples/jaxws_graalvm_dynamic/client/src/main/resources/META-INF/native-image/org.apache.cxf.samples/jaxws_graalvm_dynamic_client/resource-config.json
index 6d323d6d32..127a78ed38 100644
--- a/distribution/src/main/release/samples/jaxws_graalvm_dynamic/client/src/main/resources/META-INF/native-image/org.apache.cxf.samples/jaxws_graalvm_dynamic_client/resource-config.json
+++ b/distribution/src/main/release/samples/jaxws_graalvm_dynamic/client/src/main/resources/META-INF/native-image/org.apache.cxf.samples/jaxws_graalvm_dynamic_client/resource-config.json
@@ -1,56 +1,186 @@
 {
   "resources":{
   "includes":[
-    {"pattern":"\\QMETA-INF/cxf/bus-extensions.txt\\E"}, 
-    {"pattern":"\\QMETA-INF/io.netty.versions.properties\\E"}, 
-    {"pattern":"\\QMETA-INF/mailcap.default\\E"}, 
-    {"pattern":"\\QMETA-INF/services/javax.xml.bind.JAXBContextFactory\\E"}, 
-    {"pattern":"\\QMETA-INF/services/javax.xml.stream.XMLEventFactory\\E"}, 
-    {"pattern":"\\QMETA-INF/services/javax.xml.stream.XMLInputFactory\\E"}, 
-    {"pattern":"\\QMETA-INF/services/javax.xml.stream.XMLOutputFactory\\E"}, 
-    {"pattern":"\\Qorg/apache/cxf/transport/http/ReferencingAuthenticator.class\\E"}, 
-    {"pattern":"\\Qorg/apache/cxf/version/version.properties\\E"}, 
-    {"pattern":"\\Qorg/apache/xml/resolver/etc/catalog.dtd\\E"}, 
-    {"pattern":"\\Qorg/apache/xml/resolver/etc/catalog.rng\\E"}, 
-    {"pattern":"\\Qorg/apache/xml/resolver/etc/catalog.xsd\\E"}, 
-    {"pattern":"\\Qorg/apache/xml/resolver/etc/xcatalog.dtd\\E"}, 
-    {"pattern":"\\Qorg/slf4j/impl/StaticLoggerBinder.class\\E"}, 
-    {"pattern":"\\Qschemas/wsdl/ws-addr-wsdl.xsd\\E"}, 
-    {"pattern":"\\Qschemas/wsdl/ws-addr.xsd\\E"}, 
-    {"pattern":"\\Qschemas/wsdl/wsrm.xsd\\E"}
+    {
+      "pattern":"\\QMETA-INF/cxf/bus-extensions.txt\\E"
+    }, 
+    {
+      "pattern":"\\QMETA-INF/io.netty.versions.properties\\E"
+    }, 
+    {
+      "pattern":"\\QMETA-INF/mailcap.default\\E"
+    }, 
+    {
+      "pattern":"\\QMETA-INF/services/javax.xml.bind.JAXBContext\\E"
+    }, 
+    {
+      "pattern":"\\QMETA-INF/services/javax.xml.stream.XMLEventFactory\\E"
+    }, 
+    {
+      "pattern":"\\QMETA-INF/services/javax.xml.stream.XMLInputFactory\\E"
+    }, 
+    {
+      "pattern":"\\QMETA-INF/services/javax.xml.stream.XMLOutputFactory\\E"
+    }, 
+    {
+      "pattern":"\\Qorg/apache/cxf/transport/http/ReferencingAuthenticator.class\\E"
+    }, 
+    {
+      "pattern":"\\Qorg/apache/cxf/version/version.properties\\E"
+    }, 
+    {
+      "pattern":"\\Qorg/apache/xml/resolver/etc/catalog.dtd\\E"
+    }, 
+    {
+      "pattern":"\\Qorg/apache/xml/resolver/etc/catalog.rng\\E"
+    }, 
+    {
+      "pattern":"\\Qorg/apache/xml/resolver/etc/catalog.xsd\\E"
+    }, 
+    {
+      "pattern":"\\Qorg/apache/xml/resolver/etc/xcatalog.dtd\\E"
+    }, 
+    {
+      "pattern":"\\Qorg/slf4j/impl/StaticLoggerBinder.class\\E"
+    }, 
+    {
+      "pattern":"\\Qschemas/wsdl/ws-addr-wsdl.xsd\\E"
+    }, 
+    {
+      "pattern":"\\Qschemas/wsdl/ws-addr.xsd\\E"
+    }, 
+    {
+      "pattern":"\\Qschemas/wsdl/wsrm.xsd\\E"
+    }
   ]},
   "bundles":[
-    {"name":"org.apache.cxf.Messages"}, 
-    {"name":"org.apache.cxf.binding.soap.interceptor.Messages"}, 
-    {"name":"org.apache.cxf.binding.soap.saaj.Messages"}, 
-    {"name":"org.apache.cxf.bus.extension.Messages"}, 
-    {"name":"org.apache.cxf.bus.managers.Messages"}, 
-    {"name":"org.apache.cxf.common.annotation.Messages"}, 
-    {"name":"org.apache.cxf.common.injection.Messages"}, 
-    {"name":"org.apache.cxf.common.jaxb.Messages"}, 
-    {"name":"org.apache.cxf.common.util.Messages"}, 
-    {"name":"org.apache.cxf.endpoint.Messages"}, 
-    {"name":"org.apache.cxf.frontend.Messages"}, 
-    {"name":"org.apache.cxf.interceptor.Messages"}, 
-    {"name":"org.apache.cxf.jaxb.Messages"}, 
-    {"name":"org.apache.cxf.jaxb.attachment.Messages"}, 
-    {"name":"org.apache.cxf.jaxws.Messages"}, 
-    {"name":"org.apache.cxf.jaxws.binding.soap.Messages"}, 
-    {"name":"org.apache.cxf.jaxws.handler.Messages"}, 
-    {"name":"org.apache.cxf.jaxws.interceptors.Messages"}, 
-    {"name":"org.apache.cxf.jaxws.support.Messages"}, 
-    {"name":"org.apache.cxf.resource.Messages"}, 
-    {"name":"org.apache.cxf.service.factory.Messages"}, 
-    {"name":"org.apache.cxf.service.model.Messages"}, 
-    {"name":"org.apache.cxf.staxutils.Messages"}, 
-    {"name":"org.apache.cxf.transport.http.Messages"}, 
-    {"name":"org.apache.cxf.transport.https.Messages"}, 
-    {"name":"org.apache.cxf.ws.policy.APIMessages"}, 
-    {"name":"org.apache.cxf.ws.policy.Messages"}, 
-    {"name":"org.apache.cxf.ws.policy.attachment.Messages"}, 
-    {"name":"org.apache.cxf.wsdl.Messages"}, 
-    {"name":"org.apache.cxf.wsdl.interceptors.Messages"}, 
-    {"name":"org.apache.cxf.wsdl.service.factory.Messages"}, 
-    {"name":"org.apache.cxf.wsdl11.Messages"}
+    {
+      "name":"org.apache.cxf.Messages",
+      "locales":[""]
+    }, 
+    {
+      "name":"org.apache.cxf.binding.soap.interceptor.Messages",
+      "locales":[""]
+    }, 
+    {
+      "name":"org.apache.cxf.binding.soap.saaj.Messages",
+      "locales":[""]
+    }, 
+    {
+      "name":"org.apache.cxf.bus.extension.Messages",
+      "locales":[""]
+    }, 
+    {
+      "name":"org.apache.cxf.bus.managers.Messages",
+      "locales":[""]
+    }, 
+    {
+      "name":"org.apache.cxf.common.annotation.Messages",
+      "locales":[""]
+    }, 
+    {
+      "name":"org.apache.cxf.common.injection.Messages",
+      "locales":[""]
+    }, 
+    {
+      "name":"org.apache.cxf.common.jaxb.Messages",
+      "locales":[""]
+    }, 
+    {
+      "name":"org.apache.cxf.common.util.Messages",
+      "locales":[""]
+    }, 
+    {
+      "name":"org.apache.cxf.endpoint.Messages",
+      "locales":[""]
+    }, 
+    {
+      "name":"org.apache.cxf.frontend.Messages",
+      "locales":[""]
+    }, 
+    {
+      "name":"org.apache.cxf.interceptor.Messages",
+      "locales":[""]
+    }, 
+    {
+      "name":"org.apache.cxf.jaxb.Messages",
+      "locales":[""]
+    }, 
+    {
+      "name":"org.apache.cxf.jaxb.attachment.Messages",
+      "locales":[""]
+    }, 
+    {
+      "name":"org.apache.cxf.jaxws.Messages",
+      "locales":[""]
+    }, 
+    {
+      "name":"org.apache.cxf.jaxws.binding.soap.Messages",
+      "locales":[""]
+    }, 
+    {
+      "name":"org.apache.cxf.jaxws.handler.Messages",
+      "locales":[""]
+    }, 
+    {
+      "name":"org.apache.cxf.jaxws.interceptors.Messages",
+      "locales":[""]
+    }, 
+    {
+      "name":"org.apache.cxf.jaxws.support.Messages",
+      "locales":[""]
+    }, 
+    {
+      "name":"org.apache.cxf.resource.Messages",
+      "locales":[""]
+    }, 
+    {
+      "name":"org.apache.cxf.service.factory.Messages",
+      "locales":[""]
+    }, 
+    {
+      "name":"org.apache.cxf.service.model.Messages",
+      "locales":[""]
+    }, 
+    {
+      "name":"org.apache.cxf.staxutils.Messages",
+      "locales":[""]
+    }, 
+    {
+      "name":"org.apache.cxf.transport.http.Messages",
+      "locales":[""]
+    }, 
+    {
+      "name":"org.apache.cxf.transport.https.Messages",
+      "locales":[""]
+    }, 
+    {
+      "name":"org.apache.cxf.ws.policy.APIMessages",
+      "locales":[""]
+    }, 
+    {
+      "name":"org.apache.cxf.ws.policy.Messages",
+      "locales":[""]
+    }, 
+    {
+      "name":"org.apache.cxf.ws.policy.attachment.Messages",
+      "locales":[""]
+    }, 
+    {
+      "name":"org.apache.cxf.wsdl.Messages",
+      "locales":[""]
+    }, 
+    {
+      "name":"org.apache.cxf.wsdl.interceptors.Messages",
+      "locales":[""]
+    }, 
+    {
+      "name":"org.apache.cxf.wsdl.service.factory.Messages",
+      "locales":[""]
+    }, 
+    {
+      "name":"org.apache.cxf.wsdl11.Messages",
+      "locales":[""]
+    }
   ]
 }
diff --git a/distribution/src/main/release/samples/jaxws_graalvm_dynamic/client/src/main/resources/META-INF/native-image/org.apache.cxf.samples/jaxws_graalvm_dynamic_client/serialization-config.json b/distribution/src/main/release/samples/jaxws_graalvm_dynamic/client/src/main/resources/META-INF/native-image/org.apache.cxf.samples/jaxws_graalvm_dynamic_client/serialization-config.json
index 0d4f101c7a..f3d7e06e33 100644
--- a/distribution/src/main/release/samples/jaxws_graalvm_dynamic/client/src/main/resources/META-INF/native-image/org.apache.cxf.samples/jaxws_graalvm_dynamic_client/serialization-config.json
+++ b/distribution/src/main/release/samples/jaxws_graalvm_dynamic/client/src/main/resources/META-INF/native-image/org.apache.cxf.samples/jaxws_graalvm_dynamic_client/serialization-config.json
@@ -1,2 +1,8 @@
-[
-]
+{
+  "types":[
+  ],
+  "lambdaCapturingTypes":[
+  ],
+  "proxies":[
+  ]
+}
diff --git a/distribution/src/main/release/samples/jaxws_graalvm_dynamic/server/pom.xml b/distribution/src/main/release/samples/jaxws_graalvm_dynamic/server/pom.xml
index f96b3434d2..44434b1fdb 100644
--- a/distribution/src/main/release/samples/jaxws_graalvm_dynamic/server/pom.xml
+++ b/distribution/src/main/release/samples/jaxws_graalvm_dynamic/server/pom.xml
@@ -66,13 +66,13 @@
             <build>
                 <plugins>
                     <plugin>
-                        <groupId>org.graalvm.nativeimage</groupId>
-                        <artifactId>native-image-maven-plugin</artifactId>
-                        <version>${graalvm.version}</version>
+                        <groupId>org.graalvm.buildtools</groupId>
+                        <artifactId>native-maven-plugin</artifactId>
+                        <version>0.9.19</version>
                         <executions>
                             <execution>
                                 <goals>
-                                    <goal>native-image</goal>
+                                    <goal>compile-no-fork</goal>
                                 </goals>
                                 <phase>package</phase>
                             </execution>
diff --git a/distribution/src/main/release/samples/jaxws_graalvm_dynamic/server/src/main/resources/META-INF/native-image/org.apache.cxf.samples/jaxws_graalvm_dynamic_server/jni-config.json b/distribution/src/main/release/samples/jaxws_graalvm_dynamic/server/src/main/resources/META-INF/native-image/org.apache.cxf.samples/jaxws_graalvm_dynamic_server/jni-config.json
index 0218ccbee6..086802cc08 100644
--- a/distribution/src/main/release/samples/jaxws_graalvm_dynamic/server/src/main/resources/META-INF/native-image/org.apache.cxf.samples/jaxws_graalvm_dynamic_server/jni-config.json
+++ b/distribution/src/main/release/samples/jaxws_graalvm_dynamic/server/src/main/resources/META-INF/native-image/org.apache.cxf.samples/jaxws_graalvm_dynamic_server/jni-config.json
@@ -1,10 +1,7 @@
 [
 {
-  "name":"java.lang.ClassLoader",
-  "methods":[{"name":"getPlatformClassLoader","parameterTypes":[] }]
-},
-{
-  "name":"java.lang.NoSuchMethodError"
+  "name":"java.lang.Boolean",
+  "methods":[{"name":"getBoolean","parameterTypes":["java.lang.String"] }]
 },
 {
   "name":"sun.management.VMManagementImpl",
diff --git a/distribution/src/main/release/samples/jaxws_graalvm_dynamic/server/src/main/resources/META-INF/native-image/org.apache.cxf.samples/jaxws_graalvm_dynamic_server/proxy-config.json b/distribution/src/main/release/samples/jaxws_graalvm_dynamic/server/src/main/resources/META-INF/native-image/org.apache.cxf.samples/jaxws_graalvm_dynamic_server/proxy-config.json
index 9e5ed4d9b0..04e59febcd 100644
--- a/distribution/src/main/release/samples/jaxws_graalvm_dynamic/server/src/main/resources/META-INF/native-image/org.apache.cxf.samples/jaxws_graalvm_dynamic_server/proxy-config.json
+++ b/distribution/src/main/release/samples/jaxws_graalvm_dynamic/server/src/main/resources/META-INF/native-image/org.apache.cxf.samples/jaxws_graalvm_dynamic_server/proxy-config.json
@@ -1,22 +1,62 @@
 [
-  ["com.sun.xml.bind.marshaller.CharacterEscapeHandler"],
-  ["com.sun.xml.bind.v2.schemagen.xmlschema.ComplexType"],
-  ["com.sun.xml.bind.v2.schemagen.xmlschema.ContentModelContainer"],
-  ["com.sun.xml.bind.v2.schemagen.xmlschema.LocalElement"],
-  ["com.sun.xml.bind.v2.schemagen.xmlschema.Particle"],
-  ["com.sun.xml.bind.v2.schemagen.xmlschema.Schema"],
-  ["com.sun.xml.bind.v2.schemagen.xmlschema.TopLevelElement"],
-  ["javax.xml.bind.annotation.XmlAccessorType","com.sun.xml.bind.v2.model.annotation.Locatable"],
-  ["javax.xml.bind.annotation.XmlRegistry","com.sun.xml.bind.v2.model.annotation.Locatable"],
-  ["org.apache.cxf.binding.soap.wsdl.extensions.SoapAddress"],
-  ["org.apache.cxf.binding.soap.wsdl.extensions.SoapBinding"],
-  ["org.apache.cxf.binding.soap.wsdl.extensions.SoapBody"],
-  ["org.apache.cxf.binding.soap.wsdl.extensions.SoapFault"],
-  ["org.apache.cxf.binding.soap.wsdl.extensions.SoapOperation"],
-  ["org.apache.cxf.common.jaxb.JAXBBeanInfo"],
-  ["org.apache.cxf.common.jaxb.JAXBContextProxy"],
-  ["org.apache.cxf.common.util.ASMHelper$AnnotationVisitor"],
-  ["org.apache.cxf.common.util.ASMHelper$ClassWriter"],
-  ["org.apache.cxf.common.util.ASMHelper$FieldVisitor"],
-  ["org.apache.cxf.common.util.ASMHelper$MethodVisitor"]
+  {
+    "interfaces":["com.sun.xml.bind.marshaller.CharacterEscapeHandler"]
+  },
+  {
+    "interfaces":["com.sun.xml.bind.v2.schemagen.xmlschema.ComplexType"]
+  },
+  {
+    "interfaces":["com.sun.xml.bind.v2.schemagen.xmlschema.ContentModelContainer"]
+  },
+  {
+    "interfaces":["com.sun.xml.bind.v2.schemagen.xmlschema.LocalElement"]
+  },
+  {
+    "interfaces":["com.sun.xml.bind.v2.schemagen.xmlschema.Particle"]
+  },
+  {
+    "interfaces":["com.sun.xml.bind.v2.schemagen.xmlschema.Schema"]
+  },
+  {
+    "interfaces":["com.sun.xml.bind.v2.schemagen.xmlschema.TopLevelElement"]
+  },
+  {
+    "interfaces":["javax.xml.bind.annotation.XmlAccessorType","com.sun.xml.bind.v2.model.annotation.Locatable"]
+  },
+  {
+    "interfaces":["javax.xml.bind.annotation.XmlRegistry","com.sun.xml.bind.v2.model.annotation.Locatable"]
+  },
+  {
+    "interfaces":["org.apache.cxf.binding.soap.wsdl.extensions.SoapAddress"]
+  },
+  {
+    "interfaces":["org.apache.cxf.binding.soap.wsdl.extensions.SoapBinding"]
+  },
+  {
+    "interfaces":["org.apache.cxf.binding.soap.wsdl.extensions.SoapBody"]
+  },
+  {
+    "interfaces":["org.apache.cxf.binding.soap.wsdl.extensions.SoapFault"]
+  },
+  {
+    "interfaces":["org.apache.cxf.binding.soap.wsdl.extensions.SoapOperation"]
+  },
+  {
+    "interfaces":["org.apache.cxf.common.jaxb.JAXBBeanInfo"]
+  },
+  {
+    "interfaces":["org.apache.cxf.common.jaxb.JAXBContextProxy"]
+  },
+  {
+    "interfaces":["org.apache.cxf.common.util.ASMHelper$AnnotationVisitor"]
+  },
+  {
+    "interfaces":["org.apache.cxf.common.util.ASMHelper$ClassWriter"]
+  },
+  {
+    "interfaces":["org.apache.cxf.common.util.ASMHelper$FieldVisitor"]
+  },
+  {
+    "interfaces":["org.apache.cxf.common.util.ASMHelper$MethodVisitor"]
+  }
 ]
diff --git a/distribution/src/main/release/samples/jaxws_graalvm_dynamic/server/src/main/resources/META-INF/native-image/org.apache.cxf.samples/jaxws_graalvm_dynamic_server/reflect-config.json b/distribution/src/main/release/samples/jaxws_graalvm_dynamic/server/src/main/resources/META-INF/native-image/org.apache.cxf.samples/jaxws_graalvm_dynamic_server/reflect-config.json
index 681100092b..3b3a661858 100644
--- a/distribution/src/main/release/samples/jaxws_graalvm_dynamic/server/src/main/resources/META-INF/native-image/org.apache.cxf.samples/jaxws_graalvm_dynamic_server/reflect-config.json
+++ b/distribution/src/main/release/samples/jaxws_graalvm_dynamic/server/src/main/resources/META-INF/native-image/org.apache.cxf.samples/jaxws_graalvm_dynamic_server/reflect-config.json
@@ -1,6 +1,6 @@
 [
 {
-  "name":"char[]"
+  "name":"[C"
 },
 {
   "name":"com.ibm.wsdl.extensions.soap.SOAPAddressImpl",
@@ -36,7 +36,8 @@
 },
 {
   "name":"com.sun.xml.bind.marshaller.CharacterEscapeHandler",
-  "allPublicMethods":true
+  "queryAllPublicMethods":true,
+  "methods":[{"name":"escape","parameterTypes":["char[]","int","int","boolean","java.io.Writer"] }]
 },
 {
   "name":"com.sun.xml.bind.marshaller.MinimumEscapeHandler",
@@ -48,7 +49,7 @@
 },
 {
   "name":"com.sun.xml.bind.v2.ContextFactory",
-  "methods":[{"name":"createContext","parameterTypes":["java.lang.Class[]", "java.util.Map"]}]
+  "methods":[{"name":"createContext","parameterTypes":["java.lang.Class[]","java.util.Map"] }]
 },
 {
   "name":"com.sun.xml.bind.v2.model.nav.ReflectionNavigator",
@@ -77,31 +78,33 @@
 },
 {
   "name":"com.sun.xml.bind.v2.runtime.property.ArrayElementLeafProperty",
-  "allPublicConstructors":true
+  "queryAllPublicConstructors":true
 },
 {
   "name":"com.sun.xml.bind.v2.runtime.property.ArrayElementNodeProperty",
-  "allPublicConstructors":true
+  "queryAllPublicConstructors":true
 },
 {
   "name":"com.sun.xml.bind.v2.runtime.property.ArrayReferenceNodeProperty",
-  "allPublicConstructors":true
+  "queryAllPublicConstructors":true
 },
 {
   "name":"com.sun.xml.bind.v2.runtime.property.SingleElementLeafProperty",
-  "allPublicConstructors":true
+  "queryAllPublicConstructors":true,
+  "methods":[{"name":"<init>","parameterTypes":["com.sun.xml.bind.v2.runtime.JAXBContextImpl","com.sun.xml.bind.v2.model.runtime.RuntimeElementPropertyInfo"] }]
 },
 {
   "name":"com.sun.xml.bind.v2.runtime.property.SingleElementNodeProperty",
-  "allPublicConstructors":true
+  "queryAllPublicConstructors":true,
+  "methods":[{"name":"<init>","parameterTypes":["com.sun.xml.bind.v2.runtime.JAXBContextImpl","com.sun.xml.bind.v2.model.runtime.RuntimeElementPropertyInfo"] }]
 },
 {
   "name":"com.sun.xml.bind.v2.runtime.property.SingleMapNodeProperty",
-  "allPublicConstructors":true
+  "queryAllPublicConstructors":true
 },
 {
   "name":"com.sun.xml.bind.v2.runtime.property.SingleReferenceNodeProperty",
-  "allPublicConstructors":true
+  "queryAllPublicConstructors":true
 },
 {
   "name":"com.sun.xml.bind.v2.runtime.unmarshaller.StAXExConnector",
@@ -109,17 +112,29 @@
 },
 {
   "name":"com.sun.xml.messaging.saaj.soap.SOAPDocumentImpl",
-  "allPublicMethods":true
+  "queryAllPublicMethods":true
+},
+{
+  "name":"com.sun.xml.txw2.TypedXmlWriter",
+  "methods":[
+    {"name":"_attribute","parameterTypes":["java.lang.String","java.lang.Object"] }, 
+    {"name":"_cast","parameterTypes":["java.lang.Class"] }, 
+    {"name":"_element","parameterTypes":["java.lang.String","java.lang.Class"] }, 
+    {"name":"_namespace","parameterTypes":["java.lang.String","java.lang.String"] }, 
+    {"name":"_pcdata","parameterTypes":["java.lang.Object"] }, 
+    {"name":"commit","parameterTypes":[] }
+  ]
 },
 {
   "name":"demo.jaxws.server.AddNumbersImpl",
   "allDeclaredFields":true,
-  "allDeclaredMethods":true,
-  "allPublicMethods":true
+  "queryAllDeclaredMethods":true,
+  "queryAllPublicMethods":true,
+  "methods":[{"name":"addNumbers","parameterTypes":["int","int"] }]
 },
 {
   "name":"int",
-  "allDeclaredConstructors":true
+  "queryAllDeclaredConstructors":true
 },
 {
   "name":"io.netty.bootstrap.ServerBootstrap$1"
@@ -133,11 +148,11 @@
 },
 {
   "name":"io.netty.buffer.AbstractByteBufAllocator",
-  "allDeclaredMethods":true
+  "queryAllDeclaredMethods":true
 },
 {
   "name":"io.netty.buffer.AbstractReferenceCountedByteBuf",
-  "fields":[{"name":"refCnt", "allowUnsafeAccess":true}]
+  "fields":[{"name":"refCnt"}]
 },
 {
   "name":"io.netty.channel.ChannelDuplexHandler",
@@ -254,10 +269,6 @@
   "name":"io.netty.handler.codec.MessageToMessageDecoder",
   "methods":[{"name":"channelRead","parameterTypes":["io.netty.channel.ChannelHandlerContext","java.lang.Object"] }]
 },
-{
-  "name":"io.netty.handler.codec.MessageToMessageEncoder",
-  "methods":[{"name":"write","parameterTypes":["io.netty.channel.ChannelHandlerContext","java.lang.Object","io.netty.channel.ChannelPromise"] }]
-},
 {
   "name":"io.netty.handler.codec.http.HttpContentCompressor"
 },
@@ -272,6 +283,10 @@
   "name":"io.netty.handler.codec.http.HttpObjectDecoder",
   "methods":[{"name":"userEventTriggered","parameterTypes":["io.netty.channel.ChannelHandlerContext","java.lang.Object"] }]
 },
+{
+  "name":"io.netty.handler.codec.http.HttpObjectEncoder",
+  "methods":[{"name":"write","parameterTypes":["io.netty.channel.ChannelHandlerContext","java.lang.Object","io.netty.channel.ChannelPromise"] }]
+},
 {
   "name":"io.netty.handler.codec.http.HttpRequestDecoder"
 },
@@ -291,31 +306,31 @@
 },
 {
   "name":"io.netty.util.ReferenceCountUtil",
-  "allDeclaredMethods":true
+  "queryAllDeclaredMethods":true
 },
 {
   "name":"io.netty.util.internal.shaded.org.jctools.queues.BaseMpscLinkedArrayQueueColdProducerFields",
-  "fields":[{"name":"producerLimit", "allowUnsafeAccess":true}]
+  "fields":[{"name":"producerLimit"}]
 },
 {
   "name":"io.netty.util.internal.shaded.org.jctools.queues.BaseMpscLinkedArrayQueueConsumerFields",
-  "fields":[{"name":"consumerIndex", "allowUnsafeAccess":true}]
+  "fields":[{"name":"consumerIndex"}]
 },
 {
   "name":"io.netty.util.internal.shaded.org.jctools.queues.BaseMpscLinkedArrayQueueProducerFields",
-  "fields":[{"name":"producerIndex", "allowUnsafeAccess":true}]
+  "fields":[{"name":"producerIndex"}]
 },
 {
   "name":"io.netty.util.internal.shaded.org.jctools.queues.MpscArrayQueueConsumerIndexField",
-  "fields":[{"name":"consumerIndex", "allowUnsafeAccess":true}]
+  "fields":[{"name":"consumerIndex"}]
 },
 {
   "name":"io.netty.util.internal.shaded.org.jctools.queues.MpscArrayQueueProducerIndexField",
-  "fields":[{"name":"producerIndex", "allowUnsafeAccess":true}]
+  "fields":[{"name":"producerIndex"}]
 },
 {
   "name":"io.netty.util.internal.shaded.org.jctools.queues.MpscArrayQueueProducerLimitField",
-  "fields":[{"name":"producerLimit", "allowUnsafeAccess":true}]
+  "fields":[{"name":"producerLimit"}]
 },
 {
   "name":"java.io.Writer"
@@ -323,7 +338,14 @@
 {
   "name":"java.lang.Object",
   "allDeclaredFields":true,
-  "allDeclaredMethods":true
+  "queryAllDeclaredMethods":true
+},
+{
+  "name":"java.lang.ProcessHandle",
+  "methods":[
+    {"name":"current","parameterTypes":[] }, 
+    {"name":"pid","parameterTypes":[] }
+  ]
 },
 {
   "name":"java.lang.management.ManagementFactory",
@@ -331,10 +353,7 @@
 },
 {
   "name":"java.lang.management.RuntimeMXBean",
-  "methods":[
-    {"name":"getInputArguments","parameterTypes":[] }, 
-    {"name":"getName","parameterTypes":[] }
-  ]
+  "methods":[{"name":"getInputArguments","parameterTypes":[] }]
 },
 {
   "name":"java.nio.Bits",
@@ -342,7 +361,11 @@
 },
 {
   "name":"java.nio.Buffer",
-  "fields":[{"name":"address", "allowUnsafeAccess":true}]
+  "fields":[{"name":"address"}]
+},
+{
+  "name":"java.nio.ByteBuffer",
+  "methods":[{"name":"alignedSlice","parameterTypes":["int"] }]
 },
 {
   "name":"java.nio.DirectByteBuffer",
@@ -354,11 +377,49 @@
 {
   "name":"java.security.SecureRandomParameters"
 },
+{
+  "name":"javax.security.auth.Policy"
+},
 {
   "name":"javax.security.auth.login.Configuration"
 },
 {
-  "name":"javax.xml.bind.annotation.XmlAccessorType"
+  "name":"javax.wsdl.extensions.ExtensibilityElement",
+  "methods":[{"name":"getElementType","parameterTypes":[] }]
+},
+{
+  "name":"javax.wsdl.extensions.soap.SOAPAddress",
+  "methods":[{"name":"setLocationURI","parameterTypes":["java.lang.String"] }]
+},
+{
+  "name":"javax.wsdl.extensions.soap.SOAPBinding",
+  "methods":[
+    {"name":"setStyle","parameterTypes":["java.lang.String"] }, 
+    {"name":"setTransportURI","parameterTypes":["java.lang.String"] }
+  ]
+},
+{
+  "name":"javax.wsdl.extensions.soap.SOAPBody",
+  "methods":[{"name":"setUse","parameterTypes":["java.lang.String"] }]
+},
+{
+  "name":"javax.wsdl.extensions.soap.SOAPFault",
+  "methods":[
+    {"name":"setName","parameterTypes":["java.lang.String"] }, 
+    {"name":"setUse","parameterTypes":["java.lang.String"] }
+  ]
+},
+{
+  "name":"javax.wsdl.extensions.soap.SOAPOperation",
+  "methods":[
+    {"name":"getStyle","parameterTypes":[] }, 
+    {"name":"setSoapActionURI","parameterTypes":["java.lang.String"] }, 
+    {"name":"setStyle","parameterTypes":["java.lang.String"] }
+  ]
+},
+{
+  "name":"javax.xml.bind.annotation.XmlAccessorType",
+  "methods":[{"name":"value","parameterTypes":[] }]
 },
 {
   "name":"javax.xml.bind.annotation.XmlElement",
@@ -391,6 +452,9 @@
   "name":"jdk.internal.misc.Unsafe",
   "methods":[{"name":"getUnsafe","parameterTypes":[] }]
 },
+{
+  "name":"org.apache.axiom.om.OMElement"
+},
 {
   "name":"org.apache.cxf.binding.AbstractBindingFactory",
   "fields":[{"name":"bus"}]
@@ -415,7 +479,7 @@
 },
 {
   "name":"org.apache.cxf.bindings.xformat.ObjectFactory",
-  "allDeclaredMethods":true
+  "queryAllDeclaredMethods":true
 },
 {
   "name":"org.apache.cxf.bindings.xformat.XMLBindingMessageFormat",
@@ -473,8 +537,8 @@
 {
   "name":"org.apache.cxf.common.util.ASMHelperImpl",
   "allDeclaredFields":true,
-  "allDeclaredMethods":true,
-  "allPublicMethods":true,
+  "queryAllDeclaredMethods":true,
+  "queryAllPublicMethods":true,
   "methods":[{"name":"<init>","parameterTypes":[] }]
 },
 {
@@ -503,15 +567,15 @@
 {
   "name":"org.apache.cxf.ext.logging.LoggingFactoryBeanListener",
   "allDeclaredFields":true,
-  "allDeclaredMethods":true,
-  "allPublicMethods":true,
+  "queryAllDeclaredMethods":true,
+  "queryAllPublicMethods":true,
   "methods":[{"name":"<init>","parameterTypes":[] }]
 },
 {
   "name":"org.apache.cxf.ext.logging.OldLoggingFactoryBeanListener",
   "allDeclaredFields":true,
-  "allDeclaredMethods":true,
-  "allPublicMethods":true,
+  "queryAllDeclaredMethods":true,
+  "queryAllPublicMethods":true,
   "methods":[{"name":"<init>","parameterTypes":["org.apache.cxf.Bus"] }]
 },
 {
@@ -527,8 +591,8 @@
 {
   "name":"org.apache.cxf.jaxb.WrapperHelperProxyService",
   "allDeclaredFields":true,
-  "allDeclaredMethods":true,
-  "allPublicMethods":true,
+  "queryAllDeclaredMethods":true,
+  "queryAllPublicMethods":true,
   "methods":[{"name":"<init>","parameterTypes":["org.apache.cxf.Bus"] }]
 },
 {
@@ -542,8 +606,8 @@
 {
   "name":"org.apache.cxf.jaxws.spi.WrapperClassCreatorProxyService",
   "allDeclaredFields":true,
-  "allDeclaredMethods":true,
-  "allPublicMethods":true,
+  "queryAllDeclaredMethods":true,
+  "queryAllPublicMethods":true,
   "methods":[{"name":"<init>","parameterTypes":["org.apache.cxf.Bus"] }]
 },
 {
@@ -610,7 +674,7 @@
 },
 {
   "name":"org.apache.cxf.transports.http.configuration.ObjectFactory",
-  "allDeclaredMethods":true
+  "queryAllDeclaredMethods":true
 },
 {
   "name":"org.apache.cxf.ws.addressing.impl.AddressingFeatureApplier"
@@ -633,7 +697,7 @@
 },
 {
   "name":"org.apache.cxf.ws.addressing.wsdl.ObjectFactory",
-  "allDeclaredMethods":true
+  "queryAllDeclaredMethods":true
 },
 {
   "name":"org.apache.cxf.ws.addressing.wsdl.UsingAddressing",
@@ -650,8 +714,8 @@
 {
   "name":"org.apache.cxf.ws.policy.PolicyAnnotationListener",
   "allDeclaredFields":true,
-  "allDeclaredMethods":true,
-  "allPublicMethods":true,
+  "queryAllDeclaredMethods":true,
+  "queryAllPublicMethods":true,
   "methods":[{"name":"<init>","parameterTypes":["org.apache.cxf.Bus"] }]
 },
 {
@@ -664,8 +728,8 @@
 {
   "name":"org.apache.cxf.ws.policy.PolicyDataEngineImpl",
   "allDeclaredFields":true,
-  "allDeclaredMethods":true,
-  "allPublicMethods":true,
+  "queryAllDeclaredMethods":true,
+  "queryAllPublicMethods":true,
   "methods":[{"name":"<init>","parameterTypes":["org.apache.cxf.Bus"] }]
 },
 {
@@ -713,8 +777,8 @@
 {
   "name":"org.apache.cxf.wsdl.ExtensionClassCreatorProxyService",
   "allDeclaredFields":true,
-  "allDeclaredMethods":true,
-  "allPublicMethods":true,
+  "queryAllDeclaredMethods":true,
+  "queryAllPublicMethods":true,
   "methods":[{"name":"<init>","parameterTypes":["org.apache.cxf.Bus"] }]
 },
 {
@@ -726,17 +790,20 @@
 },
 {
   "name":"org.apache.cxf.wsdl.http.ObjectFactory",
-  "allDeclaredMethods":true
+  "queryAllDeclaredMethods":true
 },
 {
   "name":"org.apache.cxf.wsdl11.WSDLManagerImpl",
   "allDeclaredFields":true,
-  "allDeclaredMethods":true,
-  "methods":[{"name":"<init>","parameterTypes":[] }]
+  "queryAllDeclaredMethods":true,
+  "methods":[
+    {"name":"<init>","parameterTypes":[] }, 
+    {"name":"setBus","parameterTypes":["org.apache.cxf.Bus"] }
+  ]
 },
 {
   "name":"org.apache.handlers.AddNumbers",
-  "allPublicMethods":true
+  "queryAllPublicMethods":true
 },
 {
   "name":"org.apache.handlers.AddNumbersFault",
@@ -745,29 +812,43 @@
 {
   "name":"org.apache.handlers.types.AddNumbers",
   "allDeclaredFields":true,
-  "allDeclaredMethods":true,
-  "allPublicMethods":true,
-  "methods":[{"name":"<init>","parameterTypes":[] }]
+  "queryAllDeclaredMethods":true,
+  "queryAllPublicMethods":true,
+  "methods":[
+    {"name":"<init>","parameterTypes":[] }, 
+    {"name":"getArg0","parameterTypes":[] }, 
+    {"name":"getArg1","parameterTypes":[] }
+  ]
 },
 {
   "name":"org.apache.handlers.types.AddNumbersResponse",
   "allDeclaredFields":true,
-  "allDeclaredMethods":true,
-  "allPublicMethods":true,
-  "methods":[{"name":"<init>","parameterTypes":[] }]
+  "queryAllDeclaredMethods":true,
+  "queryAllPublicMethods":true,
+  "methods":[
+    {"name":"<init>","parameterTypes":[] }, 
+    {"name":"getReturn","parameterTypes":[] }, 
+    {"name":"setReturn","parameterTypes":["int"] }
+  ]
 },
 {
   "name":"org.apache.handlers.types.FaultDetail",
   "allDeclaredFields":true,
-  "allDeclaredMethods":true,
+  "queryAllDeclaredMethods":true,
   "methods":[{"name":"<init>","parameterTypes":[] }]
 },
 {
   "name":"org.apache.handlers.types.ObjectFactory",
-  "allDeclaredMethods":true,
-  "allPublicMethods":true,
+  "queryAllDeclaredMethods":true,
+  "queryAllPublicMethods":true,
   "methods":[{"name":"<init>","parameterTypes":[] }]
 },
+{
+  "name":"org.jvnet.fastinfoset.stax.FastInfosetStreamReader"
+},
+{
+  "name":"org.jvnet.fastinfoset.stax.LowLevelFastInfosetStreamWriter"
+},
 {
   "name":"org.jvnet.staxex.XMLStreamReaderEx"
 },
@@ -808,7 +889,25 @@
 },
 {
   "name":"org.objectweb.asm.MethodWriter",
-  "allPublicMethods":true
+  "queryAllPublicMethods":true,
+  "methods":[
+    {"name":"visitAnnotation","parameterTypes":["java.lang.String","boolean"] }, 
+    {"name":"visitCode","parameterTypes":[] }, 
+    {"name":"visitEnd","parameterTypes":[] }, 
+    {"name":"visitFieldInsn","parameterTypes":["int","java.lang.String","java.lang.String","java.lang.String"] }, 
+    {"name":"visitFrame","parameterTypes":["int","int","java.lang.Object[]","int","java.lang.Object[]"] }, 
+    {"name":"visitInsn","parameterTypes":["int"] }, 
+    {"name":"visitIntInsn","parameterTypes":["int","int"] }, 
+    {"name":"visitJumpInsn","parameterTypes":["int","org.objectweb.asm.Label"] }, 
+    {"name":"visitLabel","parameterTypes":["org.objectweb.asm.Label"] }, 
+    {"name":"visitLdcInsn","parameterTypes":["java.lang.Object"] }, 
+    {"name":"visitLineNumber","parameterTypes":["int","org.objectweb.asm.Label"] }, 
+    {"name":"visitLocalVariable","parameterTypes":["java.lang.String","java.lang.String","java.lang.String","org.objectweb.asm.Label","org.objectweb.asm.Label","int"] }, 
+    {"name":"visitMaxs","parameterTypes":["int","int"] }, 
+    {"name":"visitMethodInsn","parameterTypes":["int","java.lang.String","java.lang.String","java.lang.String","boolean"] }, 
+    {"name":"visitTypeInsn","parameterTypes":["int","java.lang.String"] }, 
+    {"name":"visitVarInsn","parameterTypes":["int","int"] }
+  ]
 },
 {
   "name":"org.objectweb.asm.Opcodes",
@@ -881,6 +980,9 @@
 {
   "name":"org.w3c.dom.UserDataHandler"
 },
+{
+  "name":"sun.misc.GC"
+},
 {
   "name":"sun.misc.Unsafe",
   "fields":[{"name":"theUnsafe"}],
@@ -888,14 +990,18 @@
     {"name":"copyMemory","parameterTypes":["java.lang.Object","long","java.lang.Object","long","long"] }, 
     {"name":"getAndAddLong","parameterTypes":["java.lang.Object","long","long"] }, 
     {"name":"getAndSetObject","parameterTypes":["java.lang.Object","long","java.lang.Object"] }, 
-    {"name":"invokeCleaner","parameterTypes":["java.nio.ByteBuffer"] }
+    {"name":"invokeCleaner","parameterTypes":["java.nio.ByteBuffer"] }, 
+    {"name":"storeFence","parameterTypes":[] }
   ]
 },
+{
+  "name":"sun.misc.VM"
+},
 {
   "name":"sun.nio.ch.SelectorImpl",
   "fields":[
-    {"name":"publicSelectedKeys", "allowUnsafeAccess":true}, 
-    {"name":"selectedKeys", "allowUnsafeAccess":true}
+    {"name":"publicSelectedKeys"}, 
+    {"name":"selectedKeys"}
   ]
 },
 {
diff --git a/distribution/src/main/release/samples/jaxws_graalvm_dynamic/server/src/main/resources/META-INF/native-image/org.apache.cxf.samples/jaxws_graalvm_dynamic_server/resource-config.json b/distribution/src/main/release/samples/jaxws_graalvm_dynamic/server/src/main/resources/META-INF/native-image/org.apache.cxf.samples/jaxws_graalvm_dynamic_server/resource-config.json
index 4de452aca2..55885e2517 100644
--- a/distribution/src/main/release/samples/jaxws_graalvm_dynamic/server/src/main/resources/META-INF/native-image/org.apache.cxf.samples/jaxws_graalvm_dynamic_server/resource-config.json
+++ b/distribution/src/main/release/samples/jaxws_graalvm_dynamic/server/src/main/resources/META-INF/native-image/org.apache.cxf.samples/jaxws_graalvm_dynamic_server/resource-config.json
@@ -1,56 +1,190 @@
 {
   "resources":{
   "includes":[
-    {"pattern":"\\QMETA-INF/cxf/bus-extensions.txt\\E"}, 
-    {"pattern":"\\QMETA-INF/io.netty.versions.properties\\E"}, 
-    {"pattern":"\\QMETA-INF/mailcap.default\\E"}, 
-    {"pattern":"\\QMETA-INF/services/javax.xml.bind.JAXBContextFactory\\E"}, 
-    {"pattern":"\\QMETA-INF/services/javax.xml.stream.XMLEventFactory\\E"}, 
-    {"pattern":"\\QMETA-INF/services/javax.xml.stream.XMLInputFactory\\E"}, 
-    {"pattern":"\\QMETA-INF/services/javax.xml.stream.XMLOutputFactory\\E"}, 
-    {"pattern":"\\QMETA-INF/services/javax.xml.ws.spi.Provider\\E"}, 
-    {"pattern":"\\Qorg/apache/cxf/version/version.properties\\E"}, 
-    {"pattern":"\\Qorg/slf4j/impl/StaticLoggerBinder.class\\E"}, 
-    {"pattern":"\\Qschemas/wsdl/ws-addr-wsdl.xsd\\E"}, 
-    {"pattern":"\\Qschemas/wsdl/ws-addr.xsd\\E"}, 
-    {"pattern":"\\Qschemas/wsdl/wsrm.xsd\\E"}
+    {
+      "pattern":"\\QMETA-INF/cxf/bus-extensions.txt\\E"
+    }, 
+    {
+      "pattern":"\\QMETA-INF/io.netty.versions.properties\\E"
+    }, 
+    {
+      "pattern":"\\QMETA-INF/mailcap.default\\E"
+    }, 
+    {
+      "pattern":"\\QMETA-INF/services/javax.xml.bind.JAXBContext\\E"
+    }, 
+    {
+      "pattern":"\\QMETA-INF/services/javax.xml.stream.XMLEventFactory\\E"
+    }, 
+    {
+      "pattern":"\\QMETA-INF/services/javax.xml.stream.XMLInputFactory\\E"
+    }, 
+    {
+      "pattern":"\\QMETA-INF/services/javax.xml.stream.XMLOutputFactory\\E"
+    }, 
+    {
+      "pattern":"\\QMETA-INF/services/javax.xml.ws.spi.Provider\\E"
+    }, 
+    {
+      "pattern":"\\Qorg/apache/cxf/version/version.properties\\E"
+    }, 
+    {
+      "pattern":"\\Qorg/slf4j/impl/StaticLoggerBinder.class\\E"
+    }, 
+    {
+      "pattern":"\\Qschemas/wsdl/ws-addr-wsdl.xsd\\E"
+    }, 
+    {
+      "pattern":"\\Qschemas/wsdl/ws-addr.xsd\\E"
+    }, 
+    {
+      "pattern":"\\Qschemas/wsdl/wsrm.xsd\\E"
+    }
   ]},
   "bundles":[
-    {"name":"javax.servlet.LocalStrings"}, 
-    {"name":"org.apache.cxf.Messages"}, 
-    {"name":"org.apache.cxf.binding.soap.interceptor.Messages"}, 
-    {"name":"org.apache.cxf.binding.soap.saaj.Messages"}, 
-    {"name":"org.apache.cxf.bus.extension.Messages"}, 
-    {"name":"org.apache.cxf.bus.managers.Messages"}, 
-    {"name":"org.apache.cxf.common.annotation.Messages"}, 
-    {"name":"org.apache.cxf.common.injection.Messages"}, 
-    {"name":"org.apache.cxf.common.jaxb.Messages"}, 
-    {"name":"org.apache.cxf.common.util.Messages"}, 
-    {"name":"org.apache.cxf.endpoint.Messages"}, 
-    {"name":"org.apache.cxf.frontend.Messages"}, 
-    {"name":"org.apache.cxf.interceptor.Messages"}, 
-    {"name":"org.apache.cxf.jaxb.Messages"}, 
-    {"name":"org.apache.cxf.jaxb.attachment.Messages"}, 
-    {"name":"org.apache.cxf.jaxws.Messages"}, 
-    {"name":"org.apache.cxf.jaxws.binding.soap.Messages"}, 
-    {"name":"org.apache.cxf.jaxws.context.Messages"}, 
-    {"name":"org.apache.cxf.jaxws.handler.Messages"}, 
-    {"name":"org.apache.cxf.jaxws.interceptors.Messages"}, 
-    {"name":"org.apache.cxf.jaxws.spi.Messages"}, 
-    {"name":"org.apache.cxf.jaxws.support.Messages"}, 
-    {"name":"org.apache.cxf.resource.Messages"}, 
-    {"name":"org.apache.cxf.service.factory.Messages"}, 
-    {"name":"org.apache.cxf.service.invoker.Messages"}, 
-    {"name":"org.apache.cxf.service.model.Messages"}, 
-    {"name":"org.apache.cxf.staxutils.Messages"}, 
-    {"name":"org.apache.cxf.transport.http.Messages"}, 
-    {"name":"org.apache.cxf.transport.http.netty.server.Messages"}, 
-    {"name":"org.apache.cxf.transport.https.Messages"}, 
-    {"name":"org.apache.cxf.ws.addressing.Messages"}, 
-    {"name":"org.apache.cxf.ws.policy.Messages"}, 
-    {"name":"org.apache.cxf.ws.policy.attachment.Messages"}, 
-    {"name":"org.apache.cxf.wsdl.Messages"}, 
-    {"name":"org.apache.cxf.wsdl.interceptors.Messages"}, 
-    {"name":"org.apache.cxf.wsdl.service.factory.Messages"}
+    {
+      "name":"javax.servlet.LocalStrings",
+      "locales":[""]
+    }, 
+    {
+      "name":"org.apache.cxf.Messages",
+      "locales":[""]
+    }, 
+    {
+      "name":"org.apache.cxf.binding.soap.interceptor.Messages",
+      "locales":[""]
+    }, 
+    {
+      "name":"org.apache.cxf.binding.soap.saaj.Messages",
+      "locales":[""]
+    }, 
+    {
+      "name":"org.apache.cxf.bus.extension.Messages",
+      "locales":[""]
+    }, 
+    {
+      "name":"org.apache.cxf.bus.managers.Messages",
+      "locales":[""]
+    }, 
+    {
+      "name":"org.apache.cxf.common.annotation.Messages",
+      "locales":[""]
+    }, 
+    {
+      "name":"org.apache.cxf.common.injection.Messages",
+      "locales":[""]
+    }, 
+    {
+      "name":"org.apache.cxf.common.jaxb.Messages",
+      "locales":[""]
+    }, 
+    {
+      "name":"org.apache.cxf.common.util.Messages",
+      "locales":[""]
+    }, 
+    {
+      "name":"org.apache.cxf.endpoint.Messages",
+      "locales":[""]
+    }, 
+    {
+      "name":"org.apache.cxf.frontend.Messages",
+      "locales":[""]
+    }, 
+    {
+      "name":"org.apache.cxf.interceptor.Messages",
+      "locales":[""]
+    }, 
+    {
+      "name":"org.apache.cxf.jaxb.Messages",
+      "locales":[""]
+    }, 
+    {
+      "name":"org.apache.cxf.jaxb.attachment.Messages",
+      "locales":[""]
+    }, 
+    {
+      "name":"org.apache.cxf.jaxws.Messages",
+      "locales":[""]
+    }, 
+    {
+      "name":"org.apache.cxf.jaxws.binding.soap.Messages",
+      "locales":[""]
+    }, 
+    {
+      "name":"org.apache.cxf.jaxws.context.Messages",
+      "locales":[""]
+    }, 
+    {
+      "name":"org.apache.cxf.jaxws.handler.Messages",
+      "locales":[""]
+    }, 
+    {
+      "name":"org.apache.cxf.jaxws.interceptors.Messages",
+      "locales":[""]
+    }, 
+    {
+      "name":"org.apache.cxf.jaxws.spi.Messages",
+      "locales":[""]
+    }, 
+    {
+      "name":"org.apache.cxf.jaxws.support.Messages",
+      "locales":[""]
+    }, 
+    {
+      "name":"org.apache.cxf.resource.Messages",
+      "locales":[""]
+    }, 
+    {
+      "name":"org.apache.cxf.service.factory.Messages",
+      "locales":[""]
+    }, 
+    {
+      "name":"org.apache.cxf.service.invoker.Messages",
+      "locales":[""]
+    }, 
+    {
+      "name":"org.apache.cxf.service.model.Messages",
+      "locales":[""]
+    }, 
+    {
+      "name":"org.apache.cxf.staxutils.Messages",
+      "locales":[""]
+    }, 
+    {
+      "name":"org.apache.cxf.transport.http.Messages",
+      "locales":[""]
+    }, 
+    {
+      "name":"org.apache.cxf.transport.http.netty.server.Messages",
+      "locales":[""]
+    }, 
+    {
+      "name":"org.apache.cxf.transport.https.Messages",
+      "locales":[""]
+    }, 
+    {
+      "name":"org.apache.cxf.ws.addressing.Messages",
+      "locales":[""]
+    }, 
+    {
+      "name":"org.apache.cxf.ws.policy.Messages",
+      "locales":[""]
+    }, 
+    {
+      "name":"org.apache.cxf.ws.policy.attachment.Messages",
+      "locales":[""]
+    }, 
+    {
+      "name":"org.apache.cxf.wsdl.Messages",
+      "locales":[""]
+    }, 
+    {
+      "name":"org.apache.cxf.wsdl.interceptors.Messages",
+      "locales":[""]
+    }, 
+    {
+      "name":"org.apache.cxf.wsdl.service.factory.Messages",
+      "locales":[""]
+    }
   ]
 }
diff --git a/distribution/src/main/release/samples/jaxws_graalvm_dynamic/server/src/main/resources/META-INF/native-image/org.apache.cxf.samples/jaxws_graalvm_dynamic_server/serialization-config.json b/distribution/src/main/release/samples/jaxws_graalvm_dynamic/server/src/main/resources/META-INF/native-image/org.apache.cxf.samples/jaxws_graalvm_dynamic_server/serialization-config.json
index 0d4f101c7a..f3d7e06e33 100644
--- a/distribution/src/main/release/samples/jaxws_graalvm_dynamic/server/src/main/resources/META-INF/native-image/org.apache.cxf.samples/jaxws_graalvm_dynamic_server/serialization-config.json
+++ b/distribution/src/main/release/samples/jaxws_graalvm_dynamic/server/src/main/resources/META-INF/native-image/org.apache.cxf.samples/jaxws_graalvm_dynamic_server/serialization-config.json
@@ -1,2 +1,8 @@
-[
-]
+{
+  "types":[
+  ],
+  "lambdaCapturingTypes":[
+  ],
+  "proxies":[
+  ]
+}
diff --git a/distribution/src/main/release/samples/pom.xml b/distribution/src/main/release/samples/pom.xml
index 249687bd91..ae005dfcfb 100644
--- a/distribution/src/main/release/samples/pom.xml
+++ b/distribution/src/main/release/samples/pom.xml
@@ -38,7 +38,6 @@
         <cxf.swagger.ui.version>4.15.5</cxf.swagger.ui.version>
         <cxf.tika.version>2.6.0</cxf.tika.version>
         <cxf.tomcat.version>9.0.70</cxf.tomcat.version>
-        <graalvm.version>21.1.0</graalvm.version>
         <cxf.lucene.version>9.4.1</cxf.lucene.version>
     </properties>
     <dependencies>