STORM-4010 - Reduce ASM Mess in dependency tree

apache · Dec 7, 2023 · ccc6e04 · ccc6e04
1 parent c13012c
commit ccc6e04
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 8 deletions.
diff --git a/DEPENDENCY-LICENSES b/DEPENDENCY-LICENSES
@@ -521,9 +521,11 @@ List of third-party dependencies grouped by their license type.
 
     BSD-3-Clause
 
-        * asm (org.ow2.asm:asm:9.3 - http://asm.ow2.io/)
+        * asm (org.ow2.asm:asm:9.6 - http://asm.ow2.io/)
+        * asm-analysis (org.ow2.asm:asm-analysis:9.6 - http://asm.ow2.io/)
         * asm-commons (org.ow2.asm:asm-commons:9.6 - http://asm.ow2.io/)
         * asm-tree (org.ow2.asm:asm-tree:9.6 - http://asm.ow2.io/)
+        * asm-util (org.ow2.asm:asm-util:9.6 - http://asm.ow2.io/)
 
     BSD 3-Clause License
 
@@ -539,11 +541,6 @@ List of third-party dependencies grouped by their license type.
 
     BSD License
 
-        * ASM Analysis (org.ow2.asm:asm-analysis:6.0_BETA - http://asm.objectweb.org/asm-analysis/)
-        * ASM Commons (org.ow2.asm:asm-commons:6.0 - http://asm.objectweb.org/asm-commons/)
-        * ASM Core (org.ow2.asm:asm:6.0 - http://asm.objectweb.org/asm/)
-        * ASM Tree (org.ow2.asm:asm-tree:6.0 - http://asm.objectweb.org/asm-tree/)
-        * ASM Util (org.ow2.asm:asm-util:6.0_BETA - http://asm.objectweb.org/asm-util/)
         * Javolution (javolution:javolution:5.5.1 - http://javolution.org)
         * JLine (jline:jline:0.9.94 - http://jline.sourceforge.net)
         * JLine Bundle (org.jline:jline:3.9.0 - http://nexus.sonatype.org/oss-repository-hosting.html/jline-parent/jline)

diff --git a/LICENSE-binary b/LICENSE-binary
@@ -1034,7 +1034,7 @@ The license texts of these dependencies can be found in the licenses directory.
 
     BSD-3-Clause
 
-        * asm (org.ow2.asm:asm:9.3 - http://asm.ow2.io/)
+        * asm (org.ow2.asm:asm:9.6 - http://asm.ow2.io/)
 
     BSD 3-Clause License
 

diff --git a/pom.xml b/pom.xml
@@ -162,6 +162,7 @@
         <!-- see intellij profile below... This fixes an annoyance with intellij -->
         <provided.scope>provided</provided.scope>
         <jakarta-el.version>3.0.1-b12</jakarta-el.version>
+        <asm.version>9.6</asm.version>
     </properties>
 
     <modules>
@@ -1156,7 +1157,31 @@
                 <artifactId>gson</artifactId>
                 <version>${gson.version}</version>
             </dependency>
-
+            <dependency>
+                <groupId>org.ow2.asm</groupId>
+                <artifactId>asm</artifactId>
+                <version>${asm.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.ow2.asm</groupId>
+                <artifactId>asm-commons</artifactId>
+                <version>${asm.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.ow2.asm</groupId>
+                <artifactId>asm-tree</artifactId>
+                <version>${asm.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.ow2.asm</groupId>
+                <artifactId>asm-util</artifactId>
+                <version>${asm.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.ow2.asm</groupId>
+                <artifactId>asm-analysis</artifactId>
+                <version>${asm.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>