From e545c696c3b943146e0be3bf317382f12436186e Mon Sep 17 00:00:00 2001
From: Steve Rowe <sarowe@apache.org>
Date: Mon, 16 May 2016 18:51:12 -0400
Subject: [PATCH] SOLR-9109: tell the smoke tester and the check-lib-versions
 target about the renamed Ivy settings files

---
 dev-tools/scripts/smokeTestRelease.py | 2 +-
 lucene/build.xml                      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-tools/scripts/smokeTestRelease.py b/dev-tools/scripts/smokeTestRelease.py
index 180599bff54..49225e4b0ff 100644
--- a/dev-tools/scripts/smokeTestRelease.py
+++ b/dev-tools/scripts/smokeTestRelease.py
@@ -645,7 +645,7 @@ def verifyUnpacked(java, project, artifact, unpackPath, gitRevision, version, te
     # TODO: clean this up to not be a list of modules that we must maintain
     extras = ('analysis', 'backward-codecs', 'benchmark', 'classification', 'codecs', 'core', 'demo', 'docs', 'expressions', 'facet', 'grouping', 'highlighter', 'join', 'memory', 'misc', 'queries', 'queryparser', 'replicator', 'sandbox', 'spatial', 'spatial-extras', 'spatial3d', 'suggest', 'test-framework', 'licenses')
     if isSrc:
-      extras += ('build.xml', 'common-build.xml', 'module-build.xml', 'ivy-settings.xml', 'ivy-versions.properties', 'ivy-ignore-conflicts.properties', 'version.properties', 'tools', 'site')
+      extras += ('build.xml', 'common-build.xml', 'module-build.xml', 'top-level-ivy-settings.xml', 'default-nested-ivy-settings.xml' 'ivy-versions.properties', 'ivy-ignore-conflicts.properties', 'version.properties', 'tools', 'site')
   else:
     extras = ()
 
diff --git a/lucene/build.xml b/lucene/build.xml
index 08b2c36370e..c03770066d1 100644
--- a/lucene/build.xml
+++ b/lucene/build.xml
@@ -97,7 +97,7 @@
           description="Verify that the '/org/name' keys in ivy-versions.properties are sorted lexically and are neither duplicates nor orphans, and that all dependencies in all ivy.xml files use rev=&quot;$${/org/name}&quot; format.">
     <lib-versions-check-macro dir="${common.dir}/.."
                               centralized.versions.file="${common.dir}/ivy-versions.properties"
-                              ivy.settings.file="${common.dir}/ivy-settings.xml"
+                              ivy.settings.file="${common.dir}/top-level-ivy-settings.xml"
                               ivy.resolution-cache.dir="${ivy.resolution-cache.dir}"
                               ivy.lock-strategy="${ivy.lock-strategy}"
                               common.build.dir="${common.build.dir}"