This is an automated email from the ASF dual-hosted git repository.

ggregory pushed a commit to branch 1.X
in repository https://gitbox.apache.org/repos/asf/commons-beanutils.git


The following commit(s) were added to refs/heads/1.X by this push:
     new f982fd71 Port from Doxia 1 to 2
f982fd71 is described below

commit f982fd715f55287de3c4f9b8c7bdf447719f954a
Author: Gary D. Gregory <[email protected]>
AuthorDate: Sun Jan 26 16:31:18 2025 -0500

    Port from Doxia 1 to 2
---
 src/site/site.xml                  | 96 +++++++++++++++++++++-----------------
 src/site/xdoc/bean-collections.xml |  4 +-
 src/site/xdoc/building.xml         |  4 +-
 src/site/xdoc/index.xml            | 17 ++++---
 src/site/xdoc/proposal.xml         |  4 +-
 src/site/xdoc/security.xml         | 51 ++++++++++++++++++++
 6 files changed, 124 insertions(+), 52 deletions(-)

diff --git a/src/site/site.xml b/src/site/site.xml
index c83a8813..a7011b3e 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -15,45 +15,57 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -->
-<project name="BeanUtils">
-    <bannerRight>
-        <name>Commons BeanUtils</name>
-        <src>/images/logo.png</src>
-        <href>/index.html</href>
-    </bannerRight>
-    <body>
-        <menu name="BeanUtils">
-            <item name="Overview"             href="/index.html"/>
-            <item name="Download"             
href="http://commons.apache.org/beanutils/download_beanutils.cgi"/>
-            <item name="Dependencies"         href="/dependencies.html"/>
-            <item name="Mailing Lists"        href="/mail-lists.html"/>
-            <item name="Issue Tracking"       href="/issue-tracking.html"/>
-            <item name="Source Repository"    href="/scm.html"/>
-            <item name="License"              
href="http://www.apache.org/licenses/LICENSE-2.0.txt"/>
-        </menu>
-        <menu name="Documentation">
-            <item name="Building"             href="/building.html"/>
-            <item name="History"              href="/changes.html"/>
-            <item name="1.9.4" collapse="true" href="/index.html">
-                <item name="Release Notes"    
href="http://commons.apache.org/beanutils/javadocs/v1.9.4/RELEASE-NOTES.txt"/>
-                <item name="User Guide"       
href="http://commons.apache.org/beanutils/javadocs/v1.9.4/apidocs/org/apache/commons/beanutils/package-summary.html#package_description"/>
-                <item name="API"              
href="http://commons.apache.org/beanutils/javadocs/v1.9.4/apidocs/index.html"/>
-            </item>
-            <item name="1.9.3" collapse="true" href="/index.html">
-                <item name="Release Notes"    
href="http://commons.apache.org/beanutils/javadocs/v1.9.3/RELEASE-NOTES.txt"/>
-                <item name="User Guide"       
href="http://commons.apache.org/beanutils/javadocs/v1.9.3/apidocs/org/apache/commons/beanutils/package-summary.html#package_description"/>
-                <item name="API"              
href="http://commons.apache.org/beanutils/javadocs/v1.9.3/apidocs/index.html"/>
-            </item>
-            <item name="1.9.2" collapse="true" href="/index.html">
-                <item name="Release Notes"    
href="http://commons.apache.org/beanutils/javadocs/v1.9.2/RELEASE-NOTES.txt"/>
-                <item name="User Guide"       
href="http://commons.apache.org/beanutils/javadocs/v1.9.2/apidocs/org/apache/commons/beanutils/package-summary.html#package_description"/>
-                <item name="API"              
href="http://commons.apache.org/beanutils/javadocs/v1.9.2/apidocs/index.html"/>
-            </item>
-            <item name="1.8.3" collapse="true" href="/index.html">
-                <item name="Release Notes"    
href="http://commons.apache.org/beanutils/javadocs/v1.8.3/RELEASE-NOTES.txt"/>
-                <item name="User Guide"       
href="http://commons.apache.org/beanutils/javadocs/v1.8.3/apidocs/org/apache/commons/beanutils/package-summary.html#package_description"/>
-                <item name="API"              
href="http://commons.apache.org/beanutils/javadocs/v1.8.3/apidocs/index.html"/>
-            </item>
-        </menu>
-    </body>
-</project>
+<site xmlns="http://maven.apache.org/SITE/2.0.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+  xsi:schemaLocation="http://maven.apache.org/SITE/2.0.0 
http://maven.apache.org/xsd/site-2.0.0.xsd"; name="Apache Commons BeanUtils">
+  <bannerRight name="Commons BeanUtils" href="/index.html">
+    <image src="/images/logo.png" />
+  </bannerRight>
+  <body>
+    <menu name="Commons BeanUtils">
+      <!-- Start: For all components. -->
+      <item name="About" href="/index.html" />
+      <item name="Asking Questions" href="/mail-lists.html" />
+      <item name="Release History" href="/changes.html" />
+      <item name="Issue Tracking" href="/issue-management.html" />
+      <item name="Dependency Management" href="/dependency-info.html" />
+      <item name="Sources" href="/scm.html" />
+      <item name="Security" href="/security.html" />
+      <item name="License" href="https://www.apache.org/licenses/LICENSE-2.0"; 
/>
+      <item name="Code of Conduct" 
href="https://www.apache.org/foundation/policies/conduct.html"; />
+      <item name="Download" href="/download_beanutils.cgi" />
+      <item name="Javadoc">
+        <item name="Javadoc Current" href="apidocs/index.html" />
+        <item name="Javadoc Archive" 
href="https://javadoc.io/doc/beanutils/beanutils/"; />
+      </item>
+      <!-- End: For all components. -->
+    </menu>
+    <!-- Specific to this component: -->
+    <menu name="Documentation">
+      <item name="Building" href="/building.html" />
+      <item name="1.9.4" collapse="true" href="/index.html">
+        <item name="Release Notes" 
href="http://commons.apache.org/beanutils/javadocs/v1.9.4/RELEASE-NOTES.txt"; />
+        <item name="User Guide"
+          
href="http://commons.apache.org/beanutils/javadocs/v1.9.4/apidocs/org/apache/commons/beanutils/package-summary.html#package_description";
 />
