From e5978f97fa2fa8c1093b5ab327188ee9a61f2679 Mon Sep 17 00:00:00 2001 From: Matt Jacobs Date: Mon, 8 Feb 2016 13:32:25 -0800 Subject: [PATCH 1/3] Upgrade netflixoss Nebula plugin to 3.2.3 --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 500dd4f06..a67c3ff60 100644 --- a/build.gradle +++ b/build.gradle @@ -8,7 +8,7 @@ buildscript { } plugins { - id 'nebula.netflixoss' version '3.1.2' + id 'nebula.netflixoss' version '3.2.3' id 'me.champeau.gradle.jmh' version '0.2.0' id 'net.saliman.cobertura' version '2.2.8' } From a0d97f8a06a503b01cd9da9412544be28b383539 Mon Sep 17 00:00:00 2001 From: Matt Jacobs Date: Thu, 11 Feb 2016 15:29:11 -0800 Subject: [PATCH 2/3] Special casing the 2 WAR artifacts to not have POMs rewritten --- build.gradle | 35 +++++++++++++++++++---------------- 1 file changed, 19 insertions(+), 16 deletions(-) diff --git a/build.gradle b/build.gradle index a67c3ff60..2a4596fe5 100644 --- a/build.gradle +++ b/build.gradle @@ -58,22 +58,25 @@ subprojects { publishing { publications { nebula(MavenPublication) { - pom.withXml { - configurations.compile.resolvedConfiguration.firstLevelModuleDependencies.each { dep -> - 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' - } - } - } - } + println("project.name -> " + project.name) + if (!project.name.equals("hystrix-dashboard") && !project.name.equals("hystrix-examples-webapp")) { + pom.withXml { + configurations.compile.resolvedConfiguration.firstLevelModuleDependencies.each { dep -> + 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' + } + } + } + } + } } } } From 0d385916cc83c4e6951a54321c9cb2f21239ad6a Mon Sep 17 00:00:00 2001 From: Matt Jacobs Date: Mon, 29 Feb 2016 12:28:42 -0800 Subject: [PATCH 3/3] Removing println in build.gradle --- build.gradle | 1 - 1 file changed, 1 deletion(-) diff --git a/build.gradle b/build.gradle index 2a4596fe5..aa05b97d3 100644 --- a/build.gradle +++ b/build.gradle @@ -58,7 +58,6 @@ subprojects { publishing { publications { nebula(MavenPublication) { - println("project.name -> " + project.name) if (!project.name.equals("hystrix-dashboard") && !project.name.equals("hystrix-examples-webapp")) { pom.withXml { configurations.compile.resolvedConfiguration.firstLevelModuleDependencies.each { dep ->