diff --git a/hadoop-hdds/hadoop-dependency-client/pom.xml b/hadoop-hdds/hadoop-dependency-client/pom.xml
index dbf4a9420c1d..489e1b3ddf5f 100644
--- a/hadoop-hdds/hadoop-dependency-client/pom.xml
+++ b/hadoop-hdds/hadoop-dependency-client/pom.xml
@@ -51,10 +51,6 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
           <groupId>org.xerial.snappy</groupId>
           <artifactId>snappy-java</artifactId>
         </exclusion>
-        <exclusion>
-          <groupId>org.apache.hadoop.thirdparty</groupId>
-          <artifactId>hadoop-shaded-guava</artifactId>
-        </exclusion>
         <exclusion>
           <groupId>org.apache.hadoop</groupId>
           <artifactId>hadoop-annotations</artifactId>
@@ -210,10 +206,6 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
       </exclusions>
 
     </dependency>
-    <dependency>
-      <groupId>org.apache.hadoop.thirdparty</groupId>
-      <artifactId>hadoop-shaded-guava</artifactId>
-    </dependency>
     <dependency>
       <groupId>com.nimbusds</groupId>
       <artifactId>nimbus-jose-jwt</artifactId>
@@ -224,10 +216,6 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
       <version>${hadoop.version}</version>
       <scope>compile</scope>
       <exclusions>
-        <exclusion>
-          <groupId>org.apache.hadoop.thirdparty</groupId>
-          <artifactId>hadoop-shaded-guava</artifactId>
-        </exclusion>
         <exclusion>
           <groupId>com.google.guava</groupId>
           <artifactId>guava</artifactId>
diff --git a/hadoop-hdds/hadoop-dependency-server/pom.xml b/hadoop-hdds/hadoop-dependency-server/pom.xml
index c6f91c4ca173..6be31002b094 100644
--- a/hadoop-hdds/hadoop-dependency-server/pom.xml
+++ b/hadoop-hdds/hadoop-dependency-server/pom.xml
@@ -51,10 +51,6 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
           <groupId>org.xerial.snappy</groupId>
           <artifactId>snappy-java</artifactId>
         </exclusion>
-        <exclusion>
-          <groupId>org.apache.hadoop.thirdparty</groupId>
-          <artifactId>hadoop-shaded-guava</artifactId>
-        </exclusion>
         <exclusion>
           <groupId>org.apache.curator</groupId>
           <artifactId>*</artifactId>
@@ -148,10 +144,6 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
         </exclusion>
       </exclusions>
     </dependency>
-    <dependency>
-      <groupId>org.apache.hadoop.thirdparty</groupId>
-      <artifactId>hadoop-shaded-guava</artifactId>
-    </dependency>
     <dependency>
       <groupId>com.nimbusds</groupId>
       <artifactId>nimbus-jose-jwt</artifactId>
@@ -171,10 +163,6 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
           <groupId>com.sun.jersey</groupId>
           <artifactId>*</artifactId>
         </exclusion>
-        <exclusion>
-          <groupId>org.apache.hadoop.thirdparty</groupId>
-          <artifactId>hadoop-shaded-guava</artifactId>
-        </exclusion>
         <exclusion>
           <groupId>io.netty</groupId>
           <artifactId>*</artifactId>
diff --git a/hadoop-hdds/pom.xml b/hadoop-hdds/pom.xml
index 2fb94d8c809a..0237210d2fca 100644
--- a/hadoop-hdds/pom.xml
+++ b/hadoop-hdds/pom.xml
@@ -322,36 +322,5 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
         </plugins>
       </build>
     </profile>
-    <profile>
-      <id>add-classpath-descriptor</id>
-      <activation>
-        <file>
-          <exists>src/main/java</exists>
-        </file>
-      </activation>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-dependency-plugin</artifactId>
-            <executions>
-              <execution>
-                <id>add-classpath-descriptor</id>
-                <phase>prepare-package</phase>
-                <goals>
-                  <goal>build-classpath</goal>
-                </goals>
-                <configuration>
-                  <outputFile>${project.build.outputDirectory}/${project.artifactId}.classpath</outputFile>
-                  <prefix>$HDDS_LIB_JARS_DIR</prefix>
-                  <outputFilterFile>true</outputFilterFile>
-                  <includeScope>runtime</includeScope>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
   </profiles>
 </project>