+        <item name="API" 
href="http://commons.apache.org/beanutils/javadocs/v1.9.4/apidocs/index.html"; />
+      </item>
+      <item name="1.9.3" collapse="true" href="/index.html">
+        <item name="Release Notes" 
href="http://commons.apache.org/beanutils/javadocs/v1.9.3/RELEASE-NOTES.txt"; />
+        <item name="User Guide"
+          
href="http://commons.apache.org/beanutils/javadocs/v1.9.3/apidocs/org/apache/commons/beanutils/package-summary.html#package_description";
 />
+        <item name="API" 
href="http://commons.apache.org/beanutils/javadocs/v1.9.3/apidocs/index.html"; />
+      </item>
+      <item name="1.9.2" collapse="true" href="/index.html">
+        <item name="Release Notes" 
href="http://commons.apache.org/beanutils/javadocs/v1.9.2/RELEASE-NOTES.txt"; />
+        <item name="User Guide"
+          
href="http://commons.apache.org/beanutils/javadocs/v1.9.2/apidocs/org/apache/commons/beanutils/package-summary.html#package_description";
 />
+        <item name="API" 
href="http://commons.apache.org/beanutils/javadocs/v1.9.2/apidocs/index.html"; />
+      </item>
+      <item name="1.8.3" collapse="true" href="/index.html">
+        <item name="Release Notes" 
href="http://commons.apache.org/beanutils/javadocs/v1.8.3/RELEASE-NOTES.txt"; />
+        <item name="User Guide"
+          
href="http://commons.apache.org/beanutils/javadocs/v1.8.3/apidocs/org/apache/commons/beanutils/package-summary.html#package_description";
 />
+        <item name="API" 
href="http://commons.apache.org/beanutils/javadocs/v1.8.3/apidocs/index.html"; />
+      </item>
+    </menu>
+  </body>
+</site>
\ No newline at end of file
diff --git a/src/site/xdoc/bean-collections.xml 
b/src/site/xdoc/bean-collections.xml
index 45e0a6b3..eb480eb4 100644
--- a/src/site/xdoc/bean-collections.xml
+++ b/src/site/xdoc/bean-collections.xml
@@ -16,7 +16,9 @@
    limitations under the License.
 -->
 
-<document>
+<document xmlns="http://maven.apache.org/XDOC/2.0";
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+  xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 
https://maven.apache.org/xsd/xdoc-2.0.xsd";>
 
  <properties>
   <title>Commons</title>
diff --git a/src/site/xdoc/building.xml b/src/site/xdoc/building.xml
index 1509fda8..098adca4 100644
--- a/src/site/xdoc/building.xml
+++ b/src/site/xdoc/building.xml
@@ -15,7 +15,9 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express 
or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 -->
-<document>
+<document xmlns="http://maven.apache.org/XDOC/2.0";
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+  xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 
https://maven.apache.org/xsd/xdoc-2.0.xsd";>
   <properties>
     <title>Building</title>
     <author email="[email protected]">Commons Documentation Team</author>
diff --git a/src/site/xdoc/index.xml b/src/site/xdoc/index.xml
index e8150e28..7060b322 100644
--- a/src/site/xdoc/index.xml
+++ b/src/site/xdoc/index.xml
@@ -16,8 +16,9 @@
    limitations under the License.
 -->
 
-<document>
-
+<document xmlns="http://maven.apache.org/XDOC/2.0";
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+  xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 
https://maven.apache.org/xsd/xdoc-2.0.xsd";>
  <properties>
   <title>Commons</title>
   <author email="[email protected]">Commons Documentation Team</author>
