diff --git a/comps-f14.xml.in b/comps-f14.xml.in
index 0fb99ad7..a210fb5a 100644
--- a/comps-f14.xml.in
+++ b/comps-f14.xml.in
@@ -3653,6 +3653,38 @@
       <packagereq type="default">antlr</packagereq>
       <packagereq type="default">antlr-javadoc</packagereq>
       <packagereq type="default">antlr-manual</packagereq>
+      <packagereq type="default">apache-commons-beanutils</packagereq>
+      <packagereq type="default">apache-commons-beanutils-javadoc</packagereq>
+      <packagereq type="default">apache-commons-codec</packagereq>
+      <packagereq type="default">apache-commons-codec-javadoc</packagereq>
+      <packagereq type="default">apache-commons-compress</packagereq>
+      <packagereq type="default">apache-commons-compress-javadoc</packagereq>
+      <packagereq type="default">apache-commons-configuration</packagereq>
+      <packagereq type="default">apache-commons-configuration-javadoc</packagereq>
+      <packagereq type="default">apache-commons-daemon</packagereq>
+      <packagereq type="default">apache-commons-daemon-javadoc</packagereq>
+      <packagereq type="default">apache-commons-digester</packagereq>
+      <packagereq type="default">apache-commons-digester-javadoc</packagereq>
+      <packagereq type="default">apache-commons-discovery</packagereq>
+      <packagereq type="default">apache-commons-discovery-javadoc</packagereq>
+      <packagereq type="default">apache-commons-el</packagereq>
+      <packagereq type="default">apache-commons-el-javadoc</packagereq>
+      <packagereq type="default">apache-commons-exec</packagereq>
+      <packagereq type="default">apache-commons-exec-javadoc</packagereq>
+      <packagereq type="default">apache-commons-fileupload</packagereq>
+      <packagereq type="default">apache-commons-fileupload-javadoc</packagereq>
+      <packagereq type="default">apache-commons-io</packagereq>
+      <packagereq type="default">apache-commons-io-javadoc</packagereq>
+      <packagereq type="default">apache-commons-lang</packagereq>
+      <packagereq type="default">apache-commons-lang-javadoc</packagereq>
+      <packagereq type="default">apache-commons-launcher</packagereq>
+      <packagereq type="default">apache-commons-launcher-javadoc</packagereq>
+      <packagereq type="default">apache-commons-logging</packagereq>
+      <packagereq type="default">apache-commons-logging-javadoc</packagereq>
+      <packagereq type="default">apache-commons-math</packagereq>
+      <packagereq type="default">apache-commons-math-javadoc</packagereq>
+      <packagereq type="default">apache-commons-net</packagereq>
+      <packagereq type="default">apache-commons-net-javadoc</packagereq>
       <packagereq type="default">avalon-framework</packagereq>
       <packagereq type="default">avalon-framework-javadoc</packagereq>
       <packagereq type="default">avalon-framework-manual</packagereq>
@@ -3666,26 +3698,10 @@
       <packagereq type="default">classpathx-mail-javadoc</packagereq>
       <packagereq type="default">gnu-getopt</packagereq>
       <packagereq type="default">gnu-getopt-javadoc</packagereq>
-      <packagereq type="default">jakarta-commons-beanutils</packagereq>
-      <packagereq type="default">jakarta-commons-beanutils-javadoc</packagereq>
       <packagereq type="default">jakarta-commons-collections</packagereq>
       <packagereq type="default">jakarta-commons-collections-javadoc</packagereq>
-      <packagereq type="default">jakarta-commons-daemon</packagereq>
-      <packagereq type="default">jakarta-commons-daemon-javadoc</packagereq>
       <packagereq type="default">jakarta-commons-dbcp</packagereq>
       <packagereq type="default">jakarta-commons-dbcp-javadoc</packagereq>
-      <packagereq type="default">jakarta-commons-digester</packagereq>
-      <packagereq type="default">jakarta-commons-digester-javadoc</packagereq>
-      <packagereq type="default">jakarta-commons-el</packagereq>
-      <packagereq type="default">jakarta-commons-el-javadoc</packagereq>
-      <packagereq type="default">jakarta-commons-fileupload</packagereq>
-      <packagereq type="default">jakarta-commons-fileupload-javadoc</packagereq>
-      <packagereq type="default">jakarta-commons-lang</packagereq>
-      <packagereq type="default">jakarta-commons-lang-javadoc</packagereq>
-      <packagereq type="default">jakarta-commons-launcher</packagereq>
-      <packagereq type="default">jakarta-commons-launcher-javadoc</packagereq>
-      <packagereq type="default">jakarta-commons-logging</packagereq>
-      <packagereq type="default">jakarta-commons-logging-javadoc</packagereq>
       <packagereq type="default">jakarta-commons-modeler</packagereq>
       <packagereq type="default">jakarta-commons-modeler-javadoc</packagereq>
       <packagereq type="default">jakarta-commons-pool</packagereq>
@@ -3732,10 +3748,10 @@
       <packagereq type="default">xalan-j2-xsltc</packagereq>
       <packagereq type="default">xerces-j2</packagereq>
       <packagereq type="default">xerces-j2-demo</packagereq>
-      <packagereq type="default">xerces-j2-javadoc-apis</packagereq>
       <packagereq type="default">xerces-j2-javadoc-impl</packagereq>
       <packagereq type="default">xerces-j2-javadoc-other</packagereq>
       <packagereq type="default">xerces-j2-javadoc-xni</packagereq>
+      <packagereq type="default">xerces-j2-javadoc-xs</packagereq>
       <packagereq type="default">xerces-j2-scripts</packagereq>
       <packagereq type="default">xml-commons-apis</packagereq>
       <packagereq type="default">xml-commons-apis-javadoc</packagereq>
