diff --git a/integration/build.gradle b/integration/build.gradle index 5e8ea931..603fefc7 100644 --- a/integration/build.gradle +++ b/integration/build.gradle @@ -5,14 +5,6 @@ plugins { id 'org.graalvm.buildtools.native' } -graalvmNative { - binaries { - main { - buildArgs.add('--initialize-at-run-time=sun.net.dns.ResolverConfigurationImpl') - } - } -} - dependencies { implementation(platform(org.springframework.boot.gradle.plugin.SpringBootPlugin.BOM_COORDINATES)) implementation('org.springframework.boot:spring-boot-starter-integration') @@ -35,3 +27,13 @@ dependencies { aotSmokeTest { webApplication = true } + +graalvmNative { + binaries { + main { + buildArgs.add("--exclude-config") + buildArgs.add("/netty-.*") + buildArgs.add("META-INF/native-image/.*") + } + } +} diff --git a/integration/src/main/java/com/example/integration/IntegrationApplication.java b/integration/src/main/java/com/example/integration/IntegrationApplication.java index 2960f916..91030c93 100644 --- a/integration/src/main/java/com/example/integration/IntegrationApplication.java +++ b/integration/src/main/java/com/example/integration/IntegrationApplication.java @@ -5,8 +5,6 @@ import java.util.Date; import javax.sql.DataSource; -import org.springframework.aot.smoketest.thirdpartyhints.NettyRuntimeHints; -import org.springframework.aot.smoketest.thirdpartyhints.ReactorNettyHints; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.context.annotation.Bean; @@ -42,7 +40,6 @@ import io.micrometer.core.instrument.simple.SimpleMeterRegistry; @EnableMessageHistory("dateChannel") @EnableIntegrationManagement @EnableIntegrationGraphController("/integration-graph") -@ImportRuntimeHints({ NettyRuntimeHints.class, ReactorNettyHints.class, InterimRuntimeHints.class }) public class IntegrationApplication { public static void main(String[] args) { diff --git a/integration/src/main/java/com/example/integration/InterimRuntimeHints.java b/integration/src/main/java/com/example/integration/InterimRuntimeHints.java deleted file mode 100644 index 62827ccf..00000000 --- a/integration/src/main/java/com/example/integration/InterimRuntimeHints.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.example.integration; - -import org.springframework.aot.hint.MemberCategory; -import org.springframework.aot.hint.RuntimeHints; -import org.springframework.aot.hint.RuntimeHintsRegistrar; -import org.springframework.aot.hint.TypeReference; - -public class InterimRuntimeHints implements RuntimeHintsRegistrar { - - @Override - public void registerHints(RuntimeHints hints, ClassLoader classLoader) { - hints.reflection().registerType(TypeReference.of("org.springframework.data.redis.core.DefaultListOperations"), - hint -> hint.withMembers(MemberCategory.INVOKE_PUBLIC_METHODS)); - } - -} diff --git a/integration/src/main/resources/META-INF/native-image/spring-aot-smoke-tests/integration/jni-config.json b/integration/src/main/resources/META-INF/native-image/spring-aot-smoke-tests/integration/jni-config.json deleted file mode 100644 index 89aff7e6..00000000 --- a/integration/src/main/resources/META-INF/native-image/spring-aot-smoke-tests/integration/jni-config.json +++ /dev/null @@ -1,9 +0,0 @@ -[ - { - "name":"sun.net.dns.ResolverConfigurationImpl", - "fields":[ - {"name":"os_searchlist"}, - {"name":"os_nameservers"} - ] - } -] diff --git a/integration/src/main/resources/application.properties b/integration/src/main/resources/application.properties index 14d24ae9..491d78fe 100644 --- a/integration/src/main/resources/application.properties +++ b/integration/src/main/resources/application.properties @@ -1,5 +1,3 @@ spring.integration.endpoint.no-auto-startup=dateSourceEndpoint -logging.level.tracing.data=trace -logging.level.org.springframework.integration=debug spring.data.redis.host=${REDIS_HOST:localhost} spring.data.redis.port=${REDIS_PORT_6379:6379} diff --git a/settings.gradle b/settings.gradle index 48a0f70f..ba89d898 100644 --- a/settings.gradle +++ b/settings.gradle @@ -68,11 +68,11 @@ include "flyway" include "freemarker-webflux" include "freemarker-webmvc" include "hateoas" +include "integration" include "jdbc-h2" include "jdbc-mariadb" include "jdbc-mysql" include "jdbc-postgresql" -include "integration" include "ldap-odm" include "liquibase" include "logging-log4j2"