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:40 UTC
[lucene-solr] 02/04: SOLR-13452: Use eclipse-build instead of
build-eclipse just to match current.
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 }