You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by dw...@apache.org on 2019/11/20 16:05:32 UTC
[lucene-solr] branch jira/SOLR-13452_gradle_8 updated: Copy some of
the top-level 'dist' dependencies.
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
View the commit online:
https://github.com/apache/lucene-solr/commit/69b1a1a7cfa0799c18c111adcee6674d68cb6d65
The following commit(s) were added to refs/heads/jira/SOLR-13452_gradle_8 by this push:
new 69b1a1a Copy some of the top-level 'dist' dependencies.
69b1a1a is described below
commit 69b1a1a7cfa0799c18c111adcee6674d68cb6d65
Author: Dawid Weiss <dw...@apache.org>
AuthorDate: Wed Nov 20 17:05:20 2019 +0100
Copy some of the top-level 'dist' dependencies.
---
settings.gradle | 2 +-
solr/build.gradle | 46 ++++++++++++++++------
solr/contrib/dataimporthandler-extras/build.gradle | 4 +-
solr/test-framework/build.gradle | 4 +-
4 files changed, 37 insertions(+), 19 deletions(-)
diff --git a/settings.gradle b/settings.gradle
index bb59620..ba32bb4 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -46,7 +46,7 @@ include 'dev-tools'
"solr:solr-contrib:solr-contrib-clustering" : "solr/contrib/clustering",
"solr:solr-contrib:solr-contrib-dataimporthandler" : "solr/contrib/dataimporthandler",
"solr:solr-contrib:solr-contrib-dataimporthandler-extras": "solr/contrib/dataimporthandler-extras",
- "solr:solr-contrib:solr-contrib-extraction" : "solr/contrib/extraction",
+ "solr:solr-contrib:solr-contrib-cell" : "solr/contrib/extraction",
"solr:solr-contrib:solr-contrib-langid" : "solr/contrib/langid",
"solr:solr-contrib:solr-contrib-ltr" : "solr/contrib/ltr",
"solr:solr-contrib:solr-contrib-prometheus-exporter" : "solr/contrib/prometheus-exporter",
diff --git a/solr/build.gradle b/solr/build.gradle
index 62e54e2..2ffc0fc 100644
--- a/solr/build.gradle
+++ b/solr/build.gradle
@@ -18,25 +18,45 @@
import org.apache.lucene.gradle.LicenseCheckTask
import org.apache.lucene.gradle.JarChecksum
+plugins {
+ id 'base'
+}
+
+configurations {
+ dist {
+ // Only pull explicitly mentioned primary artifacts, no subdependencies.
+ transitive false
+ }
+}
+
+dependencies {
+ dist project(":solr:solr-core")
+ dist project(":solr:solr-contrib:solr-contrib-analysis-extras")
+ dist project(":solr:solr-contrib:solr-contrib-analytics")
+ dist project(":solr:solr-contrib:solr-contrib-clustering")
+ dist project(":solr:solr-contrib:solr-contrib-dataimporthandler")
+ dist project(":solr:solr-contrib:solr-contrib-dataimporthandler-extras")
+ dist project(":solr:solr-contrib:solr-contrib-cell")
+ dist project(":solr:solr-contrib:solr-contrib-langid")
+ dist project(":solr:solr-contrib:solr-contrib-ltr")
+ dist project(":solr:solr-contrib:solr-contrib-prometheus-exporter")
+ dist project(":solr:solr-contrib:solr-contrib-velocity")
+ dist project(":solr:solr-solrj")
+ dist project(":solr:solr-test-framework")
+}
+
subprojects {
group = 'org.apache.solr'
}
-def distDir = "dist"
-
-ext.testsPolicy = "${rootDir}/lucene/tools/junit4/solr-tests.policy"
+ext {
+ testsPolicy = "${rootDir}/lucene/tools/junit4/solr-tests.policy"
+}
tasks.create("checkLicenses", LicenseCheckTask, file("licenses_gradle"))
-
tasks.create("jarChecksums", JarChecksum, file('solr'), file('licenses_gradle'))
-task packageDist(type: org.apache.lucene.gradle.dist.PackageLuceneSolrDist) {
- group = 'Dist'
- description = 'Generates the Lucene and Solr distribution.'
-
- // additional includes for solr-server
- includeArtifacts '**/server/solr/**', '**/server/resources/**', '**/server/etc/**', '**/server/modules/**', '**/server/scripts/**', '**/server/contexts/**', '**/server/start.jar'
-
- // REMOVE; cross-project task dependency.
- // dependsOn { project(":solr:solr-server").getStartJar }
+task dist(type: Sync) {
+ from configurations.dist
+ into "dist"
}
diff --git a/solr/contrib/dataimporthandler-extras/build.gradle b/solr/contrib/dataimporthandler-extras/build.gradle
index 7b4545d..f8c63e7 100644
--- a/solr/contrib/dataimporthandler-extras/build.gradle
+++ b/solr/contrib/dataimporthandler-extras/build.gradle
@@ -24,7 +24,7 @@ dependencies {
implementation project(':solr:solr-solrj')
implementation project(':solr:solr-contrib:solr-contrib-dataimporthandler')
implementation project(':lucene:lucene-analyzers:lucene-analyzers-common')
- implementation project(':solr:solr-contrib:solr-contrib-extraction')
+ implementation project(':solr:solr-contrib:solr-contrib-cell')
implementation ('org.slf4j:slf4j-api')
implementation ('javax.activation:activation')
@@ -46,5 +46,5 @@ unusedDeps {
}
missingDeps {
- addExclusionsFrom(project(':solr:solr-contrib:solr-contrib-extraction'))
+ addExclusionsFrom(project(':solr:solr-contrib:solr-contrib-cell'))
}
diff --git a/solr/test-framework/build.gradle b/solr/test-framework/build.gradle
index 5642e7a..92b1e95 100644
--- a/solr/test-framework/build.gradle
+++ b/solr/test-framework/build.gradle
@@ -26,7 +26,6 @@ dependencies {
api project(':solr:solr-solrj')
api project(':solr:solr-core')
- api project(':solr:solr-server')
api project(':lucene:lucene-core')
api project(':lucene:lucene-codecs')
api project(':lucene:lucene-queries')
@@ -85,8 +84,7 @@ dependencies {
runtimeOnly ('org.apache.logging.log4j:log4j-api')
runtimeOnly ('org.apache.logging.log4j:log4j-core')
runtimeOnly ('org.apache.logging.log4j:log4j-slf4j-impl')
- runtimeOnly ('com.lmax:disruptor')
-
+ runtimeOnly ('com.lmax:disruptor')
}
missingDeps {