From faefcc73e994cf914f897566c356a7cc53caf451 Mon Sep 17 00:00:00 2001 From: Joe Grandja Date: Wed, 28 Nov 2018 05:48:50 -0500 Subject: [PATCH] Update to spring-boot-gradle-plugin:1.5.17 Fixes gh-5831 --- build.gradle | 3 ++- gradle/maven-deployment.gradle | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 2994bfa711..471851cbd2 100644 --- a/build.gradle +++ b/build.gradle @@ -11,7 +11,7 @@ buildscript { classpath('me.champeau.gradle:gradle-javadoc-hotfix-plugin:0.1') classpath('org.asciidoctor:asciidoctor-gradle-plugin:1.5.1') classpath("io.spring.gradle:docbook-reference-plugin:0.3.1") - classpath("org.springframework.boot:spring-boot-gradle-plugin:1.5.2.RELEASE") + classpath("org.springframework.boot:spring-boot-gradle-plugin:1.5.17.RELEASE") } } @@ -61,6 +61,7 @@ sonarqube { // Set up different subproject lists for individual configuration ext.javaProjects = subprojects.findAll { project -> project.name != 'docs' && project.name != 'manual' && project.name != 'guides' && project.name != 'spring-security-bom' } ext.sampleProjects = subprojects.findAll { project -> project.name.startsWith('spring-security-samples') } +ext.sampleBootProjects = subprojects.findAll { project -> project.name.startsWith('spring-security-samples-boot') } ext.itestProjects = subprojects.findAll { project -> project.name.startsWith('itest') } ext.coreModuleProjects = javaProjects - sampleProjects - itestProjects ext.aspectjProjects = [project(':spring-security-aspects'), project(':spring-security-samples-xml-aspectj'), project(':spring-security-samples-javaconfig-aspectj')] diff --git a/gradle/maven-deployment.gradle b/gradle/maven-deployment.gradle index c637eb0165..8944fd14d6 100644 --- a/gradle/maven-deployment.gradle +++ b/gradle/maven-deployment.gradle @@ -70,8 +70,8 @@ def customizePom(pom, gradleProject) { email = 'rwinch@gopivotal.com' } } - - if(!gradleProject.name.endsWith('-bom')) { + // Exclude spring-framework-bom for sample Boot projects since spring-boot-starter-parent imports spring-framework-bom + if(!gradleProject.name.endsWith('-bom') && !sampleBootProjects.contains(gradleProject)) { dependencyManagement { dependencies { dependency {