diff --git a/hadoop-hdds/rocks-native/pom.xml b/hadoop-hdds/rocks-native/pom.xml
index 35a03db730a4..4c751e0b10a5 100644
--- a/hadoop-hdds/rocks-native/pom.xml
+++ b/hadoop-hdds/rocks-native/pom.xml
@@ -385,7 +385,7 @@
             <artifactId>maven-dependency-plugin</artifactId>
             <executions>
               <execution>
-                <id>copy-jars</id>
+                <id>copy-dependencies</id>
                 <phase>process-sources</phase>
                 <goals>
                   <goal>copy-dependencies</goal>
diff --git a/hadoop-hdds/server-scm/pom.xml b/hadoop-hdds/server-scm/pom.xml
index 26e35b072ffc..4c2e40c37592 100644
--- a/hadoop-hdds/server-scm/pom.xml
+++ b/hadoop-hdds/server-scm/pom.xml
@@ -29,6 +29,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
   <packaging>jar</packaging>
 
   <properties>
+    <classpath.skip>false</classpath.skip>
   </properties>
 
   <dependencies>
diff --git a/hadoop-ozone/csi/pom.xml b/hadoop-ozone/csi/pom.xml
index cd4d4eef0419..ba66c5d5272e 100644
--- a/hadoop-ozone/csi/pom.xml
+++ b/hadoop-ozone/csi/pom.xml
@@ -29,6 +29,7 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <packaging>jar</packaging>
 
   <properties>
+    <classpath.skip>false</classpath.skip>
     <maven.test.skip>true</maven.test.skip> <!-- no tests in this module so far -->
   </properties>
 
diff --git a/hadoop-ozone/datanode/pom.xml b/hadoop-ozone/datanode/pom.xml
index 87664b26614c..733f0837fda9 100644
--- a/hadoop-ozone/datanode/pom.xml
+++ b/hadoop-ozone/datanode/pom.xml
@@ -27,6 +27,7 @@
   <version>2.0.0-SNAPSHOT</version>
 
   <properties>
+    <classpath.skip>false</classpath.skip>
     <maven.test.skip>true</maven.test.skip> <!-- no tests in this module so far -->
     <spotbugs.skip>true</spotbugs.skip>
   </properties>
diff --git a/hadoop-ozone/dev-support/checks/dependency.sh b/hadoop-ozone/dev-support/checks/dependency.sh
index 116664df81b1..dc95a25e47c2 100755
--- a/hadoop-ozone/dev-support/checks/dependency.sh
+++ b/hadoop-ozone/dev-support/checks/dependency.sh
@@ -32,8 +32,8 @@ cp ${src_dir}/current.txt "$REPORT_DIR"/
 
 #implementation of sort cli is not exactly the same everywhere. It's better to sort with the same command locally
 (diff -uw \
-  <(sort ${src_dir}/jar-report.txt) \
-  <(sort ${src_dir}/current.txt) \
+  <(sort -u ${src_dir}/jar-report.txt) \
+  <(sort -u ${src_dir}/current.txt) \
   || true) \
   > "$REPORT_FILE"
 
diff --git a/hadoop-ozone/dev-support/checks/license.exceptions b/hadoop-ozone/dev-support/checks/license.exceptions
index 5b22b88c4921..66f17fb670d3 100644
--- a/hadoop-ozone/dev-support/checks/license.exceptions
+++ b/hadoop-ozone/dev-support/checks/license.exceptions
@@ -16,7 +16,7 @@
 # This file lists dependencies with acceptable license that
 # license-maven-plugin cannot find, or finds with unexpected license.
 
-com.google.re2j:re2j:1.7 BSD 3-Clause
+com.google.re2j:re2j:1.1 BSD 3-Clause
 javax.servlet:servlet-api:2.5 CDDL 1.1
 javax.servlet.jsp:jsp-api:2.1 CDDL 1.1
 org.codehaus.jettison:jettison:1.1 Apache License 2.0
diff --git a/hadoop-ozone/dist/dev-support/bin/dist-layout-stitching b/hadoop-ozone/dist/dev-support/bin/dist-layout-stitching
index 0ec066aca563..03905fd20abd 100755
--- a/hadoop-ozone/dist/dev-support/bin/dist-layout-stitching
+++ b/hadoop-ozone/dist/dev-support/bin/dist-layout-stitching
@@ -71,6 +71,8 @@ run cp -p "${ROOT}/HISTORY.md" .
 run cp -p "${ROOT}/SECURITY.md" .
 run cp -p "${ROOT}/CONTRIBUTING.md" .
 
