Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id B7C5E2009F8 for ; Thu, 19 May 2016 11:35:12 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id B67A1160A1E; Thu, 19 May 2016 09:35:12 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 14E1B160A05 for ; Thu, 19 May 2016 11:35:11 +0200 (CEST) Received: (qmail 21669 invoked by uid 500); 19 May 2016 09:35:03 -0000 Mailing-List: contact commits-help@lucene.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@lucene.apache.org Delivered-To: mailing list commits@lucene.apache.org Received: (qmail 18352 invoked by uid 99); 19 May 2016 09:35:01 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 19 May 2016 09:35:01 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 8C871DFE59; Thu, 19 May 2016 09:35:01 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: cpoerschke@apache.org To: commits@lucene.apache.org Date: Thu, 19 May 2016 09:35:24 -0000 Message-Id: In-Reply-To: <86126b2cb9f74896a43feeffbb26bc6a@git.apache.org> References: <86126b2cb9f74896a43feeffbb26bc6a@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [24/50] lucene-solr:jira/solr-9045: SOLR-9109: tell the smoke tester and the check-lib-versions target about the renamed Ivy settings files archived-at: Thu, 19 May 2016 09:35:12 -0000 SOLR-9109: tell the smoke tester and the check-lib-versions target about the renamed Ivy settings files Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/e545c696 Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/e545c696 Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/e545c696 Branch: refs/heads/jira/solr-9045 Commit: e545c696c3b943146e0be3bf317382f12436186e Parents: a5be64a Author: Steve Rowe Authored: Mon May 16 18:51:12 2016 -0400 Committer: Steve Rowe Committed: Mon May 16 18:51:12 2016 -0400 ---------------------------------------------------------------------- dev-tools/scripts/smokeTestRelease.py | 2 +- lucene/build.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e545c696/dev-tools/scripts/smokeTestRelease.py ---------------------------------------------------------------------- diff --git a/dev-tools/scripts/smokeTestRelease.py b/dev-tools/scripts/smokeTestRelease.py index 180599b..49225e4 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 = () http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e545c696/lucene/build.xml ---------------------------------------------------------------------- diff --git a/lucene/build.xml b/lucene/build.xml index 08b2c36..c037700 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="$${/org/name}" format.">