diff --git a/maven.yaml b/maven.yaml
index bb2375c..76ea0aa 100644
--- a/maven.yaml
+++ b/maven.yaml
@@ -26,15 +26,12 @@ data:
             - maven
     filter:
         rpms:
-            - aopalliance-javadoc
             - apache-commons-cli-javadoc
             - apache-commons-codec-javadoc
             - apache-commons-io-javadoc
             - apache-commons-lang3-javadoc
             - atinject-javadoc
-            - atinject-tck
             - cdi-api-javadoc
-            - geronimo-annotation-javadoc
             - google-guice-javadoc
             - guava-javadoc
             - guava-testlib
@@ -48,17 +45,13 @@ data:
             - guice-parent
             - guice-servlet
             - guice-throwingproviders
-            - hawtjni
-            - hawtjni-javadoc
             - httpcomponents-client-javadoc
             - httpcomponents-core-javadoc
+            - jakarta-annotations-javadoc
             - jansi-javadoc
-            - jansi-native-javadoc
             - jsoup-javadoc
             - jsr-305-javadoc
             - jul-to-slf4j
-            - log4j-over-slf4j
-            - maven-hawtjni-plugin
             - maven-javadoc
             - maven-resolver-javadoc
             - maven-shared-utils-javadoc
@@ -76,16 +69,10 @@ data:
             - slf4j-javadoc
             - slf4j-jcl
             - slf4j-jdk14
-            - slf4j-log4j12
             - slf4j-manual
             - slf4j-sources
     components:
         rpms:
-            aopalliance:
-                buildorder: 10
-                ref: stream-maven-3.6
-                rationale: >
-                    Runtime dependency of google-guice.
             apache-commons-cli:
                 buildorder: 10
                 ref: stream-maven-3.6
@@ -116,11 +103,6 @@ data:
                 ref: stream-maven-3.6
                 rationale: >
                     Runtime dependency of sisu.
-            geronimo-annotation:
-                buildorder: 10
-                ref: stream-maven-3.6
-                rationale: >
-                    Runtime dependency of maven.
             google-guice:
                 buildorder: 30
                 ref: stream-maven-3.6
@@ -131,11 +113,6 @@ data:
                 ref: stream-maven-3.6
                 rationale: >
                     Runtime dependency of google-guice.
-            hawtjni:
-                buildorder: 10
-                ref: stream-maven-3.6
-                rationale: >
-                    Runtime dependency of jansi, jansi-native.
             httpcomponents-client:
                 buildorder: 20
                 ref: stream-maven-3.6
@@ -147,16 +124,16 @@ data:
                 rationale: >
                     Runtime dependency of httpcomponents-client,
                          maven-wagon.
+            jakarta-annotations:
+                buildorder: 10
+                #ref: stream-maven-3.6
+                rationale: >
+                    Runtime dependency of maven.
             jansi:
                 buildorder: 30
                 ref: stream-maven-3.6
                 rationale: >
                     Runtime dependency of maven.
-            jansi-native:
-                buildorder: 20
-                ref: stream-maven-3.6
-                rationale: >
-                    Runtime dependency of jansi.
             jsoup:
                 buildorder: 10
                 ref: stream-maven-3.6