+run mkdir -p ./share/ozone/classpath
+run mkdir -p ./share/ozone/lib
 run mkdir -p ./share/ozone/web
 run mkdir -p ./bin
 run mkdir -p ./sbin
@@ -129,6 +131,14 @@ run cp -p -r "${ROOT}/hadoop-ozone/dist/target/Dockerfile" .
 #Copy pre-generated keytabs
 run cp -p -R "${ROOT}/hadoop-ozone/dist/src/main/keytabs" compose/_keytabs
 
+for file in $(find "${ROOT}" -path '*/target/classes/*.classpath' | sort); do
+  cp -n -p -v "$file" share/ozone/classpath/
+done
+
+for file in $(find "${ROOT}" -path '*/share/ozone/lib/*jar' | sort); do
+  cp -n -p -v "$file" share/ozone/lib/
+done
+
 #workaround for https://issues.apache.org/jira/browse/MRESOURCES-236
 find ./compose -name "*.sh" -exec chmod 755 {} \;
 find ./kubernetes -name "*.sh" -exec chmod 755 {} \;
diff --git a/hadoop-ozone/dist/pom.xml b/hadoop-ozone/dist/pom.xml
index e288520accad..52c4e4a9fa09 100644
--- a/hadoop-ozone/dist/pom.xml
+++ b/hadoop-ozone/dist/pom.xml
@@ -71,24 +71,7 @@
         <artifactId>maven-dependency-plugin</artifactId>
         <executions>
           <execution>
-            <id>copy-classpath-files</id>
-            <phase>prepare-package</phase>
-            <goals>
-              <goal>unpack-dependencies</goal>
-            </goals>
-            <configuration>
-              <outputDirectory>
-                target/ozone-${ozone.version}/share/ozone/classpath
-              </outputDirectory>
-              <includes>*.classpath</includes>
-              <includeArtifactIds>
-                hdds-server-scm,ozone-common,ozone-csi,ozone-datanode,ozone-httpfsgateway,
-                ozone-insight,ozone-manager,ozone-recon,ozone-s3gateway,ozone-tools,hdds-rocks-native,ozone-s3-secret-store
-              </includeArtifactIds>
-            </configuration>
-          </execution>
-          <execution>
-            <id>copy-jars</id>
+            <id>copy-omitted-jars</id>
             <phase>prepare-package</phase>
             <goals>
               <goal>copy-dependencies</goal>
@@ -98,24 +81,6 @@
               <includeScope>runtime</includeScope>
             </configuration>
           </execution>
-          <execution>
-            <id>copy-omitted-jars</id>
-            <phase>prepare-package</phase>
-            <goals>
-              <goal>copy</goal>
-            </goals>
-            <configuration>
-              <outputDirectory>target/ozone-${ozone.version}/share/ozone/lib
-              </outputDirectory>
-              <artifactItems>
-                <artifactItem>
-                  <groupId>com.google.protobuf</groupId>
-                  <artifactId>protobuf-java</artifactId>
-                  <version>${grpc.protobuf-compile.version}</version>
-                </artifactItem>
-              </artifactItems>
-            </configuration>
-          </execution>
         </executions>
       </plugin>
       <plugin>
diff --git a/hadoop-ozone/httpfsgateway/pom.xml b/hadoop-ozone/httpfsgateway/pom.xml
index 64eba036a5fa..bacc730a00fc 100644
--- a/hadoop-ozone/httpfsgateway/pom.xml
+++ b/hadoop-ozone/httpfsgateway/pom.xml
@@ -32,6 +32,7 @@
   <description>Apache Ozone HttpFS</description>
 
   <properties>
+    <classpath.skip>false</classpath.skip>
     <httpfs.source.repository>REPO NOT AVAIL</httpfs.source.repository>
     <httpfs.source.revision>REVISION NOT AVAIL</httpfs.source.revision>
     <maven.build.timestamp.format>yyyy-MM-dd'T'HH:mm:ssZ</maven.build.timestamp.format>
diff --git a/hadoop-ozone/insight/pom.xml b/hadoop-ozone/insight/pom.xml
index c448411c5f6b..fa3862a7f71d 100644
--- a/hadoop-ozone/insight/pom.xml
+++ b/hadoop-ozone/insight/pom.xml
@@ -27,7 +27,9 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
   <description>Apache Ozone Insight Tool</description>
   <name>Apache Ozone Insight Tool</name>
   <packaging>jar</packaging>
