This is an automated email from the ASF dual-hosted git repository.
houston pushed a commit to branch branch_9_0
in repository https://gitbox.apache.org/repos/asf/solr.git
The following commit(s) were added to refs/heads/branch_9_0 by this push:
new 872e546 SOLR-15605: Fix duplicate jars in prometheus-exporter (#563)
872e546 is described below
commit 872e546cee959f8518808d7f9bdeccd6a399c8f0
Author: Houston Putman <[email protected]>
AuthorDate: Tue Jan 25 16:40:20 2022 -0500
SOLR-15605: Fix duplicate jars in prometheus-exporter (#563)
(cherry picked from commit 14010ae98b68b291e16b2cc9241b50ceb9347297)
---
solr/modules/prometheus-exporter/build.gradle | 18 ------------------
1 file changed, 18 deletions(-)
diff --git a/solr/modules/prometheus-exporter/build.gradle
b/solr/modules/prometheus-exporter/build.gradle
index bcaffed..5493113 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
