SOLR-13452: Updates needed after merging to latest master.
diff --git a/solr/contrib/analytics/build.gradle b/solr/contrib/analytics/build.gradle
index d4e8d5d..083c41b 100644
--- a/solr/contrib/analytics/build.gradle
+++ b/solr/contrib/analytics/build.gradle
@@ -43,6 +43,7 @@
testRuntimeOnly ('org.apache.httpcomponents:httpclient') { transitive = false }
testRuntimeOnly ('org.apache.httpcomponents:httpcore') { transitive = false }
testRuntimeOnly ('org.apache.zookeeper:zookeeper') { transitive = false }
+ testRuntimeOnly ('org.apache.zookeeper:zookeeper-jute')
testRuntimeOnly ('org.eclipse.jetty:jetty-server') { transitive = false }
testRuntimeOnly ('org.eclipse.jetty:jetty-util') { transitive = false }
testRuntimeOnly ('org.eclipse.jetty:jetty-client') { transitive = false }
diff --git a/solr/contrib/dataimporthandler/build.gradle b/solr/contrib/dataimporthandler/build.gradle
index 1ff74cd..ba79e15 100644
--- a/solr/contrib/dataimporthandler/build.gradle
+++ b/solr/contrib/dataimporthandler/build.gradle
@@ -49,6 +49,7 @@
}
implementation ('org.apache.httpcomponents:httpclient') { transitive = false }
implementation ('org.apache.zookeeper:zookeeper') { transitive = false }
+ implementation ('org.apache.zookeeper:zookeeper-jute')
implementation ('io.dropwizard.metrics:metrics-core') { transitive = false }
testImplementation project(':lucene:lucene-test-framework')
diff --git a/solr/contrib/ltr/build.gradle b/solr/contrib/ltr/build.gradle
index 67359ba..9580077 100644
--- a/solr/contrib/ltr/build.gradle
+++ b/solr/contrib/ltr/build.gradle
@@ -39,6 +39,7 @@
testImplementation ('org.objenesis:objenesis') { transitive = false }
testImplementation ('org.restlet.jee:org.restlet.ext.servlet') { transitive = false }
testImplementation 'org.apache.zookeeper:zookeeper'
+ testImplementation ('org.apache.zookeeper:zookeeper-jute')
testImplementation project(':lucene:lucene-test-framework')
testImplementation project(':solr:solr-test-framework')
diff --git a/solr/contrib/prometheus-exporter/build.gradle b/solr/contrib/prometheus-exporter/build.gradle
index 7d2fad3..8e2e1a2 100644
--- a/solr/contrib/prometheus-exporter/build.gradle
+++ b/solr/contrib/prometheus-exporter/build.gradle
@@ -37,6 +37,7 @@
implementation ('org.slf4j:slf4j-api') { transitive = false }
implementation ('com.google.guava:guava') { transitive = false }
implementation ('org.apache.zookeeper:zookeeper') { transitive = false }
+ implementation ('org.apache.zookeeper:zookeeper-jute')
implementation ('commons-codec:commons-codec') { transitive = false }
implementation ('commons-io:commons-io') { transitive = false }
implementation ('org.apache.httpcomponents:httpclient') { transitive = false }
diff --git a/solr/core/build.gradle b/solr/core/build.gradle
index 0cce7f8..a727831 100644
--- a/solr/core/build.gradle
+++ b/solr/core/build.gradle
@@ -64,10 +64,15 @@
implementation ('org.slf4j:slf4j-api')
implementation ('org.apache.logging.log4j:log4j-api')
implementation ('org.apache.logging.log4j:log4j-core')
- // implementation ('org.apache.logging.log4j:log4j-1.2-api') // used by StartupLoggingUtils
implementation ('org.apache.logging.log4j:log4j-slf4j-impl') // still have to work out logging dist strat
+ // open tracing
+ implementation 'io.opentracing:opentracing-api'
+ implementation 'io.opentracing:opentracing-noop'
+ implementation 'io.opentracing:opentracing-util'
+
implementation ('org.apache.zookeeper:zookeeper') { transitive = false } // brings in a lot we don't use
+ implementation ('org.apache.zookeeper:zookeeper-jute')
implementation ('org.apache.httpcomponents:httpclient')
implementation ('org.apache.httpcomponents:httpcore')
implementation ('org.codehaus.woodstox:stax2-api')
@@ -208,6 +213,9 @@
classExclude 'org\\.pentaho\\.aggdes\\..*' // calcite sql stuff we apparently don't need
classExclude 'org\\.apache\\.commons\\.dbcp2\\.BasicDataSource' // calcite jdbc sql stuff we apparently don't need
classExclude 'com\\.yahoo\\.sketches\\.hll\\..*' // calcite sql stuff we apparently don't need
+
+ classExclude 'io\\.netty\\.buffer\\..*' // zk 3.5.5 added these deps we don't have
+ classExclude 'io\\.netty\\.handler\\.ssl\\.SslHandler' // zk 3.5.5 added these deps we don't have
}
unusedDeps {
diff --git a/solr/solrj/build.gradle b/solr/solrj/build.gradle
index 29172eb..9f4d8f8 100644
--- a/solr/solrj/build.gradle
+++ b/solr/solrj/build.gradle
@@ -21,14 +21,16 @@
dependencies {
- implementation ('org.apache.zookeeper:zookeeper') { transitive = false } // // zk has annotation deps we don't need
+ api ('org.apache.zookeeper:zookeeper') { transitive = false } // // zk has annotation deps we don't need
+ api ('org.apache.zookeeper:zookeeper-jute')
+
+ implementation ('org.slf4j:slf4j-api')
+ implementation ('org.slf4j:jcl-over-slf4j')
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.slf4j:slf4j-api')
implementation ('org.eclipse.jetty.http2:http2-client')
implementation ('org.eclipse.jetty.http2:http2-http-client-transport')
implementation ('org.eclipse.jetty:jetty-util')
diff --git a/solr/test-framework/build.gradle b/solr/test-framework/build.gradle
index 47a4e53..5d4bfab 100644
--- a/solr/test-framework/build.gradle
+++ b/solr/test-framework/build.gradle
@@ -33,12 +33,15 @@
api project(':lucene:analysis:lucene-analyzers-common')
api ('junit:junit') { transitive = false }
+ api ('io.opentracing:opentracing-mock')
+ implementation ('commons-cli:commons-cli')
implementation ('org.apache.httpcomponents:httpclient') { transitive = false }
implementation ('org.apache.httpcomponents:httpcore') { transitive = false }
implementation ('org.apache.httpcomponents:httpmime') { transitive = false }
implementation ('org.slf4j:slf4j-api') { transitive = false }
implementation ('org.apache.logging.log4j:log4j-api') { transitive = false }
implementation ('org.apache.zookeeper:zookeeper') { transitive = false }
+ implementation ('org.apache.zookeeper:zookeeper-jute')
implementation ('commons-io:commons-io') { transitive = false }
api ('org.eclipse.jetty:jetty-util') { transitive = false }
implementation ('org.apache.logging.log4j:log4j-core') { transitive = false }
diff --git a/versions.lock b/versions.lock
index 8b746f4..15cb819 100644
--- a/versions.lock
+++ b/versions.lock
@@ -62,6 +62,10 @@
io.dropwizard.metrics:metrics-jetty9:4.0.5 (1 constraints: 0b050436)
io.dropwizard.metrics:metrics-jmx:4.0.5 (1 constraints: 0b050436)
io.dropwizard.metrics:metrics-jvm:4.0.5 (1 constraints: 0b050436)
+io.opentracing:opentracing-api:0.33.0 (4 constraints: a62f7e64)
+io.opentracing:opentracing-mock:0.33.0 (1 constraints: 3805343b)
+io.opentracing:opentracing-noop:0.33.0 (3 constraints: 7c2142bd)
+io.opentracing:opentracing-util:0.33.0 (2 constraints: 5013be5a)
io.prometheus:simpleclient:0.2.0 (1 constraints: 0405f135)
io.prometheus:simpleclient_common:0.2.0 (1 constraints: 0405f135)
io.prometheus:simpleclient_httpserver:0.2.0 (1 constraints: 0405f135)
@@ -154,7 +158,9 @@
org.apache.velocity.tools:velocity-tools-view-jsp:3.0 (1 constraints: a704202c)
org.apache.ws.xmlschema:xmlschema-core:2.2.3 (1 constraints: 370a5abc)
org.apache.xmlbeans:xmlbeans:3.0.1 (2 constraints: de126c41)
-org.apache.zookeeper:zookeeper:3.4.14 (1 constraints: 3e05453b)
+org.apache.yetus:audience-annotations:0.5.0 (1 constraints: 6a0ff479)
+org.apache.zookeeper:zookeeper:3.5.5 (1 constraints: 0f050e36)
+org.apache.zookeeper:zookeeper-jute:3.5.5 (1 constraints: 0f050e36)
org.aspectj:aspectjrt:1.8.0 (1 constraints: 0b050836)
org.bitbucket.b_c:jose4j:0.6.5 (1 constraints: 0d050236)
org.bouncycastle:bcmail-jdk15on:1.60 (2 constraints: 0a113ad5)
diff --git a/versions.props b/versions.props
index 6977a6a..85360cd 100644
--- a/versions.props
+++ b/versions.props
@@ -39,6 +39,7 @@
io.netty:netty-all=4.0.52.Final
io.prometheus:*=0.2.0
io.sgr:s2-geometry-library-java=1.0.0
+io.opentracing:*=0.33.0
javax.activation:activation=1.1.1
javax.servlet:javax.servlet-api=3.1.0
junit:junit=4.12
@@ -77,7 +78,7 @@
org.apache.velocity.tools:*=3.0
org.apache.velocity:*=2.1
org.apache.xmlbeans:xmlbeans=3.0.1
-org.apache.zookeeper:zookeeper=3.4.14
+org.apache.zookeeper:*=3.5.5
org.asciidoctor:asciidoctor-ant=1.6.0-alpha.5
org.aspectj:aspectjrt=1.8.0
org.bitbucket.b_c:jose4j=0.6.5
