Skip to content

Commit f982fd7

Browse files
garydgregorygarydgregory
committed
Port from Doxia 1 to 2
1 parent 9675407 commit f982fd7

File tree

6 files changed

+124
-52
lines changed

6 files changed

+124
-52
lines changed

‎src/site/site.xml‎

Lines changed: 54 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -15,45 +15,57 @@
1515
See the License for the specific language governing permissions and
1616
limitations under the License.
1717
-->
18-
<project name="BeanUtils">
19-
<bannerRight>
20-
<name>Commons BeanUtils</name>
21-
<src>/images/logo.png</src>
22-
<href>/index.html</href>
23-
</bannerRight>
24-
<body>
25-
<menu name="BeanUtils">
26-
<item name="Overview" href="/index.html"/>
27-
<item name="Download" href="http://commons.apache.org/beanutils/download_beanutils.cgi"/>
28-
<item name="Dependencies" href="/dependencies.html"/>
29-
<item name="Mailing Lists" href="/mail-lists.html"/>
30-
<item name="Issue Tracking" href="/issue-tracking.html"/>
31-
<item name="Source Repository" href="/scm.html"/>
32-
<item name="License" href="http://www.apache.org/licenses/LICENSE-2.0.txt"/>
33-
</menu>
34-
<menu name="Documentation">
35-
<item name="Building" href="/building.html"/>
36-
<item name="History" href="/changes.html"/>
37-
<item name="1.9.4" collapse="true" href="/index.html">
38-
<item name="Release Notes" href="http://commons.apache.org/beanutils/javadocs/v1.9.4/RELEASE-NOTES.txt"/>
39-
<item name="User Guide" href="http://commons.apache.org/beanutils/javadocs/v1.9.4/apidocs/org/apache/commons/beanutils/package-summary.html#package_description"/>
40-
<item name="API" href="http://commons.apache.org/beanutils/javadocs/v1.9.4/apidocs/index.html"/>
41-
</item>
42-
<item name="1.9.3" collapse="true" href="/index.html">
43-
<item name="Release Notes" href="http://commons.apache.org/beanutils/javadocs/v1.9.3/RELEASE-NOTES.txt"/>
44-
<item name="User Guide" href="http://commons.apache.org/beanutils/javadocs/v1.9.3/apidocs/org/apache/commons/beanutils/package-summary.html#package_description"/>
45-
<item name="API" href="http://commons.apache.org/beanutils/javadocs/v1.9.3/apidocs/index.html"/>
46-
</item>
47-
<item name="1.9.2" collapse="true" href="/index.html">
48-
<item name="Release Notes" href="http://commons.apache.org/beanutils/javadocs/v1.9.2/RELEASE-NOTES.txt"/>
49-
<item name="User Guide" href="http://commons.apache.org/beanutils/javadocs/v1.9.2/apidocs/org/apache/commons/beanutils/package-summary.html#package_description"/>
50-
<item name="API" href="http://commons.apache.org/beanutils/javadocs/v1.9.2/apidocs/index.html"/>
51-
</item>
52-
<item name="1.8.3" collapse="true" href="/index.html">
53-
<item name="Release Notes" href="http://commons.apache.org/beanutils/javadocs/v1.8.3/RELEASE-NOTES.txt"/>
54-
<item name="User Guide" href="http://commons.apache.org/beanutils/javadocs/v1.8.3/apidocs/org/apache/commons/beanutils/package-summary.html#package_description"/>
55-
<item name="API" href="http://commons.apache.org/beanutils/javadocs/v1.8.3/apidocs/index.html"/>
56-
</item>
57-
</menu>
58-
</body>
59-
</project>
18+
<site xmlns="http://maven.apache.org/SITE/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
19+
xsi:schemaLocation="http://maven.apache.org/SITE/2.0.0 http://maven.apache.org/xsd/site-2.0.0.xsd" name="Apache Commons BeanUtils">
20+
<bannerRight name="Commons BeanUtils" href="/index.html">
21+
<image src="/images/logo.png" />
22+
</bannerRight>
23+
<body>
24+
<menu name="Commons BeanUtils">
25+
<!-- Start: For all components. -->
26+
<item name="About" href="/index.html" />
27+
<item name="Asking Questions" href="/mail-lists.html" />
28+
<item name="Release History" href="/changes.html" />
29+
<item name="Issue Tracking" href="/issue-management.html" />
30+
<item name="Dependency Management" href="/dependency-info.html" />
31+
<item name="Sources" href="/scm.html" />
32+
<item name="Security" href="/security.html" />
33+
<item name="License" href="https://www.apache.org/licenses/LICENSE-2.0" />
34+
<item name="Code of Conduct" href="https://www.apache.org/foundation/policies/conduct.html" />
35+
<item name="Download" href="/download_beanutils.cgi" />
36+
<item name="Javadoc">
37+
<item name="Javadoc Current" href="apidocs/index.html" />
38+
<item name="Javadoc Archive" href="https://javadoc.io/doc/beanutils/beanutils/" />
39+
</item>
40+
<!-- End: For all components. -->
41+
</menu>
42+
<!-- Specific to this component: -->
43+
<menu name="Documentation">
44+
<item name="Building" href="/building.html" />
45+
<item name="1.9.4" collapse="true" href="/index.html">
46+
<item name="Release Notes" href="http://commons.apache.org/beanutils/javadocs/v1.9.4/RELEASE-NOTES.txt" />
47+
<item name="User Guide"
48+
href="http://commons.apache.org/beanutils/javadocs/v1.9.4/apidocs/org/apache/commons/beanutils/package-summary.html#package_description" />
49+
<item name="API" href="http://commons.apache.org/beanutils/javadocs/v1.9.4/apidocs/index.html" />
50+
</item>
51+
<item name="1.9.3" collapse="true" href="/index.html">
52+
<item name="Release Notes" href="http://commons.apache.org/beanutils/javadocs/v1.9.3/RELEASE-NOTES.txt" />
53+
<item name="User Guide"
54+
href="http://commons.apache.org/beanutils/javadocs/v1.9.3/apidocs/org/apache/commons/beanutils/package-summary.html#package_description" />
55+
<item name="API" href="http://commons.apache.org/beanutils/javadocs/v1.9.3/apidocs/index.html" />
56+
</item>
57+
<item name="1.9.2" collapse="true" href="/index.html">
58+
<item name="Release Notes" href="http://commons.apache.org/beanutils/javadocs/v1.9.2/RELEASE-NOTES.txt" />
59+
<item name="User Guide"
60+
href="http://commons.apache.org/beanutils/javadocs/v1.9.2/apidocs/org/apache/commons/beanutils/package-summary.html#package_description" />
61+
<item name="API" href="http://commons.apache.org/beanutils/javadocs/v1.9.2/apidocs/index.html" />
62+
</item>
63+
<item name="1.8.3" collapse="true" href="/index.html">
64+
<item name="Release Notes" href="http://commons.apache.org/beanutils/javadocs/v1.8.3/RELEASE-NOTES.txt" />
65+
<item name="User Guide"
66+
href="http://commons.apache.org/beanutils/javadocs/v1.8.3/apidocs/org/apache/commons/beanutils/package-summary.html#package_description" />
67+
<item name="API" href="http://commons.apache.org/beanutils/javadocs/v1.8.3/apidocs/index.html" />
68+
</item>
69+
</menu>
70+
</body>
71+
</site>

