[solr] branch main updated: SOLR-15955: Fix placing of slf4j-api jar in the lib/ext dir (#1178)

[houston]

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 bd11f3a8c31 SOLR-15955: Fix placing of slf4j-api jar in the lib/ext 
dir (#1178)
bd11f3a8c31 is described below

commit bd11f3a8c31de82ff743eb5c8b3ba40d4f75b83f
Author: Houston Putman <hous...@apache.org>
AuthorDate: Mon Nov 14 17:46:05 2022 -0500

    SOLR-15955: Fix placing of slf4j-api jar in the lib/ext dir (#1178)
---
 solr/core/build.gradle   | 16 ++++------------
 solr/server/build.gradle | 10 +++++++---
 solr/webapp/build.gradle | 12 +++++++-----
 3 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/solr/core/build.gradle b/solr/core/build.gradle
index a8029f79406..361dcde3383 100644
--- a/solr/core/build.gradle
+++ b/solr/core/build.gradle
@@ -83,22 +83,14 @@ dependencies {
   runtimeOnly('org.eclipse.jetty:jetty-alpn-java-server', {
     exclude group: "org.eclipse.jetty.alpn", module: "alpn-api"
   })
-  jettyClientImplementation('org.eclipse.jetty:jetty-http', {
-    exclude group: "org.slf4j", module: "slf4j-api"
-  })
-  jettyClientImplementation('org.eclipse.jetty:jetty-io', {
-    exclude group: "org.slf4j", module: "slf4j-api"
-  })
+  jettyClientImplementation('org.eclipse.jetty:jetty-http')
+  jettyClientImplementation('org.eclipse.jetty:jetty-io')
   implementation 'org.eclipse.jetty:jetty-rewrite'
   implementation 'org.eclipse.jetty:jetty-server'
   implementation 'org.eclipse.jetty:jetty-servlet'
-  jettyClientImplementation('org.eclipse.jetty:jetty-util', {
-    exclude group: "org.slf4j", module: "slf4j-api"
-  })
+  jettyClientImplementation('org.eclipse.jetty:jetty-util')
 
-  jettyClientImplementation('org.eclipse.jetty.http2:http2-common', {
-    exclude group: "org.slf4j", module: "slf4j-api"
-  })
+  jettyClientImplementation('org.eclipse.jetty.http2:http2-common')
   implementation 'org.eclipse.jetty.http2:http2-server'
 
   
implementation('org.glassfish.jersey.containers:jersey-container-jetty-http', {
diff --git a/solr/server/build.gradle b/solr/server/build.gradle
index ee48d33545e..bb57cd71b5f 100644
--- a/solr/server/build.gradle
+++ b/solr/server/build.gradle
@@ -76,7 +76,11 @@ dependencies {
   libExt('io.dropwizard.metrics:metrics-graphite', {
     exclude group: "com.rabbitmq", module: "amqp-client"
   })
-  libExt 'io.dropwizard.metrics:metrics-jetty10'
+  libExt('io.dropwizard.metrics:metrics-jetty10', {
+    exclude group: "org.eclipse.jetty", module: "*"
+    exclude group: "org.eclipse.jetty.http2", module: "*"
+    exclude group: "org.eclipse.jetty.toolchain", module: "*"
+  })
   libExt 'io.dropwizard.metrics:metrics-jvm'
   libExt 'io.dropwizard.metrics:metrics-jmx'
 
@@ -109,11 +113,11 @@ task assemblePackaging(type: Sync) {
     include "README.md"
   })
 
-  from(configurations.libExt - configurations.serverLib, {
+  from(configurations.libExt, {
     into "lib/ext"
   })
 
-  from(configurations.serverLib, {
+  from(configurations.serverLib - configurations.libExt, {
     into "lib/"
   })
 
diff --git a/solr/webapp/build.gradle b/solr/webapp/build.gradle
index 063ad7d89cd..5b26ac6fcfd 100644
--- a/solr/webapp/build.gradle
+++ b/solr/webapp/build.gradle
@@ -24,18 +24,20 @@ description = 'Solr webapp'
 
 configurations {
   war {}
-  serverLib {}
-  solrJettyClientLib {}
-  solrCore {}
+  serverLib
+  libExt
+  solrJettyClientLib
+  solrCore
 }
 
 dependencies {
   permitUnusedDeclared project(":solr:core")
-  serverLib project(path: ":solr:server", configuration: "libExt")
+  libExt project(path: ":solr:server", configuration: "libExt")
   serverLib project(path: ":solr:server", configuration: "serverLib")
   solrCore project(":solr:core")
   solrJettyClientLib project(path: ":solr:core", configuration: 
"jettyClientImplementation")
-  implementation(configurations.solrCore - configurations.serverLib + 
configurations.solrJettyClientLib)
+  // Make sure we keep the duplicate solrJettyClientLibs, but we want to 
remove all of the logging and metrics jars already in libExt
+  implementation(configurations.solrCore - configurations.serverLib + 
configurations.solrJettyClientLib - configurations.libExt)
 }
 
 war {