From d4c2c75d73ea00fbb3296bc6896e2996f2dba4f0 Mon Sep 17 00:00:00 2001
From: Tigran Mkrtchyan <tigran.mkrtchyan@desy.de>
Date: Thu, 29 Aug 2024 11:10:26 +0200
Subject: [PATCH] maven: ensure that we have unique file names to conflicting
 jars

Motivation:
codahal metrics and yammer metric have the same jar name
metrics-core.jar. Though, this is not an issue but looks like two
versions of the same jar.

Modification:
in assembly step rename one of the jars to make it more clear that those
are different artefacts.

Result:
less confusion by jar names

Acked-by: Lea Morschel
Target: master
Require-book: no
Require-notes: no
---
 .gitlab-ci.yml                                      |  1 -
 packages/fhs/src/main/assembly/fhs.xml              | 12 ++++++++++++
 packages/system-test/src/main/assembly/assembly.xml | 12 ++++++++++++
 packages/tar/src/main/assembly/tar.xml              | 12 ++++++++++++
 pom.xml                                             |  3 ++-
 5 files changed, 38 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8aa34e7c91c..05485958a67 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -215,7 +215,6 @@ container:
 Check for duplicate dependencies:
   stage: build
   image: almalinux:9-minimal
-  allow_failure: true
   needs:
     - tar
   dependencies:
diff --git a/packages/fhs/src/main/assembly/fhs.xml b/packages/fhs/src/main/assembly/fhs.xml
index 327b06ddca8..aa1e5df7f81 100644
--- a/packages/fhs/src/main/assembly/fhs.xml
+++ b/packages/fhs/src/main/assembly/fhs.xml
@@ -3,10 +3,22 @@
     <includeBaseDirectory>false</includeBaseDirectory>
 
     <dependencySets>
+        <!-- Two dependencies same name. Rename one of them -->
+        <dependencySet>
+            <includes>
+                <include>io.dropwizard.metrics:metrics-core</include>
+            </includes>
+            <outputDirectory>usr/share/dcache/classes</outputDirectory>
+            <useProjectArtifact>false</useProjectArtifact>
+            <outputFileNameMapping>dropwizard-metrics-core-${version.dropwizard}.jar</outputFileNameMapping>
+            <fileMode>644</fileMode>
+            <directoryMode>755</directoryMode>
+        </dependencySet>
         <dependencySet>
             <excludes>
                 <exclude>org.dcache:dcache-view:jar:*</exclude>
                 <exclude>org.dcache:dcache-view-admin:jar:*</exclude>
+                <exclude>io.dropwizard.metrics:metrics-core</exclude>
             </excludes>
             <outputDirectory>usr/share/dcache/classes</outputDirectory>
             <useProjectArtifact>false</useProjectArtifact>
diff --git a/packages/system-test/src/main/assembly/assembly.xml b/packages/system-test/src/main/assembly/assembly.xml
index 7d53d472ec5..1e4dc3547b7 100644
--- a/packages/system-test/src/main/assembly/assembly.xml
+++ b/packages/system-test/src/main/assembly/assembly.xml
@@ -3,12 +3,24 @@
     <includeBaseDirectory>false</includeBaseDirectory>
 
     <dependencySets>
+        <!-- Two dependencies same name. Rename one of them -->
+        <dependencySet>
+            <includes>
+                <include>io.dropwizard.metrics:metrics-core</include>
+            </includes>
+            <outputDirectory>share/classes</outputDirectory>
+            <useProjectArtifact>false</useProjectArtifact>
+            <outputFileNameMapping>dropwizard-metrics-core-${version.dropwizard}.jar</outputFileNameMapping>
+            <fileMode>644</fileMode>
+            <directoryMode>755</directoryMode>
+        </dependencySet>
         <dependencySet>
             <excludes>
                 <exclude>*:*:war:*</exclude>
                 <exclude>org.dcache:dcache-plugin-hsqldb:zip:*</exclude>
                 <exclude>org.dcache:dcache-view:jar:*</exclude>
                 <exclude>org.dcache:dcache-view-admin:jar:*</exclude>
+                <exclude>io.dropwizard.metrics:metrics-core</exclude>
             </excludes>
             <outputDirectory>share/classes</outputDirectory>
             <useProjectArtifact>false</useProjectArtifact>
diff --git a/packages/tar/src/main/assembly/tar.xml b/packages/tar/src/main/assembly/tar.xml
index 232c04dcf02..335affd6d53 100644
--- a/packages/tar/src/main/assembly/tar.xml
+++ b/packages/tar/src/main/assembly/tar.xml
@@ -3,11 +3,23 @@
     <includeBaseDirectory>true</includeBaseDirectory>
 
     <dependencySets>
+        <!-- Two dependencies same name. Rename one of them -->
+        <dependencySet>
+            <includes>
+                <include>io.dropwizard.metrics:metrics-core</include>
+            </includes>
+            <outputDirectory>share/classes</outputDirectory>
+            <useProjectArtifact>false</useProjectArtifact>
+            <outputFileNameMapping>dropwizard-metrics-core-${version.dropwizard}.jar</outputFileNameMapping>
+            <fileMode>644</fileMode>
+            <directoryMode>755</directoryMode>
+        </dependencySet>
         <dependencySet>
             <excludes>
                 <exclude>*:*:war:*</exclude>
                 <exclude>org.dcache:dcache-view:jar:*</exclude>
                 <exclude>org.dcache:dcache-view-admin:jar:*</exclude>
+                <exclude>io.dropwizard.metrics:metrics-core</exclude>
             </excludes>
             <outputDirectory>share/classes</outputDirectory>
             <useProjectArtifact>false</useProjectArtifact>
diff --git a/pom.xml b/pom.xml
index 532cac82ef4..eab3c57f124 100644
--- a/pom.xml
+++ b/pom.xml
@@ -83,6 +83,7 @@
         <version.jackson>2.14.0</version.jackson>
         <version.jna>5.4.0</version.jna>
         <jmh.version>1.35</jmh.version>
+        <version.dropwizard>4.1.29</version.dropwizard>
 
 
 
@@ -206,7 +207,7 @@
             <dependency>
                 <groupId>io.dropwizard.metrics</groupId>
                 <artifactId>metrics-core</artifactId>
-                <version>4.1.29</version>
+                <version>${version.dropwizard}</version>
                 <exclusions>
                     <exclusion>
                         <groupId>org.slf4j</groupId>