From 66009471521838e1eb53bfed07650b5891a1c864 Mon Sep 17 00:00:00 2001 From: Matt Jacobs Date: Thu, 12 Nov 2015 21:21:43 -0800 Subject: [PATCH] Mark servlet-api as 'provided' in generated POMs --- build.gradle | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index 3e2cdeae1..d4e936e43 100644 --- a/build.gradle +++ b/build.gradle @@ -46,15 +46,24 @@ subprojects { } } + //mark all first-level dependencies as 'compile' in generated POM + //except for 'servlet-api', which should be 'provided' publishing { publications { nebula(MavenPublication) { pom.withXml { configurations.compile.resolvedConfiguration.firstLevelModuleDependencies.each { dep -> - asNode().dependencies[0].dependency.find { - it.artifactId[0].text() == dep.moduleName && - it.groupId[0].text() == dep.moduleGroup - }.scope[0].value = 'compile' + if (dep.moduleName == "servlet-api") { + asNode().dependencies[0].dependency.find { + it.artifactId[0].text() == dep.moduleName && + it.groupId[0].text() == dep.moduleGroup + }.scope[0].value = 'provided' + } else { + asNode().dependencies[0].dependency.find { + it.artifactId[0].text() == dep.moduleName && + it.groupId[0].text() == dep.moduleGroup + }.scope[0].value = 'compile' + } } } }