From f7e19137e2cdea64a0d035043ae48f8297edc11f Mon Sep 17 00:00:00 2001
From: Tigran Mkrtchyan <tigran.mkrtchyan@desy.de>
Date: Fri, 20 Oct 2023 11:05:38 +0200
Subject: [PATCH] libs: fix unexpected transient dependencies of rados4j

fixes commit 2f268fb1d7

rados4j had transient dependencies which are indirectly used by dcache.
Make this dependency explicit.

Target: master
Require-book: no
Require-notes: no
---
 modules/dcache/pom.xml | 19 ++++++++++++++++++-
 pom.xml                | 19 ++++++++++++++++++-
 2 files changed, 36 insertions(+), 2 deletions(-)

diff --git a/modules/dcache/pom.xml b/modules/dcache/pom.xml
index 0446dcd7b7f..b1fb6fd9cb1 100644
--- a/modules/dcache/pom.xml
+++ b/modules/dcache/pom.xml
@@ -124,7 +124,24 @@
         <groupId>com.github.parboiled1</groupId>
         <artifactId>grappa</artifactId>
     </dependency>
-    <dependency>
+      <!-- grappa needs asm to work -->
+      <dependency>
+          <groupId>org.ow2.asm</groupId>
+          <artifactId>asm</artifactId>
+      </dependency>
+      <dependency>
+          <groupId>org.ow2.asm</groupId>
+          <artifactId>asm-tree</artifactId>
+      </dependency>
+      <dependency>
+          <groupId>org.ow2.asm</groupId>
+          <artifactId>asm-analysis</artifactId>
+      </dependency>
+      <dependency>
+          <groupId>org.ow2.asm</groupId>
+          <artifactId>asm-util</artifactId>
+      </dependency>
+      <dependency>
         <groupId>org.datanucleus</groupId>
         <artifactId>datanucleus-core</artifactId>
     </dependency>
diff --git a/pom.xml b/pom.xml
index 8168ec9c197..58fec11b02c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -120,6 +120,8 @@
         <bouncycastle.version>1.67</bouncycastle.version>
         <datanucleus-core.version>5.2.2</datanucleus-core.version>
         <datanucleus.plugin.version>5.2.1</datanucleus.plugin.version>
+        <asm.version>7.2</asm.version>
+        <asm-tools.version>5.0.3</asm-tools.version>
     </properties>
 
     <scm>
@@ -423,7 +425,22 @@
             <dependency>
                 <groupId>org.ow2.asm</groupId>
                 <artifactId>asm</artifactId>
-                <version>7.2</version>
+                <version>${asm.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.ow2.asm</groupId>
+                <artifactId>asm-tree</artifactId>
+                <version>${asm-tools.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.ow2.asm</groupId>
+                <artifactId>asm-analysis</artifactId>
+                <version>${asm-tools.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.ow2.asm</groupId>
+                <artifactId>asm-util</artifactId>
+                <version>${asm-tools.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.datanucleus</groupId>