+
   <properties>
+    <classpath.skip>false</classpath.skip>
   </properties>
 
   <dependencies>
diff --git a/hadoop-ozone/integration-test/pom.xml b/hadoop-ozone/integration-test/pom.xml
index fe801ef98970..a4a2f159b489 100644
--- a/hadoop-ozone/integration-test/pom.xml
+++ b/hadoop-ozone/integration-test/pom.xml
@@ -42,6 +42,26 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <dependency>
       <groupId>org.apache.ozone</groupId>
       <artifactId>hdds-server-scm</artifactId>
+      <exclusions>
+        <!--
+          Dependency convergence error for com.fasterxml.woodstox:woodstox-core
+
+          +-org.apache.ozone:ozone-integration-test:jar:1.5.0-SNAPSHOT
+            +-org.apache.ozone:hdds-server-scm:jar:1.5.0-SNAPSHOT:compile
+              +-org.apache.ozone:hdds-hadoop-dependency-server:jar:1.5.0-SNAPSHOT:compile
+                +-org.apache.hadoop:hadoop-common:jar:3.3.6:compile
+                  +-com.fasterxml.woodstox:woodstox-core:jar:5.4.0:compile
+
+          +-org.apache.ozone:ozone-integration-test:jar:1.5.0-SNAPSHOT
+            +-org.apache.ozone:ozone-s3gateway:jar:1.5.0-SNAPSHOT:compile
+              +-com.fasterxml.jackson.dataformat:jackson-dataformat-xml:jar:2.16.2:compile
+                +-com.fasterxml.woodstox:woodstox-core:jar:6.5.1:compile
+        -->
+        <exclusion>
+          <groupId>com.fasterxml.woodstox</groupId>
+          <artifactId>woodstox-core</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.apache.ozone</groupId>
diff --git a/hadoop-ozone/ozone-manager/pom.xml b/hadoop-ozone/ozone-manager/pom.xml
index 7ccca37c8047..b764021f8510 100644
--- a/hadoop-ozone/ozone-manager/pom.xml
+++ b/hadoop-ozone/ozone-manager/pom.xml
@@ -29,6 +29,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
   <packaging>jar</packaging>
 
   <properties>
+    <classpath.skip>false</classpath.skip>
   </properties>
 
   <dependencies>
diff --git a/hadoop-ozone/pom.xml b/hadoop-ozone/pom.xml
index be928e760549..8b87862eefed 100644
--- a/hadoop-ozone/pom.xml
+++ b/hadoop-ozone/pom.xml
@@ -315,6 +315,25 @@
               <rules>
                 <DependencyConvergence>
                   <uniqueVersions>true</uniqueVersions>
+                  <excludes>
+                    <!--
+                      Dependency convergence error for org.codehaus.woodstox:stax2-api
+
+                      +-org.apache.ozone:ozone-common:jar:1.5.0-SNAPSHOT
+                        +-org.apache.ozone:hdds-common:jar:1.5.0-SNAPSHOT:compile
+                          +-org.apache.ozone:hdds-hadoop-dependency-client:jar:1.5.0-SNAPSHOT:compile
+                            +-org.apache.hadoop:hadoop-common:jar:3.3.6:compile
+                              +-org.codehaus.woodstox:stax2-api:jar:4.2.1:compile
+
+                      +-org.apache.ozone:ozone-common:jar:1.5.0-SNAPSHOT
+                        +-org.apache.ozone:hdds-common:jar:1.5.0-SNAPSHOT:compile
+                          +-org.apache.ozone:hdds-hadoop-dependency-client:jar:1.5.0-SNAPSHOT:compile
+                            +-org.apache.hadoop:hadoop-common:jar:3.3.6:compile
+                              +-com.fasterxml.woodstox:woodstox-core:jar:5.4.0:compile
+                                +-org.codehaus.woodstox:stax2-api:jar:4.2:compile
+                    -->
+                    <exclude>org.codehaus.woodstox:stax2-api</exclude>
+                  </excludes>
                 </DependencyConvergence>
               </rules>
             </configuration>
@@ -455,36 +474,5 @@
         </plugins>
       </build>
     </profile>
