From 68f59a0d4042c8ded24f77b87386f98b60742a67 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Thu, 13 Feb 2020 12:21:54 +0000 Subject: [PATCH] Move dependency management for JNA into spring-boot-parent Previously, dependency management for JNA was provided by spring-boot-dependencies so it affected users' applications. It was original added for Elasticsearch but is no longer needed for that purpose. We use JNA in spring-boot-buildpack-platform which is used by our Gradle and Maven plugins and should not affect an application's use of JNA. This commit moves management of JNA from spring-boot-dependencies into spring-boot-parent. This means that users' applications will now be free to use whatever version of JNA meets their needs while still controlling the version used for image building via Gradle or Maven. Closes gh-20156 --- spring-boot-project/spring-boot-dependencies/build.gradle | 8 -------- spring-boot-project/spring-boot-parent/build.gradle | 2 ++ 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index de9a7e131a8..03b6b4c3ffb 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -887,14 +887,6 @@ bom { ] } } - library("JNA", "4.5.2") { - group("net.java.dev.jna") { - modules = [ - "jna", - "jna-platform" - ] - } - } library("Johnzon", "1.2.3") { group("org.apache.johnzon") { modules = [ diff --git a/spring-boot-project/spring-boot-parent/build.gradle b/spring-boot-project/spring-boot-parent/build.gradle index 6ec70f498dc..f291a82b675 100644 --- a/spring-boot-project/spring-boot-parent/build.gradle +++ b/spring-boot-project/spring-boot-parent/build.gradle @@ -21,6 +21,8 @@ dependencies { api("io.spring.asciidoctor:spring-asciidoctor-extensions-block-switch:0.4.1.RELEASE") api("io.spring.asciidoctor:spring-asciidoctor-extensions-spring-boot:0.4.1.RELEASE") api("jline:jline:2.11") + api("net.java.dev.jna:jna:4.5.2") + api("net.java.dev.jna:jna-platform:4.5.2") api("net.sf.jopt-simple:jopt-simple:5.0.4") api("org.apache.commons:commons-compress:1.19") api("org.apache.maven:maven-plugin-api:3.6.3")