honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

use better variable name for build listener, and change access back to 

private for internal method of thirdPartyAudit
This commit is contained in:
Ryan Ernst 2015-12-18 12:07:30 -08:00
parent 5b9bf8e738
commit 44edac0081
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
buildSrc/src/main/groovy/org/elasticsearch/gradle/AntTask.groovy
View File

@ -51,13 +51,13 @@ public class AntTask extends DefaultTask {
// remove existing loggers, we add our own // remove existing loggers, we add our own
List<BuildLogger> toRemove = new ArrayList<>(); List<BuildLogger> toRemove = new ArrayList<>();
for (BuildListener l : ant.project.getBuildListeners()) { for (BuildListener listener : ant.project.getBuildListeners()) {
if (l instanceof BuildLogger) { if (l instanceof BuildLogger) {
toRemove.add(l); toRemove.add(listener);
} }
} }
for (BuildLogger l : toRemove) { for (BuildLogger listener : toRemove) {
ant.project.removeBuildListener(l) ant.project.removeBuildListener(listener)
} }
final int outputLevel = logger.isDebugEnabled() ? Project.MSG_DEBUG : (logger.isInfoEnabled() ? Project.MSG_INFO : Project.MSG_WARN) final int outputLevel = logger.isDebugEnabled() ? Project.MSG_DEBUG : (logger.isInfoEnabled() ? Project.MSG_INFO : Project.MSG_WARN)

2
buildSrc/src/main/groovy/org/elasticsearch/gradle/precommit/ThirdPartyAuditTask.groovy
View File

@ -167,7 +167,7 @@ public class ThirdPartyAuditTask extends AntTask {
/** /**
* check for sheisty classes: if they also exist in the extensions classloader, its jar hell with the jdk! * check for sheisty classes: if they also exist in the extensions classloader, its jar hell with the jdk!
*/ */
protected void checkSheistyClasses(Path root, Set<String> excluded) { private void checkSheistyClasses(Path root, Set<String> excluded) {
// system.parent = extensions loader. // system.parent = extensions loader.
// note: for jigsaw, this evilness will need modifications (e.g. use jrt filesystem!). // note: for jigsaw, this evilness will need modifications (e.g. use jrt filesystem!).
// but groovy/gradle needs to work at all first! // but groovy/gradle needs to work at all first!