diff --git a/comps-f15.xml.in b/comps-f15.xml.in
index ff7b27ef..e1a8168c 100644
--- a/comps-f15.xml.in
+++ b/comps-f15.xml.in
@@ -3647,6 +3647,38 @@
       <packagereq type="default">antlr</packagereq>
       <packagereq type="default">antlr-javadoc</packagereq>
       <packagereq type="default">antlr-manual</packagereq>
+      <packagereq type="default">apache-commons-beanutils</packagereq>
+      <packagereq type="default">apache-commons-beanutils-javadoc</packagereq>
+      <packagereq type="default">apache-commons-codec</packagereq>
+      <packagereq type="default">apache-commons-codec-javadoc</packagereq>
+      <packagereq type="default">apache-commons-compress</packagereq>
+      <packagereq type="default">apache-commons-compress-javadoc</packagereq>
+      <packagereq type="default">apache-commons-configuration</packagereq>
+      <packagereq type="default">apache-commons-configuration-javadoc</packagereq>
+      <packagereq type="default">apache-commons-daemon</packagereq>
+      <packagereq type="default">apache-commons-daemon-javadoc</packagereq>
+      <packagereq type="default">apache-commons-digester</packagereq>
+      <packagereq type="default">apache-commons-digester-javadoc</packagereq>
+      <packagereq type="default">apache-commons-discovery</packagereq>
+      <packagereq type="default">apache-commons-discovery-javadoc</packagereq>
+      <packagereq type="default">apache-commons-el</packagereq>
+      <packagereq type="default">apache-commons-el-javadoc</packagereq>
+      <packagereq type="default">apache-commons-exec</packagereq>
+      <packagereq type="default">apache-commons-exec-javadoc</packagereq>
+      <packagereq type="default">apache-commons-fileupload</packagereq>
+      <packagereq type="default">apache-commons-fileupload-javadoc</packagereq>
+      <packagereq type="default">apache-commons-io</packagereq>
+      <packagereq type="default">apache-commons-io-javadoc</packagereq>
+      <packagereq type="default">apache-commons-lang</packagereq>
+      <packagereq type="default">apache-commons-lang-javadoc</packagereq>
+      <packagereq type="default">apache-commons-launcher</packagereq>
+      <packagereq type="default">apache-commons-launcher-javadoc</packagereq>
+      <packagereq type="default">apache-commons-logging</packagereq>
+      <packagereq type="default">apache-commons-logging-javadoc</packagereq>
+      <packagereq type="default">apache-commons-math</packagereq>
+      <packagereq type="default">apache-commons-math-javadoc</packagereq>
+      <packagereq type="default">apache-commons-net</packagereq>
+      <packagereq type="default">apache-commons-net-javadoc</packagereq>
       <packagereq type="default">avalon-framework</packagereq>
       <packagereq type="default">avalon-framework-javadoc</packagereq>
       <packagereq type="default">avalon-framework-manual</packagereq>
@@ -3660,26 +3692,10 @@
       <packagereq type="default">classpathx-mail-javadoc</packagereq>
       <packagereq type="default">gnu-getopt</packagereq>
       <packagereq type="default">gnu-getopt-javadoc</packagereq>
-      <packagereq type="default">jakarta-commons-beanutils</packagereq>
-      <packagereq type="default">jakarta-commons-beanutils-javadoc</packagereq>
       <packagereq type="default">jakarta-commons-collections</packagereq>
       <packagereq type="default">jakarta-commons-collections-javadoc</packagereq>
-      <packagereq type="default">jakarta-commons-daemon</packagereq>
-      <packagereq type="default">jakarta-commons-daemon-javadoc</packagereq>
       <packagereq type="default">jakarta-commons-dbcp</packagereq>
       <packagereq type="default">jakarta-commons-dbcp-javadoc</packagereq>
-      <packagereq type="default">jakarta-commons-digester</packagereq>
-      <packagereq type="default">jakarta-commons-digester-javadoc</packagereq>
-      <packagereq type="default">jakarta-commons-el</packagereq>
-      <packagereq type="default">jakarta-commons-el-javadoc</packagereq>
-      <packagereq type="default">jakarta-commons-fileupload</packagereq>
-      <packagereq type="default">jakarta-commons-fileupload-javadoc</packagereq>
-      <packagereq type="default">jakarta-commons-lang</packagereq>
-      <packagereq type="default">jakarta-commons-lang-javadoc</packagereq>
-      <packagereq type="default">jakarta-commons-launcher</packagereq>
-      <packagereq type="default">jakarta-commons-launcher-javadoc</packagereq>
-      <packagereq type="default">jakarta-commons-logging</packagereq>
-      <packagereq type="default">jakarta-commons-logging-javadoc</packagereq>
       <packagereq type="default">jakarta-commons-modeler</packagereq>
       <packagereq type="default">jakarta-commons-modeler-javadoc</packagereq>
       <packagereq type="default">jakarta-commons-pool</packagereq>
@@ -3726,10 +3742,10 @@
       <packagereq type="default">xalan-j2-xsltc</packagereq>
       <packagereq type="default">xerces-j2</packagereq>
       <packagereq type="default">xerces-j2-demo</packagereq>
-      <packagereq type="default">xerces-j2-javadoc-apis</packagereq>
       <packagereq type="default">xerces-j2-javadoc-impl</packagereq>
       <packagereq type="default">xerces-j2-javadoc-other</packagereq>
       <packagereq type="default">xerces-j2-javadoc-xni</packagereq>
+      <packagereq type="default">xerces-j2-javadoc-xs</packagereq>
       <packagereq type="default">xerces-j2-scripts</packagereq>
       <packagereq type="default">xml-commons-apis</packagereq>
       <packagereq type="default">xml-commons-apis-javadoc</packagereq>