Skip to content

armgit / solr

Public Imported from GitHub
0

Apache Solr open-source search software

SOLR-15605: Fix duplicate jars in prometheus-exporter (#563)

Houston Putman14010ae98b68
diff --git a/solr/modules/prometheus-exporter/build.gradle b/solr/modules/prometheus-exporter/build.gradle
index bcaffed0a2a..54931136d8e 100644
--- a/solr/modules/prometheus-exporter/build.gradle
+++ b/solr/modules/prometheus-exporter/build.gradle
@@ -69,22 +69,4 @@ assemblePackaging {
include "bin/**"
include "conf/**"
})
- // Add all libs except those provided by SolrJ & Logging
- from ({
- def externalLibs = configurations.runtimeLibs.copyRecursive { dep ->
- if (dep instanceof org.gradle.api.artifacts.ProjectDependency) {
- return !dep.dependencyProject.path.startsWith(":solr")
- } else {
- return true
- }
- }
- return externalLibs - project(':solr:server').configurations.getByName('libExt')
- }, {
- into "lib"
- })
-
- // TODO: SOLR-15605 this copy spec has duplicate jars and this fails by default in gradle7
- duplicatesStrategy = 'warn'
-
- into deps
}
\ No newline at end of file