-    <profile>
-      <id>add-classpath-descriptor</id>
-      <activation>
-        <file>
-          <exists>src/main/java</exists>
-        </file>
-      </activation>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-dependency-plugin</artifactId>
-            <executions>
-              <execution>
-                <id>add-classpath-descriptor</id>
-                <phase>prepare-package</phase>
-                <goals>
-                  <goal>build-classpath</goal>
-                </goals>
-                <configuration>
-                  <outputFile>${project.build.outputDirectory}/${project.artifactId}.classpath</outputFile>
-                  <prefix>$HDDS_LIB_JARS_DIR</prefix>
-                  <outputFilterFile>true</outputFilterFile>
-                  <includeScope>runtime</includeScope>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
   </profiles>
 </project>
diff --git a/hadoop-ozone/recon/pom.xml b/hadoop-ozone/recon/pom.xml
index e0ce7065c1c9..026fe01d40bc 100644
--- a/hadoop-ozone/recon/pom.xml
+++ b/hadoop-ozone/recon/pom.xml
@@ -24,6 +24,7 @@
   <modelVersion>4.0.0</modelVersion>
   <artifactId>ozone-recon</artifactId>
   <properties>
+    <classpath.skip>false</classpath.skip>
     <pnpm.version>8.15.7</pnpm.version>
   </properties>
   <build>
diff --git a/hadoop-ozone/s3gateway/pom.xml b/hadoop-ozone/s3gateway/pom.xml
index dfcd478b6907..28221b5f3de3 100644
--- a/hadoop-ozone/s3gateway/pom.xml
+++ b/hadoop-ozone/s3gateway/pom.xml
@@ -26,6 +26,7 @@
   <packaging>jar</packaging>
   <version>2.0.0-SNAPSHOT</version>
   <properties>
+    <classpath.skip>false</classpath.skip>
     <file.encoding>UTF-8</file.encoding>
     <downloadSources>true</downloadSources>
   </properties>
@@ -226,6 +227,24 @@
     <dependency>
       <groupId>org.apache.ozone</groupId>
       <artifactId>hdds-hadoop-dependency-server</artifactId>
+      <exclusions>
+        <!--
+          Dependency convergence error for com.fasterxml.woodstox:woodstox-core
+
+          +-org.apache.ozone:ozone-s3gateway:jar:1.5.0-SNAPSHOT
+            +-com.fasterxml.jackson.dataformat:jackson-dataformat-xml:jar:2.16.2:compile
+              +-com.fasterxml.woodstox:woodstox-core:jar:6.5.1:compile
+
+          +-org.apache.ozone:ozone-s3gateway:jar:1.5.0-SNAPSHOT
+            +-org.apache.ozone:hdds-hadoop-dependency-server:jar:1.5.0-SNAPSHOT:compile
+              +-org.apache.hadoop:hadoop-common:jar:3.3.6:compile
+                +-com.fasterxml.woodstox:woodstox-core:jar:5.4.0:compile
+        -->
+        <exclusion>
+          <groupId>com.fasterxml.woodstox</groupId>
+          <artifactId>woodstox-core</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.apache.ozone</groupId>
diff --git a/hadoop-ozone/tools/pom.xml b/hadoop-ozone/tools/pom.xml
index 96853d8949ca..5922795a8e3c 100644
--- a/hadoop-ozone/tools/pom.xml
+++ b/hadoop-ozone/tools/pom.xml
@@ -28,6 +28,10 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
   <name>Apache Ozone Tools</name>
   <packaging>jar</packaging>
 
+  <properties>
+    <classpath.skip>false</classpath.skip>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.ozone</groupId>
@@ -200,6 +204,25 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <dependency>
       <groupId>com.amazonaws</groupId>
       <artifactId>aws-java-sdk-core</artifactId>
+      <exclusions>
+        <!--
+          Dependency convergence error for joda-time:joda-time
+
+          +-org.apache.ozone:ozone-tools:jar:1.5.0-SNAPSHOT
+            +-org.apache.ozone:ozone-manager:jar:1.5.0-SNAPSHOT:compile
+              +-org.apache.ranger:ranger-plugins-common:jar:2.3.0:compile
+                +-org.apache.ranger:ranger-plugins-audit:jar:2.3.0:compile
+                  +-joda-time:joda-time:jar:2.10.6:compile
+
+          +-org.apache.ozone:ozone-tools:jar:1.5.0-SNAPSHOT
+            +-com.amazonaws:aws-java-sdk-core:jar:1.12.661:compile
+              +-joda-time:joda-time:jar:2.8.1:compile
+        -->
+        <exclusion>
+          <groupId>joda-time</groupId>
+          <artifactId>joda-time</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>com.amazonaws</groupId>
diff --git a/pom.xml b/pom.xml
index 6e6f6e50cfb2..6c57d93c14fa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -95,6 +95,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
+    <classpath.skip>true</classpath.skip>
+
     <maven-gpg-plugin.version>3.2.7</maven-gpg-plugin.version>
     <shell-executable>bash</shell-executable>
 
