diff --git a/reactor-netty-graalvm-smoke-tests/build.gradle b/reactor-netty-graalvm-smoke-tests/build.gradle index e7c9bc76cb..337150d28b 100644 --- a/reactor-netty-graalvm-smoke-tests/build.gradle +++ b/reactor-netty-graalvm-smoke-tests/build.gradle @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 VMware, Inc. or its affiliates, All Rights Reserved. + * Copyright (c) 2023-2024 VMware, Inc. or its affiliates, All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -63,6 +63,7 @@ graalvmNative { } metadataRepository { enabled = true + version = "0.3.6" } } diff --git a/reactor-netty-graalvm-smoke-tests/src/test/resources/META-INF/native-image/jni-config.json b/reactor-netty-graalvm-smoke-tests/src/test/resources/META-INF/native-image/jni-config.json index 8318c0ff9b..89aff7e690 100644 --- a/reactor-netty-graalvm-smoke-tests/src/test/resources/META-INF/native-image/jni-config.json +++ b/reactor-netty-graalvm-smoke-tests/src/test/resources/META-INF/native-image/jni-config.json @@ -1,133 +1,9 @@ [ - { - "condition": { - "typeReachable": "io.netty.channel.kqueue.Native" - }, - "name": "io.netty.channel.ChannelException" - }, - { - "condition": { - "typeReachable": "io.netty.channel.kqueue.Native" - }, - "name": "io.netty.channel.unix.Buffer" - }, - { - "condition": { - "typeReachable": "io.netty.channel.kqueue.Native" - }, - "name": "io.netty.channel.unix.DatagramSocketAddress", - "methods": [ - { - "name": "", - "parameterTypes": [ - "byte[]", - "int", - "int", - "int", - "io.netty.channel.unix.DatagramSocketAddress" - ] - } - ] - }, - { - "condition": { - "typeReachable": "io.netty.channel.kqueue.Native" - }, - "name": "io.netty.channel.unix.DomainDatagramSocketAddress", - "methods": [ - { - "name": "", - "parameterTypes": [ - "byte[]", - "int", - "io.netty.channel.unix.DomainDatagramSocketAddress" - ] - } - ] - }, - { - "condition": { - "typeReachable": "io.netty.channel.kqueue.Native" - }, - "name": "io.netty.channel.unix.ErrorsStaticallyReferencedJniMethods" - }, - { - "condition": { - "typeReachable": "io.netty.channel.kqueue.Native" - }, - "name": "io.netty.channel.unix.FileDescriptor" - }, - { - "condition": { - "typeReachable": "io.netty.channel.kqueue.Native" - }, - "name": "io.netty.channel.unix.LimitsStaticallyReferencedJniMethods" - }, - { - "condition": { - "typeReachable": "io.netty.channel.kqueue.Native" - }, - "name": "io.netty.channel.unix.Socket" - }, - { - "condition": { - "typeReachable": "io.netty.util.internal.NativeLibraryUtil" - }, - "name": "io.netty.channel.DefaultFileRegion", - "fields": [ - { - "name": "file" - }, - { - "name": "transferred" - } - ] - }, - { - "condition": { - "typeReachable": "io.netty.util.internal.NativeLibraryUtil" - }, - "name": "io.netty.channel.kqueue.BsdSocket" - }, - { - "condition": { - "typeReachable": "io.netty.util.internal.NativeLibraryUtil" - }, - "name": "io.netty.channel.kqueue.KQueueEventArray" - }, - { - "condition": { - "typeReachable": "io.netty.util.internal.NativeLibraryUtil" - }, - "name": "io.netty.channel.kqueue.KQueueStaticallyReferencedJniMethods" - }, - { - "condition": { - "typeReachable": "io.netty.util.internal.NativeLibraryUtil" - }, - "name": "io.netty.channel.kqueue.Native" - }, - { - "condition": { - "typeReachable": "io.netty.util.internal.NativeLibraryUtil" - }, - "name": "io.netty.channel.unix.PeerCredentials", - "methods": [ - { - "name": "", - "parameterTypes": [ - "int", - "int", - "int[]" - ] - } - ] - }, - { - "name":"sun.net.dns.ResolverConfigurationImpl", - "fields":[ - {"name":"os_searchlist"}, - {"name":"os_nameservers"} - ] - } + { + "name":"sun.net.dns.ResolverConfigurationImpl", + "fields":[ + {"name":"os_searchlist"}, + {"name":"os_nameservers"} + ] + } ] diff --git a/reactor-netty-graalvm-smoke-tests/src/test/resources/META-INF/native-image/reflect-config.json b/reactor-netty-graalvm-smoke-tests/src/test/resources/META-INF/native-image/reflect-config.json deleted file mode 100644 index a1a6a801ad..0000000000 --- a/reactor-netty-graalvm-smoke-tests/src/test/resources/META-INF/native-image/reflect-config.json +++ /dev/null @@ -1,42 +0,0 @@ -[ - { - "condition": { - "typeReachable": "io.netty.channel.socket.nio.NioServerSocketChannel" - }, - "name": "java.nio.channels.spi.SelectorProvider", - "methods": [ - { - "name": "openServerSocketChannel", - "parameterTypes": [ - "java.net.ProtocolFamily" - ] - } - ] - }, - { - "condition": { - "typeReachable": "io.netty.channel.socket.nio.NioSocketChannel" - }, - "name": "java.nio.channels.spi.SelectorProvider", - "methods": [ - { - "name": "openSocketChannel", - "parameterTypes": [ - "java.net.ProtocolFamily" - ] - } - ] - }, - { - "condition": { - "typeReachable": "io.netty.channel.kqueue.Native" - }, - "name": "io.netty.channel.DefaultFileRegion" - }, - { - "condition": { - "typeReachable": "io.netty.channel.kqueue.Native" - }, - "name": "io.netty.channel.unix.PeerCredentials" - } -] diff --git a/reactor-netty-graalvm-smoke-tests/src/test/resources/META-INF/native-image/resource-config.json b/reactor-netty-graalvm-smoke-tests/src/test/resources/META-INF/native-image/resource-config.json deleted file mode 100644 index 5117c744f6..0000000000 --- a/reactor-netty-graalvm-smoke-tests/src/test/resources/META-INF/native-image/resource-config.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "resources": { - "includes": [ - { - "condition": { - "typeReachable": "io.netty.util.internal.NativeLibraryLoader" - }, - "pattern": "\\QMETA-INF/native/libnetty_transport_native_kqueue_x86_64.jnilib\\E" - }, - { - "condition": { - "typeReachable": "io.netty.util.internal.NativeLibraryLoader" - }, - "pattern": "\\QMETA-INF/native/libnetty_transport_native_kqueue_aarch_64.jnilib\\E" - } - ] - }, - "bundles": [] -}