‎src/site/xdoc/bean-collections.xml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,9 @@
1616
limitations under the License.
1717
-->
1818

19-
<document>
19+
<document xmlns="http://maven.apache.org/XDOC/2.0"
20+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
21+
xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 https://maven.apache.org/xsd/xdoc-2.0.xsd">
2022

2123
<properties>
2224
<title>Commons</title>

‎src/site/xdoc/building.xml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1515
See the License for the specific language governing permissions and
1616
limitations under the License.
1717
-->
18-
<document>
18+
<document xmlns="http://maven.apache.org/XDOC/2.0"
19+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
20+
xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 https://maven.apache.org/xsd/xdoc-2.0.xsd">
1921
<properties>
2022
<title>Building</title>
2123
<author email="[email protected]">Commons Documentation Team</author>

‎src/site/xdoc/index.xml‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,9 @@
1616
limitations under the License.
1717
-->
1818

19-
<document>
20-
19+
<document xmlns="http://maven.apache.org/XDOC/2.0"
20+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
21+
xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 https://maven.apache.org/xsd/xdoc-2.0.xsd">
2122
<properties>
2223
<title>Commons</title>
2324
<author email="[email protected]">Commons Documentation Team</author>
@@ -58,14 +59,16 @@ easy-to-use wrappers around these capabilities.
5859
<subsection name='BeanUtils Core And Modules'>
5960
<p>
6061
The 1.7.x and 1.8.x releases of BeanUtils have distributed three jars:
62+
</p>
6163
<ul>
6264
<li><code>commons-beanutils.jar</code> - contains everything</li>
6365
<li><code>commons-beanutils-core.jar</code> - excludes <i>Bean Collections</i> classes</li>
6466
<li><code>commons-beanutils-bean-collections.jar</code> - only <i>Bean Collections</i> classes</li>
6567
</ul>
68+
<p>
6669
The main <code>commons-beanutils.jar</code> has an <b><i>optional</i></b> dependency on
67-
<a href='http://commons.apache.org/collections'>Commons Collections</a>
6870
</p>
71+
<a href='http://commons.apache.org/collections'>Commons Collections</a>
6972
<p>
7073
Version 1.9.0 reverts this split for reasons outlined at
7174
<a href="http://issues.apache.org/jira/browse/BEANUTILS-379">BEANUTILS-379</a>.
@@ -94,11 +97,13 @@ Bean Collections has an additional dependency on
9497
The latest BeanUtils release is available to download
9598
<a href="http://commons.apache.org/beanutils/download_beanutils.cgi">here</a>.<br/>
9699
<em><strong>1.9.4</strong></em><br/><br/>
97-
<ul>
100+
</p>
101+
<ul>
98102
<li><a href="http://commons.apache.org/beanutils/javadocs/v1.9.4/RELEASE-NOTES.txt">Release Notes</a></li>
99103
<li><a href="http://commons.apache.org/beanutils/javadocs/v1.9.4/apidocs/index.html">JavaDoc</a></li>
100104
</ul>
101-
<strong>CVE-2019-10086.</strong> Apache Commons Beanutils does not suppresses
105+
<p>
106+
<strong>CVE-2019-10086.</strong> Apache Commons Beanutils does not suppresses
102107
the class property in bean introspection by default.<br/><br/>
103108
<strong>Severity.</strong> Medium<br/><br/>
104109
<strong>Vendor.</strong> The Apache Software Foundation<br/><br/>
@@ -238,7 +243,6 @@ commons collections 3.
238243
</p>
239244
</subsection>
240245
<subsection name='Older Releases (Not Mirrored)'>
241-
<p>
242246
<ul>
243247
<li>Version 1.6.1 - 18 Feb 2003
244248
<a href="http://archive.apache.org/dist/commons/beanutils/binaries/">binary</a> and
@@ -254,7 +258,6 @@ commons collections 3.
254258
<li><a href="http://archive.apache.org/dist/commons/beanutils/old/v1.1/">Version 1.1</a> - 22 Sep 2001</li>
255259
<li><a href="http://archive.apache.org/dist/commons/beanutils/old/v1.0/">Version 1.0</a> - 14 July 2001</li>
256260
</ul>
257-
</p>
258261
</subsection>
259262
</section>
260263

