Skip to content

Commit 560bac0

Browse files
committed
Update site documentation to https://maven.apache.org/xsd/xdoc-2.0.xsd
Doxia 1 to 2 for the new commons-parent 79
1 parent 6d911e8 commit 560bac0

13 files changed

Lines changed: 92 additions & 66 deletions

src/changes/changes.xml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<action type="fix" dev="ggregory" due-to="Dávid Szigecsán">Refactor default parser test #294.</action>
3030
<action type="fix" dev="ggregory" due-to="Gary Gregory">Port to JUnit 5.</action>
3131
<action type="fix" dev="ggregory" due-to="Gary Gregory">Generics for Converter should use Exception not Throwable.</action>
32-
<action type="fix" dev="ggregory" due-to="Gary Gregory">Pick up maven-antrun-plugin version from parent POM org.apache:apache.</action>
32+
<action type="fix" dev="ggregory" due-to="Gary Gregory">Pick up maven-antrun-plugin version from parent POM org.apache:apache.</action>
3333
<!-- ADD -->
3434
<action type="add" issue="CLI-339" dev="ggregory" due-to="Claude Warren, Gary Gregory">Help formatter extension in the new package #314.</action>
3535
<action type="add" dev="ggregory" due-to="Gary Gregory">CommandLine.Builder implements Supplier&lt;CommandLine&gt;.</action>
@@ -38,7 +38,8 @@
3838
<!-- UPDATE -->
3939
<action type="update" dev="ggregory" due-to="Gary Gregory, Dependabot">Bump org.apache.commons:commons-parent from 72 to 79 #302, #304, #310, #315, #320, #327.</action>
4040
<action type="update" dev="ggregory" due-to="Gary Gregory, Dependabot">[test] Bump commons-io:commons-io from 2.16.1 to 2.18.0 #309, #337.</action>
41-
<action type="update" dev="ggregory" due-to="Gary Gregory, Dependabot">[test] Bump org.apache.commons:commons-text from 1.12.0 to 1.13.0 #344.</action>
41+
<action type="update" dev="ggregory" due-to="Gary Gregory, Dependabot">[test] Bump org.apache.commons:commons-text from 1.12.0 to 1.13.0 #344.</action>
42+
<action type="update" dev="ggregory" due-to="Gary Gregory">Update site documentation to https://maven.apache.org/xsd/xdoc-2.0.xsd.</action>
4243
</release>
4344
<release version="1.9.0" date="2024-08-10" description="This release contains new features and bug fixes and requires Java 8 or above.">
4445
<!-- ADD -->

src/site/xdoc/index.xml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,12 @@
1717
specific language governing permissions and limitations
1818
under the License.
1919
-->
20-
<document>
21-
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">
2223
<properties>
2324
<title>Apache Commons CLI</title>
24-
<author email="dev@commons.apache.org">commons-dev</author>
25+
<author email="dev@commons.apache.org">Apache Commons Team</author>
2526
</properties>
2627

2728
<body>

src/site/xdoc/introduction.xml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,12 @@
1717
specific language governing permissions and limitations
1818
under the License.
1919
-->
20-
<document>
21-
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">
2223
<properties>
23-
<author email="dev@commons.apache.org">commons-dev</author>
2424
<title>Introducing Apache Commons CLI</title>
25+
<author email="dev@commons.apache.org">Apache Commons Team</author>
2526
</properties>
2627

2728
<body>

src/site/xdoc/issue-tracking.xml

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ The ASF licenses this file to You under the Apache License, Version 2.0
77
(the "License"); you may not use this file except in compliance with
88
the License. You may obtain a copy of the License at
99
10-
http://www.apache.org/licenses/LICENSE-2.0
10+
https://www.apache.org/licenses/LICENSE-2.0
1111
1212
Unless required by applicable law or agreed to in writing, software
1313
distributed under the License is distributed on an "AS IS" BASIS,
@@ -41,10 +41,12 @@ limitations under the License.
4141
| |
4242
+======================================================================+
4343
-->
44-
<document>
44+
<document xmlns="http://maven.apache.org/XDOC/2.0"
45+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
46+
xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 https://maven.apache.org/xsd/xdoc-2.0.xsd">
4547
<properties>
4648
<title>Apache Commons CLI Issue tracking</title>
47-
<author email="dev@commons.apache.org">Apache Commons Documentation Team</author>
49+
<author email="dev@commons.apache.org">Apache Commons Team</author>
4850
</properties>
4951
<body>
5052

