Skip to content

Commit 227fce2

Browse files
garydgregorygarydgregory
committed
Fix up discrepancies in changes actions
- Minor format tweaks in examples - Update site for security page and Javadoc archives
1 parent b21d20d commit 227fce2

File tree

4 files changed

+63
-11
lines changed

4 files changed

+63
-11
lines changed

‎src/changes/changes.xml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,10 @@ The <action> type attribute can be add,update,fix,remove.
5353
<action type="fix" dev="ggregory" due-to="Gary Gregory">Javadoc is missing its Overview page.</action>
5454
<!-- ADD -->
5555
<!-- UPDATE -->
56-
<action type="update" dev="ggregory">Bump org.apache.commons:commons-parent from 62 to 73.</action>
57-
<action type="update" dev="ggregory">Bump org.ow2.asm:asm-util from 9.5 to 9.7.</action>
56+
<action type="update" dev="ggregory" due-to="Gary Gregory">Bump org.apache.commons:commons-parent from 62 to 79.</action>
5857
<action type="update" dev="ggregory" due-to="Gary Gregory">[test] Bump commons-lang3 from 3.13.0 to 3.17.0.</action>
5958
<action type="update" dev="ggregory" due-to="Gary Gregory">[site] Pickup org.apache.bcel:bcel version from parent POM.</action>
60-
<action type="update" dev="ggregory" due-to="Gary Gregory">[test] Bump org.ow2.asm:asm-util from 9.7 to 9.7.1.</action>
59+
<action type="update" dev="ggregory" due-to="Gary Gregory">[test] Bump org.ow2.asm:asm-util from 9.5 to 9.7.1.</action>
6160
</release>
6261
<release version="2.12.0" date="2023-09-30" description="This is a feature and maintenance release (Java 8 or above).">
6362
<!-- FIX -->

‎src/site/site.xml‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,18 +26,20 @@
2626
<menu name="Commons Pool">
2727
<!-- Start: For all components. -->
2828
<item name="About" href="index.html" />
29-
<item name="Asking Questions" href="/mail-lists.html" />
30-
<item name="Release History" href="/changes.html" />
31-
<item name="Issue Tracking" href="/issue-management.html" />
29+
<item name="Asking Questions" href="mail-lists.html" />
30+
<item name="Release History" href="changes.html" />
31+
<item name="Issue Tracking" href="issue-management.html" />
3232
<item name="Dependency Management" href="/dependency-info.html" />
3333
<item name="Javadoc" href="apidocs/index.html" />
34-
<item name="Javadoc Archive" href="https://javadoc.io/doc/org.apache.commons/commons-pool2/" />
35-
<item name="Sources" href="/scm.html" />
34+
<item name="Javadoc Archive 2.x" href="https://javadoc.io/doc/org.apache.commons/commons-pool2/" />
35+
<item name="Javadoc Archive 1.x" href="https://javadoc.io/doc/commons-pool/commons-pool/" />
36+
<item name="Sources" href="scm.html" />
3637
<item name="Security" href="security.html" />
3738
<item name="License" href="https://www.apache.org/licenses/LICENSE-2.0" />
3839
<item name="Code of Conduct" href="https://www.apache.org/foundation/policies/conduct.html" />
3940
<item name="Download" href="https://commons.apache.org/proper/commons-pool/download_bcel.cgi" />
4041
<!-- End: For all components. -->
42+
<item name="Examples" href="examples.html" />
4143
</menu>
4244
</body>
4345
</site>

‎src/site/xdoc/examples.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,16 +45,16 @@ public class ReaderUtil {
4545
public String readToString(Reader in) throws IOException {
4646
StringBuffer buf = new StringBuffer();
4747
try {
48-
for(int c = in.read(); c != -1; c = in.read()) {
48+
for (int c = in.read(); c != -1; c = in.read()) {
4949
buf.append((char)c);
5050
}
5151
return buf.toString();
52-
} catch(IOException e) {
52+
} catch (IOException e) {
5353
throw e;
5454
} finally {
5555
try {
5656
in.close();
57-
} catch(Exception e) {
57+
} catch (Exception e) {
5858
// ignored
5959
}
6060
}

‎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 https://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)