mirror of https://github.com/apache/lucene.git
SOLR-9109: tell the smoke tester and the check-lib-versions target about the renamed Ivy settings files
This commit is contained in:
parent
a5be64af05
commit
e545c696c3
|
@ -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 = ()
|
||||
|
||||
|
|
|
@ -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="$${/org/name}" 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}"
|
||||
|
|
Loading…
Reference in New Issue