Apache Solr open-source search software
SOLR-18075: SolrJ-Zookeeper no longer depends on Jetty (#4062)
David Smiley9f69afb24284
diff --git a/changelog/unreleased/SOLR-18075-zkNoJetty.yml b/changelog/unreleased/SOLR-18075-zkNoJetty.ymlnew file mode 100644index 00000000000..f501e1cb602--- /dev/null+++ b/changelog/unreleased/SOLR-18075-zkNoJetty.yml@@ -0,0 +1,8 @@+# See https://github.com/apache/solr/blob/main/dev-docs/changelog.adoc+title: 'solrj-zookeeper depended on jetty, although not in practice. Not any longer.'+type: other # added, changed, fixed, deprecated, removed, dependency_update, security, other+authors:+ - name: David Smiley+links:+ - name: SOLR-18075+ url: https://issues.apache.org/jira/browse/SOLR-18075diff --git a/solr/solrj-zookeeper/build.gradle b/solr/solrj-zookeeper/build.gradleindex 1f2f212f15e..57abfbf5b0c 100644--- a/solr/solrj-zookeeper/build.gradle+++ b/solr/solrj-zookeeper/build.gradle@@ -30,7 +30,6 @@ dependencies {}implementation project(':solr:solrj')- implementation project(':solr:solrj-jetty')implementation project(':solr:api')implementation libs.slf4j.apidiff --git a/solr/solrj-zookeeper/gradle.lockfile b/solr/solrj-zookeeper/gradle.lockfileindex fc5fb5b6f79..bd83b7225db 100644--- a/solr/solrj-zookeeper/gradle.lockfile+++ b/solr/solrj-zookeeper/gradle.lockfile@@ -130,23 +130,23 @@ org.apiguardian:apiguardian-api:1.1.2=jarValidation,testRuntimeClasspathorg.checkerframework:checker-qual:3.33.0=apiHelperorg.codehaus.woodstox:stax2-api:4.2.2=jarValidation,testRuntimeClasspathorg.eclipse.jetty.ee10:jetty-ee10-servlet:12.0.27=jarValidation,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-client-transport:12.0.27=jarValidation,runtimeClasspath,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-client:12.0.27=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-common:12.0.27=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty.http2:jetty-http2-hpack:12.0.27=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-client-transport:12.0.27=jarValidation,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-client:12.0.27=jarValidation,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-common:12.0.27=jarValidation,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty.http2:jetty-http2-hpack:12.0.27=jarValidation,testCompileClasspath,testRuntimeClasspathorg.eclipse.jetty.http2:jetty-http2-server:12.0.27=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-client:12.0.27=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-alpn-java-client:12.0.27=jarValidation,runtimeClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-client:12.0.27=jarValidation,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-alpn-java-client:12.0.27=jarValidation,testRuntimeClasspathorg.eclipse.jetty:jetty-alpn-java-server:12.0.27=jarValidation,testRuntimeClasspathorg.eclipse.jetty:jetty-alpn-server:12.0.27=jarValidation,testRuntimeClasspath-org.eclipse.jetty:jetty-client:12.0.27=jarValidation,runtimeClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-http:12.0.27=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-io:12.0.27=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-client:12.0.27=jarValidation,testRuntimeClasspath+org.eclipse.jetty:jetty-http:12.0.27=jarValidation,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-io:12.0.27=jarValidation,testCompileClasspath,testRuntimeClasspathorg.eclipse.jetty:jetty-rewrite:12.0.27=jarValidation,testRuntimeClasspathorg.eclipse.jetty:jetty-security:12.0.27=jarValidation,testCompileClasspath,testRuntimeClasspathorg.eclipse.jetty:jetty-server:12.0.27=jarValidation,testCompileClasspath,testRuntimeClasspathorg.eclipse.jetty:jetty-session:12.0.27=jarValidation,testCompileClasspath,testRuntimeClasspath-org.eclipse.jetty:jetty-util:12.0.27=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath+org.eclipse.jetty:jetty-util:12.0.27=jarValidation,testCompileClasspath,testRuntimeClasspathorg.glassfish.hk2.external:aopalliance-repackaged:3.1.1=jarValidation,testRuntimeClasspathorg.glassfish.hk2:hk2-api:3.1.1=jarValidation,testRuntimeClasspathorg.glassfish.hk2:hk2-locator:3.1.1=jarValidation,testRuntimeClasspathdiff --git a/solr/solrj-zookeeper/src/java/org/apache/solr/common/cloud/NodesSysPropsCacher.java b/solr/solrj-zookeeper/src/java/org/apache/solr/common/cloud/NodesSysPropsCacher.javaindex 46974dce6d4..856c6d8a9f9 100644--- a/solr/solrj-zookeeper/src/java/org/apache/solr/common/cloud/NodesSysPropsCacher.java+++ b/solr/solrj-zookeeper/src/java/org/apache/solr/common/cloud/NodesSysPropsCacher.java@@ -22,7 +22,7 @@ import java.util.LinkedHashMap;import java.util.Map;import java.util.concurrent.ConcurrentHashMap;import org.apache.solr.client.solrj.SolrRequest;-import org.apache.solr.client.solrj.jetty.HttpJettySolrClient;+import org.apache.solr.client.solrj.impl.HttpSolrClientBase;import org.apache.solr.client.solrj.request.GenericSolrRequest;import org.apache.solr.common.NavigableObject;import org.apache.solr.common.SolrException;@@ -33,10 +33,10 @@ import org.apache.solr.common.params.ModifiableSolrParams;public class NodesSysPropsCacher implements NodesSysProps, AutoCloseable {private volatile boolean isClosed = false;private final Map<String, Map<String, Object>> nodeVsTagsCache = new ConcurrentHashMap<>();- private ZkStateReader zkStateReader;- private final HttpJettySolrClient solrClient;+ private final ZkStateReader zkStateReader;+ private final HttpSolrClientBase solrClient;- public NodesSysPropsCacher(HttpJettySolrClient solrClient, ZkStateReader zkStateReader) {+ public NodesSysPropsCacher(HttpSolrClientBase solrClient, ZkStateReader zkStateReader) {this.zkStateReader = zkStateReader;this.solrClient = solrClient;zkStateReader.registerLiveNodesListener(