This is an automated email from the ASF dual-hosted git repository.
houston pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/solr.git
The following commit(s) were added to refs/heads/main by this push:
new ef397cdb32e SOLR-16157: Fix introduced dependency issues
ef397cdb32e is described below
commit ef397cdb32ee39a2f2772ff5a6c9b7d6f5aabf07
Author: Houston Putman <[email protected]>
AuthorDate: Tue Apr 26 11:35:01 2022 +0900
SOLR-16157: Fix introduced dependency issues
---
solr/core/build.gradle | 3 +++
solr/modules/s3-repository/build.gradle | 2 ++
2 files changed, 5 insertions(+)
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 {
