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:38 UTC
[lucene-solr] branch jira/SOLR-13452_gradle_3 updated (5090c1a ->
3bcfcb4)
This is an automated email from the ASF dual-hosted git repository.
markrmiller pushed a change to branch jira/SOLR-13452_gradle_3
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git.
from 5090c1a SOLR-13452: Add note about running pristineClean before buildTest.
new 27f4eac SOLR-13452: Add a listDeps task and convert solrj to non transitive.
new 50dabfb SOLR-13452: Use eclipse-build instead of build-eclipse just to match current.
new 7260f76 SOLR-13452: More work on transitive deps, mostly on solr-core.
new 3bcfcb4 SOLR-13452: Improve/fix project naming.
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.gitignore | 3 +-
build.gradle | 50 ++--
buildSrc/ide/eclipse.gradle | 4 +-
.../gradle/{JUnit4.groovy => ListDeps.groovy} | 36 ++-
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 | 4 +-
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 | 5 +-
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 | 12 +-
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 | 278 ++++++++++++---------
.../solr/handler/tagger/XmlOffsetCorrector.java | 12 +-
solr/solrj/build.gradle | 73 +++---
solr/test-framework/build.gradle | 8 +-
versions.lock | 67 ++---
42 files changed, 431 insertions(+), 338 deletions(-)
copy buildSrc/src/main/groovy/org/apache/lucene/gradle/{JUnit4.groovy => ListDeps.groovy} (57%)
[lucene-solr] 02/04: SOLR-13452: Use eclipse-build instead of
build-eclipse just to match current.
Posted by ma...@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 50dabfbb794b29567d6893f7c4210bc7f09fb30e
Author: markrmiller <ma...@apache.org>
AuthorDate: Tue Jun 4 12:09:26 2019 -0500
SOLR-13452: Use eclipse-build instead of build-eclipse just to match current.
---
buildSrc/ide/eclipse.gradle | 2 +-
solr/core/build.gradle | 212 +++++++++++++++++++++++++-------------------
2 files changed, 120 insertions(+), 94 deletions(-)
diff --git a/buildSrc/ide/eclipse.gradle b/buildSrc/ide/eclipse.gradle
index d4363b9..f547ae8 100644
--- a/buildSrc/ide/eclipse.gradle
+++ b/buildSrc/ide/eclipse.gradle
@@ -31,7 +31,7 @@ eclipse {
classpath {
- defaultOutputDir = file('build-eclipse')
+ defaultOutputDir = file('eclipse-build')
downloadSources = true
downloadJavadoc = true
diff --git a/solr/core/build.gradle b/solr/core/build.gradle
index 0d57d1f..2a310f2 100644
--- a/solr/core/build.gradle
+++ b/solr/core/build.gradle
@@ -41,101 +41,127 @@ dependencies {
implementation project(':lucene:misc')
implementation project(':lucene:join')
- compileOnly ('javax.servlet:javax.servlet-api') { transitive = false }
+ compileOnly ('javax.servlet:javax.servlet-api')
- implementation ('org.eclipse.jetty:jetty-servlet') { transitive = false }
- implementation ('org.eclipse.jetty:jetty-server') { transitive = false }
-
- implementation ('org.apache.httpcomponents:httpclient') { transitive = false }
- implementation ('org.apache.httpcomponents:httpmime') { transitive = false }
- implementation ('org.apache.httpcomponents:httpcore') { transitive = false }
-
- // TODO: this is not good
- implementation ('org.apache.logging.log4j:log4j-slf4j-impl') { transitive = false }
-
- implementation ('org.slf4j:slf4j-api') { transitive = false }
- implementation ('org.slf4j:jcl-over-slf4j') { transitive = false }
- implementation ('org.codehaus.woodstox:stax2-api') { transitive = false }
- implementation ('org.codehaus.woodstox:woodstox-core-asl') { transitive = false }
- implementation ('org.apache.zookeeper:zookeeper') { transitive = false }
- implementation ('org.ow2.asm:asm') { transitive = false }
- implementation ('org.ow2.asm:asm-commons') { transitive = false }
- implementation ('io.dropwizard.metrics:metrics-core') { transitive = false }
- implementation ('io.dropwizard.metrics:metrics-graphite') { transitive = false }
- implementation ('io.dropwizard.metrics:metrics-jvm') { transitive = false }
- implementation ('io.dropwizard.metrics:metrics-jmx') { transitive = false }
- implementation ('org.noggit:noggit') { transitive = false }
- implementation ('commons-codec:commons-codec') { transitive = false }
- implementation ('commons-io:commons-io') { transitive = false }
- implementation ('org.apache.commons:commons-exec') { transitive = false }
- implementation ('commons-fileupload:commons-fileupload') { transitive = false }
- implementation ('commons-cli:commons-cli') { transitive = false }
- implementation ('org.apache.commons:commons-text') { transitive = false }
- implementation ('com.google.guava:guava') { transitive = false }
- implementation ('org.locationtech.spatial4j:spatial4j') { transitive = false }
- implementation ('org.apache.commons:commons-math3') { transitive = false }
- implementation ('org.ow2.asm:asm') { transitive = false }
-
- implementation ('org.restlet.jee:org.restlet') { transitive = false }
- implementation ('org.restlet.jee:org.restlet.ext.servlet') { transitive = false }
- implementation ('com.carrotsearch:hppc') { transitive = false }
-
- implementation ('org.apache.logging.log4j:log4j-api') { transitive = false }
- implementation ('org.apache.logging.log4j:log4j-core') { transitive = false }
- implementation ('org.apache.logging.log4j:log4j-1.2-api') { transitive = false }
- implementation ('org.slf4j:jcl-over-slf4j') { transitive = false }
-
- implementation ('com.fasterxml.jackson.core:jackson-core') { transitive = false }
- implementation ('com.fasterxml.jackson.core:jackson-databind') { transitive = false }
- implementation ('com.fasterxml.jackson.core:jackson-annotations') { transitive = false }
- implementation ('com.fasterxml.jackson.dataformat:jackson-dataformat-smile') { transitive = false }
- implementation ('org.apache.hadoop:hadoop-auth') { transitive = false }
- implementation ('org.apache.hadoop:hadoop-common') { transitive = false }
- implementation ('org.apache.hadoop:hadoop-hdfs-client') { transitive = false }
- implementation ('org.apache.hadoop:hadoop-annotations') { transitive = false }
- implementation ('org.apache.commons:commons-configuration2') { transitive = false }
- implementation ('commons-collections:commons-collections') { transitive = false }
- implementation ('commons-beanutils:commons-beanutils') { transitive = false }
- implementation ('com.github.ben-manes.caffeine:caffeine') { transitive = false }
- implementation ('com.google.re2j:re2j') { transitive = false }
- implementation ('org.apache.commons:commons-lang3') { transitive = false }
- implementation ('org.apache.htrace:htrace-core4') { transitive = false }
- implementation ('org.apache.curator:curator-framework') { transitive = false }
- implementation ('org.apache.curator:curator-client') { transitive = false }
- implementation ('org.apache.curator:curator-recipes') { transitive = false }
- implementation ('org.apache.kerby:kerb-core') { transitive = false }
- implementation ('org.apache.kerby:kerb-util') { transitive = false }
- implementation ('org.apache.kerby:kerby-asn1') { transitive = false }
- implementation ('org.apache.kerby:kerby-pkix') { transitive = false }
-
- implementation ('com.tdunning:t-digest') { transitive = false }
- implementation ('org.apache.calcite:calcite-core') { transitive = false }
- implementation ('org.apache.calcite:calcite-linq4j') { transitive = false }
- implementation ('org.apache.calcite.avatica:avatica-core') { transitive = false }
- implementation ('org.apache.commons:commons-lang3') { transitive = false }
- implementation ('net.hydromatic:eigenbase-properties') { transitive = false }
- implementation ('org.codehaus.janino:janino') { transitive = false }
- implementation ('org.codehaus.janino:commons-compiler') { transitive = false }
- implementation ('com.google.protobuf:protobuf-java') { transitive = false }
+ // TODO: this is not great
+ implementation ('org.apache.logging.log4j:log4j-slf4j-impl')
+
+ implementation ('org.slf4j:slf4j-api')
+ implementation ('org.slf4j:jcl-over-slf4j')
+ implementation ('org.apache.zookeeper:zookeeper') {
+ exclude group: '*', module: '*' // zk has many deps we don't need
+ }
+ implementation ('org.apache.httpcomponents:httpclient')
+ implementation ('org.apache.httpcomponents:httpmime')
+ implementation ('org.apache.httpcomponents:httpcore')
+ implementation ('org.codehaus.woodstox:stax2-api')
+ implementation ('org.ow2.asm:asm')
+ implementation ('org.ow2.asm:asm-commons')
+ implementation ('io.dropwizard.metrics:metrics-core') {
+ exclude group: 'com.rabbitmq', module: 'amqp-client' // we don't use this
+ }
+ implementation ('io.dropwizard.metrics:metrics-graphite') {
+ exclude group: 'com.rabbitmq', module: 'amqp-client' // we don't use this
+ }
+ implementation ('io.dropwizard.metrics:metrics-jvm')
+ implementation ('io.dropwizard.metrics:metrics-jmx')
+ implementation ('org.noggit:noggit')
+ implementation ('commons-codec:commons-codec')
+ implementation ('commons-io:commons-io')
+ implementation ('org.apache.commons:commons-exec')
+ implementation ('commons-fileupload:commons-fileupload')
+ implementation ('commons-cli:commons-cli')
+ implementation ('org.apache.commons:commons-text')
+ implementation ('com.google.guava:guava') {
+ exclude group: '*', module: '*' // many annotation deps we don't need
+ }
+ implementation ('org.locationtech.spatial4j:spatial4j')
+ implementation ('org.apache.commons:commons-math3')
+ implementation ('org.ow2.asm:asm')
+
+ implementation ('org.restlet.jee:org.restlet')
+ implementation ('org.restlet.jee:org.restlet.ext.servlet')
+ implementation ('com.carrotsearch:hppc')
+
+ implementation ('org.apache.logging.log4j:log4j-api')
+ implementation ('org.apache.logging.log4j:log4j-core')
+ implementation ('org.apache.logging.log4j:log4j-1.2-api')
+ implementation ('org.slf4j:jcl-over-slf4j')
+
+ implementation ('com.fasterxml.jackson.core:jackson-core')
+ implementation ('com.fasterxml.jackson.core:jackson-databind')
+ implementation ('com.fasterxml.jackson.core:jackson-annotations')
+ implementation ('com.fasterxml.jackson.dataformat:jackson-dataformat-smile')
+ implementation ('org.apache.hadoop:hadoop-auth') {
+ exclude group: '*', module: '*' // brings in a lot we don't use
+ }
+ implementation ('org.apache.hadoop:hadoop-common') {
+ exclude group: '*', module: '*' // brings in a lot we don't use
+ }
+ implementation ('org.apache.hadoop:hadoop-hdfs-client') {
+ exclude group: '*', module: '*' // brings in a lot we don't use
+ }
+ implementation ('org.apache.hadoop:hadoop-annotations') {
+ exclude group: '*', module: '*' // brings in a lot we don't use
+ }
+ implementation ('org.apache.commons:commons-configuration2')
+ implementation ('commons-collections:commons-collections')
+ implementation ('commons-beanutils:commons-beanutils')
+ implementation ('com.github.ben-manes.caffeine:caffeine')
+ implementation ('com.google.re2j:re2j')
+ implementation ('org.apache.commons:commons-lang3')
+ implementation ('org.apache.htrace:htrace-core4')
+ implementation ('org.apache.curator:curator-framework') {
+ exclude group: '*', module: '*' // brings in a lot we don't use
+ }
+ implementation ('org.apache.curator:curator-client') {
+ exclude group: '*', module: '*' // brings in a lot we don't use
+ }
+ implementation ('org.apache.curator:curator-recipes') {
+ exclude group: '*', module: '*' // brings in a lot we don't use
+ }
+ implementation ('org.apache.kerby:kerb-core')
+ implementation ('org.apache.kerby:kerb-util')
+ implementation ('org.apache.kerby:kerby-asn1')
+ implementation ('org.apache.kerby:kerby-pkix')
+
+ implementation ('com.tdunning:t-digest')
+ implementation ('org.apache.calcite:calcite-core') {
+ exclude group: '*', module: '*' // brings in a lot we don't use
+ }
+ implementation ('org.apache.calcite:calcite-linq4j') {
+ exclude group: '*', module: '*' // brings in a lot we don't use
+ }
+ implementation ('org.apache.calcite.avatica:avatica-core') {
+ exclude group: '*', module: '*' // brings in a lot we don't use
+ }
+ implementation ('org.apache.commons:commons-lang3')
+ implementation ('net.hydromatic:eigenbase-properties')
+ implementation ('org.codehaus.janino:janino')
+ implementation ('org.codehaus.janino:commons-compiler')
+ implementation ('com.google.protobuf:protobuf-java')
implementation ('com.jayway.jsonpath:json-path') { transitive = false }
- implementation ('org.rrd4j:rrd4j') { transitive = false }
- implementation ('org.bitbucket.b_c:jose4j') { transitive = false }
-
- implementation ('org.eclipse.jetty:jetty-alpn-server') { transitive = false }
- implementation ('org.eclipse.jetty.http2:http2-server') { transitive = false }
- implementation ('org.eclipse.jetty.http2:http2-client') { transitive = false }
- implementation ('org.eclipse.jetty.http2:http2-http-client-transport') { transitive = false }
- implementation ('org.eclipse.jetty.http2:http2-common') { transitive = false }
- implementation ('org.eclipse.jetty.http2:http2-hpack') { transitive = false }
- implementation ('org.eclipse.jetty:jetty-client') { transitive = false }
- implementation ('org.eclipse.jetty:jetty-util') { transitive = false }
- implementation ('org.eclipse.jetty:jetty-http') { transitive = false }
- implementation ('org.eclipse.jetty:jetty-io') { transitive = false }
- implementation ('org.eclipse.jetty:jetty-xml') { transitive = false }
- implementation ('org.eclipse.jetty:jetty-alpn-java-client') { transitive = false }
- implementation ('org.eclipse.jetty:jetty-alpn-client') { transitive = false }
-
- testRuntimeOnly ('com.lmax:disruptor') { transitive = false }
+ implementation ('org.rrd4j:rrd4j')
+ implementation ('org.bitbucket.b_c:jose4j')
+
+ implementation ('org.eclipse.jetty:jetty-alpn-server')
+ implementation ('org.eclipse.jetty.http2:http2-server')
+ implementation ('org.eclipse.jetty.http2:http2-client')
+ implementation ('org.eclipse.jetty.http2:http2-http-client-transport')
+ implementation ('org.eclipse.jetty.http2:http2-common')
+ implementation ('org.eclipse.jetty.http2:http2-hpack')
+ implementation ('org.eclipse.jetty:jetty-server')
+ implementation ('org.eclipse.jetty:jetty-client')
+ implementation ('org.eclipse.jetty:jetty-util')
+ implementation ('org.eclipse.jetty:jetty-http')
+ implementation ('org.eclipse.jetty:jetty-io')
+ implementation ('org.eclipse.jetty:jetty-xml')
+ implementation ('org.eclipse.jetty:jetty-alpn-java-client')
+ implementation ('org.eclipse.jetty:jetty-alpn-client')
+ implementation ('org.eclipse.jetty:jetty-servlet')
+ implementation ('org.eclipse.jetty:jetty-server')
+
+ testRuntimeOnly ('com.lmax:disruptor')
testImplementation ('org.eclipse.jetty:jetty-webapp') { transitive = false }
testImplementation ('com.sun.jersey:jersey-servlet:1.19.4') { transitive = false }
[lucene-solr] 03/04: SOLR-13452: More work on transitive deps,
mostly on solr-core.
Posted by ma...@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 7260f766ec9e8ab3e4f1a5e56f8c46c83b800ca3
Author: markrmiller <ma...@apache.org>
AuthorDate: Tue Jun 4 12:10:09 2019 -0500
SOLR-13452: More work on transitive deps, mostly on solr-core.
---
build.gradle | 9 +++-
.../org/apache/lucene/gradle/ListDeps.groovy | 18 +++++--
lucene/analysis/opennlp/build.gradle | 2 +-
lucene/memory/build.gradle | 1 +
lucene/test-framework/build.gradle | 10 ++--
solr/core/build.gradle | 24 +++++----
.../solr/handler/tagger/XmlOffsetCorrector.java | 12 ++---
solr/solrj/build.gradle | 4 +-
versions.lock | 58 +++++++++++-----------
9 files changed, 83 insertions(+), 55 deletions(-)
diff --git a/build.gradle b/build.gradle
index 63fe65e..42f434f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -30,6 +30,7 @@ def luceneSolrSubProjects = subprojects.findAll { project -> project.name != 'bu
def rootProjectDir = project.rootProject.projectDir;
+// make sure ant task logging shows up by default
ant.lifecycleLogLevel = "INFO"
// TOC
@@ -167,7 +168,13 @@ configure(allprojects) {
configure(allprojects) {
- dependencies {
+ dependencies {
+ configurations.all {
+ // these classes are in Java 11
+ exclude group: 'javax.xml.stream', module: 'stax-api'
+ exclude group: 'stax', module: 'stax-api'
+ }
+
modules {
module("commons-logging:commons-logging") { replacedBy("org.slf4j:jcl-over-slf4j") }
}
diff --git a/buildSrc/src/main/groovy/org/apache/lucene/gradle/ListDeps.groovy b/buildSrc/src/main/groovy/org/apache/lucene/gradle/ListDeps.groovy
index c353656..b330eac 100644
--- a/buildSrc/src/main/groovy/org/apache/lucene/gradle/ListDeps.groovy
+++ b/buildSrc/src/main/groovy/org/apache/lucene/gradle/ListDeps.groovy
@@ -29,10 +29,22 @@ class ListDeps extends DefaultTask {
@TaskAction
void list() {
- def artifacts = project.configurations.runtimeClasspath.getResolvedConfiguration().getResolvedArtifacts()
- println 'count: ' + artifacts.size()
+ println "Runtime Deps"
+ def runtimeArtifacts = project.configurations.runtimeClasspath.getResolvedConfiguration().getResolvedArtifacts()
+ runtimeArtifacts = runtimeArtifacts.toSorted{a,b -> a.name <=> b.name}
+ runtimeArtifacts.forEach( { ra -> println ra })
- artifacts.forEach( { ra -> println ra })
+ println "-"
+
+ println "TestRuntime Deps"
+ def testRuntimeArtifacts = project.configurations.testRuntimeClasspath.getResolvedConfiguration().getResolvedArtifacts()
+
+ testRuntimeArtifacts = testRuntimeArtifacts.toSorted{a,b -> a.name <=> b.name}
+ testRuntimeArtifacts.forEach( { ra -> println ra })
+
+ println "-"
+ println 'runtime count: ' + runtimeArtifacts.size()
+ println 'testRuntime count: ' + testRuntimeArtifacts.size()
}
}
diff --git a/lucene/analysis/opennlp/build.gradle b/lucene/analysis/opennlp/build.gradle
index 7f6c462..0cda201 100644
--- a/lucene/analysis/opennlp/build.gradle
+++ b/lucene/analysis/opennlp/build.gradle
@@ -156,7 +156,7 @@ task trainLemmatizerTrainerME(type: JavaExec) {
task trainTestModels {
group = 'Build'
- description = "Traines all small test models for unit tests."
+ description = "Trains all small test models for unit tests."
dependsOn trainSentenceDetector, trainTokenizerTrainer, trainPOSTaggerTrainer, trainChunkerTrainerME, trainTokenNameFinderTrainer, trainLemmatizerTrainerME
}
diff --git a/lucene/memory/build.gradle b/lucene/memory/build.gradle
index d646dc2..3f601cd 100644
--- a/lucene/memory/build.gradle
+++ b/lucene/memory/build.gradle
@@ -20,6 +20,7 @@ apply plugin: 'java-library'
dependencies {
implementation project(':lucene:lucene-core')
implementation project(':lucene:codecs')
+
testImplementation project(':lucene:lucene-test-framework')
testImplementation project(':lucene:queryparser')
}
\ No newline at end of file
diff --git a/lucene/test-framework/build.gradle b/lucene/test-framework/build.gradle
index b90762d..d7c4efa 100644
--- a/lucene/test-framework/build.gradle
+++ b/lucene/test-framework/build.gradle
@@ -24,10 +24,10 @@ dependencies {
api project(':lucene:lucene-core')
implementation project(':lucene:codecs')
- api ("junit:junit") { transitive = false }
- api ("com.carrotsearch.randomizedtesting:randomizedtesting-runner") { transitive = false }
- api ('org.hamcrest:hamcrest-all') { transitive = false }
-
- implementation ('commons-codec:commons-codec') { transitive = false }
+ api ("junit:junit")
+ api ('org.hamcrest:hamcrest-core')
+ api ("com.carrotsearch.randomizedtesting:randomizedtesting-runner")
+
+ implementation ('commons-codec:commons-codec')
}
diff --git a/solr/core/build.gradle b/solr/core/build.gradle
index 2a310f2..dadee3b 100644
--- a/solr/core/build.gradle
+++ b/solr/core/build.gradle
@@ -21,8 +21,6 @@ archivesBaseName = 'solr-core'
dependencies {
- implementation project(':solr:solrj')
-
implementation project(':lucene:lucene-core')
implementation project(':lucene:codecs')
implementation project(':lucene:analysis:analyzers-common')
@@ -40,6 +38,7 @@ dependencies {
implementation project(':lucene:queryparser')
implementation project(':lucene:misc')
implementation project(':lucene:join')
+ implementation project(':solr:solrj')
compileOnly ('javax.servlet:javax.servlet-api')
@@ -55,6 +54,7 @@ dependencies {
implementation ('org.apache.httpcomponents:httpmime')
implementation ('org.apache.httpcomponents:httpcore')
implementation ('org.codehaus.woodstox:stax2-api')
+ implementation ('org.codehaus.woodstox:woodstox-core-asl')
implementation ('org.ow2.asm:asm')
implementation ('org.ow2.asm:asm-commons')
implementation ('io.dropwizard.metrics:metrics-core') {
@@ -108,7 +108,7 @@ dependencies {
implementation ('commons-collections:commons-collections')
implementation ('commons-beanutils:commons-beanutils')
implementation ('com.github.ben-manes.caffeine:caffeine')
- implementation ('com.google.re2j:re2j')
+ implementation ('com.google.re2j:re2j')
implementation ('org.apache.commons:commons-lang3')
implementation ('org.apache.htrace:htrace-core4')
implementation ('org.apache.curator:curator-framework') {
@@ -140,7 +140,7 @@ dependencies {
implementation ('org.codehaus.janino:janino')
implementation ('org.codehaus.janino:commons-compiler')
implementation ('com.google.protobuf:protobuf-java')
- implementation ('com.jayway.jsonpath:json-path') { transitive = false }
+ implementation ('com.jayway.jsonpath:json-path')
implementation ('org.rrd4j:rrd4j')
implementation ('org.bitbucket.b_c:jose4j')
@@ -163,16 +163,23 @@ dependencies {
testRuntimeOnly ('com.lmax:disruptor')
+ testImplementation ('org.mockito:mockito-core') { transitive = false }
+ testImplementation ('net.bytebuddy:byte-buddy') { transitive = false }
+ testImplementation ('org.objenesis:objenesis') { transitive = false }
+ testImplementation ('commons-logging:commons-logging') { transitive = false }
+ testImplementation ('io.netty:netty-all') { transitive = false }
+ testImplementation ('org.apache.commons:commons-text')
testImplementation ('org.eclipse.jetty:jetty-webapp') { transitive = false }
testImplementation ('com.sun.jersey:jersey-servlet:1.19.4') { transitive = false }
+
+ // hdfs
testImplementation ('org.apache.hadoop:hadoop-minicluster') { transitive = false }
testImplementation ('org.apache.hadoop:hadoop-common::tests') { transitive = false }
testImplementation ('org.apache.hadoop:hadoop-hdfs') { transitive = false }
testImplementation ('org.apache.hadoop:hadoop-hdfs::tests') { transitive = false }
- testImplementation ('commons-logging:commons-logging') { transitive = false }
- testImplementation ('io.netty:netty-all') { transitive = false }
- testImplementation ('org.apache.commons:commons-text') { transitive = false }
testImplementation ('org.apache.hadoop:hadoop-minikdc') { transitive = false }
+
+ // kerby
testImplementation ('org.apache.kerby:kerby-config') { transitive = false }
testImplementation ('org.apache.kerby:kerb-client') { transitive = false }
testImplementation ('org.apache.kerby:kerb-common') { transitive = false }
@@ -183,9 +190,6 @@ dependencies {
testImplementation ('org.apache.kerby:kerby-util') { transitive = false }
testImplementation ('org.apache.kerby:kerb-admin') { transitive = false }
testImplementation ('org.apache.kerby:kerby-kdc') { transitive = false }
- testImplementation ('org.mockito:mockito-core') { transitive = false }
- testImplementation ('net.bytebuddy:byte-buddy') { transitive = false }
- testImplementation ('org.objenesis:objenesis') { transitive = false }
testImplementation project(path: ':lucene:backward-codecs', configuration: 'testOutput')
testImplementation project(path: ':lucene:queryparser', configuration: 'testOutput')
diff --git a/solr/core/src/java/org/apache/solr/handler/tagger/XmlOffsetCorrector.java b/solr/core/src/java/org/apache/solr/handler/tagger/XmlOffsetCorrector.java
index 576328f..d17c417 100644
--- a/solr/core/src/java/org/apache/solr/handler/tagger/XmlOffsetCorrector.java
+++ b/solr/core/src/java/org/apache/solr/handler/tagger/XmlOffsetCorrector.java
@@ -22,13 +22,14 @@
package org.apache.solr.handler.tagger;
+import java.io.InputStream;
+import java.io.StringReader;
+
+import javax.xml.stream.XMLInputFactory;
import javax.xml.stream.XMLResolver;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.events.XMLEvent;
-import java.io.InputStream;
-import java.io.StringReader;
-import com.ctc.wstx.stax.WstxInputFactory;
import org.apache.commons.io.input.ClosedInputStream;
import org.codehaus.stax2.LocationInfo;
import org.codehaus.stax2.XMLInputFactory2;
@@ -47,10 +48,10 @@ public class XmlOffsetCorrector extends OffsetCorrector {
//TODO use StAX without hard requirement on woodstox. xmlStreamReader.getLocation().getCharacterOffset()
- private static final XMLInputFactory2 XML_INPUT_FACTORY;
+ private static final XMLInputFactory XML_INPUT_FACTORY;
static {
// note: similar code in Solr's EmptyEntityResolver
- XML_INPUT_FACTORY = new WstxInputFactory();
+ XML_INPUT_FACTORY = XMLInputFactory2.newFactory();
XML_INPUT_FACTORY.setXMLResolver(new XMLResolver() {
@Override
public InputStream resolveEntity(String publicId, String systemId, String baseURI, String namespace) {
@@ -59,7 +60,6 @@ public class XmlOffsetCorrector extends OffsetCorrector {
});
// TODO disable DTD?
// XML_INPUT_FACTORY.setProperty(XMLInputFactory.IS_VALIDATING, Boolean.FALSE)
- XML_INPUT_FACTORY.configureForSpeed();
}
/**
diff --git a/solr/solrj/build.gradle b/solr/solrj/build.gradle
index 16c8e9a..bcf0c92 100644
--- a/solr/solrj/build.gradle
+++ b/solr/solrj/build.gradle
@@ -56,7 +56,9 @@ dependencies {
testImplementation ('org.eclipse.jetty:jetty-server')
testImplementation ('org.eclipse.jetty:jetty-xml')
testImplementation ('commons-collections:commons-collections')
- testImplementation ('com.google.guava:guava')
+ testImplementation ('com.google.guava:guava') {
+ exclude group: '*', module: '*' // many annotation deps we don't need
+ }
testImplementation ('org.apache.commons:commons-compress')
testImplementation ('org.mockito:mockito-core')
testImplementation ('net.bytebuddy:byte-buddy')
diff --git a/versions.lock b/versions.lock
index 8f9b652..f482593 100644
--- a/versions.lock
+++ b/versions.lock
@@ -7,8 +7,8 @@ com.carrotsearch.randomizedtesting:randomizedtesting-runner:2.7.2 (1 constraints
com.cybozu.labs:langdetect:1.1-20120112 (1 constraints: 5c066d5e)
com.drewnoakes:metadata-extractor:2.11.0 (2 constraints: c011970f)
com.epam:parso:2.0.9 (2 constraints: 6e11a9f2)
-com.fasterxml.jackson.core:jackson-annotations:2.9.8 (2 constraints: 7c1103f4)
-com.fasterxml.jackson.core:jackson-core:2.9.8 (3 constraints: de2340b3)
+com.fasterxml.jackson.core:jackson-annotations:2.9.8 (3 constraints: d62310b2)
+com.fasterxml.jackson.core:jackson-core:2.9.8 (4 constraints: ed3b2294)
com.fasterxml.jackson.core:jackson-databind:2.9.8 (2 constraints: 7c1103f4)
com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.9.8 (1 constraints: 15051836)
com.fasterxml.woodstox:woodstox-core:5.2.0 (1 constraints: 360a63bc)
@@ -45,11 +45,10 @@ com.tdunning:t-digest:3.1 (1 constraints: a804212c)
commons-beanutils:commons-beanutils:1.9.3 (1 constraints: 0f050e36)
commons-cli:commons-cli:1.2 (2 constraints: 161107d9)
commons-codec:commons-codec:1.11 (4 constraints: 2d29e02a)
-commons-collections:commons-collections:3.2.2 (2 constraints: d911ad14)
+commons-collections:commons-collections:3.2.2 (3 constraints: 9121ccda)
commons-fileupload:commons-fileupload:1.3.3 (1 constraints: 0905fc35)
-commons-io:commons-io:2.6 (3 constraints: 1b1dc919)
+commons-io:commons-io:2.6 (4 constraints: 2e2d61f3)
commons-lang:commons-lang:2.6 (3 constraints: df29f552)
-commons-logging:commons-logging:1.2 (2 constraints: c8149e7f)
de.l3s.boilerpipe:boilerpipe:1.1.0 (2 constraints: 5c1146f1)
de.thetaphi:forbiddenapis:2.6 (1 constraints: ac04232c)
edu.ucar:cdm:4.5.5 (3 constraints: 9d1abd7d)
@@ -58,7 +57,7 @@ edu.ucar:httpservices:4.5.5 (2 constraints: 8f122834)
edu.ucar:netcdf4:4.5.5 (1 constraints: 650c0402)
edu.ucar:udunits:4.5.5 (1 constraints: 2b06034e)
edu.usc.ir:sentiment-analysis-parser:0.1 (1 constraints: fa0b50e9)
-io.dropwizard.metrics:metrics-core:4.0.5 (1 constraints: 0b050436)
+io.dropwizard.metrics:metrics-core:4.0.5 (4 constraints: 48333d26)
io.dropwizard.metrics:metrics-graphite:4.0.5 (1 constraints: 0b050436)
io.dropwizard.metrics:metrics-jetty9:4.0.5 (1 constraints: 0b050436)
io.dropwizard.metrics:metrics-jmx:4.0.5 (1 constraints: 0b050436)
@@ -70,7 +69,7 @@ io.sgr:s2-geometry-library-java:1.0.0 (1 constraints: 0305f035)
javax.activation:activation:1.1.1 (2 constraints: 5e116df1)
javax.annotation:javax.annotation-api:1.3 (1 constraints: f50e785e)
javax.measure:unit-api:1.0 (5 constraints: 8e3e2cc5)
-javax.servlet:javax.servlet-api:3.1.0 (1 constraints: 0605fd35)
+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)
@@ -92,7 +91,7 @@ org.apache.commons:commons-compress:1.18 (4 constraints: 2128b5ae)
org.apache.commons:commons-configuration2:2.1.1 (1 constraints: 0605f935)
org.apache.commons:commons-csv:1.5 (1 constraints: ff0b57e9)
org.apache.commons:commons-exec:1.3 (2 constraints: a41056b8)
-org.apache.commons:commons-lang3:3.6 (1 constraints: ad04262c)
+org.apache.commons:commons-lang3:3.8.1 (3 constraints: 2824aaaf)
org.apache.commons:commons-math3:3.6.1 (1 constraints: 0c050d36)
org.apache.commons:commons-text:1.6 (1 constraints: ab04202c)
org.apache.curator:curator-client:2.13.0 (1 constraints: 3805383b)
@@ -113,13 +112,16 @@ org.apache.httpcomponents:httpcore:4.4.10 (4 constraints: ce250e79)
org.apache.httpcomponents:httpmime:4.5.6 (3 constraints: 8e1b90af)
org.apache.james:apache-mime4j-core:0.8.2 (3 constraints: 9f1f5230)
org.apache.james:apache-mime4j-dom:0.8.2 (2 constraints: 6c1192f2)
-org.apache.kerby:kerb-core:1.0.1 (1 constraints: 0405f135)
+org.apache.kerby:kerb-core:1.0.1 (3 constraints: f11c583a)
+org.apache.kerby:kerb-crypto:1.0.1 (1 constraints: 860b05e6)
org.apache.kerby:kerb-util:1.0.1 (1 constraints: 0405f135)
-org.apache.kerby:kerby-asn1:1.0.1 (1 constraints: 0405f135)
-org.apache.kerby:kerby-pkix:1.0.1 (1 constraints: 0405f135)
+org.apache.kerby:kerby-asn1:1.0.1 (2 constraints: 001155df)
+org.apache.kerby:kerby-config:1.0.1 (1 constraints: 860b05e6)
+org.apache.kerby:kerby-pkix:1.0.1 (2 constraints: 741065ca)
+org.apache.kerby:kerby-util:1.0.1 (2 constraints: 6518bdb6)
org.apache.logging.log4j:log4j-1.2-api:2.11.2 (1 constraints: 3805343b)
-org.apache.logging.log4j:log4j-api:2.11.2 (1 constraints: 3805343b)
-org.apache.logging.log4j:log4j-core:2.11.2 (1 constraints: 3805343b)
+org.apache.logging.log4j:log4j-api:2.11.2 (4 constraints: c83394ae)
+org.apache.logging.log4j:log4j-core:2.11.2 (3 constraints: 102588ba)
org.apache.logging.log4j:log4j-slf4j-impl:2.11.2 (1 constraints: 3805343b)
org.apache.opennlp:opennlp-tools:1.9.1 (2 constraints: 6d11c4f2)
org.apache.pdfbox:fontbox:2.0.15 (2 constraints: 4f1040c5)
@@ -167,32 +169,32 @@ org.carrot2.attributes:attributes-binder:1.3.3 (1 constraints: 0905fc35)
org.carrot2.shaded:carrot2-guava:18.0 (1 constraints: dd040931)
org.ccil.cowan.tagsoup:tagsoup:1.2.1 (2 constraints: 601198f1)
org.checkerframework:checker-qual:2.0.0 (1 constraints: 140ae5b4)
-org.codehaus.janino:commons-compiler:3.0.9 (1 constraints: 0e050336)
+org.codehaus.janino:commons-compiler:3.0.9 (2 constraints: d910f7d1)
org.codehaus.janino:janino:3.0.9 (1 constraints: 0e050336)
org.codehaus.mojo:animal-sniffer-annotations:1.14 (1 constraints: ea09d5aa)
-org.codehaus.woodstox:stax2-api:4.1 (2 constraints: d7141885)
+org.codehaus.woodstox:stax2-api:4.1 (3 constraints: f125f836)
org.codehaus.woodstox:woodstox-core-asl:4.4.1 (1 constraints: 0b050c36)
org.codelibs:jhighlight:1.0.3 (1 constraints: 5b0ce401)
-org.eclipse.jetty:jetty-alpn-client:9.4.14.v20181114 (1 constraints: 7a070e7d)
+org.eclipse.jetty:jetty-alpn-client:9.4.14.v20181114 (3 constraints: bf2ca4fb)
org.eclipse.jetty:jetty-alpn-java-client:9.4.14.v20181114 (1 constraints: 7a070e7d)
org.eclipse.jetty:jetty-alpn-server:9.4.14.v20181114 (1 constraints: 7a070e7d)
-org.eclipse.jetty:jetty-client:9.4.14.v20181114 (1 constraints: 7a070e7d)
+org.eclipse.jetty:jetty-client:9.4.14.v20181114 (2 constraints: 411fc83d)
org.eclipse.jetty:jetty-continuation:9.4.14.v20181114 (1 constraints: 7a070e7d)
org.eclipse.jetty:jetty-deploy:9.4.14.v20181114 (1 constraints: 7a070e7d)
-org.eclipse.jetty:jetty-http:9.4.14.v20181114 (1 constraints: 7a070e7d)
-org.eclipse.jetty:jetty-io:9.4.14.v20181114 (1 constraints: 7a070e7d)
+org.eclipse.jetty:jetty-http:9.4.14.v20181114 (4 constraints: 963853af)
+org.eclipse.jetty:jetty-io:9.4.14.v20181114 (6 constraints: 6b59afbf)
org.eclipse.jetty:jetty-jmx:9.4.14.v20181114 (1 constraints: 7a070e7d)
org.eclipse.jetty:jetty-rewrite:9.4.14.v20181114 (1 constraints: 7a070e7d)
-org.eclipse.jetty:jetty-security:9.4.14.v20181114 (1 constraints: 7a070e7d)
-org.eclipse.jetty:jetty-server:9.4.14.v20181114 (1 constraints: 7a070e7d)
+org.eclipse.jetty:jetty-security:9.4.14.v20181114 (2 constraints: de1772dc)
+org.eclipse.jetty:jetty-server:9.4.14.v20181114 (4 constraints: f73bfbd7)
org.eclipse.jetty:jetty-servlet:9.4.14.v20181114 (1 constraints: 7a070e7d)
org.eclipse.jetty:jetty-servlets:9.4.14.v20181114 (1 constraints: 7a070e7d)
-org.eclipse.jetty:jetty-util:9.4.14.v20181114 (1 constraints: 7a070e7d)
+org.eclipse.jetty:jetty-util:9.4.14.v20181114 (5 constraints: c8449c9d)
org.eclipse.jetty:jetty-webapp:9.4.14.v20181114 (1 constraints: 7a070e7d)
org.eclipse.jetty:jetty-xml:9.4.14.v20181114 (1 constraints: 7a070e7d)
-org.eclipse.jetty.http2:http2-client:9.4.14.v20181114 (1 constraints: 7a070e7d)
-org.eclipse.jetty.http2:http2-common:9.4.14.v20181114 (1 constraints: 7a070e7d)
-org.eclipse.jetty.http2:http2-hpack:9.4.14.v20181114 (1 constraints: 7a070e7d)
+org.eclipse.jetty.http2:http2-client:9.4.14.v20181114 (2 constraints: 411fc83d)
+org.eclipse.jetty.http2:http2-common:9.4.14.v20181114 (3 constraints: 122b0a1b)
+org.eclipse.jetty.http2:http2-hpack:9.4.14.v20181114 (2 constraints: 4419b95a)
org.eclipse.jetty.http2:http2-http-client-transport:9.4.14.v20181114 (1 constraints: 7a070e7d)
org.eclipse.jetty.http2:http2-server:9.4.14.v20181114 (1 constraints: 7a070e7d)
org.eclipse.jgit:org.eclipse.jgit:4.6.0.201612231935-r (1 constraints: 3c085c99)
@@ -216,13 +218,13 @@ 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)
org.quartz-scheduler:quartz:2.2.0 (1 constraints: 2106eb4d)
-org.restlet.jee:org.restlet:2.3.0 (1 constraints: 0705fe35)
+org.restlet.jee:org.restlet:2.3.0 (2 constraints: e3159ee6)
org.restlet.jee:org.restlet.ext.servlet:2.3.0 (1 constraints: 0705fe35)
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 (3 constraints: 0018d6b7)
+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 (14 constraints: af846a32)
+org.slf4j:slf4j-api:1.7.25 (22 constraints: c2f7e475)
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)
[lucene-solr] 01/04: SOLR-13452: Add a listDeps task and convert
solrj to non transitive.
Posted by ma...@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 27f4eac8e4310c99444e197035bd06b388b3d777
Author: markrmiller <ma...@apache.org>
AuthorDate: Mon Jun 3 12:33:16 2019 -0500
SOLR-13452: Add a listDeps task and convert solrj to non transitive.
---
build.gradle | 21 +++++--
.../org/apache/lucene/gradle/ListDeps.groovy | 39 +++++++++++++
solr/solrj/build.gradle | 67 +++++++++++-----------
3 files changed, 90 insertions(+), 37 deletions(-)
diff --git a/build.gradle b/build.gradle
index 34712ee..63fe65e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -37,6 +37,7 @@ ant.lifecycleLogLevel = "INFO"
// -> lucene-solr sub module config
// -> lucene-solr root project config
// -> lucene-solr IDE config
+// -> other config
// -> lucene-solr all module config - configure all lucene-solr projects, including root project
configure(luceneSolrProjects) {
@@ -78,6 +79,11 @@ configure(luceneSolrProjects) {
}
// TODO: check.dependsOn checkMissingJavaDocs
+
+ task listDeps(type: org.apache.lucene.gradle.ListDeps) {
+ group = 'Help'
+ description = "List deps for a module."
+ }
}
// -> lucene-solr sub module config - configure all lucene-solr modules (excludes the root project)
@@ -150,14 +156,21 @@ configure(rootProject) {
configure(allprojects) {
apply plugin: 'eclipse'
apply plugin: 'idea'
-}
-
-configure(allprojects) {
+
plugins.withType(JavaPlugin) {
-
project.apply from: new File(rootProjectDir, "buildSrc/ide/eclipse.gradle")
project.apply from: new File(rootProjectDir, "buildSrc/ide/idea.gradle")
+ }
+}
+
+// -> other config
+configure(allprojects) {
+
+ dependencies {
+ modules {
+ module("commons-logging:commons-logging") { replacedBy("org.slf4j:jcl-over-slf4j") }
+ }
}
}
diff --git a/buildSrc/src/main/groovy/org/apache/lucene/gradle/ListDeps.groovy b/buildSrc/src/main/groovy/org/apache/lucene/gradle/ListDeps.groovy
new file mode 100644
index 0000000..c353656
--- /dev/null
+++ b/buildSrc/src/main/groovy/org/apache/lucene/gradle/ListDeps.groovy
@@ -0,0 +1,39 @@
+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
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import org.gradle.api.DefaultTask
+import org.gradle.api.Project
+import org.gradle.api.tasks.Input
+import org.gradle.api.tasks.Optional
+import org.gradle.api.tasks.InputDirectory
+import org.gradle.api.tasks.InputFile
+import org.gradle.api.tasks.OutputDirectory
+import org.gradle.api.tasks.TaskAction
+import org.gradle.api.tasks.bundling.Compression
+
+class ListDeps extends DefaultTask {
+
+ @TaskAction
+ void list() {
+ def artifacts = project.configurations.runtimeClasspath.getResolvedConfiguration().getResolvedArtifacts()
+ println 'count: ' + artifacts.size()
+
+ artifacts.forEach( { ra -> println ra })
+ }
+}
+
+
diff --git a/solr/solrj/build.gradle b/solr/solrj/build.gradle
index 6fad43b..16c8e9a 100644
--- a/solr/solrj/build.gradle
+++ b/solr/solrj/build.gradle
@@ -28,40 +28,41 @@ dependencies {
runtimeOnly ('org.eclipse.jetty:jetty-security') { transitive = false }
- implementation ('org.apache.zookeeper:zookeeper') { transitive = false }
- implementation ('org.apache.httpcomponents:httpclient') { transitive = false }
- implementation ('org.apache.httpcomponents:httpmime') { transitive = false }
- implementation ('org.apache.httpcomponents:httpcore') { transitive = false }
- implementation ('commons-io:commons-io') { transitive = false }
- implementation ('org.apache.commons:commons-math3') { transitive = false }
-
- implementation ('org.noggit:noggit') { transitive = false }
- implementation ('org.slf4j:slf4j-api') { transitive = false }
- implementation ('org.slf4j:jcl-over-slf4j') { transitive = false }
- implementation ('org.eclipse.jetty.http2:http2-client') { transitive = false }
- implementation ('org.eclipse.jetty.http2:http2-http-client-transport') { transitive = false }
- implementation ('org.eclipse.jetty.http2:http2-common') { transitive = false }
- implementation ('org.eclipse.jetty.http2:http2-hpack') { transitive = false }
- implementation ('org.eclipse.jetty:jetty-client') { transitive = false }
- implementation ('org.eclipse.jetty:jetty-util') { transitive = false }
- implementation ('org.eclipse.jetty:jetty-http') { transitive = false }
- implementation ('commons-codec:commons-codec') { transitive = false }
+ implementation ('org.apache.zookeeper:zookeeper') {
+ exclude group: '*', module: '*' // zk has many deps we don't need
+ }
+ implementation ('org.apache.httpcomponents:httpclient')
+ implementation ('org.apache.httpcomponents:httpmime')
+ implementation ('org.apache.httpcomponents:httpcore')
+ implementation ('org.slf4j:jcl-over-slf4j')
+ implementation ('commons-io:commons-io')
+ implementation ('org.apache.commons:commons-math3')
+ implementation ('org.noggit:noggit')
+ implementation ('org.slf4j:slf4j-api')
+ implementation ('org.eclipse.jetty.http2:http2-client')
+ implementation ('org.eclipse.jetty.http2:http2-http-client-transport')
+ implementation ('org.eclipse.jetty.http2:http2-common')
+ implementation ('org.eclipse.jetty.http2:http2-hpack')
+ implementation ('org.eclipse.jetty:jetty-client')
+ implementation ('org.eclipse.jetty:jetty-util')
+ implementation ('org.eclipse.jetty:jetty-http')
+ implementation ('commons-codec:commons-codec')
- testImplementation ('org.eclipse.jetty:jetty-servlet') { transitive = false }
- testImplementation ('io.dropwizard.metrics:metrics-core') { transitive = false }
- testImplementation ('org.restlet.jee:org.restlet') { transitive = false }
- testImplementation ('org.restlet.jee:org.restlet.ext.servlet') { transitive = false }
- testImplementation ('org.eclipse.jetty:jetty-webapp') { transitive = false }
- testImplementation ('org.eclipse.jetty:jetty-server') { transitive = false }
- testImplementation ('org.eclipse.jetty:jetty-xml') { transitive = false }
- testImplementation ('commons-collections:commons-collections') { transitive = false }
- testImplementation ('com.google.guava:guava') { transitive = false }
- testImplementation ('org.apache.commons:commons-compress') { transitive = false }
- testImplementation ('org.mockito:mockito-core') { transitive = false }
- testImplementation ('net.bytebuddy:byte-buddy') { transitive = false }
- testImplementation ('org.objenesis:objenesis') { transitive = false }
- testImplementation ('org.apache.commons:commons-lang3') { transitive = false }
- testImplementation ('javax.servlet:javax.servlet-api') { transitive = false }
+ testImplementation ('org.eclipse.jetty:jetty-servlet')
+ testImplementation ('io.dropwizard.metrics:metrics-core')
+ testImplementation ('org.restlet.jee:org.restlet')
+ testImplementation ('org.restlet.jee:org.restlet.ext.servlet')
+ testImplementation ('org.eclipse.jetty:jetty-webapp')
+ testImplementation ('org.eclipse.jetty:jetty-server')
+ testImplementation ('org.eclipse.jetty:jetty-xml')
+ testImplementation ('commons-collections:commons-collections')
+ testImplementation ('com.google.guava:guava')
+ testImplementation ('org.apache.commons:commons-compress')
+ testImplementation ('org.mockito:mockito-core')
+ testImplementation ('net.bytebuddy:byte-buddy')
+ testImplementation ('org.objenesis:objenesis')
+ testImplementation ('org.apache.commons:commons-lang3')
+ testImplementation ('javax.servlet:javax.servlet-api')
testImplementation project(':solr:solr-core')
testImplementation project(':lucene:lucene-core')
[lucene-solr] 04/04: SOLR-13452: Improve/fix project naming.
Posted by ma...@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 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)