Skip to content

armgit / solr

Public Imported from GitHub
0

Apache Solr open-source search software

SOLR-16157: Fix introduced dependency issues

Houston Putmanef397cdb32ee
diff --git a/solr/core/build.gradle b/solr/core/build.gradle
index c023bb90db2..6f7a93b154e 100644
--- a/solr/core/build.gradle
+++ b/solr/core/build.gradle
@@ -65,6 +65,9 @@ dependencies {
// Jetty (both for client and server, which is only used by EmbeddedSolrServer)
implementation 'org.eclipse.jetty:jetty-alpn-server'
+ runtimeOnly('org.eclipse.jetty:jetty-alpn-java-server', {
+ exclude group: "org.eclipse.jetty.alpn", module: "alpn-api"
+ })
jettyClientImplementation 'org.eclipse.jetty:jetty-http'
jettyClientImplementation 'org.eclipse.jetty:jetty-io'
implementation 'org.eclipse.jetty:jetty-rewrite'
diff --git a/solr/modules/s3-repository/build.gradle b/solr/modules/s3-repository/build.gradle
index 7c78b4d5c55..b1db54140ef 100644
--- a/solr/modules/s3-repository/build.gradle
+++ b/solr/modules/s3-repository/build.gradle
@@ -73,6 +73,8 @@ dependencies {
testImplementation 'commons-io:commons-io'
testImplementation 'org.apache.commons:commons-lang3'
+
+ testRuntimeOnly 'org.eclipse.jetty:jetty-webapp'
}
test {