This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-configuration.git
The following commit(s) were added to refs/heads/master by this push:
new 0a181c9d Port site from Doxia 1 to 2
0a181c9d is described below
commit 0a181c9d32142169b4d109d25c10e6b5ef09c783
Author: Gary D. Gregory <garydgreg...@gmail.com>
AuthorDate: Fri Feb 7 10:30:56 2025 -0500
Port site from Doxia 1 to 2
Normalize main menu
---
src/site/site.xml | 59 ++++++++++++++++++-------------------
src/site/xdoc/building.xml | 5 ++--
src/site/xdoc/dependencies.xml | 7 ++---
src/site/xdoc/dependencies_1_10.xml | 7 ++---
src/site/xdoc/index.xml | 11 +++----
src/site/xdoc/javadocarchive.xml | 4 ++-
src/site/xdoc/security.xml | 8 +++--
7 files changed, 51 insertions(+), 50 deletions(-)
diff --git a/src/site/site.xml b/src/site/site.xml
index d0382501..1dcaa825 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -15,40 +15,37 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project name="Commons Configuration"
- xmlns="http://maven.apache.org/DECORATION/1.8.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.0
https://maven.apache.org/xsd/decoration-1.8.0.xsd";>
-
- <bannerRight>
- <name>Commons Configuration</name>
- <src>/images/logo.png</src>
- <href>/index.html</href>
+<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
https://maven.apache.org/xsd/site-2.0.0.xsd"; name="Apache Commons
Configuration">
+ <bannerRight name="Commons Configuration" href="/index.html">
+ <image src="/images/logo.png" />
</bannerRight>
-
<body>
<menu name="Commons Configuration">
- <item name="Overview" href="/index.html"/>
- <item name="Download"
href="https://commons.apache.org/configuration/download_configuration.cgi"/>
- <item name="Issue Tracking"
href="/issue-tracking.html"/>
- <item name="Security" href="/security.html"/>
- </menu>
-
- <menu name="Documentation">
- <item name="Building" href="/building.html"/>
- <item name="Release History" href="/changes.html"/>
- <item name="${project.version}" collapse="true" href="/index.html">
- <item name="User's Guide"
href="/userguide/user_guide.html"/>
- <item name="Upgrade Guide: 1.x to 2.0"
href="/userguide/upgradeto2_0.html"/>
- <item name="Upgrade Guide: 2.x"
href="/userguide/upgradeto2_x.html"/>
- <item name="Javadoc"
href="/apidocs/index.html"/>
- <item name="Runtime Dependencies"
href="/dependencies.html"/>
- </item>
- <item name="1.10" collapse="true" href="/index.html">
- <item name="User's Guide"
href="/userguide_v1.10/user_guide.html"/>
- <item name="Javadoc"
href="https://commons.apache.org/configuration/javadocs/v1.10/apidocs/index.html"/>
- <item name="Runtime Dependencies"
href="/dependencies_1_10.html"/>
+ <!-- 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_configuration.cgi" />
+ <item name="Javadoc">
+ <item name="Javadoc Current" href="/apidocs/index.html" />
+ <item name="Javadoc Archive 2.x"
href="https://javadoc.io/doc/org.apache.commons/commons-configuration2/"; />
+ <item name="Javadoc Archive 1.x"
href="https://javadoc.io/doc/commons-configuration/commons-configuration/"; />
</item>
+ <!-- End: For all components. -->
+ <!-- Specific to this component: -->
+ <item name="Building" href="/building.html" />
+ <item name="User's Guide" href="/userguide/user_guide.html" />
+ <item name="Upgrade Guide: 1.x to 2.0"
href="/userguide/upgradeto2_0.html" />
+ <item name="Upgrade Guide: 2.x" href="/userguide/upgradeto2_x.html" />
+ <item name="Javadoc" href="/apidocs/index.html" />
+ <item name="Runtime Dependencies" href="/dependencies.html" />
</menu>
</body>
-
-</project>
+</site>
diff --git a/src/site/xdoc/building.xml b/src/site/xdoc/building.xml
index f3a4674c..dea98832 100644
--- a/src/site/xdoc/building.xml
+++ b/src/site/xdoc/building.xml
@@ -15,8 +15,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>Building</title>
</properties>
diff --git a/src/site/xdoc/dependencies.xml b/src/site/xdoc/dependencies.xml
index f76d112b..ff39997d 100644
--- a/src/site/xdoc/dependencies.xml
+++ b/src/site/xdoc/dependencies.xml
@@ -15,8 +15,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>Runtime dependencies</title>
</properties>
@@ -102,7 +103,6 @@
<p>
<strong>Notes</strong>
</p>
- <p>
<ul>
<li>Commons Configuration makes use of other
Commons components. You should be able to use the current
@@ -111,7 +111,6 @@
versions will work, too.</li>
<li>See pom.xml for versions used to build and test this
version.</li>
</ul>
- </p>
</section>
</body>
diff --git a/src/site/xdoc/dependencies_1_10.xml
b/src/site/xdoc/dependencies_1_10.xml
index 5661c963..fa51973b 100644
--- a/src/site/xdoc/dependencies_1_10.xml
+++ b/src/site/xdoc/dependencies_1_10.xml
@@ -15,8 +15,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>Runtime dependencies</title>
</properties>
@@ -101,7 +102,6 @@
<p>
<strong>Notes</strong>
</p>
- <p>
<ul>
<li>Commons Configuration makes use of other
Commons components. You should be able to use the current
@@ -161,7 +161,6 @@
</table>
</li>
</ul>
- </p>
</section>
</body>
diff --git a/src/site/xdoc/index.xml b/src/site/xdoc/index.xml
index 53330078..5b773da0 100644
--- a/src/site/xdoc/index.xml
+++ b/src/site/xdoc/index.xml
@@ -15,16 +15,17 @@
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>Java Configuration API</title>
<author email="p...@kazmier.com">Pete Kazmier</author>
<author email="mpoes...@marmot.at">Martin Poeschl</author>
<author email="ja...@zenplex.com">Jason van Zyl</author>
<author email="ep...@upstate.com">Eric Pugh</author>
<author email="tobr...@discursive.com">Tim O'Brien</author>
<author email="rgo...@apache.org">Ralph Goers</author>
- <title>Java Configuration API</title>
</properties>
<body>
@@ -43,7 +44,7 @@ Integer integer = config.getInteger("number");
</p>
<p>
Configuration parameters may be loaded from the following sources:
-
+ </p>
<ul>
<li>Properties files</li>
<li>XML documents</li>
@@ -55,7 +56,7 @@ Integer integer = config.getInteger("number");
<li>Applet parameters</li>
<li>Servlet parameters</li>
</ul>
-
+ <p>
Configuration objects are created using configuration builders.
Different configuration sources can be mixed using a
<code>CombinedConfigurationBuilder</code> and
a <code>CombinedConfiguration</code>. Additional sources of
configuration parameters can
diff --git a/src/site/xdoc/javadocarchive.xml b/src/site/xdoc/javadocarchive.xml
index 79016b1d..8b2389ef 100644
--- a/src/site/xdoc/javadocarchive.xml
+++ b/src/site/xdoc/javadocarchive.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>Javadoc Archives</title>
</properties>
diff --git a/src/site/xdoc/security.xml b/src/site/xdoc/security.xml
index 3de3b2ec..b1a119c5 100644
--- a/src/site/xdoc/security.xml
+++ b/src/site/xdoc/security.xml
@@ -6,7 +6,9 @@
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>
+<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>Apache Commons Configuration Security Reports</title>
<author email="d...@commons.apache.org">Commons Team</author>
@@ -45,6 +47,7 @@
On 2022-07-06, the Apache Commons Configuration team
disclosed
<a
href="https://www.cve.org/CVERecord?id=CVE-2022-33980";>CVE-2022-33980</a>
. Key takeaways:
+ </p>
<ul>
<li>
If you rely on software that uses a version of
commons-configuration prior to 2.8.0, you are likely
@@ -58,7 +61,6 @@
untrusted input.
</li>
</ul>
- </p>
<p>
Apache Commons Configuration is a library to read
configuration data from a variety of sources.
It supports variable interpolation with lookups using
various mechanisms, such as system properties
@@ -94,6 +96,7 @@
</p>
<p>
References:
+ </p>
<ul>
<li>
<a
href="https://lists.apache.org/thread/tdf5n7j80lfxdhs2764vn0xmpfodm87s";>Announcement
on d...@commons.apache.org</a>
@@ -108,7 +111,6 @@
<a
href="https://securitylab.github.com/advisories/GHSL-2022-017_Apache_Commons_Configuration/";>GHSL
advisory</a>
</li>
</ul>
- </p>
</subsection>
<subsection name="CVE-2024-29131 prior to 2.10.1, Out-of-bounds
Write vulnerability">
<p>
