Skip to content

Commit b20db1f

Browse files
committed
Merge branch 'master' into release
2 parents 03cf937 + cb344d6 commit b20db1f

31 files changed

+83
-51
lines changed

.asf.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@ notifications:
2323
pullrequests: [email protected]
2424
jira_options: link label
2525
26-
issues_bot_dependabot: [email protected]
27-
pullrequests_bot_dependabot: [email protected]
26+
# commits_bot_dependabot: [email protected]
27+
issues_bot_dependabot: [email protected]
28+
pullrequests_bot_dependabot: [email protected]
2829
issues_bot_codecov-commenter: [email protected]
2930
pullrequests_bot_codecov-commenter: [email protected]

.github/workflows/codeql-analysis.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ jobs:
5757
5858
# Initializes the CodeQL tools for scanning.
5959
- name: Initialize CodeQL
60-
uses: github/codeql-action/init@16140ae1a102900babc80a33c44059580f687047 # 3.29.5
60+
uses: github/codeql-action/init@0499de31b99561a6d14a36a5f662c2a54f91beee # 3.29.5
6161
with:
6262
languages: ${{ matrix.language }}
6363
# If you wish to specify custom queries, you can do so here or in a config file.
@@ -68,7 +68,7 @@ jobs:
6868
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
6969
# If this step fails, then you should remove it and run the build manually (see below)
7070
- name: Autobuild
71-
uses: github/codeql-action/autobuild@16140ae1a102900babc80a33c44059580f687047 # 3.29.5
71+
uses: github/codeql-action/autobuild@0499de31b99561a6d14a36a5f662c2a54f91beee # 3.29.5
7272

7373
# ℹ️ Command-line programs to run using the OS shell.
7474
# 📚 https://git.io/JvXDl
@@ -82,4 +82,4 @@ jobs:
8282
# make release
8383

8484
- name: Perform CodeQL Analysis
85-
uses: github/codeql-action/analyze@16140ae1a102900babc80a33c44059580f687047 # 3.29.5
85+
uses: github/codeql-action/analyze@0499de31b99561a6d14a36a5f662c2a54f91beee # 3.29.5

.github/workflows/scorecards-analysis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,13 +57,13 @@ jobs:
5757
publish_results: true
5858

5959
- name: "Upload artifact"
60-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
60+
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
6161
with:
6262
name: SARIF file
6363
path: results.sarif
6464
retention-days: 5
6565

6666
- name: "Upload to code-scanning"
67-
uses: github/codeql-action/upload-sarif@16140ae1a102900babc80a33c44059580f687047 # 3.29.5
67+
uses: github/codeql-action/upload-sarif@0499de31b99561a6d14a36a5f662c2a54f91beee # 3.29.5
6868
with:
6969
sarif_file: results.sarif

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -388,7 +388,7 @@ limitations under the License.
388388
<name>Julius Davies</name>
389389
<id>julius</id>
390390
<email>[email protected]</email>
391-
<organizationUrl>http://juliusdavies.ca/</organizationUrl>
391+
<organizationUrl>https://juliusdavies.ca/</organizationUrl>
392392
<timezone>-8</timezone>
393393
</developer>
394394
<developer>

src/changes/changes.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -576,7 +576,7 @@ The <action> type attribute can be add,update,fix,remove.
576576
This version is released under the
577577
&lt;a href="https://www.apache.org/licenses/LICENSE-2.0">Apache License 2.0&lt;/a>
578578
, please see LICENSE.txt. Previous versions were released under the
579-
&lt;a href="http://www.apache.org/licenses/LICENSE-1.1">Apache License 1.1&lt;/a>
579+
&lt;a href="https://www.apache.org/licenses/LICENSE-1.1">Apache License 1.1&lt;/a>
580580
</action>
581581
<action dev="ggregory" type="update">
582582
The Board recommendation to remove Javadoc author tags has been

src/main/java/org/apache/commons/codec/DecoderException.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public DecoderException(final String message) {
6060
* @see String#format(String, Object...)
6161
* @since 1.20.0
6262
*/
63-
public DecoderException(final String message, Object... args) {
63+
public DecoderException(final String message, final Object... args) {
6464
super(String.format(message, args));
6565
}
6666

src/main/java/org/apache/commons/codec/binary/Base16.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ public Base16 get() {
7979
}
8080

8181
@Override
82-
public Builder setEncodeTable(byte... encodeTable) {
82+
public Builder setEncodeTable(final byte... encodeTable) {
8383
super.setDecodeTableRaw(Arrays.equals(encodeTable, LOWER_CASE_ENCODE_TABLE) ? LOWER_CASE_DECODE_TABLE : UPPER_CASE_DECODE_TABLE);
8484
return super.setEncodeTable(encodeTable);
8585
}

src/main/java/org/apache/commons/codec/binary/Base32.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
import org.apache.commons.codec.CodecPolicy;
2323

2424
/**
25-
* Provides Base32 encoding and decoding as defined by <a href="http://www.ietf.org/rfc/rfc4648.txt">RFC 4648</a>.
25+
* Provides Base32 encoding and decoding as defined by <a href="https://www.ietf.org/rfc/rfc4648.txt">RFC 4648</a>.
2626
*
2727
* <p>
2828
* The class can be parameterized in the following manner with various constructors:
@@ -53,7 +53,7 @@
5353
*
5454
* @see Base32InputStream
5555
* @see Base32OutputStream
56-
* @see <a href="http://www.ietf.org/rfc/rfc4648.txt">RFC 4648</a>
56+
* @see <a href="https://www.ietf.org/rfc/rfc4648.txt">RFC 4648</a>
5757
* @since 1.5
5858
*/
5959
public class Base32 extends BaseNCodec {
@@ -97,7 +97,7 @@ public Base32 get() {
9797
}
9898

9999
@Override
100-
public Builder setEncodeTable(byte... encodeTable) {
100+
public Builder setEncodeTable(final byte... encodeTable) {
101101
super.setDecodeTableRaw(Arrays.equals(encodeTable, HEX_ENCODE_TABLE) ? HEX_DECODE_TABLE : DECODE_TABLE);
102102
return super.setEncodeTable(encodeTable);
103103
}

src/main/java/org/apache/commons/codec/binary/Base32InputStream.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
* </p>
4949
*
5050
* @see Base32
51-
* @see <a href="http://www.ietf.org/rfc/rfc4648.txt">RFC 4648</a>
51+
* @see <a href="https://www.ietf.org/rfc/rfc4648.txt">RFC 4648</a>
5252
* @since 1.5
5353
*/
5454
public class Base32InputStream extends BaseNCodecInputStream<Base32, Base32InputStream, Base32InputStream.Builder> {

src/main/java/org/apache/commons/codec/binary/Base32OutputStream.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
* </p>
5353
*
5454
* @see Base32
55-
* @see <a href="http://www.ietf.org/rfc/rfc4648.txt">RFC 4648</a>
55+
* @see <a href="https://www.ietf.org/rfc/rfc4648.txt">RFC 4648</a>
5656
* @since 1.5
5757
*/
5858
public class Base32OutputStream extends BaseNCodecOutputStream<Base32, Base32OutputStream, Base32OutputStream.Builder> {

0 commit comments

Comments
 (0)