From d14da746a10bc6b6cbc38efa6fec8f20945763ce Mon Sep 17 00:00:00 2001 From: Benjamin Boyle Date: Tue, 4 May 2021 16:08:34 -0700 Subject: [PATCH] Remove fixPom method from build.gradle The pom is generated with the reactive-streams scope set to 'compile' by default. To test that this works, the below gradle tasks were run: ./gradlew -PreleaseMode=full cleanGeneratePomFileForMavenPublication generatePomFileForMavenPublication ./gradlew -PreleaseMode=branch cleanGeneratePomFileForMavenPublication generatePomFileForMavenPublication Both tasks generated a pom file with the reactive-streams set to 'compile' scope. --- build.gradle | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/build.gradle b/build.gradle index da06dfbc85..5d66ba9bfd 100644 --- a/build.gradle +++ b/build.gradle @@ -191,27 +191,12 @@ checkstyle { apply from: file("gradle/javadoc_cleanup.gradle") -def fixPom() { - // Reactive-Streams as compile dependency - publishing.publications.all { - pom.withXml { - asNode().dependencies."*".findAll() { - it.scope.text() == "runtime" && project.configurations.compile.allDependencies.find { dep -> - dep.name == it.artifactId.text() - } - }.each { it.scope*.value = "compile"} - } - } -} - if (rootProject.hasProperty("releaseMode")) { logger.lifecycle("ReleaseMode: {}", rootProject.releaseMode) if ("branch".equals(rootProject.releaseMode)) { if (version.endsWith("-SNAPSHOT")) { - fixPom() - publishing { repositories { maven { @@ -229,8 +214,6 @@ if (rootProject.hasProperty("releaseMode")) { } if ("full".equals(rootProject.releaseMode)) { - fixPom() - signing { if (project.hasProperty("SIGNING_PRIVATE_KEY") && project.hasProperty("SIGNING_PASSWORD")) { useInMemoryPgpKeys(project.getProperty("SIGNING_PRIVATE_KEY"), project.getProperty("SIGNING_PASSWORD"))