Skip to content

Commit bd3a79a

Browse files
VincentDebugVincentDebug
authored
Merge branch 'apache:master' into master
2 parents feeb149 + 1fa4dae commit bd3a79a

File tree

623 files changed

+144627
-85180
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

623 files changed

+144627
-85180
lines changed

‎.asf.yaml‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
# Licensed to the Apache Software Foundation (ASF) under one or more
2+
# contributor license agreements. See the NOTICE file distributed with
3+
# this work for additional information regarding copyright ownership.
4+
# The ASF licenses this file to You under the Apache License, Version 2.0
5+
# (the "License"); you may not use this file except in compliance with
6+
# the License. You may obtain a copy of the License at
7+
#
8+
# https://www.apache.org/licenses/LICENSE-2.0
9+
#
10+
# Unless required by applicable law or agreed to in writing, software
11+
# distributed under the License is distributed on an "AS IS" BASIS,
12+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
# See the License for the specific language governing permissions and
14+
# limitations under the License.
15+
16+
github:
17+
description: "Apache Commons Lang"
18+
homepage: https://commons.apache.org/lang/
19+
20+
notifications:
21+
commits: commits@commons.apache.org
22+
issues: issues@commons.apache.org
23+
pullrequests: issues@commons.apache.org
24+
jira_options: link label
25+
jobs: notifications@commons.apache.org
26+
# commits_bot_dependabot: dependabot@commons.apache.org
27+
issues_bot_dependabot: dependabot@commons.apache.org
28+
pullrequests_bot_dependabot: dependabot@commons.apache.org
29+
issues_bot_codecov-commenter: notifications@commons.apache.org
30+
pullrequests_bot_codecov-commenter: notifications@commons.apache.org

‎.gitattributes‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# (the "License"); you may not use this file except in compliance with
66
# the License. You may obtain a copy of the License at
77
#
8-
# http://www.apache.org/licenses/LICENSE-2.0
8+
# https://www.apache.org/licenses/LICENSE-2.0
99
#
1010
# Unless required by applicable law or agreed to in writing, software
1111
# distributed under the License is distributed on an "AS IS" BASIS,

.travis.yml renamed to .github/GH-ROBOTS.txt

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,24 +5,15 @@
55
# (the "License"); you may not use this file except in compliance with
66
# the License. You may obtain a copy of the License at
77
#
8-
# http://www.apache.org/licenses/LICENSE-2.0
8+
# https://www.apache.org/licenses/LICENSE-2.0
99
#
1010
# Unless required by applicable law or agreed to in writing, software
1111
# distributed under the License is distributed on an "AS IS" BASIS,
1212
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1313
# See the License for the specific language governing permissions and
1414
# limitations under the License.
1515

16-
language: java
17-
sudo: false
18-
19-
jdk:
20-
- openjdk7
21-
- oraclejdk8
22-
- oraclejdk9
23-
24-
script:
25-
- mvn
26-
27-
after_success:
28-
- mvn clean cobertura:cobertura coveralls:report -Ptravis-cobertura
16+
# Keeps on creating FUD PRs in test code
17+
# Does not follow Apache disclosure policies
18+
User-agent: JLLeitschuh/security-research
19+
Disallow: *

‎.github/dependabot.yml‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
# Licensed to the Apache Software Foundation (ASF) under one or more
2+
# contributor license agreements. See the NOTICE file distributed with
3+
# this work for additional information regarding copyright ownership.
4+
# The ASF licenses this file to You under the Apache License, Version 2.0
5+
# (the "License"); you may not use this file except in compliance with
6+
# the License. You may obtain a copy of the License at
7+
#
8+
# https://www.apache.org/licenses/LICENSE-2.0
9+
#
10+
# Unless required by applicable law or agreed to in writing, software
11+
# distributed under the License is distributed on an "AS IS" BASIS,
12+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
# See the License for the specific language governing permissions and
14+
# limitations under the License.
15+
16+
version: 2
17+
updates:
18+
- package-ecosystem: "maven"
19+
directory: "/"
20+
schedule:
21+
interval: "quarterly"
22+
- package-ecosystem: "github-actions"
23+
directory: "/"
24+
schedule:
25+
interval: "quarterly"
26+