@@ -64,6 +66,7 @@ limitations under the License.
6466
<p>
6567
If you would like to report a bug, or raise an enhancement request with
6668
Apache Commons CLI please do the following:
69+
</p>
6770
<ol>
6871
<li><a href="https://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&amp;pid=12310463&amp;sorter/field=issuekey&amp;sorter/order=DESC&amp;status=1&amp;status=3&amp;status=4">Search existing open bugs</a>.
6972
If you find your issue listed then please add a comment with your details.</li>
@@ -73,16 +76,15 @@ limitations under the License.
7376
<li>Submit either a <a href="https://issues.apache.org/jira/secure/CreateIssueDetails!init.jspa?pid=12310463&amp;issuetype=1&amp;priority=4&amp;assignee=-1">bug report</a>
7477
or <a href="https://issues.apache.org/jira/secure/CreateIssueDetails!init.jspa?pid=12310463&amp;issuetype=4&amp;priority=4&amp;assignee=-1">enhancement request</a>.</li>
7578
</ol>
76-
</p>
7779

7880
<p>
7981
Please also remember these points:
82+
</p>
8083
<ul>
8184
<li>the more information you provide, the better we can help you</li>
8285
<li>test cases are vital, particularly for any proposed enhancements</li>
8386
<li>the developers of Apache Commons CLI are all unpaid volunteers</li>
8487
</ul>
85-
</p>
8688

8789
<p>
8890
For more information on creating patches see the
@@ -91,12 +93,12 @@ limitations under the License.
9193

9294
<p>
9395
You may also find these links useful:
96+
</p>
9497
<ul>
9598
<li><a href="https://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&amp;pid=12310463&amp;sorter/field=issuekey&amp;sorter/order=DESC&amp;status=1&amp;status=3&amp;status=4">All Open Apache Commons CLI bugs</a></li>
9699
<li><a href="https://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&amp;pid=12310463&amp;sorter/field=issuekey&amp;sorter/order=DESC&amp;status=5&amp;status=6">All Resolved Apache Commons CLI bugs</a></li>
97100
<li><a href="https://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&amp;pid=12310463&amp;sorter/field=issuekey&amp;sorter/order=DESC">All Apache Commons CLI bugs</a></li>
98101
</ul>
99-
</p>
100102
</section>
101103
</body>
102104
</document>

src/site/xdoc/mail-lists.xml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,12 @@ limitations under the License.
3939
| |
4040
+======================================================================+
4141
-->
42-
<document>
42+
<document xmlns="http://maven.apache.org/XDOC/2.0"
43+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
44+
xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 https://maven.apache.org/xsd/xdoc-2.0.xsd">
4345
<properties>
4446
<title>Apache Commons CLI Mailing Lists</title>
45-
<author email="dev@commons.apache.org">Apache Commons Documentation Team</author>
47+
<author email="dev@commons.apache.org">Apache Commons Team</author>
4648
</properties>
4749
<body>
4850

@@ -53,10 +55,10 @@ limitations under the License.
5355
To make it easier for people to only read messages related to components they are interested in,
5456
the convention in Commons is to prefix the subject line of messages with the component's name,
5557
for example:
56-
<ul>
57-
<li>[cli] Problem with the ...</li>
58-
</ul>
5958
</p>
59+
<ul>
60+
<li>[cli] Problem with the ...</li>
61+
</ul>
6062
<p>
6163
Questions related to the usage of Apache Commons CLI should be posted to the
6264
<a href="https://lists.apache.org/list.html?user@commons.apache.org">User List</a>.

src/site/xdoc/properties.xml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,12 @@
1717
specific language governing permissions and limitations
1818
under the License.
1919
-->
20-
<document>
21-
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 https://maven.apache.org/xsd/xdoc-2.0.xsd">
2223
<properties>
23-
<author email="dev@commons.apache.org">commons-dev</author>
2424
<title>Defining Option Properties</title>
25+
<author email="dev@commons.apache.org">Apache Commons Team</author>
2526
</properties>
2627

2728
<body>

src/site/xdoc/release_1_0.xml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,12 @@ 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>Release notes for CLI 1.0</title>
21-
<author email="dev@commons.apache.org">Commons Documentation Team</author>
23+
<author email="dev@commons.apache.org">Apache Commons Team</author>
2224
</properties>
2325
<body>
2426

src/site/xdoc/release_1_2.xml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,12 @@ 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>Release notes for CLI 1.2</title>
21-
<author email="dev@commons.apache.org">Commons Documentation Team</author>
23+
<author email="dev@commons.apache.org">Apache Commons Team</author>
2224
</properties>
2325
<body>
2426

src/site/xdoc/release_1_3.xml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,12 @@ 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>Release notes for CLI 1.3</title>
21-
<author email="dev@commons.apache.org">Commons Documentation Team</author>
23+
<author email="dev@commons.apache.org">Apache Commons Team</author>
2224
</properties>
2325
<body>
2426

src/site/xdoc/release_1_3_1.xml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,12 @@ 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>Release notes for CLI 1.3.1</title>
21-
<author email="dev@commons.apache.org">Commons Documentation Team</author>
23+
<author email="dev@commons.apache.org">Apache Commons Team</author>
2224
</properties>
2325
<body>
2426

0 commit comments

Comments
 (0)