Skip to content

Commit 93e5216

Browse files
Remove fixPom method from build.gradle (#7253)
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.
1 parent 4aa1c43 commit 93e5216

File tree

1 file changed

+0
-17
lines changed

1 file changed

+0
-17
lines changed

build.gradle

-17
Original file line numberDiff line numberDiff line change
@@ -191,27 +191,12 @@ checkstyle {
191191

192192
apply from: file("gradle/javadoc_cleanup.gradle")
193193

194-
def fixPom() {
195-
// Reactive-Streams as compile dependency
196-
publishing.publications.all {
197-
pom.withXml {
198-
asNode().dependencies."*".findAll() {
199-
it.scope.text() == "runtime" && project.configurations.compile.allDependencies.find { dep ->
200-
dep.name == it.artifactId.text()
201-
}
202-
}.each { it.scope*.value = "compile"}
203-
}
204-
}
205-
}
206-
207194
if (rootProject.hasProperty("releaseMode")) {
208195
logger.lifecycle("ReleaseMode: {}", rootProject.releaseMode)
209196

210197
if ("branch".equals(rootProject.releaseMode)) {
211198

212199
if (version.endsWith("-SNAPSHOT")) {
213-
fixPom()
214-
215200
publishing {
216201
repositories {
217202
maven {
@@ -229,8 +214,6 @@ if (rootProject.hasProperty("releaseMode")) {
229214
}
230215

231216
if ("full".equals(rootProject.releaseMode)) {
232-
fixPom()
233-
234217
signing {
235218
if (project.hasProperty("SIGNING_PRIVATE_KEY") && project.hasProperty("SIGNING_PASSWORD")) {
236219
useInMemoryPgpKeys(project.getProperty("SIGNING_PRIVATE_KEY"), project.getProperty("SIGNING_PASSWORD"))

0 commit comments

Comments
 (0)