From commits-return-108583-archive-asf-public=cust-asf.ponee.io@lucene.apache.org Wed Jun 5 04:30:03 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 08ACC180763 for ; Wed, 5 Jun 2019 06:30:02 +0200 (CEST) Received: (qmail 27231 invoked by uid 500); 5 Jun 2019 04:30:01 -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 27208 invoked by uid 99); 5 Jun 2019 04:30:01 -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; Wed, 05 Jun 2019 04:30:01 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 3DF118AAF6; Wed, 5 Jun 2019 04:30:01 +0000 (UTC) Date: Wed, 05 Jun 2019 04:30:01 +0000 To: "commits@lucene.apache.org" Subject: [lucene-solr] branch jira/SOLR-13452_gradle_3 updated: SOLR-13452: Add a new marker plugin to determine which modules to include in dist. MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <155970900105.13911.229338824118812384@gitbox.apache.org> From: markrmiller@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-Oldrev: 3bcfcb4a1933267f75921f64f6eb63258386bf70 X-Git-Newrev: d980a226eedf5148c647d1347f70a7b1287fac5b X-Git-Rev: d980a226eedf5148c647d1347f70a7b1287fac5b 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. markrmiller pushed a commit to branch jira/SOLR-13452_gradle_3 in repository https://gitbox.apache.org/repos/asf/lucene-solr.git The following commit(s) were added to refs/heads/jira/SOLR-13452_gradle_3 by this push: new d980a22 SOLR-13452: Add a new marker plugin to determine which modules to include in dist. d980a22 is described below commit d980a226eedf5148c647d1347f70a7b1287fac5b Author: markrmiller AuthorDate: Tue Jun 4 23:29:50 2019 -0500 SOLR-13452: Add a new marker plugin to determine which modules to include in dist. --- .../gradle/LuceneSolrForbiddenApisPlugin.groovy | 3 --- .../lucene/gradle/PackageLuceneSolrDist.groovy | 9 +++++--- .../org/apache/lucene/gradle/PartOfDist.groovy | 26 ++++++++-------------- lucene/analysis/common/build.gradle | 1 + lucene/analysis/icu/build.gradle | 1 + lucene/analysis/kuromoji/build.gradle | 1 + lucene/analysis/morfologik/build.gradle | 1 + lucene/analysis/nori/build.gradle | 1 + lucene/analysis/opennlp/build.gradle | 3 ++- lucene/analysis/phonetic/build.gradle | 1 + lucene/analysis/smartcn/build.gradle | 1 + lucene/analysis/stempel/build.gradle | 1 + lucene/backward-codecs/build.gradle | 1 + lucene/benchmark/build.gradle | 1 + lucene/classification/build.gradle | 1 + lucene/codecs/build.gradle | 1 + lucene/core/build.gradle | 1 + lucene/expressions/build.gradle | 1 + lucene/facet/build.gradle | 2 +- lucene/grouping/build.gradle | 1 + lucene/highlighter/build.gradle | 1 + lucene/join/build.gradle | 1 + lucene/memory/build.gradle | 1 + lucene/misc/build.gradle | 1 + lucene/queries/build.gradle | 5 +---- lucene/queryparser/build.gradle | 1 + lucene/replicator/build.gradle | 1 + lucene/sandbox/build.gradle | 1 + lucene/spatial-extras/build.gradle | 1 + lucene/spatial/build.gradle | 1 + lucene/spatial3d/build.gradle | 1 + lucene/suggest/build.gradle | 1 + lucene/test-framework/build.gradle | 1 + solr/contrib/analysis-extras/build.gradle | 1 + solr/contrib/analytics/build.gradle | 1 + solr/contrib/clustering/build.gradle | 1 + solr/contrib/dataimporthandler-extras/build.gradle | 1 + solr/contrib/dataimporthandler/build.gradle | 1 + solr/contrib/extraction/build.gradle | 1 + solr/contrib/langid/build.gradle | 1 + solr/contrib/ltr/build.gradle | 1 + solr/contrib/prometheus-exporter/build.gradle | 1 + solr/contrib/velocity/build.gradle | 1 + solr/example/example-DIH/build.gradle | 1 + solr/server/build.gradle | 1 + solr/solrj/build.gradle | 10 ++------- solr/test-framework/build.gradle | 1 + 47 files changed, 61 insertions(+), 37 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 80e36f5..9e1c7fc 100644 --- a/buildSrc/src/main/groovy/org/apache/lucene/gradle/LuceneSolrForbiddenApisPlugin.groovy +++ b/buildSrc/src/main/groovy/org/apache/lucene/gradle/LuceneSolrForbiddenApisPlugin.groovy @@ -23,9 +23,6 @@ import org.gradle.api.Project class LuceneSolrForbiddenApisPlugin implements Plugin { - // TODO: somehow determine this from versions.props - static final String COMMONS_IO_VERSION = '2.5' - @Override void apply(Project project) { project.pluginManager.apply(ForbiddenApisPlugin.class) diff --git a/buildSrc/src/main/groovy/org/apache/lucene/gradle/PackageLuceneSolrDist.groovy b/buildSrc/src/main/groovy/org/apache/lucene/gradle/PackageLuceneSolrDist.groovy index d085636..a47863b 100644 --- a/buildSrc/src/main/groovy/org/apache/lucene/gradle/PackageLuceneSolrDist.groovy +++ b/buildSrc/src/main/groovy/org/apache/lucene/gradle/PackageLuceneSolrDist.groovy @@ -15,6 +15,9 @@ package org.apache.lucene.gradle * See the License for the specific language governing permissions and * limitations under the License. */ + +import org.apache.lucene.gradle.PartOfDist + import org.gradle.api.DefaultTask import org.gradle.api.Project import org.gradle.api.tasks.Input @@ -40,7 +43,7 @@ class PackageLuceneSolrDist extends DefaultTask { "CHANGES.txt", "licenses/**", "*/docs/", - "**/README*" + "**/README.txt" ] def standardExcludes = [ @@ -73,7 +76,7 @@ class PackageLuceneSolrDist extends DefaultTask { project.subprojects.each {subproject -> project.evaluationDependsOn(subproject.path) - if (subproject.tasks.findByName('jar') && subproject.configurations.hasProperty('runtimeClasspath')) { + if (subproject.getPlugins().hasPlugin(PartOfDist) && subproject.tasks.findByName('jar') && subproject.configurations.hasProperty('runtimeClasspath')) { from(subproject.jar.outputs.files) { include "*.jar" into (project.relativePath(subproject.projectDir)) @@ -107,7 +110,7 @@ class PackageLuceneSolrDist extends DefaultTask { project.subprojects.each {subproject -> project.evaluationDependsOn(subproject.path) - if (subproject.tasks.findByName('jar') && subproject.configurations.hasProperty('runtimeClasspath')) { + if (subproject.getPlugins().hasPlugin(PartOfDist) && subproject.tasks.findByName('jar') && subproject.configurations.hasProperty('runtimeClasspath')) { from(subproject.jar.outputs.files) { include "*.jar" into (project.relativePath(subproject.projectDir)) diff --git a/lucene/backward-codecs/build.gradle b/buildSrc/src/main/groovy/org/apache/lucene/gradle/PartOfDist.groovy similarity index 72% copy from lucene/backward-codecs/build.gradle copy to buildSrc/src/main/groovy/org/apache/lucene/gradle/PartOfDist.groovy index 4f6ac14..935296f 100644 --- a/lucene/backward-codecs/build.gradle +++ b/buildSrc/src/main/groovy/org/apache/lucene/gradle/PartOfDist.groovy @@ -1,3 +1,4 @@ +package org.apache.lucene.gradle /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,24 +16,15 @@ * limitations under the License. */ -apply plugin: 'java-library' +import de.thetaphi.forbiddenapis.gradle.CheckForbiddenApis +import de.thetaphi.forbiddenapis.gradle.ForbiddenApisPlugin +import org.gradle.api.Plugin +import org.gradle.api.Project -task jarTest (type: Jar) { - from sourceSets.test.output - classifier = 'test' -} - -configurations { - testOutput -} +class PartOfDist implements Plugin { -artifacts { - testOutput jarTest -} -dependencies { + @Override + void apply(Project project) {} - implementation project(':lucene:lucene-core') - - testImplementation project(':lucene:lucene-test-framework') -} \ No newline at end of file +} diff --git a/lucene/analysis/common/build.gradle b/lucene/analysis/common/build.gradle index d212691..3154ec7 100644 --- a/lucene/analysis/common/build.gradle +++ b/lucene/analysis/common/build.gradle @@ -16,6 +16,7 @@ */ apply plugin: 'java-library' +apply plugin: org.apache.lucene.gradle.PartOfDist archivesBaseName = 'analyzers-common' diff --git a/lucene/analysis/icu/build.gradle b/lucene/analysis/icu/build.gradle index 87a450b..082f9c5 100644 --- a/lucene/analysis/icu/build.gradle +++ b/lucene/analysis/icu/build.gradle @@ -16,6 +16,7 @@ */ apply plugin: 'java-library' +apply plugin: org.apache.lucene.gradle.PartOfDist archivesBaseName = 'analyzers-icu' diff --git a/lucene/analysis/kuromoji/build.gradle b/lucene/analysis/kuromoji/build.gradle index 3fe5332..ccbdd30 100644 --- a/lucene/analysis/kuromoji/build.gradle +++ b/lucene/analysis/kuromoji/build.gradle @@ -16,6 +16,7 @@ */ apply plugin: 'java-library' +apply plugin: org.apache.lucene.gradle.PartOfDist archivesBaseName = 'analyzers-kuromoji' diff --git a/lucene/analysis/morfologik/build.gradle b/lucene/analysis/morfologik/build.gradle index c7da4b2..7057bda 100644 --- a/lucene/analysis/morfologik/build.gradle +++ b/lucene/analysis/morfologik/build.gradle @@ -16,6 +16,7 @@ */ apply plugin: 'java-library' +apply plugin: org.apache.lucene.gradle.PartOfDist archivesBaseName = 'analyzers-morfologik' diff --git a/lucene/analysis/nori/build.gradle b/lucene/analysis/nori/build.gradle index 5ca4c33..427197a 100644 --- a/lucene/analysis/nori/build.gradle +++ b/lucene/analysis/nori/build.gradle @@ -16,6 +16,7 @@ */ apply plugin: 'java-library' +apply plugin: org.apache.lucene.gradle.PartOfDist archivesBaseName = 'analyzers-nori' diff --git a/lucene/analysis/opennlp/build.gradle b/lucene/analysis/opennlp/build.gradle index 6e9672e..6d848b2 100644 --- a/lucene/analysis/opennlp/build.gradle +++ b/lucene/analysis/opennlp/build.gradle @@ -14,8 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - + apply plugin: 'java-library' +apply plugin: org.apache.lucene.gradle.PartOfDist dependencies { implementation project(':lucene:lucene-core') diff --git a/lucene/analysis/phonetic/build.gradle b/lucene/analysis/phonetic/build.gradle index 8d1450d..9e5114a 100644 --- a/lucene/analysis/phonetic/build.gradle +++ b/lucene/analysis/phonetic/build.gradle @@ -16,6 +16,7 @@ */ apply plugin: 'java-library' +apply plugin: org.apache.lucene.gradle.PartOfDist archivesBaseName = 'analyzers-phonetic' diff --git a/lucene/analysis/smartcn/build.gradle b/lucene/analysis/smartcn/build.gradle index 2bd514a..e5545cf 100644 --- a/lucene/analysis/smartcn/build.gradle +++ b/lucene/analysis/smartcn/build.gradle @@ -16,6 +16,7 @@ */ apply plugin: 'java-library' +apply plugin: org.apache.lucene.gradle.PartOfDist archivesBaseName = 'analyzers-smartcn' diff --git a/lucene/analysis/stempel/build.gradle b/lucene/analysis/stempel/build.gradle index f82a709..973cd37 100644 --- a/lucene/analysis/stempel/build.gradle +++ b/lucene/analysis/stempel/build.gradle @@ -16,6 +16,7 @@ */ apply plugin: 'java-library' +apply plugin: org.apache.lucene.gradle.PartOfDist archivesBaseName = 'analyzers-stemple' diff --git a/lucene/backward-codecs/build.gradle b/lucene/backward-codecs/build.gradle index 4f6ac14..80ef556 100644 --- a/lucene/backward-codecs/build.gradle +++ b/lucene/backward-codecs/build.gradle @@ -16,6 +16,7 @@ */ apply plugin: 'java-library' +apply plugin: org.apache.lucene.gradle.PartOfDist task jarTest (type: Jar) { from sourceSets.test.output diff --git a/lucene/benchmark/build.gradle b/lucene/benchmark/build.gradle index b21ae5b..f8f772e 100644 --- a/lucene/benchmark/build.gradle +++ b/lucene/benchmark/build.gradle @@ -16,6 +16,7 @@ */ apply plugin: 'java-library' +apply plugin: org.apache.lucene.gradle.PartOfDist def workingDir = "${projectDir}/work" diff --git a/lucene/classification/build.gradle b/lucene/classification/build.gradle index 703ba3b..74f90d3 100644 --- a/lucene/classification/build.gradle +++ b/lucene/classification/build.gradle @@ -16,6 +16,7 @@ */ apply plugin: 'java-library' +apply plugin: org.apache.lucene.gradle.PartOfDist dependencies { diff --git a/lucene/codecs/build.gradle b/lucene/codecs/build.gradle index 28ec67c..09eff5f 100644 --- a/lucene/codecs/build.gradle +++ b/lucene/codecs/build.gradle @@ -16,6 +16,7 @@ */ apply plugin: 'java-library' +apply plugin: org.apache.lucene.gradle.PartOfDist archivesBaseName = 'codecs' diff --git a/lucene/core/build.gradle b/lucene/core/build.gradle index c8ee7a2..671ed68 100644 --- a/lucene/core/build.gradle +++ b/lucene/core/build.gradle @@ -16,6 +16,7 @@ */ apply plugin: 'java-library' +apply plugin: org.apache.lucene.gradle.PartOfDist archivesBaseName = 'lucene-core' diff --git a/lucene/expressions/build.gradle b/lucene/expressions/build.gradle index 03de475..79ecf40 100644 --- a/lucene/expressions/build.gradle +++ b/lucene/expressions/build.gradle @@ -16,6 +16,7 @@ */ apply plugin: 'java-library' +apply plugin: org.apache.lucene.gradle.PartOfDist dependencies { diff --git a/lucene/facet/build.gradle b/lucene/facet/build.gradle index 824052a..238bf78 100644 --- a/lucene/facet/build.gradle +++ b/lucene/facet/build.gradle @@ -16,7 +16,7 @@ */ apply plugin: 'java-library' - +apply plugin: org.apache.lucene.gradle.PartOfDist dependencies { diff --git a/lucene/grouping/build.gradle b/lucene/grouping/build.gradle index c0335e2..12d30d2 100644 --- a/lucene/grouping/build.gradle +++ b/lucene/grouping/build.gradle @@ -16,6 +16,7 @@ */ apply plugin: 'java-library' +apply plugin: org.apache.lucene.gradle.PartOfDist dependencies { diff --git a/lucene/highlighter/build.gradle b/lucene/highlighter/build.gradle index 59c6d74..9401c17 100644 --- a/lucene/highlighter/build.gradle +++ b/lucene/highlighter/build.gradle @@ -16,6 +16,7 @@ */ apply plugin: 'java-library' +apply plugin: org.apache.lucene.gradle.PartOfDist dependencies { diff --git a/lucene/join/build.gradle b/lucene/join/build.gradle index f5fae14..8ddd135 100644 --- a/lucene/join/build.gradle +++ b/lucene/join/build.gradle @@ -16,6 +16,7 @@ */ apply plugin: 'java-library' +apply plugin: org.apache.lucene.gradle.PartOfDist dependencies { diff --git a/lucene/memory/build.gradle b/lucene/memory/build.gradle index ad31d9d..0dd3000 100644 --- a/lucene/memory/build.gradle +++ b/lucene/memory/build.gradle @@ -16,6 +16,7 @@ */ apply plugin: 'java-library' +apply plugin: org.apache.lucene.gradle.PartOfDist dependencies { implementation project(':lucene:lucene-core') diff --git a/lucene/misc/build.gradle b/lucene/misc/build.gradle index 7bd5755..5c1d351 100644 --- a/lucene/misc/build.gradle +++ b/lucene/misc/build.gradle @@ -16,6 +16,7 @@ */ apply plugin: 'java-library' +apply plugin: org.apache.lucene.gradle.PartOfDist dependencies { diff --git a/lucene/queries/build.gradle b/lucene/queries/build.gradle index 4d7d1de..b3c38b3 100644 --- a/lucene/queries/build.gradle +++ b/lucene/queries/build.gradle @@ -16,15 +16,12 @@ */ apply plugin: 'java-library' +apply plugin: org.apache.lucene.gradle.PartOfDist dependencies { implementation project(':lucene:lucene-core') implementation project(':lucene:lucene-codecs') - runtimeOnly 'org.antlr:antlr4-runtime' - runtimeOnly 'org.ow2.asm:asm' - runtimeOnly 'org.ow2.asm:asm-commons' - testImplementation project(':lucene:lucene-test-framework') testImplementation project(':lucene:lucene-expressions') } \ No newline at end of file diff --git a/lucene/queryparser/build.gradle b/lucene/queryparser/build.gradle index 416ea36..aa9152c 100644 --- a/lucene/queryparser/build.gradle +++ b/lucene/queryparser/build.gradle @@ -16,6 +16,7 @@ */ apply plugin: 'java-library' +apply plugin: org.apache.lucene.gradle.PartOfDist task jarTest (type: Jar) { from sourceSets.test.output diff --git a/lucene/replicator/build.gradle b/lucene/replicator/build.gradle index 341f3f1..5efb273 100644 --- a/lucene/replicator/build.gradle +++ b/lucene/replicator/build.gradle @@ -16,6 +16,7 @@ */ apply plugin: 'java-library' +apply plugin: org.apache.lucene.gradle.PartOfDist dependencies { api project(':lucene:lucene-core') diff --git a/lucene/sandbox/build.gradle b/lucene/sandbox/build.gradle index b558bc8..289d387 100644 --- a/lucene/sandbox/build.gradle +++ b/lucene/sandbox/build.gradle @@ -16,6 +16,7 @@ */ apply plugin: 'java-library' +apply plugin: org.apache.lucene.gradle.PartOfDist dependencies { diff --git a/lucene/spatial-extras/build.gradle b/lucene/spatial-extras/build.gradle index 75d4740..7237e0e 100644 --- a/lucene/spatial-extras/build.gradle +++ b/lucene/spatial-extras/build.gradle @@ -16,6 +16,7 @@ */ apply plugin: 'java-library' +apply plugin: org.apache.lucene.gradle.PartOfDist dependencies { diff --git a/lucene/spatial/build.gradle b/lucene/spatial/build.gradle index f5fae14..8ddd135 100644 --- a/lucene/spatial/build.gradle +++ b/lucene/spatial/build.gradle @@ -16,6 +16,7 @@ */ apply plugin: 'java-library' +apply plugin: org.apache.lucene.gradle.PartOfDist dependencies { diff --git a/lucene/spatial3d/build.gradle b/lucene/spatial3d/build.gradle index ff1cc6b..bc10c46 100644 --- a/lucene/spatial3d/build.gradle +++ b/lucene/spatial3d/build.gradle @@ -16,6 +16,7 @@ */ apply plugin: 'java-library' +apply plugin: org.apache.lucene.gradle.PartOfDist task jarTest (type: Jar) { from sourceSets.test.output diff --git a/lucene/suggest/build.gradle b/lucene/suggest/build.gradle index 1f8aee5..87dfadf 100644 --- a/lucene/suggest/build.gradle +++ b/lucene/suggest/build.gradle @@ -16,6 +16,7 @@ */ apply plugin: 'java-library' +apply plugin: org.apache.lucene.gradle.PartOfDist dependencies { implementation project(':lucene:lucene-core') diff --git a/lucene/test-framework/build.gradle b/lucene/test-framework/build.gradle index b4feb32..29bb46d 100644 --- a/lucene/test-framework/build.gradle +++ b/lucene/test-framework/build.gradle @@ -16,6 +16,7 @@ */ apply plugin: 'java-library' +apply plugin: org.apache.lucene.gradle.PartOfDist archivesBaseName = 'lucene-test-framework' diff --git a/solr/contrib/analysis-extras/build.gradle b/solr/contrib/analysis-extras/build.gradle index 1c86e8f..5ed2fa7 100644 --- a/solr/contrib/analysis-extras/build.gradle +++ b/solr/contrib/analysis-extras/build.gradle @@ -16,6 +16,7 @@ */ apply plugin: 'java-library' +apply plugin: org.apache.lucene.gradle.PartOfDist dependencies { diff --git a/solr/contrib/analytics/build.gradle b/solr/contrib/analytics/build.gradle index e32a69b..4907c87 100644 --- a/solr/contrib/analytics/build.gradle +++ b/solr/contrib/analytics/build.gradle @@ -16,6 +16,7 @@ */ apply plugin: 'java-library' +apply plugin: org.apache.lucene.gradle.PartOfDist dependencies { implementation project(':solr:solr-core') diff --git a/solr/contrib/clustering/build.gradle b/solr/contrib/clustering/build.gradle index b7b21c5..48e0001 100644 --- a/solr/contrib/clustering/build.gradle +++ b/solr/contrib/clustering/build.gradle @@ -16,6 +16,7 @@ */ apply plugin: 'java-library' +apply plugin: org.apache.lucene.gradle.PartOfDist dependencies { diff --git a/solr/contrib/dataimporthandler-extras/build.gradle b/solr/contrib/dataimporthandler-extras/build.gradle index 70d00a2..b359e4a 100644 --- a/solr/contrib/dataimporthandler-extras/build.gradle +++ b/solr/contrib/dataimporthandler-extras/build.gradle @@ -16,6 +16,7 @@ */ apply plugin: 'java-library' +apply plugin: org.apache.lucene.gradle.PartOfDist dependencies { implementation project(':solr:solr-core') diff --git a/solr/contrib/dataimporthandler/build.gradle b/solr/contrib/dataimporthandler/build.gradle index 0d5788a..0d93f03 100644 --- a/solr/contrib/dataimporthandler/build.gradle +++ b/solr/contrib/dataimporthandler/build.gradle @@ -16,6 +16,7 @@ */ apply plugin: 'java-library' +apply plugin: org.apache.lucene.gradle.PartOfDist task jarTest (type: Jar) { from sourceSets.test.output diff --git a/solr/contrib/extraction/build.gradle b/solr/contrib/extraction/build.gradle index 06fa8ab..77e33b8 100644 --- a/solr/contrib/extraction/build.gradle +++ b/solr/contrib/extraction/build.gradle @@ -16,6 +16,7 @@ */ apply plugin: 'java-library' +apply plugin: org.apache.lucene.gradle.PartOfDist dependencies { diff --git a/solr/contrib/langid/build.gradle b/solr/contrib/langid/build.gradle index 069c1d4..b17a7df 100644 --- a/solr/contrib/langid/build.gradle +++ b/solr/contrib/langid/build.gradle @@ -16,6 +16,7 @@ */ apply plugin: 'java-library' +apply plugin: org.apache.lucene.gradle.PartOfDist dependencies { implementation project(':solr:solr-core') diff --git a/solr/contrib/ltr/build.gradle b/solr/contrib/ltr/build.gradle index 53c0940..b2e5482 100644 --- a/solr/contrib/ltr/build.gradle +++ b/solr/contrib/ltr/build.gradle @@ -16,6 +16,7 @@ */ apply plugin: 'java-library' +apply plugin: org.apache.lucene.gradle.PartOfDist dependencies { diff --git a/solr/contrib/prometheus-exporter/build.gradle b/solr/contrib/prometheus-exporter/build.gradle index 4deca32..fcd4566 100644 --- a/solr/contrib/prometheus-exporter/build.gradle +++ b/solr/contrib/prometheus-exporter/build.gradle @@ -16,6 +16,7 @@ */ apply plugin: 'java-library' +apply plugin: org.apache.lucene.gradle.PartOfDist dependencies { diff --git a/solr/contrib/velocity/build.gradle b/solr/contrib/velocity/build.gradle index 6a33734..49efa69 100644 --- a/solr/contrib/velocity/build.gradle +++ b/solr/contrib/velocity/build.gradle @@ -16,6 +16,7 @@ */ apply plugin: 'java-library' +apply plugin: org.apache.lucene.gradle.PartOfDist dependencies { diff --git a/solr/example/example-DIH/build.gradle b/solr/example/example-DIH/build.gradle index 315f596..93693c7 100644 --- a/solr/example/example-DIH/build.gradle +++ b/solr/example/example-DIH/build.gradle @@ -16,6 +16,7 @@ */ apply plugin: 'java-library' +apply plugin: org.apache.lucene.gradle.PartOfDist dependencies { implementation 'org.hsqldb:hsqldb' diff --git a/solr/server/build.gradle b/solr/server/build.gradle index 97ccc28..a9ede86 100644 --- a/solr/server/build.gradle +++ b/solr/server/build.gradle @@ -16,6 +16,7 @@ */ apply plugin: 'java' +apply plugin: org.apache.lucene.gradle.PartOfDist dependencies { diff --git a/solr/solrj/build.gradle b/solr/solrj/build.gradle index 4a4b199..2845e89 100644 --- a/solr/solrj/build.gradle +++ b/solr/solrj/build.gradle @@ -15,14 +15,8 @@ * limitations under the License. */ -plugins { - id 'java-library' - id 'eclipse' -} - -repositories{ - mavenCentral() -} +apply plugin: 'java-library' +apply plugin: org.apache.lucene.gradle.PartOfDist dependencies { diff --git a/solr/test-framework/build.gradle b/solr/test-framework/build.gradle index 6fc57e1..0de4610 100644 --- a/solr/test-framework/build.gradle +++ b/solr/test-framework/build.gradle @@ -16,6 +16,7 @@ */ apply plugin: 'java-library' +apply plugin: org.apache.lucene.gradle.PartOfDist archivesBaseName = 'solr-test-framework'