@@ -148,7 +150,6 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
     <jaxb-runtime.version>2.3.9</jaxb-runtime.version>
     <jnr-constants.version>0.10.4</jnr-constants.version>
     <jnr-posix.version>3.1.19</jnr-posix.version>
-    <jsch.version>0.1.55</jsch.version>
     <cdi-api.version>2.0</cdi-api.version>
     <servlet-api.version>3.1.0</servlet-api.version>
     <jsp-api.version>2.1</jsp-api.version>
@@ -162,7 +163,6 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
     <jackson1.version>1.9.13</jackson1.version>
     <jackson-jaxr.version>1.9.13</jackson-jaxr.version>
     <jackson2-bom.version>2.16.2</jackson2-bom.version>
-    <woodstox.version>5.4.0</woodstox.version>
 
     <!-- jaegertracing veresion -->
     <jaeger.version>1.8.1</jaeger.version>
@@ -187,9 +187,6 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
     <prometheus.version>0.16.0</prometheus.version>
     <reflections.version>0.10.2</reflections.version>
 
-    <!-- com.google.re2j version -->
-    <re2j.version>1.7</re2j.version>
-
     <!-- ProtocolBuffer version, used to verify the protoc version and -->
     <!-- define the protobuf JAR version                               -->
     <proto2.hadooprpc.protobuf.version>2.5.0</proto2.hadooprpc.protobuf.version>
@@ -197,15 +194,12 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
     <hadoop-thirdparty.version>1.1.1</hadoop-thirdparty.version>
 
     <spotbugs.version>3.1.12.2</spotbugs.version>
-    <dnsjava.version>2.1.9</dnsjava.version>
     <okhttp3.version>4.12.0</okhttp3.version>
-    <stax2.version>4.2.2</stax2.version>
     <jakarta.inject.version>2.6.1</jakarta.inject.version>
     <jakarta.annotation.version>2.1.1</jakarta.annotation.version>
     <jakarta.validation.version>2.0.2</jakarta.validation.version>
     <jakarta.ws.rs-api.version>2.1.6</jakarta.ws.rs-api.version>
     <javax.inject.version>1</javax.inject.version>
-    <joda.time.version>2.12.7</joda.time.version>
 
     <aopalliance.version>1.0</aopalliance.version>
     <compile-testing.version>0.21.0</compile-testing.version>
@@ -215,7 +209,6 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
     <gson.version>2.10.1</gson.version>
 
     <okhttp.version>2.7.5</okhttp.version>
-    <okio.version>3.6.0</okio.version>
     <mockito.version>4.11.0</mockito.version>
     <hamcrest.version>2.2</hamcrest.version>
     <junit5.version>5.10.3</junit5.version>
@@ -310,17 +303,11 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
     <properties.maven.plugin.version>1.2.1</properties.maven.plugin.version>
     <maven.core.version>3.9.9</maven.core.version>
     <snappy-java.version>1.1.10.7</snappy-java.version>
-    <hadoop-shaded-guava.version>1.2.0</hadoop-shaded-guava.version>
     <com.nimbusds.nimbus-jose-jwt.version>9.40</com.nimbusds.nimbus-jose-jwt.version>
   </properties>
 
   <dependencyManagement>
     <dependencies>
-      <dependency>
-        <groupId>com.squareup.okio</groupId>
-        <artifactId>okio</artifactId>
-        <version>${okio.version}</version>
-      </dependency>
       <dependency>
         <groupId>com.squareup.okhttp</groupId>
         <artifactId>okhttp</artifactId>
@@ -991,11 +978,6 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
         <artifactId>spring-tx</artifactId>
         <version>${spring.version}</version>
       </dependency>
-      <dependency>
-        <groupId>com.fasterxml.woodstox</groupId>
-        <artifactId>woodstox-core</artifactId>
-        <version>${woodstox.version}</version>
-      </dependency>
       <dependency>
         <groupId>com.fasterxml.jackson</groupId>
         <artifactId>jackson-bom</artifactId>