‎src/site/xdoc/proposal.xml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,9 @@
1414
See the License for the specific language governing permissions and
1515
limitations under the License.
1616
-->
17-
<document>
17+
<document xmlns="http://maven.apache.org/XDOC/2.0"
18+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
19+
xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 https://maven.apache.org/xsd/xdoc-2.0.xsd">
1820
<properties>
1921
<title>Proposal for BeanUtils Package</title>
2022
</properties>

‎src/site/xdoc/security.xml‎

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
<?xml version="1.0"?>
2+
<!--
3+
Licensed to the Apache Software Foundation (ASF) under one
4+
or more contributor license agreements. See the NOTICE file
5+
distributed with this work for additional information
6+
regarding copyright ownership. The ASF licenses this file
7+
to you under the Apache License, Version 2.0 (the
8+
"License"); you may not use this file except in compliance
9+
with the License. You may obtain a copy of the License at
10+
11+
https://www.apache.org/licenses/LICENSE-2.0
12+
13+
Unless required by applicable law or agreed to in writing,
14+
software distributed under the License is distributed on an
15+
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
16+
KIND, either express or implied. See the License for the
17+
specific language governing permissions and limitations
18+
under the License.
19+
-->
20+
<document xmlns="http://maven.apache.org/XDOC/2.0"
21+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
22+
xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd">
23+
<properties>
24+
<title>Apache Commons Security Reports</title>
25+
<author email="[email protected]">Apache Commons Team</author>
26+
</properties>
27+
<body>
28+
<section name="About Security">
29+
<p>
30+
For information about reporting or asking questions about security, please see
31+
<a href="https://commons.apache.org/security.html">Apache Commons Security</a>.
32+
</p>
33+
<p>This page lists all security vulnerabilities fixed in released versions of this component.
34+
</p>
35+
<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
36+
that you are using.
37+
</p>
38+
<p>
39+
If you need help on building this component or other help on following the instructions to mitigate the known vulnerabilities listed here, please send
40+
your questions to the public
41+
<a href="mail-lists.html">user mailing list</a>.
42+
</p>
43+
<p>If you have encountered an unlisted security vulnerability or other unexpected behavior that has security impact, or if the descriptions here are
44+
incomplete, please report them privately to the Apache Security Team. Thank you.
45+
</p>
46+
</section>
47+
<section name="Security Vulnerabilities">
48+
<p>None.</p>
49+
</section>
50+
</body>
51+
</document>

0 commit comments

Comments
 (0)