You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ma...@apache.org on 2019/06/05 02:12:42 UTC
[lucene-solr] 04/04: SOLR-13452: Improve/fix project naming.
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 3bcfcb4a1933267f75921f64f6eb63258386bf70
Author: markrmiller <ma...@apache.org>
AuthorDate: Tue Jun 4 17:04:25 2019 -0500
SOLR-13452: Improve/fix project naming.
---
.gitignore | 3 +-
build.gradle | 22 ++++----
buildSrc/ide/eclipse.gradle | 2 +-
lucene/analysis/icu/build.gradle | 2 +-
lucene/analysis/kuromoji/build.gradle | 2 +-
lucene/analysis/morfologik/build.gradle | 2 +-
lucene/analysis/nori/build.gradle | 2 +-
lucene/analysis/opennlp/build.gradle | 2 +-
lucene/analysis/phonetic/build.gradle | 2 +-
lucene/analysis/smartcn/build.gradle | 2 +-
lucene/analysis/stempel/build.gradle | 2 +-
lucene/benchmark/build.gradle | 12 ++---
lucene/classification/build.gradle | 8 +--
lucene/core/build.gradle | 2 +-
lucene/demo/build.gradle | 10 ++--
lucene/facet/build.gradle | 2 +-
lucene/grouping/build.gradle | 2 +-
lucene/highlighter/build.gradle | 6 +--
lucene/memory/build.gradle | 4 +-
lucene/queries/build.gradle | 4 +-
lucene/queryparser/build.gradle | 6 +--
lucene/replicator/build.gradle | 2 +-
lucene/spatial-extras/build.gradle | 6 +--
lucene/suggest/build.gradle | 2 +-
lucene/test-framework/build.gradle | 2 +-
settings.gradle | 59 ++++++++++++++++++----
solr/contrib/analysis-extras/build.gradle | 18 +++----
solr/contrib/analytics/build.gradle | 20 ++++----
solr/contrib/clustering/build.gradle | 6 +--
solr/contrib/dataimporthandler-extras/build.gradle | 10 ++--
solr/contrib/dataimporthandler/build.gradle | 6 +--
solr/contrib/extraction/build.gradle | 4 +-
solr/contrib/langid/build.gradle | 4 +-
solr/contrib/ltr/build.gradle | 4 +-
solr/contrib/prometheus-exporter/build.gradle | 4 +-
solr/contrib/velocity/build.gradle | 6 +--
solr/core/build.gradle | 42 +++++++--------
solr/solrj/build.gradle | 4 +-
solr/test-framework/build.gradle | 8 +--
versions.lock | 11 ++--
40 files changed, 178 insertions(+), 139 deletions(-)
diff --git a/.gitignore b/.gitignore
index d9e0689..51efb8b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,5 @@
# .
-/eclipse-build
-build-eclipse
+eclipse-build
/maven-build
/classes
build
diff --git a/build.gradle b/build.gradle
index 42f434f..f115575 100644
--- a/build.gradle
+++ b/build.gradle
@@ -183,17 +183,17 @@ configure(allprojects) {
// Single JavaDocs for all modules
-def noJavaDocModules = ["buildSrc", "dev-tools","lucene", "solr", "solr-ref-guide", "analysis", "backward-codecs", "contrib", "example"]
+def noJavaDocModules = ["buildSrc", "dev-tools","lucene", "solr", "solr-ref-guide", "lucene-analysis", "lucene-backward-codecs", "solr-contrib", "solr-example", "solr-example-DIH"]
def javaDocProjects = subprojects.findAll { project -> !noJavaDocModules.contains(project.name)}
-project.afterEvaluate{
- task javadocAll(type: Javadoc) {
- group = 'Documentation'
- description = "Generates single JavaDoc for all modules."
- javaDocProjects.each { evaluationDependsOn(it.path) }
- source javaDocProjects.collect { it.sourceSets.main.allJava }
- classpath = files(javaDocProjects.collect { it.sourceSets.main.compileClasspath })
- destinationDir = file("${buildDir}/docs")
- }
-}
+// project.afterEvaluate{
+// task javadocAll(type: Javadoc) {
+// group = 'Documentation'
+// description = "Generates single JavaDoc for all modules."
+// javaDocProjects.each { println it.name;println it.sourceSets;evaluationDependsOn(it.path) }
+// source javaDocProjects.collect { it.sourceSets.main.allJava }
+// classpath = files(javaDocProjects.collect { it.sourceSets.main.compileClasspath })
+// destinationDir = file("${buildDir}/docs")
+// }
+// }
diff --git a/buildSrc/ide/eclipse.gradle b/buildSrc/ide/eclipse.gradle
index f547ae8..56f8f8b 100644
--- a/buildSrc/ide/eclipse.gradle
+++ b/buildSrc/ide/eclipse.gradle
@@ -17,7 +17,7 @@
eclipse {
project {
- if (project.name == 'benchmark') {
+ if (project.name.equals('lucene-benchmark')) {
resourceFilter {
appliesTo = 'FOLDERS'
type = 'EXCLUDE_ALL'
diff --git a/lucene/analysis/icu/build.gradle b/lucene/analysis/icu/build.gradle
index 991c51e..87a450b 100644
--- a/lucene/analysis/icu/build.gradle
+++ b/lucene/analysis/icu/build.gradle
@@ -26,7 +26,7 @@ configurations {
dependencies {
api project(':lucene:lucene-core')
- api project(':lucene:analysis:analyzers-common')
+ api project(':lucene:analysis:lucene-analyzers-common')
api ('com.ibm.icu:icu4j') { transitive = false }
diff --git a/lucene/analysis/kuromoji/build.gradle b/lucene/analysis/kuromoji/build.gradle
index 14d6594..3fe5332 100644
--- a/lucene/analysis/kuromoji/build.gradle
+++ b/lucene/analysis/kuromoji/build.gradle
@@ -26,7 +26,7 @@ configurations {
dependencies {
implementation project(':lucene:lucene-core')
- implementation project(':lucene:analysis:analyzers-common')
+ implementation project(':lucene:analysis:lucene-analyzers-common')
tools ('com.ibm.icu:icu4j') { transitive = false }
diff --git a/lucene/analysis/morfologik/build.gradle b/lucene/analysis/morfologik/build.gradle
index 7bb4635..c7da4b2 100644
--- a/lucene/analysis/morfologik/build.gradle
+++ b/lucene/analysis/morfologik/build.gradle
@@ -22,7 +22,7 @@ archivesBaseName = 'analyzers-morfologik'
dependencies {
implementation project(':lucene:lucene-core')
- implementation project(':lucene:analysis:analyzers-common')
+ implementation project(':lucene:analysis:lucene-analyzers-common')
implementation ('org.carrot2:morfologik-polish') { transitive = false }
implementation ('org.carrot2:morfologik-fsa') { transitive = false }
diff --git a/lucene/analysis/nori/build.gradle b/lucene/analysis/nori/build.gradle
index 5cddf41..5ca4c33 100644
--- a/lucene/analysis/nori/build.gradle
+++ b/lucene/analysis/nori/build.gradle
@@ -25,7 +25,7 @@ configurations {
dependencies {
implementation project(':lucene:lucene-core')
- implementation project(':lucene:analysis:analyzers-common')
+ implementation project(':lucene:analysis:lucene-analyzers-common')
tools ('com.ibm.icu:icu4j') { transitive = false }
diff --git a/lucene/analysis/opennlp/build.gradle b/lucene/analysis/opennlp/build.gradle
index 0cda201..6e9672e 100644
--- a/lucene/analysis/opennlp/build.gradle
+++ b/lucene/analysis/opennlp/build.gradle
@@ -19,7 +19,7 @@ apply plugin: 'java-library'
dependencies {
implementation project(':lucene:lucene-core')
- implementation project(':lucene:analysis:analyzers-common')
+ implementation project(':lucene:analysis:lucene-analyzers-common')
api ('org.apache.opennlp:opennlp-tools') { transitive = false }
diff --git a/lucene/analysis/phonetic/build.gradle b/lucene/analysis/phonetic/build.gradle
index 38f2411..8d1450d 100644
--- a/lucene/analysis/phonetic/build.gradle
+++ b/lucene/analysis/phonetic/build.gradle
@@ -22,7 +22,7 @@ archivesBaseName = 'analyzers-phonetic'
dependencies {
implementation project(':lucene:lucene-core')
- implementation project(':lucene:analysis:analyzers-common')
+ implementation project(':lucene:analysis:lucene-analyzers-common')
implementation ('commons-codec:commons-codec') { transitive = false }
diff --git a/lucene/analysis/smartcn/build.gradle b/lucene/analysis/smartcn/build.gradle
index cd589a7..2bd514a 100644
--- a/lucene/analysis/smartcn/build.gradle
+++ b/lucene/analysis/smartcn/build.gradle
@@ -22,7 +22,7 @@ archivesBaseName = 'analyzers-smartcn'
dependencies {
implementation project(':lucene:lucene-core')
- implementation project(':lucene:analysis:analyzers-common')
+ implementation project(':lucene:analysis:lucene-analyzers-common')
testImplementation project(':lucene:lucene-test-framework')
}
\ No newline at end of file
diff --git a/lucene/analysis/stempel/build.gradle b/lucene/analysis/stempel/build.gradle
index be70136..f82a709 100644
--- a/lucene/analysis/stempel/build.gradle
+++ b/lucene/analysis/stempel/build.gradle
@@ -22,7 +22,7 @@ archivesBaseName = 'analyzers-stemple'
dependencies {
implementation project(':lucene:lucene-core')
- implementation project(':lucene:analysis:analyzers-common')
+ implementation project(':lucene:analysis:lucene-analyzers-common')
testImplementation project(':lucene:lucene-test-framework')
}
\ No newline at end of file
diff --git a/lucene/benchmark/build.gradle b/lucene/benchmark/build.gradle
index 2cd5d9a..b21ae5b 100644
--- a/lucene/benchmark/build.gradle
+++ b/lucene/benchmark/build.gradle
@@ -22,12 +22,12 @@ def workingDir = "${projectDir}/work"
dependencies {
implementation project(':lucene:lucene-core')
- implementation project(':lucene:analysis:analyzers-common')
- implementation project(':lucene:facet')
- implementation project(':lucene:highlighter')
- implementation project(':lucene:queries')
- implementation project(':lucene:spatial-extras')
- implementation project(':lucene:queryparser')
+ implementation project(':lucene:analysis:lucene-analyzers-common')
+ implementation project(':lucene:lucene-facet')
+ implementation project(':lucene:lucene-highlighter')
+ implementation project(':lucene:lucene-queries')
+ implementation project(':lucene:lucene-spatial-extras')
+ implementation project(':lucene:lucene-queryparser')
implementation ("org.apache.commons:commons-compress") { transitive = false }
implementation ("xerces:xercesImpl") { transitive = false }
diff --git a/lucene/classification/build.gradle b/lucene/classification/build.gradle
index 8b89bf1..703ba3b 100644
--- a/lucene/classification/build.gradle
+++ b/lucene/classification/build.gradle
@@ -20,10 +20,10 @@ apply plugin: 'java-library'
dependencies {
implementation project(':lucene:lucene-core')
- implementation project(':lucene:queries')
- implementation project(':lucene:grouping')
+ implementation project(':lucene:lucene-queries')
+ implementation project(':lucene:lucene-grouping')
testImplementation project(':lucene:lucene-test-framework')
- testImplementation project(':lucene:analysis:analyzers-common')
- testImplementation project(':lucene:codecs')
+ testImplementation project(':lucene:analysis:lucene-analyzers-common')
+ testImplementation project(':lucene:lucene-codecs')
}
diff --git a/lucene/core/build.gradle b/lucene/core/build.gradle
index 53a176f..c8ee7a2 100644
--- a/lucene/core/build.gradle
+++ b/lucene/core/build.gradle
@@ -23,7 +23,7 @@ def momanCommitHash="5c5c2a1e4dea"
def momanUrl = "https://bitbucket.org/jpbarrette/moman/get/${momanCommitHash}.zip"
dependencies {
- testImplementation project(':lucene:codecs')
+ testImplementation project(':lucene:lucene-codecs')
testImplementation project(':lucene:lucene-test-framework')
}
diff --git a/lucene/demo/build.gradle b/lucene/demo/build.gradle
index 01bc115..c43c1be 100644
--- a/lucene/demo/build.gradle
+++ b/lucene/demo/build.gradle
@@ -20,11 +20,11 @@ apply plugin: 'java-library'
dependencies {
implementation project(':lucene:lucene-core')
- implementation project(':lucene:facet')
- implementation project(':lucene:queries')
- implementation project(':lucene:analysis:analyzers-common')
- implementation project(':lucene:queryparser')
- implementation project(':lucene:expressions')
+ implementation project(':lucene:lucene-facet')
+ implementation project(':lucene:lucene-queries')
+ implementation project(':lucene:analysis:lucene-analyzers-common')
+ implementation project(':lucene:lucene-queryparser')
+ implementation project(':lucene:lucene-expressions')
runtimeOnly ('org.antlr:antlr4-runtime') { transitive = false }
runtimeOnly ('org.ow2.asm:asm') { transitive = false }
diff --git a/lucene/facet/build.gradle b/lucene/facet/build.gradle
index 8905bda..824052a 100644
--- a/lucene/facet/build.gradle
+++ b/lucene/facet/build.gradle
@@ -25,5 +25,5 @@ dependencies {
implementation 'com.carrotsearch:hppc:0.8.1'
testImplementation project(':lucene:lucene-test-framework')
- testImplementation project(':lucene:queries')
+ testImplementation project(':lucene:lucene-queries')
}
\ No newline at end of file
diff --git a/lucene/grouping/build.gradle b/lucene/grouping/build.gradle
index 5eda325..c0335e2 100644
--- a/lucene/grouping/build.gradle
+++ b/lucene/grouping/build.gradle
@@ -20,7 +20,7 @@ apply plugin: 'java-library'
dependencies {
implementation project(':lucene:lucene-core')
- implementation project(':lucene:queries')
+ implementation project(':lucene:lucene-queries')
testImplementation project(':lucene:lucene-test-framework')
}
\ No newline at end of file
diff --git a/lucene/highlighter/build.gradle b/lucene/highlighter/build.gradle
index 3d2149a..59c6d74 100644
--- a/lucene/highlighter/build.gradle
+++ b/lucene/highlighter/build.gradle
@@ -20,11 +20,11 @@ apply plugin: 'java-library'
dependencies {
implementation project(':lucene:lucene-core')
- implementation project(':lucene:queries')
- implementation project(':lucene:memory')
+ implementation project(':lucene:lucene-queries')
+ implementation project(':lucene:lucene-memory')
testImplementation project(':lucene:lucene-test-framework')
- testImplementation project(':lucene:analysis:analyzers-common')
+ testImplementation project(':lucene:analysis:lucene-analyzers-common')
}
ratSources {
diff --git a/lucene/memory/build.gradle b/lucene/memory/build.gradle
index 3f601cd..ad31d9d 100644
--- a/lucene/memory/build.gradle
+++ b/lucene/memory/build.gradle
@@ -19,8 +19,8 @@ apply plugin: 'java-library'
dependencies {
implementation project(':lucene:lucene-core')
- implementation project(':lucene:codecs')
+ implementation project(':lucene:lucene-codecs')
testImplementation project(':lucene:lucene-test-framework')
- testImplementation project(':lucene:queryparser')
+ testImplementation project(':lucene:lucene-queryparser')
}
\ No newline at end of file
diff --git a/lucene/queries/build.gradle b/lucene/queries/build.gradle
index ab6aa03..4d7d1de 100644
--- a/lucene/queries/build.gradle
+++ b/lucene/queries/build.gradle
@@ -19,12 +19,12 @@ apply plugin: 'java-library'
dependencies {
implementation project(':lucene:lucene-core')
- implementation project(':lucene:codecs')
+ 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:expressions')
+ testImplementation project(':lucene:lucene-expressions')
}
\ No newline at end of file
diff --git a/lucene/queryparser/build.gradle b/lucene/queryparser/build.gradle
index 0b431fc..416ea36 100644
--- a/lucene/queryparser/build.gradle
+++ b/lucene/queryparser/build.gradle
@@ -33,9 +33,9 @@ artifacts {
dependencies {
implementation project(':lucene:lucene-core')
- implementation project(':lucene:codecs')
- implementation project(':lucene:queries')
- implementation project(':lucene:sandbox')
+ implementation project(':lucene:lucene-codecs')
+ implementation project(':lucene:lucene-queries')
+ implementation project(':lucene:lucene-sandbox')
testImplementation project(':lucene:lucene-test-framework')
diff --git a/lucene/replicator/build.gradle b/lucene/replicator/build.gradle
index 069dc01..341f3f1 100644
--- a/lucene/replicator/build.gradle
+++ b/lucene/replicator/build.gradle
@@ -19,7 +19,7 @@ apply plugin: 'java-library'
dependencies {
api project(':lucene:lucene-core')
- api project(':lucene:facet')
+ api project(':lucene:lucene-facet')
runtimeOnly ('org.slf4j:jcl-over-slf4j') { transitive = false }
diff --git a/lucene/spatial-extras/build.gradle b/lucene/spatial-extras/build.gradle
index 4725be4..75d4740 100644
--- a/lucene/spatial-extras/build.gradle
+++ b/lucene/spatial-extras/build.gradle
@@ -20,8 +20,8 @@ apply plugin: 'java-library'
dependencies {
implementation project(':lucene:lucene-core')
- implementation project(':lucene:spatial')
- implementation project(':lucene:spatial3d')
+ implementation project(':lucene:lucene-spatial')
+ implementation project(':lucene:lucene-spatial3d')
implementation ('org.locationtech.spatial4j:spatial4j') { transitive = false }
implementation ('io.sgr:s2-geometry-library-java') { transitive = false }
@@ -30,5 +30,5 @@ dependencies {
testImplementation ('org.locationtech.spatial4j:spatial4j::tests') { transitive = false }
testImplementation project(':lucene:lucene-test-framework')
- testImplementation project(path: ':lucene:spatial3d', configuration: 'testOutput')
+ testImplementation project(path: ':lucene:lucene-spatial3d', configuration: 'testOutput')
}
diff --git a/lucene/suggest/build.gradle b/lucene/suggest/build.gradle
index d50aa96..1f8aee5 100644
--- a/lucene/suggest/build.gradle
+++ b/lucene/suggest/build.gradle
@@ -19,7 +19,7 @@ apply plugin: 'java-library'
dependencies {
implementation project(':lucene:lucene-core')
- implementation project(':lucene:analysis:analyzers-common')
+ implementation project(':lucene:analysis:lucene-analyzers-common')
testImplementation project(':lucene:lucene-test-framework')
}
diff --git a/lucene/test-framework/build.gradle b/lucene/test-framework/build.gradle
index d7c4efa..b4feb32 100644
--- a/lucene/test-framework/build.gradle
+++ b/lucene/test-framework/build.gradle
@@ -22,7 +22,7 @@ archivesBaseName = 'lucene-test-framework'
dependencies {
api project(':lucene:lucene-core')
- implementation project(':lucene:codecs')
+ implementation project(':lucene:lucene-codecs')
api ("junit:junit")
api ('org.hamcrest:hamcrest-core')
diff --git a/settings.gradle b/settings.gradle
index b02e248..148c77d 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -7,70 +7,109 @@
* in the user guide at https://docs.gradle.org/4.10.2/userguide/multi_project_builds.html
*/
-rootProject.name = 'lucene-solr'
+rootProject.name = '_lucene-solr'
include 'buildSrc'
+include 'lucene:analysis'
+project (':lucene:analysis').name='lucene-analysis'
include 'lucene:analysis:common'
-project (':lucene:analysis:common').name='analyzers-common'
+project (':lucene:analysis:common').name='lucene-analyzers-common'
include 'lucene:analysis:icu'
-project (':lucene:analysis:icu').name='analyzers-icu'
+project (':lucene:analysis:icu').name='lucene-analyzers-icu'
include 'lucene:analysis:kuromoji'
-project (':lucene:analysis:kuromoji').name='analyzers-kuromoji'
+project (':lucene:analysis:kuromoji').name='lucene-analyzers-kuromoji'
include 'lucene:analysis:morfologik'
-project (':lucene:analysis:morfologik').name='analyzers-morfologik'
+project (':lucene:analysis:morfologik').name='lucene-analyzers-morfologik'
include 'lucene:analysis:nori'
-project (':lucene:analysis:nori').name='analyzers-nori'
+project (':lucene:analysis:nori').name='lucene-analyzers-nori'
include 'lucene:analysis:opennlp'
-project (':lucene:analysis:opennlp').name='analyzers-opennlp'
+project (':lucene:analysis:opennlp').name='lucene-analyzers-opennlp'
include 'lucene:analysis:phonetic'
-project (':lucene:analysis:phonetic').name='analyzers-phonetic'
+project (':lucene:analysis:phonetic').name='lucene-analyzers-phonetic'
include 'lucene:analysis:smartcn'
-project (':lucene:analysis:smartcn').name='analyzers-smartcn'
+project (':lucene:analysis:smartcn').name='lucene-analyzers-smartcn'
include 'lucene:analysis:stempel'
-project (':lucene:analysis:stempel').name='analyzers-stempel'
+project (':lucene:analysis:stempel').name='lucene-analyzers-stempel'
include 'lucene:backward-codecs'
+project (':lucene:backward-codecs').name='lucene-backward-codecs'
include 'lucene:benchmark'
+project (':lucene:benchmark').name='lucene-benchmark'
include 'lucene:classification'
+project (':lucene:classification').name='lucene-classification'
include 'lucene:codecs'
+project (':lucene:codecs').name='lucene-codecs'
include 'lucene:core'
project (':lucene:core').name='lucene-core'
include 'lucene:demo'
+project (':lucene:demo').name='lucene-demo'
include 'lucene:expressions'
+project (':lucene:expressions').name='lucene-expressions'
include 'lucene:facet'
+project (':lucene:facet').name='lucene-facet'
include 'lucene:grouping'
+project (':lucene:grouping').name='lucene-grouping'
include 'lucene:highlighter'
+project (':lucene:highlighter').name='lucene-highlighter'
include 'lucene:join'
+project (':lucene:join').name='lucene-join'
include 'lucene:memory'
+project (':lucene:memory').name='lucene-memory'
include 'lucene:misc'
+project (':lucene:misc').name='lucene-misc'
include 'lucene:queries'
+project (':lucene:queries').name='lucene-queries'
include 'lucene:queryparser'
+project (':lucene:queryparser').name='lucene-queryparser'
include 'lucene:replicator'
+project (':lucene:replicator').name='lucene-replicator'
include 'lucene:sandbox'
+project (':lucene:sandbox').name='lucene-sandbox'
include 'lucene:spatial'
+project (':lucene:spatial').name='lucene-spatial'
include 'lucene:spatial-extras'
+project (':lucene:spatial-extras').name='lucene-spatial-extras'
include 'lucene:spatial3d'
+project (':lucene:spatial3d').name='lucene-spatial3d'
include 'lucene:suggest'
+project (':lucene:suggest').name='lucene-suggest'
include 'lucene:test-framework'
project (':lucene:test-framework').name='lucene-test-framework'
include 'solr:core'
project (':solr:core').name='solr-core'
include 'solr:server'
+project (':solr:server').name='solr-server'
include 'solr:solrj'
+project (':solr:solrj').name='solr-solrj'
include 'solr:solr-ref-guide'
include 'solr:test-framework'
project (':solr:test-framework').name='solr-test-framework'
+include 'solr:example'
+project (':solr:example').name='solr-example'
include 'solr:example:example-DIH'
+project (':solr:example:example-DIH').name='solr-example-DIH'
+include 'solr:contrib'
+project (':solr:contrib').name='solr-contrib'
include 'solr:contrib:analysis-extras'
+project (':solr:contrib:analysis-extras').name='solr-contrib-analysis-extras'
include 'solr:contrib:analytics'
+project (':solr:contrib:analytics').name='solr-contrib-analytics'
include 'solr:contrib:clustering'
+project (':solr:contrib:clustering').name='solr-contrib-clustering'
include 'solr:contrib:dataimporthandler'
+project (':solr:contrib:dataimporthandler').name='solr-contrib-dataimporthandler'
include 'solr:contrib:dataimporthandler-extras'
+project (':solr:contrib:dataimporthandler-extras').name='solr-contrib-dataimporthandler-extras'
include 'solr:contrib:extraction'
+project (':solr:contrib:extraction').name='solr-contrib-extraction'
include 'solr:contrib:langid'
+project (':solr:contrib:langid').name='solr-contrib-langid'
include 'solr:contrib:ltr'
+project (':solr:contrib:ltr').name='solr-contrib-ltr'
include 'solr:contrib:prometheus-exporter'
+project (':solr:contrib:prometheus-exporter').name='solr-contrib-prometheus-exporter'
include 'solr:contrib:velocity'
+project (':solr:contrib:velocity').name='solr-contrib-velocity'
include 'dev-tools'
diff --git a/solr/contrib/analysis-extras/build.gradle b/solr/contrib/analysis-extras/build.gradle
index 5e5c4bb..1c86e8f 100644
--- a/solr/contrib/analysis-extras/build.gradle
+++ b/solr/contrib/analysis-extras/build.gradle
@@ -19,23 +19,23 @@ apply plugin: 'java-library'
dependencies {
- implementation project(':solr:solrj')
+ implementation project(':solr:solr-solrj')
implementation project(':solr:solr-core')
implementation project(':lucene:lucene-core')
- implementation project(':lucene:codecs')
- implementation project(':lucene:analysis:analyzers-icu')
- implementation project(':lucene:analysis:analyzers-smartcn')
- implementation project(':lucene:analysis:analyzers-stempel')
- implementation project(':lucene:analysis:analyzers-morfologik')
- implementation project(':lucene:analysis:analyzers-opennlp')
+ implementation project(':lucene:lucene-codecs')
+ implementation project(':lucene:analysis:lucene-analyzers-icu')
+ implementation project(':lucene:analysis:lucene-analyzers-smartcn')
+ implementation project(':lucene:analysis:lucene-analyzers-stempel')
+ implementation project(':lucene:analysis:lucene-analyzers-morfologik')
+ implementation project(':lucene:analysis:lucene-analyzers-opennlp')
implementation ('org.slf4j:slf4j-api') { transitive = false }
implementation ('commons-io:commons-io') { transitive = false }
implementation ('com.google.guava:guava') { transitive = false }
implementation ('commons-codec:commons-codec') { transitive = false }
- testImplementation project(path: ':lucene:analysis:analyzers-common', configuration: 'testOutput')
- testImplementation project(path: ':solr:contrib:dataimporthandler', configuration: 'testOutput')
+ testImplementation project(path: ':lucene:analysis:lucene-analyzers-common', configuration: 'testOutput')
+ testImplementation project(path: ':solr:contrib:solr-contrib-dataimporthandler', configuration: 'testOutput')
testImplementation project(':lucene:lucene-test-framework')
testImplementation project(':solr:solr-test-framework')
diff --git a/solr/contrib/analytics/build.gradle b/solr/contrib/analytics/build.gradle
index 97d4369..e32a69b 100644
--- a/solr/contrib/analytics/build.gradle
+++ b/solr/contrib/analytics/build.gradle
@@ -19,7 +19,7 @@ apply plugin: 'java-library'
dependencies {
implementation project(':solr:solr-core')
- implementation project(':solr:solrj')
+ implementation project(':solr:solr-solrj')
implementation project(':lucene:lucene-core')
implementation ('com.fasterxml.jackson.core:jackson-core') { transitive = false }
@@ -82,15 +82,15 @@ dependencies {
testRuntimeOnly ('commons-io:commons-io') { transitive = false }
testRuntimeOnly ('org.slf4j:jcl-over-slf4j') { transitive = false }
- testRuntimeOnly project(':lucene:analysis:analyzers-common')
- testRuntimeOnly project(':lucene:codecs')
- testRuntimeOnly project(':lucene:join')
- testRuntimeOnly project(':lucene:highlighter')
- testRuntimeOnly project(':lucene:suggest')
- testRuntimeOnly project(':lucene:grouping')
- testRuntimeOnly project(':lucene:sandbox')
- testRuntimeOnly project(':lucene:queries')
- testRuntimeOnly project(':lucene:misc')
+ testRuntimeOnly project(':lucene:analysis:lucene-analyzers-common')
+ testRuntimeOnly project(':lucene:lucene-codecs')
+ testRuntimeOnly project(':lucene:lucene-join')
+ testRuntimeOnly project(':lucene:lucene-highlighter')
+ testRuntimeOnly project(':lucene:lucene-suggest')
+ testRuntimeOnly project(':lucene:lucene-grouping')
+ testRuntimeOnly project(':lucene:lucene-sandbox')
+ testRuntimeOnly project(':lucene:lucene-queries')
+ testRuntimeOnly project(':lucene:lucene-misc')
testImplementation project(':lucene:lucene-test-framework')
testImplementation project(':solr:solr-test-framework')
diff --git a/solr/contrib/clustering/build.gradle b/solr/contrib/clustering/build.gradle
index db7095a..b7b21c5 100644
--- a/solr/contrib/clustering/build.gradle
+++ b/solr/contrib/clustering/build.gradle
@@ -20,10 +20,10 @@ apply plugin: 'java-library'
dependencies {
implementation project(':solr:solr-core')
- implementation project(':solr:solrj')
+ implementation project(':solr:solr-solrj')
implementation project(':lucene:lucene-core')
- implementation project(':lucene:memory')
- implementation project(':lucene:analysis:analyzers-common')
+ implementation project(':lucene:lucene-memory')
+ implementation project(':lucene:analysis:lucene-analyzers-common')
implementation ('org.slf4j:slf4j-api') { transitive = false }
implementation ('org.carrot2:carrot2-mini') { transitive = false }
diff --git a/solr/contrib/dataimporthandler-extras/build.gradle b/solr/contrib/dataimporthandler-extras/build.gradle
index 0d14ac6..70d00a2 100644
--- a/solr/contrib/dataimporthandler-extras/build.gradle
+++ b/solr/contrib/dataimporthandler-extras/build.gradle
@@ -19,10 +19,10 @@ apply plugin: 'java-library'
dependencies {
implementation project(':solr:solr-core')
- implementation project(':solr:solrj')
- implementation project(':solr:contrib:dataimporthandler')
- implementation project(':lucene:analysis:analyzers-common')
- implementation project(':solr:contrib:extraction')
+ implementation project(':solr:solr-solrj')
+ implementation project(':solr:contrib:solr-contrib-dataimporthandler')
+ implementation project(':lucene:analysis:lucene-analyzers-common')
+ implementation project(':solr:contrib:solr-contrib-extraction')
implementation ('org.slf4j:slf4j-api') { transitive = false }
implementation ('javax.activation:activation') { transitive = false }
@@ -33,7 +33,7 @@ dependencies {
implementation ('org.apache.tika:tika-core') { transitive = false }
implementation 'org.apache.tika:tika-parsers'
- testImplementation project(path: ':solr:contrib:dataimporthandler', configuration: 'testOutput')
+ testImplementation project(path: ':solr:contrib:solr-contrib-dataimporthandler', configuration: 'testOutput')
testImplementation project(':lucene:lucene-test-framework')
testImplementation project(':solr:solr-test-framework')
}
\ No newline at end of file
diff --git a/solr/contrib/dataimporthandler/build.gradle b/solr/contrib/dataimporthandler/build.gradle
index c2b094e..0d5788a 100644
--- a/solr/contrib/dataimporthandler/build.gradle
+++ b/solr/contrib/dataimporthandler/build.gradle
@@ -33,10 +33,10 @@ artifacts {
dependencies {
implementation project(':solr:solr-core')
- implementation project(':solr:solrj')
+ implementation project(':solr:solr-solrj')
implementation project(':lucene:lucene-core')
- implementation project(':lucene:analysis:analyzers-common')
- implementation project(':lucene:join')
+ implementation project(':lucene:analysis:lucene-analyzers-common')
+ implementation project(':lucene:lucene-join')
implementation ('org.slf4j:slf4j-api') { transitive = false }
implementation ('com.google.guava:guava') { transitive = false }
diff --git a/solr/contrib/extraction/build.gradle b/solr/contrib/extraction/build.gradle
index 63d70d8..06fa8ab 100644
--- a/solr/contrib/extraction/build.gradle
+++ b/solr/contrib/extraction/build.gradle
@@ -21,8 +21,8 @@ dependencies {
implementation project(':lucene:lucene-core')
implementation project(':solr:solr-core')
- implementation project(':solr:solrj')
- implementation project(':lucene:analysis:analyzers-common')
+ implementation project(':solr:solr-solrj')
+ implementation project(':lucene:analysis:lucene-analyzers-common')
implementation ('org.slf4j:slf4j-api') { transitive = false }
implementation ('org.apache.tika:tika-core') { transitive = false }
diff --git a/solr/contrib/langid/build.gradle b/solr/contrib/langid/build.gradle
index 0869b60..069c1d4 100644
--- a/solr/contrib/langid/build.gradle
+++ b/solr/contrib/langid/build.gradle
@@ -19,9 +19,9 @@ apply plugin: 'java-library'
dependencies {
implementation project(':solr:solr-core')
- implementation project(':solr:solrj')
+ implementation project(':solr:solr-solrj')
implementation project(':lucene:lucene-core')
- implementation project(':lucene:analysis:analyzers-common')
+ implementation project(':lucene:analysis:lucene-analyzers-common')
implementation 'com.cybozu.labs:langdetect'
implementation 'net.arnx:jsonic'
diff --git a/solr/contrib/ltr/build.gradle b/solr/contrib/ltr/build.gradle
index 74233bf..53c0940 100644
--- a/solr/contrib/ltr/build.gradle
+++ b/solr/contrib/ltr/build.gradle
@@ -20,9 +20,9 @@ apply plugin: 'java-library'
dependencies {
implementation project(':solr:solr-core')
- implementation project(':solr:solrj')
+ implementation project(':solr:solr-solrj')
implementation project(':lucene:lucene-core')
- implementation project(':lucene:analysis:analyzers-common')
+ implementation project(':lucene:analysis:lucene-analyzers-common')
implementation ('org.slf4j:slf4j-api') { transitive = false }
implementation ('org.restlet.jee:org.restlet') { transitive = false }
diff --git a/solr/contrib/prometheus-exporter/build.gradle b/solr/contrib/prometheus-exporter/build.gradle
index 00d9947..4deca32 100644
--- a/solr/contrib/prometheus-exporter/build.gradle
+++ b/solr/contrib/prometheus-exporter/build.gradle
@@ -20,9 +20,9 @@ apply plugin: 'java-library'
dependencies {
implementation project(':solr:solr-core')
- implementation project(':solr:solrj')
+ implementation project(':solr:solr-solrj')
implementation project(':lucene:lucene-core')
- implementation project(':lucene:analysis:analyzers-common')
+ implementation project(':lucene:analysis:lucene-analyzers-common')
implementation ('io.prometheus:simpleclient') { transitive = false }
implementation ('io.prometheus:simpleclient_common') { transitive = false }
diff --git a/solr/contrib/velocity/build.gradle b/solr/contrib/velocity/build.gradle
index f88db9e..6a33734 100644
--- a/solr/contrib/velocity/build.gradle
+++ b/solr/contrib/velocity/build.gradle
@@ -19,9 +19,9 @@ apply plugin: 'java-library'
dependencies {
- implementation project(':lucene:analysis:analyzers-common')
+ implementation project(':lucene:analysis:lucene-analyzers-common')
implementation project(':solr:solr-core')
- implementation project(':solr:solrj')
+ implementation project(':solr:solr-solrj')
implementation ('commons-collections:commons-collections') { transitive = false }
implementation ("org.apache.velocity:velocity-engine-core") { transitive = false }
@@ -33,7 +33,7 @@ dependencies {
implementation ('commons-codec:commons-codec') { transitive = false }
implementation ('org.slf4j:slf4j-api') { transitive = false }
- testImplementation project(':lucene:misc')
+ testImplementation project(':lucene:lucene-misc')
testImplementation project(':lucene:lucene-test-framework')
testImplementation project(':solr:solr-test-framework')
}
\ No newline at end of file
diff --git a/solr/core/build.gradle b/solr/core/build.gradle
index dadee3b..e8153c6 100644
--- a/solr/core/build.gradle
+++ b/solr/core/build.gradle
@@ -22,23 +22,23 @@ archivesBaseName = 'solr-core'
dependencies {
implementation project(':lucene:lucene-core')
- implementation project(':lucene:codecs')
- implementation project(':lucene:analysis:analyzers-common')
- implementation project(':lucene:analysis:analyzers-phonetic')
- implementation project(':lucene:analysis:analyzers-kuromoji')
- implementation project(':lucene:analysis:analyzers-nori')
- implementation project(':lucene:suggest')
- implementation project(':lucene:queries')
- implementation project(':lucene:highlighter')
- implementation project(':lucene:spatial-extras')
- implementation project(':lucene:grouping')
- implementation project(':lucene:classification')
- implementation project(':lucene:expressions')
- implementation project(':lucene:sandbox')
- implementation project(':lucene:queryparser')
- implementation project(':lucene:misc')
- implementation project(':lucene:join')
- implementation project(':solr:solrj')
+ implementation project(':lucene:lucene-codecs')
+ implementation project(':lucene:analysis:lucene-analyzers-common')
+ implementation project(':lucene:analysis:lucene-analyzers-phonetic')
+ implementation project(':lucene:analysis:lucene-analyzers-kuromoji')
+ implementation project(':lucene:analysis:lucene-analyzers-nori')
+ implementation project(':lucene:lucene-suggest')
+ implementation project(':lucene:lucene-queries')
+ implementation project(':lucene:lucene-highlighter')
+ implementation project(':lucene:lucene-spatial-extras')
+ implementation project(':lucene:lucene-grouping')
+ implementation project(':lucene:lucene-classification')
+ implementation project(':lucene:lucene-expressions')
+ implementation project(':lucene:lucene-sandbox')
+ implementation project(':lucene:lucene-queryparser')
+ implementation project(':lucene:lucene-misc')
+ implementation project(':lucene:lucene-join')
+ implementation project(':solr:solr-solrj')
compileOnly ('javax.servlet:javax.servlet-api')
@@ -191,12 +191,12 @@ dependencies {
testImplementation ('org.apache.kerby:kerb-admin') { transitive = false }
testImplementation ('org.apache.kerby:kerby-kdc') { transitive = false }
- testImplementation project(path: ':lucene:backward-codecs', configuration: 'testOutput')
- testImplementation project(path: ':lucene:queryparser', configuration: 'testOutput')
+ testImplementation project(path: ':lucene:lucene-backward-codecs', configuration: 'testOutput')
+ testImplementation project(path: ':lucene:lucene-queryparser', configuration: 'testOutput')
testImplementation project(':lucene:lucene-test-framework')
testImplementation project(':solr:solr-test-framework')
- testImplementation project(':lucene:analysis:analyzers-icu')
- testImplementation project(':solr:contrib:analysis-extras')
+ testImplementation project(':lucene:analysis:lucene-analyzers-icu')
+ testImplementation project(':solr:contrib:solr-contrib-analysis-extras')
}
diff --git a/solr/solrj/build.gradle b/solr/solrj/build.gradle
index bcf0c92..4a4b199 100644
--- a/solr/solrj/build.gradle
+++ b/solr/solrj/build.gradle
@@ -70,6 +70,6 @@ dependencies {
testImplementation project(':lucene:lucene-core')
testImplementation project(':solr:solr-test-framework')
testImplementation project(':lucene:lucene-test-framework')
- testImplementation project(':lucene:analysis:analyzers-common')
- testImplementation project(':solr:example:example-DIH')
+ testImplementation project(':lucene:analysis:lucene-analyzers-common')
+ testImplementation project(':solr:example:solr-example-DIH')
}
diff --git a/solr/test-framework/build.gradle b/solr/test-framework/build.gradle
index 1a63c16..6fc57e1 100644
--- a/solr/test-framework/build.gradle
+++ b/solr/test-framework/build.gradle
@@ -23,12 +23,12 @@ dependencies {
runtimeOnly "org.slf4j:jcl-over-slf4j"
api project(':lucene:lucene-test-framework')
- api project(':solr:solrj')
+ api project(':solr:solr-solrj')
api project(':solr:solr-core')
api project(':lucene:lucene-core')
- api project(':lucene:codecs')
- api project(':lucene:queries')
- api project(':lucene:analysis:analyzers-common')
+ api project(':lucene:lucene-codecs')
+ api project(':lucene:lucene-queries')
+ api project(':lucene:analysis:lucene-analyzers-common')
api ('junit:junit') { transitive = false }
implementation ('org.apache.httpcomponents:httpclient') { transitive = false }
diff --git a/versions.lock b/versions.lock
index f482593..33d7ce2 100644
--- a/versions.lock
+++ b/versions.lock
@@ -73,11 +73,13 @@ javax.servlet:javax.servlet-api:3.1.0 (2 constraints: 88129b22)
javax.ws.rs:javax.ws.rs-api:2.1 (1 constraints: f40e795e)
javax.xml.bind:jaxb-api:2.3.0 (1 constraints: 5f0c0706)
joda-time:joda-time:2.2 (2 constraints: 5d0d232c)
-junit:junit:4.12 (1 constraints: db04ff30)
+junit:junit:4.12 (2 constraints: 3e1e6104)
net.arnx:jsonic:1.2.7 (2 constraints: db10d4d1)
net.hydromatic:eigenbase-properties:1.1.5 (1 constraints: 0905f835)
net.java.dev.jna:jna:4.3.0 (1 constraints: 5e0cf901)
net.jcip:jcip-annotations:1.0 (5 constraints: 6824b237)
+net.minidev:accessors-smart:1.2 (1 constraints: e60926a4)
+net.minidev:json-smart:2.3 (1 constraints: a40c49ff)
net.sf.ehcache:ehcache-core:2.6.2 (1 constraints: 2706f94d)
net.sourceforge.argparse4j:argparse4j:0.8.1 (1 constraints: 0b050436)
net.sourceforge.nekohtml:nekohtml:1.9.17 (1 constraints: 4405503b)
@@ -203,8 +205,7 @@ org.gagravarr:vorbis-java-tika:0.8 (2 constraints: ac10e6b8)
org.glassfish.jaxb:jaxb-core:2.3.0.1 (2 constraints: d31a8983)
org.glassfish.jaxb:jaxb-runtime:2.3.0.1 (1 constraints: bb0c341b)
org.glassfish.jaxb:txw2:2.3.0.1 (1 constraints: be0c521f)
-org.hamcrest:hamcrest-all:1.3 (1 constraints: a8041d2c)
-org.hamcrest:hamcrest-core:1.3 (1 constraints: cc05fe3f)
+org.hamcrest:hamcrest-core:1.3 (2 constraints: 730ad9bf)
org.hsqldb:hsqldb:2.4.0 (1 constraints: 08050136)
org.itadaki:bzip2:0.9.1 (2 constraints: bd0c4b2c)
org.jdom:jdom2:2.0.6 (2 constraints: 681134f2)
@@ -213,7 +214,7 @@ org.jvnet.staxex:stax-ex:1.7.8 (1 constraints: c50dc135)
org.locationtech.spatial4j:spatial4j:0.7 (1 constraints: ab041e2c)
org.noggit:noggit:0.8 (1 constraints: ac041f2c)
org.opengis:geoapi:3.0.1 (7 constraints: 1361d046)
-org.ow2.asm:asm:6.2 (4 constraints: 2223c0a3)
+org.ow2.asm:asm:6.2 (5 constraints: 772fb0b6)
org.ow2.asm:asm-analysis:6.2 (1 constraints: e309d6a5)
org.ow2.asm:asm-commons:6.2 (1 constraints: aa04272c)
org.ow2.asm:asm-tree:6.2 (2 constraints: 2d14228c)
@@ -224,7 +225,7 @@ org.rrd4j:rrd4j:3.5 (1 constraints: ac04252c)
org.simpleframework:simple-xml:2.7.1 (1 constraints: 0c050b36)
org.slf4j:jcl-over-slf4j:1.7.25 (6 constraints: 974ad8ec)
org.slf4j:jul-to-slf4j:1.7.25 (2 constraints: d5113e11)
-org.slf4j:slf4j-api:1.7.25 (22 constraints: c2f7e475)
+org.slf4j:slf4j-api:1.7.25 (23 constraints: 0c05f93d)
org.tallison:jmatio:1.5 (2 constraints: a810a0b8)
org.tukaani:xz:1.8 (2 constraints: ae100fb9)
ua.net.nlp:morfologik-ukrainian-search:3.9.0 (1 constraints: 0e051536)