@@ -1018,11 +1000,6 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
         <artifactId>compile-testing</artifactId>
         <version>${compile-testing.version}</version>
       </dependency>
-      <dependency>
-        <groupId>com.google.re2j</groupId>
-        <artifactId>re2j</artifactId>
-        <version>${re2j.version}</version>
-      </dependency>
       <dependency>
         <groupId>com.google.protobuf</groupId>
         <artifactId>protobuf-java</artifactId>
@@ -1038,11 +1015,6 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
         <artifactId>commons-daemon</artifactId>
         <version>${commons-daemon.version}</version>
       </dependency>
-      <dependency>
-        <groupId>com.jcraft</groupId>
-        <artifactId>jsch</artifactId>
-        <version>${jsch.version}</version>
-      </dependency>
 
       <dependency>
         <groupId>org.kohsuke.metainf-services</groupId>
@@ -1181,12 +1153,6 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
         <version>${bouncycastle.version}</version>
       </dependency>
 
-      <dependency>
-        <groupId>dnsjava</groupId>
-        <artifactId>dnsjava</artifactId>
-        <version>${dnsjava.version}</version>
-      </dependency>
-
       <dependency>
         <groupId>org.yaml</groupId>
         <artifactId>snakeyaml</artifactId>
@@ -1233,11 +1199,6 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
         <artifactId>okhttp</artifactId>
         <version>${okhttp3.version}</version>
       </dependency>
-      <dependency>
-        <groupId>org.codehaus.woodstox</groupId>
-        <artifactId>stax2-api</artifactId>
-        <version>${stax2.version}</version>
-      </dependency>
       <dependency>
         <groupId>net.java.dev.jna</groupId>
         <artifactId>jna</artifactId>
@@ -1268,11 +1229,6 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
         <artifactId>jakarta.ws.rs-api</artifactId>
         <version>${jakarta.ws.rs-api.version}</version>
       </dependency>
-      <dependency>
-        <groupId>joda-time</groupId>
-        <artifactId>joda-time</artifactId>
-        <version>${joda.time.version}</version>
-      </dependency>
       <dependency>
         <groupId>org.apache.curator</groupId>
         <artifactId>curator-framework</artifactId>
@@ -1304,21 +1260,18 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
         <version>${mockito.version}</version>
       </dependency>
       <dependency>
+        <!-- transitive dependency of Hadoop, manage version for CVE -->
         <groupId>org.xerial.snappy</groupId>
         <artifactId>snappy-java</artifactId>
         <version>${snappy-java.version}</version>
       </dependency>
-      <dependency>
-        <groupId>org.apache.hadoop.thirdparty</groupId>
-        <artifactId>hadoop-shaded-guava</artifactId>
-        <version>${hadoop-shaded-guava.version}</version>
-      </dependency>
       <dependency>
         <groupId>com.github.vlsi.mxgraph</groupId>
         <artifactId>jgraphx</artifactId>
         <version>${jgraphx.version}</version>
       </dependency>
       <dependency>
+        <!-- transitive dependency of Hadoop, manage version for CVE -->
         <groupId>com.nimbusds</groupId>
         <artifactId>nimbus-jose-jwt</artifactId>
         <version>${com.nimbusds.nimbus-jose-jwt.version}</version>
@@ -1703,6 +1656,38 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
     </pluginManagement>
 
     <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-dependency-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>add-classpath-descriptor</id>
+            <phase>prepare-package</phase>
+            <goals>
+              <goal>build-classpath</goal>
+            </goals>
+            <configuration>
+              <outputFile>${project.build.outputDirectory}/${project.artifactId}.classpath</outputFile>
+              <prefix>$HDDS_LIB_JARS_DIR</prefix>
+              <outputFilterFile>true</outputFilterFile>
+              <includeScope>runtime</includeScope>
+              <skip>${classpath.skip}</skip>
+            </configuration>
+          </execution>
+          <execution>
+            <id>copy-jars</id>
+            <phase>prepare-package</phase>
+            <goals>
+              <goal>copy-dependencies</goal>
+            </goals>
+            <configuration>
+              <outputDirectory>${project.build.directory}/share/ozone/lib</outputDirectory>
+              <includeScope>runtime</includeScope>
+              <skip>${classpath.skip}</skip>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
       <plugin>
         <artifactId>maven-clean-plugin</artifactId>
         <configuration>