From commits-return-108484-archive-asf-public=cust-asf.ponee.io@lucene.apache.org Sun Jun 2 07:43:59 2019 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [207.244.88.153]) by mx-eu-01.ponee.io (Postfix) with SMTP id EE5D318064E for ; Sun, 2 Jun 2019 09:43:58 +0200 (CEST) Received: (qmail 88931 invoked by uid 500); 2 Jun 2019 07:43:57 -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 88891 invoked by uid 99); 2 Jun 2019 07:43:57 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 02 Jun 2019 07:43:57 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 528D18A836; Sun, 2 Jun 2019 07:43:57 +0000 (UTC) Date: Sun, 02 Jun 2019 07:43:58 +0000 To: "commits@lucene.apache.org" Subject: [lucene-solr] 02/03: SOLR-13452: Get commons-io version in forbiddenApis from versions.props. MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit From: markrmiller@apache.org In-Reply-To: <155946143633.27006.5133351373258618862@gitbox.apache.org> References: <155946143633.27006.5133351373258618862@gitbox.apache.org> X-Git-Host: gitbox.apache.org X-Git-Repo: lucene-solr X-Git-Refname: refs/heads/jira/SOLR-13452_gradle_3 X-Git-Reftype: branch X-Git-Rev: 91ac7f619942ae77480214c987ca769966c36ddf X-Git-NotificationType: diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated Message-Id: <20190602074357.528D18A836@gitbox.apache.org> This is an automated email from the ASF dual-hosted git repository. markrmiller pushed a commit to branch jira/SOLR-13452_gradle_3 in repository https://gitbox.apache.org/repos/asf/lucene-solr.git commit 91ac7f619942ae77480214c987ca769966c36ddf Author: markrmiller AuthorDate: Sun Jun 2 02:13:53 2019 -0500 SOLR-13452: Get commons-io version in forbiddenApis from versions.props. --- .../org/apache/lucene/gradle/LuceneSolrForbiddenApisPlugin.groovy | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/buildSrc/src/main/groovy/org/apache/lucene/gradle/LuceneSolrForbiddenApisPlugin.groovy b/buildSrc/src/main/groovy/org/apache/lucene/gradle/LuceneSolrForbiddenApisPlugin.groovy index 927a8de..80e36f5 100644 --- a/buildSrc/src/main/groovy/org/apache/lucene/gradle/LuceneSolrForbiddenApisPlugin.groovy +++ b/buildSrc/src/main/groovy/org/apache/lucene/gradle/LuceneSolrForbiddenApisPlugin.groovy @@ -48,10 +48,12 @@ class LuceneSolrForbiddenApisPlugin implements Plugin { task.signaturesURLs += getClass().getResource('/forbidden/lucene.txt') } else if (project.group ==~ /.*?\.solr(?:\.\w+)?/) { task.signaturesURLs += getClass().getResource((project.name == 'solrj') ? '/forbidden/solrj.txt' : '/forbidden/solr.txt') - task.bundledSignatures += [ 'commons-io-unsafe-' + COMMONS_IO_VERSION ] - // we delay adding the servlet-api checks until we figured out that we have a servlet-api.jar on forbidden's classpath: + task.doFirst{ + task.bundledSignatures += [ 'commons-io-unsafe-' + project.getVersion("commons-io:commons-io") ] + + // we delay adding the servlet-api checks until we figured out that we have a servlet-api.jar on forbidden's classpath: if (task.classpath.filter { it.name ==~ /.*?\bservlet-api\b.*?\.jar/ }.empty == false) { task.signaturesURLs += getClass().getResource('/forbidden/servlet-api.txt') }