‎.github/pull_request_template.md‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
<!--
2+
Licensed to the Apache Software Foundation (ASF) under one
3+
or more contributor license agreements. See the NOTICE file
4+
distributed with this work for additional information
5+
regarding copyright ownership. The ASF licenses this file
6+
to you under the Apache License, Version 2.0 (the
7+
"License"); you may not use this file except in compliance
8+
with the License. You may obtain a copy of the License at
9+
10+
https://www.apache.org/licenses/LICENSE-2.0
11+
12+
Unless required by applicable law or agreed to in writing,
13+
software distributed under the License is distributed on an
14+
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15+
KIND, either express or implied. See the License for the
16+
specific language governing permissions and limitations
17+
under the License.
18+
-->
19+
20+
Thanks for your contribution to [Apache Commons](https://commons.apache.org/)! Your help is appreciated!
21+
22+
Before you push a pull request, review this list:
23+
24+
- [ ] Read the [contribution guidelines](CONTRIBUTING.md) for this project.
25+
- [ ] Read the [ASF Generative Tooling Guidance](https://www.apache.org/legal/generative-tooling.html) if you use Artificial Intelligence (AI).
26+
- [ ] I used AI to create any part of, or all of, this pull request. Which AI tool was used to create this pull request, and to what extent did it contribute?
27+
- [ ] Run a successful build using the default [Maven](https://maven.apache.org/) goal with `mvn`; that's `mvn` on the command line by itself.
28+
- [ ] Write unit tests that match behavioral changes, where the tests fail if the changes to the runtime are not applied. This may not always be possible, but it is a best practice.
29+
- [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
30+
- [ ] Each commit in the pull request should have a meaningful subject line and body. Note that a maintainer may squash commits during the merge process.

‎.github/workflows/codeql-analysis.yml‎

Lines changed: 85 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,85 @@
1+
# Licensed to the Apache Software Foundation (ASF) under one or more
2+
# contributor license agreements. See the NOTICE file distributed with
3+
# this work for additional information regarding copyright ownership.
4+
# The ASF licenses this file to You under the Apache License, Version 2.0
5+
# (the "License"); you may not use this file except in compliance with
6+
# the License. You may obtain a copy of the License at
7+
#
8+
# https://www.apache.org/licenses/LICENSE-2.0
9+
#
10+
# Unless required by applicable law or agreed to in writing, software
11+
# distributed under the License is distributed on an "AS IS" BASIS,
12+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
# See the License for the specific language governing permissions and
14+
# limitations under the License.
15+
16+
name: "CodeQL"
17+
18+
on:
19+
push:
20+
branches: [ master ]
21+
pull_request:
22+
# The branches below must be a subset of the branches above
23+
branches: [ master ]
24+
schedule:
25+
- cron: '33 9 * * 4'
26+
27+
permissions:
28+
contents: read
29+
30+
jobs:
31+
analyze:
32+
name: Analyze
33+
runs-on: ubuntu-latest
34+
permissions:
35+
actions: read
36+
contents: read
37+
security-events: write
38+
39+
strategy:
40+
fail-fast: false
41+
matrix:
42+
language: [ 'java', 'javascript' ]
43+
# CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
44+
# Learn more about CodeQL language support at https://git.io/codeql-language-support
45+
46+
steps:
47+
- name: Checkout repository
48+
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
49+
with:
50+
persist-credentials: false
51+
- uses: actions/cache@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
52+
with:
53+
path: ~/.m2/repository
54+
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
55+
restore-keys: |
56+
${{ runner.os }}-maven-
57+
58+
# Initializes the CodeQL tools for scanning.
59+
- name: Initialize CodeQL
60+
uses: github/codeql-action/init@cdefb33c0f6224e58673d9004f47f7cb3e328b89 # v4.31.10
61+
with:
62+
languages: ${{ matrix.language }}
63+
# If you wish to specify custom queries, you can do so here or in a config file.
64+
# By default, queries listed here will override any specified in a config file.
65+
# Prefix the list here with "+" to use these queries and those in the config file.
66+
# queries: ./path/to/local/query, your-org/your-repo/queries@main
67+
68+
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
69+
# If this step fails, then you should remove it and run the build manually (see below)
70+
- name: Autobuild
71+
uses: github/codeql-action/autobuild@cdefb33c0f6224e58673d9004f47f7cb3e328b89 # v4.31.10
72+
73+
# ℹ️ Command-line programs to run using the OS shell.
74+
# 📚 https://git.io/JvXDl
75+
76+
# ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
77+
# and modify them (or add more) to build your code if your project
78+
# uses a compiled language
79+
80+
#- run: |
81+
# make bootstrap
82+
# make release
83+
84+
- name: Perform CodeQL Analysis
85+
uses: github/codeql-action/analyze@cdefb33c0f6224e58673d9004f47f7cb3e328b89 # v4.31.10

‎.github/workflows/dependency-review.yml‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
# Licensed to the Apache Software Foundation (ASF) under one
2+
# or more contributor license agreements. See the NOTICE file
3+
# distributed with this work for additional information
4+
# regarding copyright ownership. The ASF licenses this file
5+
# to you under the Apache License, Version 2.0 (the
6+
# "License"); you may not use this file except in compliance
7+
# with the License. You may obtain a copy of the License at
8+
#
9+
# https://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing,
12+
# software distributed under the License is distributed on an
13+
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
# KIND, either express or implied. See the License for the
15+
# specific language governing permissions and limitations
16+
# under the License.
17+
18+
name: 'Dependency Review'
19+
on: [pull_request]
20+
21+
permissions:
22+
contents: read
23+
24+
jobs:
25+
dependency-review:
26+
runs-on: ubuntu-latest
27+
steps:
28+
- name: 'Checkout Repository'
29+
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
30+
- name: 'Dependency Review PR'
31+
uses: actions/dependency-review-action@3c4e3dcb1aa7874d2c16be7d79418e9b7efd6261 # v4.8.2

‎.github/workflows/maven.yml‎

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
# Licensed to the Apache Software Foundation (ASF) under one or more
2+
# contributor license agreements. See the NOTICE file distributed with
3+
# this work for additional information regarding copyright ownership.
4+
# The ASF licenses this file to You under the Apache License, Version 2.0
5+
# (the "License"); you may not use this file except in compliance with
6+
# the License. You may obtain a copy of the License at
7+
#
8+
# https://www.apache.org/licenses/LICENSE-2.0
9+
#
10+
# Unless required by applicable law or agreed to in writing, software
11+
# distributed under the License is distributed on an "AS IS" BASIS,
12+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
# See the License for the specific language governing permissions and
14+
# limitations under the License.
15+
16+
name: Java CI
17+
18+
on: [push, pull_request]
19+
20+
permissions:
21+
contents: read
22+
23+
jobs:
24+
build:
25+
26+
runs-on: ${{ matrix.os }}
27+
continue-on-error: ${{ matrix.experimental }}
28+
strategy:
29+
matrix:
30+
os: [ubuntu-latest, windows-latest, macos-latest]
31+
java: [ 8, 11, 17, 21, 25 ]
32+
experimental: [false]
33+
include:
34+
- java: 26-ea
35+
experimental: true
36+
os: ubuntu-latest
37+
38+
steps:
39+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
40+
with:
41+
persist-credentials: false
42+
- uses: actions/cache@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
43+
with:
44+
path: ~/.m2/repository
45+
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
46+
restore-keys: |
47+
${{ runner.os }}-maven-
48+
- name: Set up JDK ${{ matrix.java }}
49+
uses: actions/setup-java@f2beeb24e141e01a676f977032f5a29d81c9e27e # v5.1.0
50+
with:
51+
distribution: ${{ runner.os == 'macOS' && matrix.java == '8' && 'zulu' || 'temurin' }}
52+
java-version: ${{ matrix.java }}
53+
- name: Build with Maven
54+
run: mvn --errors --show-version --batch-mode --no-transfer-progress -Ddoclint=all

‎.github/workflows/scorecards-analysis.yml‎

Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
1+
# Licensed to the Apache Software Foundation (ASF) under one or more
2+
# contributor license agreements. See the NOTICE file distributed with
3+
# this work for additional information regarding copyright ownership.
4+
# The ASF licenses this file to You under the Apache license, Version 2.0
5+
# (the "License"); you may not use this file except in compliance with
6+
# the License. You may obtain a copy of the License at
7+
#
8+
# https://www.apache.org/licenses/LICENSE-2.0
9+
#
10+
# Unless required by applicable law or agreed to in writing, software
11+
# distributed under the License is distributed on an "AS IS" BASIS,
12+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
# See the license for the specific language governing permissions and
14+
# limitations under the license.
15+
16+
name: "Scorecards supply-chain security"
17+
18+
on:
19+
branch_protection_rule:
20+
schedule:
21+
- cron: "30 1 * * 6" # Weekly on Saturdays
22+
push:
23+
branches: [ "master" ]
24+
25+
permissions: read-all
26+
27+
jobs:
28+
29+
analysis:
30+
31+
name: "Scorecards analysis"
32+
runs-on: ubuntu-latest
33+
permissions:
34+
# Needed to upload the results to the code-scanning dashboard.
35+
security-events: write
36+
actions: read
37+
id-token: write # This is required for requesting the JWT
38+
contents: read # This is required for actions/checkout
39+
40+
steps:
41+
42+
- name: "Checkout code"
43+
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # 6.0.1
44+
with:
45+
persist-credentials: false
46+
47+
- name: "Run analysis"
48+
uses: ossf/scorecard-action@4eaacf0543bb3f2c246792bd56e8cdeffafb205a # 2.4.3
49+
with:
50+
results_file: results.sarif
51+
results_format: sarif
52+
# A read-only PAT token, which is sufficient for the action to function.
53+
# The relevant discussion: https://github.com/ossf/scorecard-action/issues/188
54+
repo_token: ${{ secrets.GITHUB_TOKEN }}
55+
# Publish the results for public repositories to enable scorecard badges.
56+
# For more details: https://github.com/ossf/scorecard-action#publishing-results
57+
publish_results: true
58+
59+
- name: "Upload artifact"
60+
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # 6.0.0
61+
with:
62+
name: SARIF file
63+
path: results.sarif
64+
retention-days: 5
65+
66+
- name: "Upload to code-scanning"
67+
uses: github/codeql-action/upload-sarif@cdefb33c0f6224e58673d9004f47f7cb3e328b89 # v4.31.10
68+
with:
69+
sarif_file: results.sarif

‎.gitignore‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ maven-eclipse.xml
55
build.properties
66
site-content
77
*~
8+
.mvn/
89

910
# IntelliJ IDEA files
1011
.idea
@@ -18,3 +19,11 @@ site-content
1819
.project
1920
.externalToolBuilders
2021
.checkstyle
22+
23+
# jenv's version file
24+
.java-version
25+
/.DS_Store
26+
27+
# NetBeans files
28+
nb-configuration.xml
29+
nbactions.xml

0 commit comments

Comments
 (0)