From commits-return-111215-archive-asf-public=cust-asf.ponee.io@lucene.apache.org Thu Nov 14 09:04:49 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 05D10180607 for ; Thu, 14 Nov 2019 10:04:48 +0100 (CET) Received: (qmail 9530 invoked by uid 500); 14 Nov 2019 09:04:48 -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 9484 invoked by uid 99); 14 Nov 2019 09:04:48 -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; Thu, 14 Nov 2019 09:04:48 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 1790281E87; Thu, 14 Nov 2019 09:04:48 +0000 (UTC) Date: Thu, 14 Nov 2019 09:04:47 +0000 To: "commits@lucene.apache.org" Subject: [lucene-solr] branch jira/SOLR-13452_gradle_8 updated: Add grouping rule for license check task (javax.servlet). Remove asciidoctor-ant from versions.props. MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <157372228783.13804.8790081016845806289@gitbox.apache.org> From: dweiss@apache.org X-Git-Host: gitbox.apache.org X-Git-Repo: lucene-solr X-Git-Refname: refs/heads/jira/SOLR-13452_gradle_8 X-Git-Reftype: branch X-Git-Oldrev: 40db8743e2e65728eee1819a1242ecbb809f4c3d X-Git-Newrev: 333ade5152e2f5a326b142a8662cac1adf28bbae X-Git-Rev: 333ade5152e2f5a326b142a8662cac1adf28bbae X-Git-NotificationType: ref_changed_plus_diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated This is an automated email from the ASF dual-hosted git repository. dweiss pushed a commit to branch jira/SOLR-13452_gradle_8 in repository https://gitbox.apache.org/repos/asf/lucene-solr.git The following commit(s) were added to refs/heads/jira/SOLR-13452_gradle_8 by this push: new 333ade5 Add grouping rule for license check task (javax.servlet). Remove asciidoctor-ant from versions.props. 333ade5 is described below commit 333ade5152e2f5a326b142a8662cac1adf28bbae Author: Dawid Weiss AuthorDate: Thu Nov 14 10:04:39 2019 +0100 Add grouping rule for license check task (javax.servlet). Remove asciidoctor-ant from versions.props. --- buildSrc/src/main/java/org/apache/lucene/gradle/LicenseCheckTask.java | 1 + versions.props | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/buildSrc/src/main/java/org/apache/lucene/gradle/LicenseCheckTask.java b/buildSrc/src/main/java/org/apache/lucene/gradle/LicenseCheckTask.java index 6939855..802ec38 100644 --- a/buildSrc/src/main/java/org/apache/lucene/gradle/LicenseCheckTask.java +++ b/buildSrc/src/main/java/org/apache/lucene/gradle/LicenseCheckTask.java @@ -56,6 +56,7 @@ public class LicenseCheckTask extends DefaultTask { REPLACE_PATTERNS.put(Pattern.compile("asm([^/]+)$"), "asm"); REPLACE_PATTERNS.put(Pattern.compile("slf4j-([^/]+)$"), "slf4j"); REPLACE_PATTERNS.put(Pattern.compile("(?:bcmail|bcprov)-([^\\.]+)$"), "$1"); + REPLACE_PATTERNS.put(Pattern.compile("(javax\\.servlet)-.+"), "$1"); } private Pattern skipRegexChecksum; diff --git a/versions.props b/versions.props index eb3dc78..5d536af 100644 --- a/versions.props +++ b/versions.props @@ -79,7 +79,6 @@ org.apache.velocity.tools:*=3.0 org.apache.velocity:*=2.1 org.apache.xmlbeans:xmlbeans=3.0.1 org.apache.zookeeper:*=3.5.5 -org.asciidoctor:asciidoctor-ant=1.6.2 org.asciidoctor:asciidoctorj=1.6.2 org.aspectj:aspectjrt=1.8.0 org.bitbucket.b_c:jose4j=0.6.5