From c00e885ac4e59f5d4ad949ec1d435e6426315c44 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 14 Jul 2021 18:28:24 +0100 Subject: [PATCH] Work around compile warnings from Data Neo4j's use of API Guardian See gh-27170 --- spring-boot-project/spring-boot-autoconfigure/build.gradle | 1 + spring-boot-project/spring-boot-parent/build.gradle | 7 +++++++ .../spring-boot-smoke-test-data-neo4j/build.gradle | 1 + 3 files changed, 9 insertions(+) diff --git a/spring-boot-project/spring-boot-autoconfigure/build.gradle b/spring-boot-project/spring-boot-autoconfigure/build.gradle index 77111a9d6b..8edc919f17 100644 --- a/spring-boot-project/spring-boot-autoconfigure/build.gradle +++ b/spring-boot-project/spring-boot-autoconfigure/build.gradle @@ -64,6 +64,7 @@ dependencies { optional("org.apache.tomcat.embed:tomcat-embed-el") optional("org.apache.tomcat.embed:tomcat-embed-websocket") optional("org.apache.tomcat:tomcat-jdbc") + optional("org.apiguardian:apiguardian-api") optional("org.codehaus.groovy:groovy-templates") optional("com.github.ben-manes.caffeine:caffeine") optional("com.github.mxab.thymeleaf.extras:thymeleaf-extras-data-attribute") diff --git a/spring-boot-project/spring-boot-parent/build.gradle b/spring-boot-project/spring-boot-parent/build.gradle index 5efaa10c78..25d3f8b38a 100644 --- a/spring-boot-project/spring-boot-parent/build.gradle +++ b/spring-boot-project/spring-boot-parent/build.gradle @@ -20,6 +20,13 @@ bom { ] } } + library("API Guardian", "1.1.0") { + group("org.apiguardian") { + modules = [ + "apiguardian-api" + ] + } + } library("Commons Compress", "1.20") { group("org.apache.commons") { modules = [ diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-neo4j/build.gradle b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-neo4j/build.gradle index 233d3efeab..e5394d5fef 100644 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-neo4j/build.gradle +++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-neo4j/build.gradle @@ -7,6 +7,7 @@ description = "Spring Boot Data Neo4j smoke test" dependencies { implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-data-neo4j")) + implementation("org.apiguardian:apiguardian-api") testImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test")) }