diff --git a/warehouse/pom.xml b/warehouse/pom.xml
index 26d2ecc33ed..483c3383d34 100644
--- a/warehouse/pom.xml
+++ b/warehouse/pom.xml
@@ -384,11 +384,6 @@
                 <artifactId>slf4j-api</artifactId>
                 <version>${version.slf4j}</version>
             </dependency>
-            <dependency>
-                <groupId>org.slf4j</groupId>
-                <artifactId>slf4j-log4j12</artifactId>
-                <version>${version.slf4j}</version>
-            </dependency>
             <dependency>
                 <groupId>org.xerial.snappy</groupId>
                 <artifactId>snappy-java</artifactId>
diff --git a/warehouse/query-core/pom.xml b/warehouse/query-core/pom.xml
index e7b6c8100b3..f860fecb412 100644
--- a/warehouse/query-core/pom.xml
+++ b/warehouse/query-core/pom.xml
@@ -231,14 +231,6 @@
             <artifactId>jakarta.xml.bind-api</artifactId>
             <version>${version.jakarta.xml.bind-api}</version>
         </dependency>
-        <dependency>
-            <groupId>javax.enterprise</groupId>
-            <artifactId>cdi-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>javax.enterprise</groupId>
-            <artifactId>cdi-api</artifactId>
-        </dependency>
         <dependency>
             <groupId>javax.inject</groupId>
             <artifactId>javax.inject</artifactId>
@@ -450,6 +442,11 @@
             <artifactId>woodstox-core</artifactId>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>javax.enterprise</groupId>
+            <artifactId>cdi-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>org.apache.accumulo</groupId>
             <artifactId>accumulo-server-base</artifactId>
diff --git a/web-services/client/pom.xml b/web-services/client/pom.xml
index c613f6914a3..cc77e945328 100644
--- a/web-services/client/pom.xml
+++ b/web-services/client/pom.xml
@@ -93,6 +93,10 @@
             <groupId>java3d</groupId>
             <artifactId>vecmath</artifactId>
         </dependency>
+        <dependency>
+            <groupId>javax.enterprise</groupId>
+            <artifactId>cdi-api</artifactId>
+        </dependency>
         <dependency>
             <groupId>javax.ws.rs</groupId>
             <artifactId>javax.ws.rs-api</artifactId>
diff --git a/web-services/security/pom.xml b/web-services/security/pom.xml
index c504a46c79f..716a4e7a452 100644
--- a/web-services/security/pom.xml
+++ b/web-services/security/pom.xml
@@ -149,13 +149,6 @@
             <groupId>org.apache.hadoop</groupId>
             <artifactId>hadoop-client-api</artifactId>
         </dependency>
-        <!--
-        <dependency>
-            <groupId>org.apache.hadoop</groupId>
-            <artifactId>hadoop-client-api</artifactId>
-            <scope>compile</scope>
-        </dependency>
-        -->
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>
@@ -165,6 +158,10 @@
             <artifactId>httpcore</artifactId>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>org.bouncycastle</groupId>
+            <artifactId>bcprov-jdk16</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.easymock</groupId>
             <artifactId>easymock</artifactId>