@@ -58,14 +59,16 @@ easy-to-use wrappers around these capabilities.
 <subsection name='BeanUtils Core And Modules'>
 <p>
 The 1.7.x and 1.8.x releases of BeanUtils have distributed three jars:
+</p>
 <ul>
   <li><code>commons-beanutils.jar</code> - contains everything</li>
   <li><code>commons-beanutils-core.jar</code> - excludes <i>Bean 
Collections</i> classes</li>
   <li><code>commons-beanutils-bean-collections.jar</code> - only <i>Bean 
Collections</i> classes</li>
 </ul>
+<p>
 The main <code>commons-beanutils.jar</code> has an <b><i>optional</i></b> 
dependency on
-<a href='http://commons.apache.org/collections'>Commons Collections</a>
 </p>
+<a href='http://commons.apache.org/collections'>Commons Collections</a>
 <p>
 Version 1.9.0 reverts this split for reasons outlined at
 <a href="http://issues.apache.org/jira/browse/BEANUTILS-379";>BEANUTILS-379</a>.
@@ -94,11 +97,13 @@ Bean Collections has an additional dependency on
     The latest BeanUtils release is available to download
     <a 
href="http://commons.apache.org/beanutils/download_beanutils.cgi";>here</a>.<br/>
     <em><strong>1.9.4</strong></em><br/><br/>
-    <ul>
+   </p>
+   <ul>
       <li><a 
href="http://commons.apache.org/beanutils/javadocs/v1.9.4/RELEASE-NOTES.txt";>Release
 Notes</a></li>
       <li><a 
href="http://commons.apache.org/beanutils/javadocs/v1.9.4/apidocs/index.html";>JavaDoc</a></li>
     </ul>
-    <strong>CVE-2019-10086.</strong> Apache Commons Beanutils does not 
suppresses
+   <p>
+   <strong>CVE-2019-10086.</strong> Apache Commons Beanutils does not 
suppresses
     the class property in bean introspection by default.<br/><br/>
     <strong>Severity.</strong> Medium<br/><br/>
     <strong>Vendor.</strong> The Apache Software Foundation<br/><br/>
@@ -238,7 +243,6 @@ commons collections 3.
 </p>
 </subsection>
     <subsection name='Older Releases (Not Mirrored)'>
-    <p>
     <ul>
     <li>Version 1.6.1 - 18 Feb 2003 
         <a 
href="http://archive.apache.org/dist/commons/beanutils/binaries/";>binary</a> and
@@ -254,7 +258,6 @@ commons collections 3.
     <li><a 
href="http://archive.apache.org/dist/commons/beanutils/old/v1.1/";>Version 
1.1</a> - 22 Sep 2001</li>
     <li><a 
href="http://archive.apache.org/dist/commons/beanutils/old/v1.0/";>Version 
1.0</a> - 14 July 2001</li>
     </ul>
-    </p>
     </subsection>
 </section>
 
diff --git a/src/site/xdoc/proposal.xml b/src/site/xdoc/proposal.xml
index 41e8683a..a7c1591e 100644
--- a/src/site/xdoc/proposal.xml
+++ b/src/site/xdoc/proposal.xml
@@ -14,7 +14,9 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 -->
-<document>
+<document xmlns="http://maven.apache.org/XDOC/2.0";
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+  xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 
https://maven.apache.org/xsd/xdoc-2.0.xsd";>
 <properties>
 <title>Proposal for BeanUtils Package</title>
 </properties>
diff --git a/src/site/xdoc/security.xml b/src/site/xdoc/security.xml
new file mode 100644
index 00000000..34b02c75
--- /dev/null
+++ b/src/site/xdoc/security.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+
+   https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<document xmlns="http://maven.apache.org/XDOC/2.0";
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+  xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 
http://maven.apache.org/xsd/xdoc-2.0.xsd";>
+  <properties>
+    <title>Apache Commons Security Reports</title>
+    <author email="[email protected]">Apache Commons Team</author>
+  </properties>
+  <body>
+    <section name="About Security">
+      <p>
+        For information about reporting or asking questions about security, 
please see
+        <a href="https://commons.apache.org/security.html";>Apache Commons 
Security</a>.
+      </p>
+      <p>This page lists all security vulnerabilities fixed in released 
versions of this component. 
+      </p>
+      <p>Please note that binary patches are never provided. If you need to 
apply a source code patch, use the building instructions for the component 
version
+        that you are using. 
+      </p>
+      <p>
+        If you need help on building this component or other help on following 
the instructions to mitigate the known vulnerabilities listed here, please send
+        your questions to the public
+        <a href="mail-lists.html">user mailing list</a>.
+      </p>
+      <p>If you have encountered an unlisted security vulnerability or other 
unexpected behavior that has security impact, or if the descriptions here are
+        incomplete, please report them privately to the Apache Security Team. 
Thank you. 
+      </p>
+    </section>
+    <section name="Security Vulnerabilities">
+      <p>None.</p>
+    </section>
+  </body>
+</document>
\ No newline at end of file

Reply via email to