get rid of htrace cves

Signed-off-by: Jan Jansen <[email protected]> (cherry picked from commit 9f0c4cc)
JanusGraph · Nov 20, 2023 · 1609c3c · 1609c3c
1 parent 45a0313
commit 1609c3c
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 3 deletions.
diff --git a/janusgraph-hbase/pom.xml b/janusgraph-hbase/pom.xml
@@ -54,8 +54,17 @@
                     <groupId>log4j</groupId>
                     <artifactId>log4j</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>org.apache.htrace</groupId>
+                    <artifactId>htrace-core4</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>org.apache.hbase.thirdparty</groupId>
+            <artifactId>hbase-noop-htrace</artifactId>
+            <version>${htrace.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.apache.hbase</groupId>
             <artifactId>hbase-shaded-mapreduce</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -69,7 +69,7 @@
         <httpcomponents.httpcore.version>4.4.16</httpcomponents.httpcore.version>
         <hadoop.version>3.3.5</hadoop.version>
         <hbase2.version>2.5.3-hadoop3</hbase2.version>
-        <htrace.version>4.2.0-incubating</htrace.version>
+        <htrace.version>4.1.5</htrace.version>
         <bigtable.version>1.24.0</bigtable.version>
         <!-- align with org.apache.spark:spark-core_2.12 -->
         <jackson2.version>2.15.3</jackson2.version>
@@ -1392,8 +1392,13 @@
                 <version>6.5.1</version>
             </dependency>
             <dependency>
-                <groupId>org.apache.htrace</groupId>
-                <artifactId>htrace-core4</artifactId>
+                <groupId>org.apache.hbase.thirdparty</groupId>
+                <artifactId>hbase-noop-htrace</artifactId>
+                <version>${htrace.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.hbase.thirdparty</groupId>
+                <artifactId>hbase-noop-htrace</artifactId>
                 <version>${htrace.version}</version>
             </dependency>
             <dependency>