From 743b1660a99fbc16ee5bc13fdf27a98a1773ba54 Mon Sep 17 00:00:00 2001 From: Violeta Georgieva Date: Thu, 14 Nov 2024 18:56:59 +0200 Subject: [PATCH] Depend on Netty v4.1.115.Final (#3511) Add workaround for missing native metadata --- .github/workflows/check_netty_snapshots.yml | 2 +- build.gradle | 2 +- .../META-INF/native-image/reflect-config.json | 35 +++++++++++++++++++ 3 files changed, 37 insertions(+), 2 deletions(-) create mode 100644 reactor-netty-graalvm-smoke-tests/src/test/resources/META-INF/native-image/reflect-config.json diff --git a/.github/workflows/check_netty_snapshots.yml b/.github/workflows/check_netty_snapshots.yml index f2d24afde8..b64d5deabf 100644 --- a/.github/workflows/check_netty_snapshots.yml +++ b/.github/workflows/check_netty_snapshots.yml @@ -29,4 +29,4 @@ jobs: distribution: 'temurin' java-version: '8' - name: Build with Gradle - run: ./gradlew clean check --no-daemon -PforceTransport=${{ matrix.transport }} -PforceNettyVersion='4.1.115.Final-SNAPSHOT' + run: ./gradlew clean check --no-daemon -PforceTransport=${{ matrix.transport }} -PforceNettyVersion='4.1.116.Final-SNAPSHOT' \ No newline at end of file diff --git a/build.gradle b/build.gradle index 677e9a54eb..64caa1c93f 100644 --- a/build.gradle +++ b/build.gradle @@ -109,7 +109,7 @@ ext { logbackVersion = '1.2.13' // Netty - nettyDefaultVersion = '4.1.114.Final' + nettyDefaultVersion = '4.1.115.Final' if (!project.hasProperty("forceNettyVersion")) { nettyVersion = nettyDefaultVersion } 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 new file mode 100644 index 0000000000..c66b7edbd0 --- /dev/null +++ b/reactor-netty-graalvm-smoke-tests/src/test/resources/META-INF/native-image/reflect-config.json @@ -0,0 +1,35 @@ +[ + { + "condition": { + "typeReachable": "io.netty.util.internal.shaded.org.jctools.queues.unpadded.MpscUnpaddedArrayQueueConsumerIndexField" + }, + "name": "io.netty.util.internal.shaded.org.jctools.queues.unpadded.MpscUnpaddedArrayQueueConsumerIndexField", + "fields": [ + { + "name": "consumerIndex" + } + ] + }, + { + "condition": { + "typeReachable": "io.netty.util.internal.shaded.org.jctools.queues.unpadded.MpscUnpaddedArrayQueueProducerIndexField" + }, + "name": "io.netty.util.internal.shaded.org.jctools.queues.unpadded.MpscUnpaddedArrayQueueProducerIndexField", + "fields": [ + { + "name": "producerIndex" + } + ] + }, + { + "condition": { + "typeReachable": "io.netty.util.internal.shaded.org.jctools.queues.unpadded.MpscUnpaddedArrayQueueProducerLimitField" + }, + "name": "io.netty.util.internal.shaded.org.jctools.queues.unpadded.MpscUnpaddedArrayQueueProducerLimitField", + "fields": [ + { + "name": "producerLimit" + } + ] + } +] \ No newline at end of file