From a6954614b28393a254cb25991b734b87178d5f17 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 17 Jun 2020 09:54:53 +0100 Subject: [PATCH] Minimize contents of poms that are an ancestor of a user's pom Fixes gh-21989 --- .../build/MavenPublishingConventions.java | 23 ++++++++++++++----- 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/buildSrc/src/main/java/org/springframework/boot/build/MavenPublishingConventions.java b/buildSrc/src/main/java/org/springframework/boot/build/MavenPublishingConventions.java index a763df9dde1..39a621bd0aa 100644 --- a/buildSrc/src/main/java/org/springframework/boot/build/MavenPublishingConventions.java +++ b/buildSrc/src/main/java/org/springframework/boot/build/MavenPublishingConventions.java @@ -86,11 +86,15 @@ class MavenPublishingConventions { pom.getUrl().set("https://spring.io/projects/spring-boot"); pom.getName().set(project.provider(project::getName)); pom.getDescription().set(project.provider(project::getDescription)); - pom.organization(this::customizeOrganization); + if (!isUserInherited(project)) { + pom.organization(this::customizeOrganization); + } pom.licenses(this::customizeLicences); pom.developers(this::customizeDevelopers); - pom.scm(this::customizeScm); - pom.issueManagement(this::customizeIssueManagement); + pom.scm((scm) -> customizeScm(scm, project)); + if (!isUserInherited(project)) { + pom.issueManagement(this::customizeIssueManagement); + } } private void customizeJavaMavenPublication(MavenPublication publication, Project project) { @@ -121,9 +125,11 @@ class MavenPublishingConventions { }); } - private void customizeScm(MavenPomScm scm) { - scm.getConnection().set("scm:git:git://github.com/spring-projects/spring-boot.git"); - scm.getDeveloperConnection().set("scm:git:ssh://git@github.com/spring-projects/spring-boot.git"); + private void customizeScm(MavenPomScm scm, Project project) { + if (!isUserInherited(project)) { + scm.getConnection().set("scm:git:git://github.com/spring-projects/spring-boot.git"); + scm.getDeveloperConnection().set("scm:git:ssh://git@github.com/spring-projects/spring-boot.git"); + } scm.getUrl().set("https://github.com/spring-projects/spring-boot"); } @@ -132,4 +138,9 @@ class MavenPublishingConventions { issueManagement.getUrl().set("https://github.com/spring-projects/spring-boot/issues"); } + private boolean isUserInherited(Project project) { + return "spring-boot-starter-parent".equals(project.getName()) + || "spring-boot-dependencies".equals(project.getName()); + } + }