From 332795c30b54bec45a6095dde50edf19684ddd28 Mon Sep 17 00:00:00 2001 From: Mark Thomas Date: Fri, 25 Nov 2022 12:19:50 +0000 Subject: [PATCH 001/298] Avoid referencing uninitialised variables in clean-up --- src/native/windows/src/security.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/native/windows/src/security.c b/src/native/windows/src/security.c index b2d0b0b2..6cda7cb5 100644 --- a/src/native/windows/src/security.c +++ b/src/native/windows/src/security.c @@ -29,8 +29,8 @@ apxSecurityGrantFileAccessToUser( WCHAR sUser[SIZ_RESLEN]; DWORD dwResult; PACL pOldDACL; - PACL pNewDACL; - PSECURITY_DESCRIPTOR pSD; + PACL pNewDACL = NULL; + PSECURITY_DESCRIPTOR pSD = NULL; EXPLICIT_ACCESS ea; if (szPath) { From 073eb38c085bfb530aaeb6a2fed4726f2b0abb2f Mon Sep 17 00:00:00 2001 From: Mark Thomas Date: Tue, 29 Nov 2022 11:48:54 +0000 Subject: [PATCH 002/298] Update version to 1.3.4 for next development cycle --- RELEASE-NOTES.txt | 2 +- pom.xml | 6 +++--- src/changes/changes.xml | 4 +++- src/native/unix/man/jsvc.1.xml | 4 ++-- src/native/windows/apps/prunmgr/prunmgr.h | 2 +- src/native/windows/apps/prunmgr/prunmgr.rc | 6 +++--- src/native/windows/apps/prunsrv/prunsrv.h | 2 +- src/native/windows/apps/prunsrv/prunsrv.rc | 4 ++-- src/samples/SimpleApplication.sh | 2 +- src/site/xdoc/binaries.xml | 2 +- 10 files changed, 18 insertions(+), 16 deletions(-) diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt index c23d89b6..108658d9 100644 --- a/RELEASE-NOTES.txt +++ b/RELEASE-NOTES.txt @@ -15,7 +15,7 @@ limitations under the License. ================================================================================ - Apache Commons Daemon 1.3.3 + Apache Commons Daemon 1.3.4 Release Notes This document contains the release notes for this version of the diff --git a/pom.xml b/pom.xml index 1a2b14b0..83d2df37 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ 4.0.0 commons-daemon commons-daemon - 1.3.3-SNAPSHOT + 1.3.4-SNAPSHOT Apache Commons Daemon @@ -131,9 +131,9 @@ ${commons.daemon.javaversion} daemon org.apache.commons.daemon - 1.3.3 + 1.3.4 RC1 - 1.3.2 + 1.3.3 DAEMON 12310468 5.9.1 diff --git a/src/changes/changes.xml b/src/changes/changes.xml index 862967cb..73c88ec5 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -38,7 +38,9 @@ Apache Commons Daemon Release Notes - + + + Procrun. Fix creation of duplicate ACL entries on some Windows platforms. diff --git a/src/native/unix/man/jsvc.1.xml b/src/native/unix/man/jsvc.1.xml index 297dc997..09bf6028 100644 --- a/src/native/unix/man/jsvc.1.xml +++ b/src/native/unix/man/jsvc.1.xml @@ -21,8 +21,8 @@ JSVC 1 - 2022-11-28 - Jsvc version 1.3.3 + TBD + Jsvc version 1.3.4 Apache Commons Daemon project diff --git a/src/native/windows/apps/prunmgr/prunmgr.h b/src/native/windows/apps/prunmgr/prunmgr.h index 17654b2d..4656a334 100644 --- a/src/native/windows/apps/prunmgr/prunmgr.h +++ b/src/native/windows/apps/prunmgr/prunmgr.h @@ -24,7 +24,7 @@ #define _PRUNMGR_H #undef PRG_VERSION -#define PRG_VERSION "1.3.3.0" +#define PRG_VERSION "1.3.4.0" #define PRG_REGROOT L"Apache Software Foundation\\Procrun 2.0" #define IDM_TM_EXIT 2000 diff --git a/src/native/windows/apps/prunmgr/prunmgr.rc b/src/native/windows/apps/prunmgr/prunmgr.rc index c9cfda8a..011b9f41 100644 --- a/src/native/windows/apps/prunmgr/prunmgr.rc +++ b/src/native/windows/apps/prunmgr/prunmgr.rc @@ -228,7 +228,7 @@ END STRINGTABLE BEGIN IDS_APPLICATION RSTR_PSM - IDS_APPVERSION "Version 1.3.3" + IDS_APPVERSION "Version 1.3.4" IDS_APPFULLNAME RSTR_PSM " Version " PRG_VERSION IDS_APPCOPYRIGHT "Copyright (c) 2000-2022 The Apache Software Foundation" IDS_APPDESCRIPTION "Apache Commons Daemon Service Management Tool" @@ -259,8 +259,8 @@ BEGIN END 1 VERSIONINFO - FILEVERSION 1,3,3,0 - PRODUCTVERSION 1,3,3,0 + FILEVERSION 1,3,4,0 + PRODUCTVERSION 1,3,4,0 FILEFLAGSMASK 0x3fL #if defined(_DEBUG) FILEFLAGS 0x03L diff --git a/src/native/windows/apps/prunsrv/prunsrv.h b/src/native/windows/apps/prunsrv/prunsrv.h index 53db4887..40254936 100644 --- a/src/native/windows/apps/prunsrv/prunsrv.h +++ b/src/native/windows/apps/prunsrv/prunsrv.h @@ -25,7 +25,7 @@ #define _PRUNSRV_H #undef PRG_VERSION -#define PRG_VERSION "1.3.3.0" +#define PRG_VERSION "1.3.4.0" #define PRG_REGROOT L"Apache Software Foundation\\Procrun 2.0" #endif /* _PRUNSRV_H */ diff --git a/src/native/windows/apps/prunsrv/prunsrv.rc b/src/native/windows/apps/prunsrv/prunsrv.rc index f7e1fafb..ee0ebe69 100644 --- a/src/native/windows/apps/prunsrv/prunsrv.rc +++ b/src/native/windows/apps/prunsrv/prunsrv.rc @@ -23,8 +23,8 @@ IDI_MAINICON ICON "../../resources/procrunw.ico" CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "prunsrv.manifest" 1 VERSIONINFO - FILEVERSION 1,3,3,0 - PRODUCTVERSION 1,3,3,0 + FILEVERSION 1,3,4,0 + PRODUCTVERSION 1,3,4,0 FILEFLAGSMASK 0x3fL #if defined(_DEBUG) FILEFLAGS 0x03L diff --git a/src/samples/SimpleApplication.sh b/src/samples/SimpleApplication.sh index d1616e91..73a1c00b 100755 --- a/src/samples/SimpleApplication.sh +++ b/src/samples/SimpleApplication.sh @@ -20,7 +20,7 @@ # Adapt the following lines to your configuration JAVA_HOME=/opt/java6 PROGRAM=SimpleApplication -CLASSPATH=`pwd`/$PROGRAM.jar:`pwd`/commons-daemon-1.3.3.jar +CLASSPATH=`pwd`/$PROGRAM.jar:`pwd`/commons-daemon-1.3.4.jar case "$1" in start ) diff --git a/src/site/xdoc/binaries.xml b/src/site/xdoc/binaries.xml index 7905aaa8..6db9e51f 100644 --- a/src/site/xdoc/binaries.xml +++ b/src/site/xdoc/binaries.xml @@ -36,7 +36,7 @@ corresponding to your operating system. Only the Windows builds are provided as

-The Windows archive (e.g. commons-daemon-1.3.3-bin-windows.zip) contains 2 different executables: +The Windows archive (e.g. commons-daemon-1.3.4-bin-windows.zip) contains 2 different executables:

  • prunsrv.exe - service application for running applications as services.
  • prunmgr.exe - the GUI manager application used to monitor and configure installed services.
    • From 07cec391ac6815b81bf06beccb05320d618b06e9 Mon Sep 17 00:00:00 2001 From: Gary Gregory Date: Thu, 1 Dec 2022 22:03:04 -0500 Subject: [PATCH 003/298] Bump actions/setup-java from 3.6.0 to 3.7.0 #126 --- .github/workflows/coverage.yml | 2 +- .github/workflows/maven.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index d8e23279..29b99f39 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -39,7 +39,7 @@ jobs: restore-keys: | ${{ runner.os }}-maven- - name: Set up JDK ${{ matrix.java }} - uses: actions/setup-java@v3.6.0 + uses: actions/setup-java@v3.7.0 with: distribution: 'temurin' java-version: ${{ matrix.java }} diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 381527fe..141a7b9d 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -45,7 +45,7 @@ jobs: restore-keys: | ${{ runner.os }}-maven- - name: Set up JDK ${{ matrix.java }} - uses: actions/setup-java@v3.6.0 + uses: actions/setup-java@v3.7.0 with: distribution: 'temurin' java-version: ${{ matrix.java }} From a2966ec087df358fd50d7beb831e1f2d5b86215f Mon Sep 17 00:00:00 2001 From: Gary Gregory Date: Tue, 6 Dec 2022 06:51:24 -0500 Subject: [PATCH 004/298] Undo Bump actions/setup-java from 3.6.0 to 3.7.0 --- .github/workflows/coverage.yml | 2 +- .github/workflows/maven.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index 29b99f39..d8e23279 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -39,7 +39,7 @@ jobs: restore-keys: | ${{ runner.os }}-maven- - name: Set up JDK ${{ matrix.java }} - uses: actions/setup-java@v3.7.0 + uses: actions/setup-java@v3.6.0 with: distribution: 'temurin' java-version: ${{ matrix.java }} diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 141a7b9d..381527fe 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -45,7 +45,7 @@ jobs: restore-keys: | ${{ runner.os }}-maven- - name: Set up JDK ${{ matrix.java }} - uses: actions/setup-java@v3.7.0 + uses: actions/setup-java@v3.6.0 with: distribution: 'temurin' java-version: ${{ matrix.java }} From d011eb2493971df1d756a7926ae50a3df87e7c09 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 9 Dec 2022 11:03:37 -0500 Subject: [PATCH 005/298] Bump actions/setup-java from 3.6.0 to 3.8.0 (#67) Bumps [actions/setup-java](https://github.com/actions/setup-java) from 3.6.0 to 3.8.0. - [Release notes](https://github.com/actions/setup-java/releases) - [Commits](https://github.com/actions/setup-java/compare/v3.6.0...v3.8.0) --- updated-dependencies: - dependency-name: actions/setup-java dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/coverage.yml | 2 +- .github/workflows/maven.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index d8e23279..46b46f2a 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -39,7 +39,7 @@ jobs: restore-keys: | ${{ runner.os }}-maven- - name: Set up JDK ${{ matrix.java }} - uses: actions/setup-java@v3.6.0 + uses: actions/setup-java@v3.8.0 with: distribution: 'temurin' java-version: ${{ matrix.java }} diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 381527fe..3b558082 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -45,7 +45,7 @@ jobs: restore-keys: | ${{ runner.os }}-maven- - name: Set up JDK ${{ matrix.java }} - uses: actions/setup-java@v3.6.0 + uses: actions/setup-java@v3.8.0 with: distribution: 'temurin' java-version: ${{ matrix.java }} From cc95df94eb3f0038dcb7459d9cc85b491f215b2d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 23 Dec 2022 14:20:42 -0500 Subject: [PATCH 006/298] Bump ossf/scorecard-action from 2.0.6 to 2.1.2 (#72) Bumps [ossf/scorecard-action](https://github.com/ossf/scorecard-action) from 2.0.6 to 2.1.2. - [Release notes](https://github.com/ossf/scorecard-action/releases) - [Changelog](https://github.com/ossf/scorecard-action/blob/main/RELEASE.md) - [Commits](https://github.com/ossf/scorecard-action/compare/99c53751e09b9529366343771cc321ec74e9bd3d...e38b1902ae4f44df626f11ba0734b14fb91f8f86) --- updated-dependencies: - dependency-name: ossf/scorecard-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/scorecards-analysis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/scorecards-analysis.yml b/.github/workflows/scorecards-analysis.yml index d223bf49..a57d8cbb 100644 --- a/.github/workflows/scorecards-analysis.yml +++ b/.github/workflows/scorecards-analysis.yml @@ -45,7 +45,7 @@ jobs: persist-credentials: false - name: "Run analysis" - uses: ossf/scorecard-action@99c53751e09b9529366343771cc321ec74e9bd3d # 2.0.6 + uses: ossf/scorecard-action@e38b1902ae4f44df626f11ba0734b14fb91f8f86 # 2.1.2 with: results_file: results.sarif results_format: sarif From 3a086ffec5c19dd236c775b02217e7fbed2c4f4d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 23 Dec 2022 14:21:06 -0500 Subject: [PATCH 007/298] Bump actions/cache from 3.0.11 to 3.2.1 (#73) Bumps [actions/cache](https://github.com/actions/cache) from 3.0.11 to 3.2.1. - [Release notes](https://github.com/actions/cache/releases) - [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md) - [Commits](https://github.com/actions/cache/compare/v3.0.11...v3.2.1) --- updated-dependencies: - dependency-name: actions/cache dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/codeql-analysis-cpp.yml | 2 +- .github/workflows/codeql-analysis-java.yml | 2 +- .github/workflows/coverage.yml | 2 +- .github/workflows/maven.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/codeql-analysis-cpp.yml b/.github/workflows/codeql-analysis-cpp.yml index 821d5f01..f71ad428 100644 --- a/.github/workflows/codeql-analysis-cpp.yml +++ b/.github/workflows/codeql-analysis-cpp.yml @@ -48,7 +48,7 @@ jobs: uses: actions/checkout@v3.1.0 with: persist-credentials: false - - uses: actions/cache@v3.0.11 + - uses: actions/cache@v3.2.1 with: path: ~/.m2/repository key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} diff --git a/.github/workflows/codeql-analysis-java.yml b/.github/workflows/codeql-analysis-java.yml index df4efbad..5991d084 100644 --- a/.github/workflows/codeql-analysis-java.yml +++ b/.github/workflows/codeql-analysis-java.yml @@ -48,7 +48,7 @@ jobs: uses: actions/checkout@v3.1.0 with: persist-credentials: false - - uses: actions/cache@v3.0.11 + - uses: actions/cache@v3.2.1 with: path: ~/.m2/repository key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index 46b46f2a..b0d7c176 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -32,7 +32,7 @@ jobs: - uses: actions/checkout@v3.1.0 with: persist-credentials: false - - uses: actions/cache@v3.0.11 + - uses: actions/cache@v3.2.1 with: path: ~/.m2/repository key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 3b558082..ec3f15f0 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -38,7 +38,7 @@ jobs: - uses: actions/checkout@v3.1.0 with: persist-credentials: false - - uses: actions/cache@v3.0.11 + - uses: actions/cache@v3.2.1 with: path: ~/.m2/repository key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} From 659a5fa3b193df8286cc7b2422121154441a0839 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 23 Dec 2022 14:21:23 -0500 Subject: [PATCH 008/298] Bump actions/checkout from 3.1.0 to 3.2.0 (#69) Bumps [actions/checkout](https://github.com/actions/checkout) from 3.1.0 to 3.2.0. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v3.1.0...v3.2.0) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/codeql-analysis-cpp.yml | 2 +- .github/workflows/codeql-analysis-java.yml | 2 +- .github/workflows/coverage.yml | 2 +- .github/workflows/maven.yml | 2 +- .github/workflows/scorecards-analysis.yml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/codeql-analysis-cpp.yml b/.github/workflows/codeql-analysis-cpp.yml index f71ad428..0f1f7755 100644 --- a/.github/workflows/codeql-analysis-cpp.yml +++ b/.github/workflows/codeql-analysis-cpp.yml @@ -45,7 +45,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v3.1.0 + uses: actions/checkout@v3.2.0 with: persist-credentials: false - uses: actions/cache@v3.2.1 diff --git a/.github/workflows/codeql-analysis-java.yml b/.github/workflows/codeql-analysis-java.yml index 5991d084..7ab9f5df 100644 --- a/.github/workflows/codeql-analysis-java.yml +++ b/.github/workflows/codeql-analysis-java.yml @@ -45,7 +45,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v3.1.0 + uses: actions/checkout@v3.2.0 with: persist-credentials: false - uses: actions/cache@v3.2.1 diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index b0d7c176..cd8eec8a 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -29,7 +29,7 @@ jobs: java: [ 8 ] steps: - - uses: actions/checkout@v3.1.0 + - uses: actions/checkout@v3.2.0 with: persist-credentials: false - uses: actions/cache@v3.2.1 diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index ec3f15f0..838d0af3 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -35,7 +35,7 @@ jobs: # experimental: true steps: - - uses: actions/checkout@v3.1.0 + - uses: actions/checkout@v3.2.0 with: persist-credentials: false - uses: actions/cache@v3.2.1 diff --git a/.github/workflows/scorecards-analysis.yml b/.github/workflows/scorecards-analysis.yml index a57d8cbb..bb63e923 100644 --- a/.github/workflows/scorecards-analysis.yml +++ b/.github/workflows/scorecards-analysis.yml @@ -40,7 +40,7 @@ jobs: steps: - name: "Checkout code" - uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # 3.1.0 + uses: actions/checkout@v3.2.0 # 3.1.0 with: persist-credentials: false From 1ac4b55f993167aebcd6dae173a349756ce34083 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 23 Dec 2022 14:21:50 -0500 Subject: [PATCH 009/298] Bump actions/setup-java from 3.8.0 to 3.9.0 (#68) Bumps [actions/setup-java](https://github.com/actions/setup-java) from 3.8.0 to 3.9.0. - [Release notes](https://github.com/actions/setup-java/releases) - [Commits](https://github.com/actions/setup-java/compare/v3.8.0...v3.9.0) --- updated-dependencies: - dependency-name: actions/setup-java dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/coverage.yml | 2 +- .github/workflows/maven.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index cd8eec8a..49966fc1 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -39,7 +39,7 @@ jobs: restore-keys: | ${{ runner.os }}-maven- - name: Set up JDK ${{ matrix.java }} - uses: actions/setup-java@v3.8.0 + uses: actions/setup-java@v3.9.0 with: distribution: 'temurin' java-version: ${{ matrix.java }} diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 838d0af3..6deac906 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -45,7 +45,7 @@ jobs: restore-keys: | ${{ runner.os }}-maven- - name: Set up JDK ${{ matrix.java }} - uses: actions/setup-java@v3.8.0 + uses: actions/setup-java@v3.9.0 with: distribution: 'temurin' java-version: ${{ matrix.java }} From 44c1662d8ab948f669591f4fac4fcd41f73b18bd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 23 Dec 2022 14:22:53 -0500 Subject: [PATCH 010/298] Bump commons-parent from 54 to 55 (#71) Bumps [commons-parent](https://github.com/apache/commons-parent) from 54 to 55. - [Release notes](https://github.com/apache/commons-parent/releases) - [Changelog](https://github.com/apache/commons-parent/blob/master/RELEASE-NOTES.txt) - [Commits](https://github.com/apache/commons-parent/commits) --- updated-dependencies: - dependency-name: org.apache.commons:commons-parent dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 83d2df37..7c51c775 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ org.apache.commons commons-parent - 54 + 55 4.0.0 commons-daemon From a330e1a71e0456a04285ffea293864acc3265ddb Mon Sep 17 00:00:00 2001 From: Gary Gregory Date: Fri, 23 Dec 2022 14:27:36 -0500 Subject: [PATCH 011/298] Bump commons-parent from 54 to 55 #71 --- src/changes/changes.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/src/changes/changes.xml b/src/changes/changes.xml index 73c88ec5..8f30cf11 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -39,6 +39,7 @@ + Bump commons-parent from 54 to 55 #71. From 5ea4da3fe21b64c96d8ad2a64189e8da0fd7bdce Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 30 Dec 2022 11:27:36 -0500 Subject: [PATCH 012/298] Bump actions/cache from 3.2.1 to 3.2.2 (#74) Bumps [actions/cache](https://github.com/actions/cache) from 3.2.1 to 3.2.2. - [Release notes](https://github.com/actions/cache/releases) - [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md) - [Commits](https://github.com/actions/cache/compare/v3.2.1...v3.2.2) --- updated-dependencies: - dependency-name: actions/cache dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/codeql-analysis-cpp.yml | 2 +- .github/workflows/codeql-analysis-java.yml | 2 +- .github/workflows/coverage.yml | 2 +- .github/workflows/maven.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/codeql-analysis-cpp.yml b/.github/workflows/codeql-analysis-cpp.yml index 0f1f7755..2cb2b474 100644 --- a/.github/workflows/codeql-analysis-cpp.yml +++ b/.github/workflows/codeql-analysis-cpp.yml @@ -48,7 +48,7 @@ jobs: uses: actions/checkout@v3.2.0 with: persist-credentials: false - - uses: actions/cache@v3.2.1 + - uses: actions/cache@v3.2.2 with: path: ~/.m2/repository key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} diff --git a/.github/workflows/codeql-analysis-java.yml b/.github/workflows/codeql-analysis-java.yml index 7ab9f5df..33ea93da 100644 --- a/.github/workflows/codeql-analysis-java.yml +++ b/.github/workflows/codeql-analysis-java.yml @@ -48,7 +48,7 @@ jobs: uses: actions/checkout@v3.2.0 with: persist-credentials: false - - uses: actions/cache@v3.2.1 + - uses: actions/cache@v3.2.2 with: path: ~/.m2/repository key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index 49966fc1..10499412 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -32,7 +32,7 @@ jobs: - uses: actions/checkout@v3.2.0 with: persist-credentials: false - - uses: actions/cache@v3.2.1 + - uses: actions/cache@v3.2.2 with: path: ~/.m2/repository key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 6deac906..cb5f5887 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -38,7 +38,7 @@ jobs: - uses: actions/checkout@v3.2.0 with: persist-credentials: false - - uses: actions/cache@v3.2.1 + - uses: actions/cache@v3.2.2 with: path: ~/.m2/repository key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} From ff1adc5647269b1737443e8d5205fa8b395c4901 Mon Sep 17 00:00:00 2001 From: Gary Gregory Date: Tue, 3 Jan 2023 10:38:10 -0500 Subject: [PATCH 013/298] Update NOTICE to 2023 --- NOTICE.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NOTICE.txt b/NOTICE.txt index 58c12f18..d6491d7d 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -1,5 +1,5 @@ Apache Commons Daemon -Copyright 1999-2022 The Apache Software Foundation +Copyright 1999-2023 The Apache Software Foundation This product includes software developed by The Apache Software Foundation (http://www.apache.org/). From 276a3201731efe2449bc67c9f8f541a8a6c71e1b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 3 Jan 2023 10:55:40 -0500 Subject: [PATCH 014/298] Bump commons-parent from 55 to 56 (#76) Bumps [commons-parent](https://github.com/apache/commons-parent) from 55 to 56. - [Release notes](https://github.com/apache/commons-parent/releases) - [Changelog](https://github.com/apache/commons-parent/blob/master/RELEASE-NOTES.txt) - [Commits](https://github.com/apache/commons-parent/commits) --- updated-dependencies: - dependency-name: org.apache.commons:commons-parent dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7c51c775..07b3de5f 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ org.apache.commons commons-parent - 55 + 56 4.0.0 commons-daemon From 8daf19baab6e605c625c5253ef632590a5242d58 Mon Sep 17 00:00:00 2001 From: Gary Gregory Date: Tue, 3 Jan 2023 10:57:03 -0500 Subject: [PATCH 015/298] Bump commons-parent from 55 to 56 #76 --- src/changes/changes.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/src/changes/changes.xml b/src/changes/changes.xml index 8f30cf11..48c18632 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -55,6 +55,7 @@ Bump actions/checkout from 3.0.2 to 3.1.0 #59. Bump actions/setup-java from 3.5.1 to 3.6.0 #63. Bump spotbugs-maven-plugin from 4.7.2.0 to 4.7.3.0 #61, #66. + Bump commons-parent from 55 to 56 #76. From 20be1979f54f1d9d03514b938fb8af160fd69c6f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 6 Jan 2023 13:28:53 -0500 Subject: [PATCH 016/298] Bump actions/checkout from 3.2.0 to 3.3.0 (#77) Bumps [actions/checkout](https://github.com/actions/checkout) from 3.2.0 to 3.3.0. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v3.2.0...v3.3.0) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/codeql-analysis-cpp.yml | 2 +- .github/workflows/codeql-analysis-java.yml | 2 +- .github/workflows/coverage.yml | 2 +- .github/workflows/maven.yml | 2 +- .github/workflows/scorecards-analysis.yml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/codeql-analysis-cpp.yml b/.github/workflows/codeql-analysis-cpp.yml index 2cb2b474..892ab6af 100644 --- a/.github/workflows/codeql-analysis-cpp.yml +++ b/.github/workflows/codeql-analysis-cpp.yml @@ -45,7 +45,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v3.2.0 + uses: actions/checkout@v3.3.0 with: persist-credentials: false - uses: actions/cache@v3.2.2 diff --git a/.github/workflows/codeql-analysis-java.yml b/.github/workflows/codeql-analysis-java.yml index 33ea93da..e2967bd1 100644 --- a/.github/workflows/codeql-analysis-java.yml +++ b/.github/workflows/codeql-analysis-java.yml @@ -45,7 +45,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v3.2.0 + uses: actions/checkout@v3.3.0 with: persist-credentials: false - uses: actions/cache@v3.2.2 diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index 10499412..ee5e2d03 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -29,7 +29,7 @@ jobs: java: [ 8 ] steps: - - uses: actions/checkout@v3.2.0 + - uses: actions/checkout@v3.3.0 with: persist-credentials: false - uses: actions/cache@v3.2.2 diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index cb5f5887..0ca734a1 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -35,7 +35,7 @@ jobs: # experimental: true steps: - - uses: actions/checkout@v3.2.0 + - uses: actions/checkout@v3.3.0 with: persist-credentials: false - uses: actions/cache@v3.2.2 diff --git a/.github/workflows/scorecards-analysis.yml b/.github/workflows/scorecards-analysis.yml index bb63e923..4bc841b3 100644 --- a/.github/workflows/scorecards-analysis.yml +++ b/.github/workflows/scorecards-analysis.yml @@ -40,7 +40,7 @@ jobs: steps: - name: "Checkout code" - uses: actions/checkout@v3.2.0 # 3.1.0 + uses: actions/checkout@v3.3.0 # 3.1.0 with: persist-credentials: false From 9a4b706569b70cf9af9163991e071919ffb36d05 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 6 Jan 2023 13:29:12 -0500 Subject: [PATCH 017/298] Bump actions/upload-artifact from 3.1.1 to 3.1.2 (#78) Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 3.1.1 to 3.1.2. - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](https://github.com/actions/upload-artifact/compare/83fd05a356d7e2593de66fc9913b3002723633cb...0b7f8abb1508181956e8e162db84b466c27e18ce) --- updated-dependencies: - dependency-name: actions/upload-artifact dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/scorecards-analysis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/scorecards-analysis.yml b/.github/workflows/scorecards-analysis.yml index 4bc841b3..f2c0f766 100644 --- a/.github/workflows/scorecards-analysis.yml +++ b/.github/workflows/scorecards-analysis.yml @@ -57,7 +57,7 @@ jobs: publish_results: true - name: "Upload artifact" - uses: actions/upload-artifact@83fd05a356d7e2593de66fc9913b3002723633cb # 3.1.0 + uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # 3.1.0 with: name: SARIF file path: results.sarif From a4e4f8e55d2f06276650068ee8ffb0f5ad4cb3d2 Mon Sep 17 00:00:00 2001 From: Gary Gregory Date: Tue, 10 Jan 2023 10:55:39 -0500 Subject: [PATCH 018/298] Pick up JUnit version from parent POM --- pom.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/pom.xml b/pom.xml index 07b3de5f..e0af1d02 100644 --- a/pom.xml +++ b/pom.xml @@ -136,7 +136,6 @@ 1.3.3 DAEMON 12310468 - 5.9.1 0.8.8 0.16.0 4.7.3.0 From 2d0297e6b0ffd5e777119178722eeb30468add3a Mon Sep 17 00:00:00 2001 From: Gary Gregory Date: Tue, 10 Jan 2023 11:14:48 -0500 Subject: [PATCH 019/298] Pick up JaCoCo version from parent POM --- pom.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/pom.xml b/pom.xml index e0af1d02..be238a6d 100644 --- a/pom.xml +++ b/pom.xml @@ -136,7 +136,6 @@ 1.3.3 DAEMON 12310468 - 0.8.8 0.16.0 4.7.3.0 From c73c2824a57012d7508c7fb5e3fa76d6e40cf521 Mon Sep 17 00:00:00 2001 From: Gary Gregory Date: Tue, 10 Jan 2023 13:36:37 -0500 Subject: [PATCH 020/298] Pick up japicmp-maven-plugin version from parent POM --- pom.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/pom.xml b/pom.xml index be238a6d..817623ea 100644 --- a/pom.xml +++ b/pom.xml @@ -136,7 +136,6 @@ 1.3.3 DAEMON 12310468 - 0.16.0 4.7.3.0 From 00e4344efbad27bcadfbf746921f6914b84036ae Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 13 Jan 2023 11:31:11 -0500 Subject: [PATCH 021/298] Bump actions/cache from 3.2.2 to 3.2.3 (#79) Bumps [actions/cache](https://github.com/actions/cache) from 3.2.2 to 3.2.3. - [Release notes](https://github.com/actions/cache/releases) - [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md) - [Commits](https://github.com/actions/cache/compare/v3.2.2...v3.2.3) --- updated-dependencies: - dependency-name: actions/cache dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/codeql-analysis-cpp.yml | 2 +- .github/workflows/codeql-analysis-java.yml | 2 +- .github/workflows/coverage.yml | 2 +- .github/workflows/maven.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/codeql-analysis-cpp.yml b/.github/workflows/codeql-analysis-cpp.yml index 892ab6af..6e4b3c36 100644 --- a/.github/workflows/codeql-analysis-cpp.yml +++ b/.github/workflows/codeql-analysis-cpp.yml @@ -48,7 +48,7 @@ jobs: uses: actions/checkout@v3.3.0 with: persist-credentials: false - - uses: actions/cache@v3.2.2 + - uses: actions/cache@v3.2.3 with: path: ~/.m2/repository key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} diff --git a/.github/workflows/codeql-analysis-java.yml b/.github/workflows/codeql-analysis-java.yml index e2967bd1..b5cd5da7 100644 --- a/.github/workflows/codeql-analysis-java.yml +++ b/.github/workflows/codeql-analysis-java.yml @@ -48,7 +48,7 @@ jobs: uses: actions/checkout@v3.3.0 with: persist-credentials: false - - uses: actions/cache@v3.2.2 + - uses: actions/cache@v3.2.3 with: path: ~/.m2/repository key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index ee5e2d03..63768ff1 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -32,7 +32,7 @@ jobs: - uses: actions/checkout@v3.3.0 with: persist-credentials: false - - uses: actions/cache@v3.2.2 + - uses: actions/cache@v3.2.3 with: path: ~/.m2/repository key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 0ca734a1..c87155ad 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -38,7 +38,7 @@ jobs: - uses: actions/checkout@v3.3.0 with: persist-credentials: false - - uses: actions/cache@v3.2.2 + - uses: actions/cache@v3.2.3 with: path: ~/.m2/repository key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} From 2819d3f02ea3a9cad6caf22bb5a258a4e0442643 Mon Sep 17 00:00:00 2001 From: Gary Gregory Date: Wed, 18 Jan 2023 09:30:34 -0500 Subject: [PATCH 022/298] Fix spelling --- src/site/xdoc/jsvc.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/site/xdoc/jsvc.xml b/src/site/xdoc/jsvc.xml index e3acf7dc..d8884bea 100644 --- a/src/site/xdoc/jsvc.xml +++ b/src/site/xdoc/jsvc.xml @@ -316,7 +316,7 @@ Note: The controller process uses signals to stop the controlled process.

    -On Linux setuid()/setgid() + capabilities are used. On other unix setgid/initgroups are used. +On Linux setuid()/setgid() + capabilities are used. On other Unix setgid/initgroups are used. We have something like: From ae296022eb3abed3c77e20767adb9ff5a3f30705 Mon Sep 17 00:00:00 2001 From: Gary Gregory Date: Wed, 18 Jan 2023 09:34:40 -0500 Subject: [PATCH 023/298] Fix spelling --- src/samples/AloneDaemon.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/samples/AloneDaemon.sh b/src/samples/AloneDaemon.sh index 37865fc1..29846770 100755 --- a/src/samples/AloneDaemon.sh +++ b/src/samples/AloneDaemon.sh @@ -16,7 +16,7 @@ # limitations under the License. # # Small shell script to show how to start the sample services. -# That is for linux, if your are using cygwin look to ServiceDaemon.sh. +# That is for Linux, if your are using cygwin look to ServiceDaemon.sh. # # Adapt the following lines to your configuration JAVA_HOME=`echo $JAVA_HOME` From 3abc56e903c9516c7a3082d717f65c5112dd6dc0 Mon Sep 17 00:00:00 2001 From: Sebb Date: Fri, 20 Jan 2023 19:40:11 +0000 Subject: [PATCH 024/298] += .asf.yaml --- .asf.yaml | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 .asf.yaml diff --git a/.asf.yaml b/.asf.yaml new file mode 100644 index 00000000..b0fe61be --- /dev/null +++ b/.asf.yaml @@ -0,0 +1,27 @@ +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to 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. + +github: + description: "Apache Commons Daemon" + homepage: https://commons.apache.org/daemon/ + +notifications: + commits: commits@commons.apache.org + issues: issues@commons.apache.org + pullrequests: issues@commons.apache.org + jira_options: link label + jobs: notifications@commons.apache.org + issues_bot_dependabot: notifications@commons.apache.org + pullrequests_bot_dependabot: notifications@commons.apache.org From 68beb1c459cd1ec25ac6cc63e35ca512cd66de03 Mon Sep 17 00:00:00 2001 From: Gary Gregory Date: Fri, 3 Feb 2023 08:52:19 -0500 Subject: [PATCH 025/298] Pick up Spotbugs version from parent POM --- pom.xml | 2 -- 1 file changed, 2 deletions(-) diff --git a/pom.xml b/pom.xml index 817623ea..e25c61da 100644 --- a/pom.xml +++ b/pom.xml @@ -136,7 +136,6 @@ 1.3.3 DAEMON 12310468 - 4.7.3.0 @@ -190,7 +189,6 @@ com.github.spotbugs spotbugs-maven-plugin - ${commons.spotbugs.version} From 583482fdedf14c7ede61ad30ac148c4f401f4997 Mon Sep 17 00:00:00 2001 From: Sebb Date: Fri, 3 Feb 2023 16:41:23 +0000 Subject: [PATCH 026/298] codecov-commenter => notifications --- .asf.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.asf.yaml b/.asf.yaml index b0fe61be..f9644fca 100644 --- a/.asf.yaml +++ b/.asf.yaml @@ -25,3 +25,5 @@ notifications: jobs: notifications@commons.apache.org issues_bot_dependabot: notifications@commons.apache.org pullrequests_bot_dependabot: notifications@commons.apache.org + issues_bot_codecov-commenter: notifications@commons.apache.org + pullrequests_bot_codecov-commenter: notifications@commons.apache.org From 52095f071391babed11a8bc085f2b4595f2d8cf8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 3 Feb 2023 12:42:32 -0500 Subject: [PATCH 027/298] Bump actions/cache from 3.2.3 to 3.2.4 (#80) Bumps [actions/cache](https://github.com/actions/cache) from 3.2.3 to 3.2.4. - [Release notes](https://github.com/actions/cache/releases) - [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md) - [Commits](https://github.com/actions/cache/compare/v3.2.3...v3.2.4) --- updated-dependencies: - dependency-name: actions/cache dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/codeql-analysis-cpp.yml | 2 +- .github/workflows/codeql-analysis-java.yml | 2 +- .github/workflows/coverage.yml | 2 +- .github/workflows/maven.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/codeql-analysis-cpp.yml b/.github/workflows/codeql-analysis-cpp.yml index 6e4b3c36..6f8faa49 100644 --- a/.github/workflows/codeql-analysis-cpp.yml +++ b/.github/workflows/codeql-analysis-cpp.yml @@ -48,7 +48,7 @@ jobs: uses: actions/checkout@v3.3.0 with: persist-credentials: false - - uses: actions/cache@v3.2.3 + - uses: actions/cache@v3.2.4 with: path: ~/.m2/repository key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} diff --git a/.github/workflows/codeql-analysis-java.yml b/.github/workflows/codeql-analysis-java.yml index b5cd5da7..aa1e0fe5 100644 --- a/.github/workflows/codeql-analysis-java.yml +++ b/.github/workflows/codeql-analysis-java.yml @@ -48,7 +48,7 @@ jobs: uses: actions/checkout@v3.3.0 with: persist-credentials: false - - uses: actions/cache@v3.2.3 + - uses: actions/cache@v3.2.4 with: path: ~/.m2/repository key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index 63768ff1..35b00ce6 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -32,7 +32,7 @@ jobs: - uses: actions/checkout@v3.3.0 with: persist-credentials: false - - uses: actions/cache@v3.2.3 + - uses: actions/cache@v3.2.4 with: path: ~/.m2/repository key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index c87155ad..62683544 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -38,7 +38,7 @@ jobs: - uses: actions/checkout@v3.3.0 with: persist-credentials: false - - uses: actions/cache@v3.2.3 + - uses: actions/cache@v3.2.4 with: path: ~/.m2/repository key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} From 447c820a9cc397872067170aab8a08056f2e1d30 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 10 Feb 2023 12:25:58 -0500 Subject: [PATCH 028/298] Bump actions/setup-java from 3.9.0 to 3.10.0 (#82) Bumps [actions/setup-java](https://github.com/actions/setup-java) from 3.9.0 to 3.10.0. - [Release notes](https://github.com/actions/setup-java/releases) - [Commits](https://github.com/actions/setup-java/compare/v3.9.0...v3.10.0) --- updated-dependencies: - dependency-name: actions/setup-java dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/coverage.yml | 2 +- .github/workflows/maven.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index 35b00ce6..861208b4 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -39,7 +39,7 @@ jobs: restore-keys: | ${{ runner.os }}-maven- - name: Set up JDK ${{ matrix.java }} - uses: actions/setup-java@v3.9.0 + uses: actions/setup-java@v3.10.0 with: distribution: 'temurin' java-version: ${{ matrix.java }} diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 62683544..9024beef 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -45,7 +45,7 @@ jobs: restore-keys: | ${{ runner.os }}-maven- - name: Set up JDK ${{ matrix.java }} - uses: actions/setup-java@v3.9.0 + uses: actions/setup-java@v3.10.0 with: distribution: 'temurin' java-version: ${{ matrix.java }} From fbc0b9bd023afa438a0bf093a8a33431ba624206 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 10 Feb 2023 12:26:16 -0500 Subject: [PATCH 029/298] Bump actions/cache from 3.2.4 to 3.2.5 (#81) Bumps [actions/cache](https://github.com/actions/cache) from 3.2.4 to 3.2.5. - [Release notes](https://github.com/actions/cache/releases) - [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md) - [Commits](https://github.com/actions/cache/compare/v3.2.4...v3.2.5) --- updated-dependencies: - dependency-name: actions/cache dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/codeql-analysis-cpp.yml | 2 +- .github/workflows/codeql-analysis-java.yml | 2 +- .github/workflows/coverage.yml | 2 +- .github/workflows/maven.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/codeql-analysis-cpp.yml b/.github/workflows/codeql-analysis-cpp.yml index 6f8faa49..ed4d5416 100644 --- a/.github/workflows/codeql-analysis-cpp.yml +++ b/.github/workflows/codeql-analysis-cpp.yml @@ -48,7 +48,7 @@ jobs: uses: actions/checkout@v3.3.0 with: persist-credentials: false - - uses: actions/cache@v3.2.4 + - uses: actions/cache@v3.2.5 with: path: ~/.m2/repository key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} diff --git a/.github/workflows/codeql-analysis-java.yml b/.github/workflows/codeql-analysis-java.yml index aa1e0fe5..ef3d93c7 100644 --- a/.github/workflows/codeql-analysis-java.yml +++ b/.github/workflows/codeql-analysis-java.yml @@ -48,7 +48,7 @@ jobs: uses: actions/checkout@v3.3.0 with: persist-credentials: false - - uses: actions/cache@v3.2.4 + - uses: actions/cache@v3.2.5 with: path: ~/.m2/repository key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index 861208b4..13270899 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -32,7 +32,7 @@ jobs: - uses: actions/checkout@v3.3.0 with: persist-credentials: false - - uses: actions/cache@v3.2.4 + - uses: actions/cache@v3.2.5 with: path: ~/.m2/repository key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 9024beef..13d6a570 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -38,7 +38,7 @@ jobs: - uses: actions/checkout@v3.3.0 with: persist-credentials: false - - uses: actions/cache@v3.2.4 + - uses: actions/cache@v3.2.5 with: path: ~/.m2/repository key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} From ecec7bfc74265cec43bbc36c806fb98494f9c8db Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 24 Feb 2023 14:42:23 -0500 Subject: [PATCH 030/298] Bump actions/cache from 3.2.5 to 3.2.6 (#83) Bumps [actions/cache](https://github.com/actions/cache) from 3.2.5 to 3.2.6. - [Release notes](https://github.com/actions/cache/releases) - [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md) - [Commits](https://github.com/actions/cache/compare/v3.2.5...v3.2.6) --- updated-dependencies: - dependency-name: actions/cache dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/codeql-analysis-cpp.yml | 2 +- .github/workflows/codeql-analysis-java.yml | 2 +- .github/workflows/coverage.yml | 2 +- .github/workflows/maven.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/codeql-analysis-cpp.yml b/.github/workflows/codeql-analysis-cpp.yml index ed4d5416..ad02d05e 100644 --- a/.github/workflows/codeql-analysis-cpp.yml +++ b/.github/workflows/codeql-analysis-cpp.yml @@ -48,7 +48,7 @@ jobs: uses: actions/checkout@v3.3.0 with: persist-credentials: false - - uses: actions/cache@v3.2.5 + - uses: actions/cache@v3.2.6 with: path: ~/.m2/repository key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} diff --git a/.github/workflows/codeql-analysis-java.yml b/.github/workflows/codeql-analysis-java.yml index ef3d93c7..c88e1750 100644 --- a/.github/workflows/codeql-analysis-java.yml +++ b/.github/workflows/codeql-analysis-java.yml @@ -48,7 +48,7 @@ jobs: uses: actions/checkout@v3.3.0 with: persist-credentials: false - - uses: actions/cache@v3.2.5 + - uses: actions/cache@v3.2.6 with: path: ~/.m2/repository key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index 13270899..3cff7ecf 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -32,7 +32,7 @@ jobs: - uses: actions/checkout@v3.3.0 with: persist-credentials: false - - uses: actions/cache@v3.2.5 + - uses: actions/cache@v3.2.6 with: path: ~/.m2/repository key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 13d6a570..3abf1d12 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -38,7 +38,7 @@ jobs: - uses: actions/checkout@v3.3.0 with: persist-credentials: false - - uses: actions/cache@v3.2.5 + - uses: actions/cache@v3.2.6 with: path: ~/.m2/repository key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} From 7b4e9ba90448b1f6e7c139bdca26da5a30e6416f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 10 Mar 2023 14:23:32 -0500 Subject: [PATCH 031/298] Bump actions/cache from 3.2.6 to 3.3.0 (#84) Bumps [actions/cache](https://github.com/actions/cache) from 3.2.6 to 3.3.0. - [Release notes](https://github.com/actions/cache/releases) - [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md) - [Commits](https://github.com/actions/cache/compare/v3.2.6...v3.3.0) --- updated-dependencies: - dependency-name: actions/cache dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/codeql-analysis-cpp.yml | 2 +- .github/workflows/codeql-analysis-java.yml | 2 +- .github/workflows/coverage.yml | 2 +- .github/workflows/maven.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/codeql-analysis-cpp.yml b/.github/workflows/codeql-analysis-cpp.yml index ad02d05e..f619085b 100644 --- a/.github/workflows/codeql-analysis-cpp.yml +++ b/.github/workflows/codeql-analysis-cpp.yml @@ -48,7 +48,7 @@ jobs: uses: actions/checkout@v3.3.0 with: persist-credentials: false - - uses: actions/cache@v3.2.6 + - uses: actions/cache@v3.3.0 with: path: ~/.m2/repository key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} diff --git a/.github/workflows/codeql-analysis-java.yml b/.github/workflows/codeql-analysis-java.yml index c88e1750..c8764e68 100644 --- a/.github/workflows/codeql-analysis-java.yml +++ b/.github/workflows/codeql-analysis-java.yml @@ -48,7 +48,7 @@ jobs: uses: actions/checkout@v3.3.0 with: persist-credentials: false - - uses: actions/cache@v3.2.6 + - uses: actions/cache@v3.3.0 with: path: ~/.m2/repository key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index 3cff7ecf..93aa1b57 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -32,7 +32,7 @@ jobs: - uses: actions/checkout@v3.3.0 with: persist-credentials: false - - uses: actions/cache@v3.2.6 + - uses: actions/cache@v3.3.0 with: path: ~/.m2/repository key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 3abf1d12..ea093cb1 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -38,7 +38,7 @@ jobs: - uses: actions/checkout@v3.3.0 with: persist-credentials: false - - uses: actions/cache@v3.2.6 + - uses: actions/cache@v3.3.0 with: path: ~/.m2/repository key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} From 7c8974b10f30f67e8add5724a83d893b326f05d1 Mon Sep 17 00:00:00 2001 From: Gary Gregory Date: Mon, 13 Mar 2023 08:10:03 -0400 Subject: [PATCH 032/298] Use XSD --- src/changes/changes.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/changes/changes.xml b/src/changes/changes.xml index 48c18632..e1039335 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -33,7 +33,9 @@ The type attribute can be add,update,fix,remove. --> - + Apache Commons Daemon Release Notes From ebb0c2a6e42a3c2f895e690900416c997eb25722 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 17 Mar 2023 13:35:32 -0400 Subject: [PATCH 033/298] Bump actions/checkout from 3.3.0 to 3.4.0 (#86) Bumps [actions/checkout](https://github.com/actions/checkout) from 3.3.0 to 3.4.0. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v3.3.0...v3.4.0) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/codeql-analysis-cpp.yml | 2 +- .github/workflows/codeql-analysis-java.yml | 2 +- .github/workflows/coverage.yml | 2 +- .github/workflows/maven.yml | 2 +- .github/workflows/scorecards-analysis.yml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/codeql-analysis-cpp.yml b/.github/workflows/codeql-analysis-cpp.yml index f619085b..314d0254 100644 --- a/.github/workflows/codeql-analysis-cpp.yml +++ b/.github/workflows/codeql-analysis-cpp.yml @@ -45,7 +45,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v3.3.0 + uses: actions/checkout@v3.4.0 with: persist-credentials: false - uses: actions/cache@v3.3.0 diff --git a/.github/workflows/codeql-analysis-java.yml b/.github/workflows/codeql-analysis-java.yml index c8764e68..eb6e1a95 100644 --- a/.github/workflows/codeql-analysis-java.yml +++ b/.github/workflows/codeql-analysis-java.yml @@ -45,7 +45,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v3.3.0 + uses: actions/checkout@v3.4.0 with: persist-credentials: false - uses: actions/cache@v3.3.0 diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index 93aa1b57..169c48d6 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -29,7 +29,7 @@ jobs: java: [ 8 ] steps: - - uses: actions/checkout@v3.3.0 + - uses: actions/checkout@v3.4.0 with: persist-credentials: false - uses: actions/cache@v3.3.0 diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index ea093cb1..f9951e9d 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -35,7 +35,7 @@ jobs: # experimental: true steps: - - uses: actions/checkout@v3.3.0 + - uses: actions/checkout@v3.4.0 with: persist-credentials: false - uses: actions/cache@v3.3.0 diff --git a/.github/workflows/scorecards-analysis.yml b/.github/workflows/scorecards-analysis.yml index f2c0f766..1af8fd11 100644 --- a/.github/workflows/scorecards-analysis.yml +++ b/.github/workflows/scorecards-analysis.yml @@ -40,7 +40,7 @@ jobs: steps: - name: "Checkout code" - uses: actions/checkout@v3.3.0 # 3.1.0 + uses: actions/checkout@v3.4.0 # 3.1.0 with: persist-credentials: false From 16bf435dacab7ab1950cf28f807b1de1b6210e04 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 17 Mar 2023 13:35:50 -0400 Subject: [PATCH 034/298] Bump actions/cache from 3.3.0 to 3.3.1 (#85) Bumps [actions/cache](https://github.com/actions/cache) from 3.3.0 to 3.3.1. - [Release notes](https://github.com/actions/cache/releases) - [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md) - [Commits](https://github.com/actions/cache/compare/v3.3.0...v3.3.1) --- updated-dependencies: - dependency-name: actions/cache dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/codeql-analysis-cpp.yml | 2 +- .github/workflows/codeql-analysis-java.yml | 2 +- .github/workflows/coverage.yml | 2 +- .github/workflows/maven.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/codeql-analysis-cpp.yml b/.github/workflows/codeql-analysis-cpp.yml index 314d0254..fe9b0bc2 100644 --- a/.github/workflows/codeql-analysis-cpp.yml +++ b/.github/workflows/codeql-analysis-cpp.yml @@ -48,7 +48,7 @@ jobs: uses: actions/checkout@v3.4.0 with: persist-credentials: false - - uses: actions/cache@v3.3.0 + - uses: actions/cache@v3.3.1 with: path: ~/.m2/repository key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} diff --git a/.github/workflows/codeql-analysis-java.yml b/.github/workflows/codeql-analysis-java.yml index eb6e1a95..875c7cb7 100644 --- a/.github/workflows/codeql-analysis-java.yml +++ b/.github/workflows/codeql-analysis-java.yml @@ -48,7 +48,7 @@ jobs: uses: actions/checkout@v3.4.0 with: persist-credentials: false - - uses: actions/cache@v3.3.0 + - uses: actions/cache@v3.3.1 with: path: ~/.m2/repository key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index 169c48d6..1d23bd57 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -32,7 +32,7 @@ jobs: - uses: actions/checkout@v3.4.0 with: persist-credentials: false - - uses: actions/cache@v3.3.0 + - uses: actions/cache@v3.3.1 with: path: ~/.m2/repository key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index f9951e9d..90b471f2 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -38,7 +38,7 @@ jobs: - uses: actions/checkout@v3.4.0 with: persist-credentials: false - - uses: actions/cache@v3.3.0 + - uses: actions/cache@v3.3.1 with: path: ~/.m2/repository key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} From 9d813da79f8c45d4dddd58cf8b049cdff381959d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 25 Mar 2023 00:26:55 -0400 Subject: [PATCH 035/298] Bump actions/checkout from 3.4.0 to 3.5.0 (#87) Bumps [actions/checkout](https://github.com/actions/checkout) from 3.4.0 to 3.5.0. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v3.4.0...v3.5.0) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/codeql-analysis-cpp.yml | 2 +- .github/workflows/codeql-analysis-java.yml | 2 +- .github/workflows/coverage.yml | 2 +- .github/workflows/maven.yml | 2 +- .github/workflows/scorecards-analysis.yml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/codeql-analysis-cpp.yml b/.github/workflows/codeql-analysis-cpp.yml index fe9b0bc2..f4496510 100644 --- a/.github/workflows/codeql-analysis-cpp.yml +++ b/.github/workflows/codeql-analysis-cpp.yml @@ -45,7 +45,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v3.4.0 + uses: actions/checkout@v3.5.0 with: persist-credentials: false - uses: actions/cache@v3.3.1 diff --git a/.github/workflows/codeql-analysis-java.yml b/.github/workflows/codeql-analysis-java.yml index 875c7cb7..9a76eb98 100644 --- a/.github/workflows/codeql-analysis-java.yml +++ b/.github/workflows/codeql-analysis-java.yml @@ -45,7 +45,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v3.4.0 + uses: actions/checkout@v3.5.0 with: persist-credentials: false - uses: actions/cache@v3.3.1 diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index 1d23bd57..08c5c3ac 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -29,7 +29,7 @@ jobs: java: [ 8 ] steps: - - uses: actions/checkout@v3.4.0 + - uses: actions/checkout@v3.5.0 with: persist-credentials: false - uses: actions/cache@v3.3.1 diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 90b471f2..96f6ca87 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -35,7 +35,7 @@ jobs: # experimental: true steps: - - uses: actions/checkout@v3.4.0 + - uses: actions/checkout@v3.5.0 with: persist-credentials: false - uses: actions/cache@v3.3.1 diff --git a/.github/workflows/scorecards-analysis.yml b/.github/workflows/scorecards-analysis.yml index 1af8fd11..1186ddc0 100644 --- a/.github/workflows/scorecards-analysis.yml +++ b/.github/workflows/scorecards-analysis.yml @@ -40,7 +40,7 @@ jobs: steps: - name: "Checkout code" - uses: actions/checkout@v3.4.0 # 3.1.0 + uses: actions/checkout@v3.5.0 # 3.1.0 with: persist-credentials: false From 121432dc82de9fd7570208c3bbde4cf87e2a59bb Mon Sep 17 00:00:00 2001 From: Gary Gregory Date: Sat, 25 Mar 2023 09:24:09 -0400 Subject: [PATCH 036/298] Javadoc/Comments: Remove extra "whitespace" --- src/main/java/org/apache/commons/daemon/DaemonInitException.java | 1 - .../org/apache/commons/daemon/support/DaemonConfiguration.java | 1 - .../java/org/apache/commons/daemon/support/DaemonWrapper.java | 1 - src/samples/ProcrunService.java | 1 - 4 files changed, 4 deletions(-) diff --git a/src/main/java/org/apache/commons/daemon/DaemonInitException.java b/src/main/java/org/apache/commons/daemon/DaemonInitException.java index 28c1442b..17dcdcc9 100644 --- a/src/main/java/org/apache/commons/daemon/DaemonInitException.java +++ b/src/main/java/org/apache/commons/daemon/DaemonInitException.java @@ -12,7 +12,6 @@ * 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./* - * */ package org.apache.commons.daemon; diff --git a/src/main/java/org/apache/commons/daemon/support/DaemonConfiguration.java b/src/main/java/org/apache/commons/daemon/support/DaemonConfiguration.java index bd464430..a2691e13 100644 --- a/src/main/java/org/apache/commons/daemon/support/DaemonConfiguration.java +++ b/src/main/java/org/apache/commons/daemon/support/DaemonConfiguration.java @@ -44,7 +44,6 @@ * In case of {@code $${foo}} this will be unescaped and resulting * value will be {@code ${foo}}. *

    - * */ public final class DaemonConfiguration { diff --git a/src/main/java/org/apache/commons/daemon/support/DaemonWrapper.java b/src/main/java/org/apache/commons/daemon/support/DaemonWrapper.java index 0e44862e..475aecfa 100644 --- a/src/main/java/org/apache/commons/daemon/support/DaemonWrapper.java +++ b/src/main/java/org/apache/commons/daemon/support/DaemonWrapper.java @@ -31,7 +31,6 @@ * standard applications as daemons. * The applications must have the mechanism to manage * the application lifecycle. - * */ public class DaemonWrapper implements Daemon { diff --git a/src/samples/ProcrunService.java b/src/samples/ProcrunService.java index 13de4a06..8dda938d 100644 --- a/src/samples/ProcrunService.java +++ b/src/samples/ProcrunService.java @@ -29,7 +29,6 @@ * 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. - * */ /** From 58e12c470d4c2038292dae27693618e7bc0c06d9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 1 Apr 2023 07:11:03 -0400 Subject: [PATCH 037/298] Bump ossf/scorecard-action from 2.1.2 to 2.1.3 (#88) Bumps [ossf/scorecard-action](https://github.com/ossf/scorecard-action) from 2.1.2 to 2.1.3. - [Release notes](https://github.com/ossf/scorecard-action/releases) - [Changelog](https://github.com/ossf/scorecard-action/blob/main/RELEASE.md) - [Commits](https://github.com/ossf/scorecard-action/compare/e38b1902ae4f44df626f11ba0734b14fb91f8f86...80e868c13c90f172d68d1f4501dee99e2479f7af) --- updated-dependencies: - dependency-name: ossf/scorecard-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/scorecards-analysis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/scorecards-analysis.yml b/.github/workflows/scorecards-analysis.yml index 1186ddc0..52a440ac 100644 --- a/.github/workflows/scorecards-analysis.yml +++ b/.github/workflows/scorecards-analysis.yml @@ -45,7 +45,7 @@ jobs: persist-credentials: false - name: "Run analysis" - uses: ossf/scorecard-action@e38b1902ae4f44df626f11ba0734b14fb91f8f86 # 2.1.2 + uses: ossf/scorecard-action@80e868c13c90f172d68d1f4501dee99e2479f7af # 2.1.3 with: results_file: results.sarif results_format: sarif From 99445aa588de6aa29230263471ec46050d6eecf8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 1 Apr 2023 07:11:19 -0400 Subject: [PATCH 038/298] Bump actions/setup-java from 3.10.0 to 3.11.0 (#89) Bumps [actions/setup-java](https://github.com/actions/setup-java) from 3.10.0 to 3.11.0. - [Release notes](https://github.com/actions/setup-java/releases) - [Commits](https://github.com/actions/setup-java/compare/v3.10.0...v3.11.0) --- updated-dependencies: - dependency-name: actions/setup-java dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/coverage.yml | 2 +- .github/workflows/maven.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index 08c5c3ac..06a2b95e 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -39,7 +39,7 @@ jobs: restore-keys: | ${{ runner.os }}-maven- - name: Set up JDK ${{ matrix.java }} - uses: actions/setup-java@v3.10.0 + uses: actions/setup-java@v3.11.0 with: distribution: 'temurin' java-version: ${{ matrix.java }} diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 96f6ca87..060a0a13 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -45,7 +45,7 @@ jobs: restore-keys: | ${{ runner.os }}-maven- - name: Set up JDK ${{ matrix.java }} - uses: actions/setup-java@v3.10.0 + uses: actions/setup-java@v3.11.0 with: distribution: 'temurin' java-version: ${{ matrix.java }} From b4d8d181bab452873d535876d33d549d34efc91b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 14 Apr 2023 15:13:29 -0400 Subject: [PATCH 039/298] Bump actions/checkout from 3.5.0 to 3.5.2 (#90) Bumps [actions/checkout](https://github.com/actions/checkout) from 3.5.0 to 3.5.2. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v3.5.0...v3.5.2) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/codeql-analysis-cpp.yml | 2 +- .github/workflows/codeql-analysis-java.yml | 2 +- .github/workflows/coverage.yml | 2 +- .github/workflows/maven.yml | 2 +- .github/workflows/scorecards-analysis.yml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/codeql-analysis-cpp.yml b/.github/workflows/codeql-analysis-cpp.yml index f4496510..7d477002 100644 --- a/.github/workflows/codeql-analysis-cpp.yml +++ b/.github/workflows/codeql-analysis-cpp.yml @@ -45,7 +45,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v3.5.0 + uses: actions/checkout@v3.5.2 with: persist-credentials: false - uses: actions/cache@v3.3.1 diff --git a/.github/workflows/codeql-analysis-java.yml b/.github/workflows/codeql-analysis-java.yml index 9a76eb98..75136f77 100644 --- a/.github/workflows/codeql-analysis-java.yml +++ b/.github/workflows/codeql-analysis-java.yml @@ -45,7 +45,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v3.5.0 + uses: actions/checkout@v3.5.2 with: persist-credentials: false - uses: actions/cache@v3.3.1 diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index 06a2b95e..ce7402a8 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -29,7 +29,7 @@ jobs: java: [ 8 ] steps: - - uses: actions/checkout@v3.5.0 + - uses: actions/checkout@v3.5.2 with: persist-credentials: false - uses: actions/cache@v3.3.1 diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 060a0a13..a29282d1 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -35,7 +35,7 @@ jobs: # experimental: true steps: - - uses: actions/checkout@v3.5.0 + - uses: actions/checkout@v3.5.2 with: persist-credentials: false - uses: actions/cache@v3.3.1 diff --git a/.github/workflows/scorecards-analysis.yml b/.github/workflows/scorecards-analysis.yml index 52a440ac..3e68a136 100644 --- a/.github/workflows/scorecards-analysis.yml +++ b/.github/workflows/scorecards-analysis.yml @@ -40,7 +40,7 @@ jobs: steps: - name: "Checkout code" - uses: actions/checkout@v3.5.0 # 3.1.0 + uses: actions/checkout@v3.5.2 # 3.1.0 with: persist-credentials: false From 05504ad29c0df2eefc8314504deb47055ee5bebc Mon Sep 17 00:00:00 2001 From: Gary Gregory Date: Tue, 18 Apr 2023 10:33:43 -0400 Subject: [PATCH 040/298] Format: "catch(" -> "catch (" --- src/samples/AloneService.java | 4 ++-- src/samples/ServiceDaemon.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/samples/AloneService.java b/src/samples/AloneService.java index 0051ab5a..71dc5af9 100644 --- a/src/samples/AloneService.java +++ b/src/samples/AloneService.java @@ -86,7 +86,7 @@ public void start() { System.err.println("ServiceDaemon: starting: " + name + " : " + prop.getProperty(name)); try { proc[i] = Runtime.getRuntime().exec(prop.getProperty(name)); - } catch(Exception ex) { + } catch (Exception ex) { System.err.println("Exception: " + ex); } /* Start threads to read from Error and Out streams */ @@ -110,7 +110,7 @@ public void stop() { proc[i].destroy(); try { proc[i].waitFor(); - } catch(InterruptedException ex) { + } catch (InterruptedException ex) { System.err.println("ServiceDaemon: exception while stopping:" + ex); } diff --git a/src/samples/ServiceDaemon.java b/src/samples/ServiceDaemon.java index 9f7ba5f4..d6905212 100644 --- a/src/samples/ServiceDaemon.java +++ b/src/samples/ServiceDaemon.java @@ -92,7 +92,7 @@ public void start() { System.err.println("ServiceDaemon: starting: " + name + " : " + prop.getProperty(name)); try { proc[i] = Runtime.getRuntime().exec(prop.getProperty(name)); - } catch(Exception ex) { + } catch (Exception ex) { System.err.println("Exception: " + ex); } /* Start threads to read from Error and Out streams */ @@ -118,7 +118,7 @@ public void stop() proc[i].destroy(); try { proc[i].waitFor(); - } catch(InterruptedException ex) { + } catch (InterruptedException ex) { System.err.println("ServiceDaemon: exception while stopping:" + ex); } From 19baea32b142c27f98d48336900b394a9240cce5 Mon Sep 17 00:00:00 2001 From: Mark Thomas Date: Wed, 19 Apr 2023 10:46:35 +0100 Subject: [PATCH 041/298] Fix DAEMON-451 - Use configured stack size for main thread (kkolinko) --- src/changes/changes.xml | 6 ++++++ src/native/windows/src/javajni.c | 7 ++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/src/changes/changes.xml b/src/changes/changes.xml index e1039335..0d8d00f0 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -41,6 +41,12 @@ + + + Procrun. Configured stack size now applies to the main thread when + running in JVM mode. + + Bump commons-parent from 54 to 55 #71. diff --git a/src/native/windows/src/javajni.c b/src/native/windows/src/javajni.c index e541e40a..1aad2e16 100644 --- a/src/native/windows/src/javajni.c +++ b/src/native/windows/src/javajni.c @@ -1105,13 +1105,18 @@ apxJavaStart(LPAPXJAVA_THREADARGS pArgs) lpJava = APXHANDLE_DATA(pArgs->hJava); if (!lpJava) return FALSE; + if (pArgs->dwSs) { + /* dwSS is measured in Kb, szStackSize in bytes */ + lpJava->szStackSize = (SIZE_T) (pArgs->dwSs * 1024); + } lpJava->dwWorkerStatus = 0; lpJava->hWorkerInit = CreateEvent(NULL, FALSE, FALSE, NULL); lpJava->hWorkerSync = CreateEvent(NULL, FALSE, FALSE, NULL); lpJava->hWorkerThread = CreateThread(NULL, lpJava->szStackSize, __apxJavaWorkerThread, - pArgs, CREATE_SUSPENDED, + pArgs, + CREATE_SUSPENDED + STACK_SIZE_PARAM_IS_A_RESERVATION, &lpJava->iWorkerThread); if (IS_INVALID_HANDLE(lpJava->hWorkerThread)) { apxLogWrite(APXLOG_MARK_SYSERR); From c7c879e25a316a6b8f6e0294a281e664598398cc Mon Sep 17 00:00:00 2001 From: Mark Thomas Date: Wed, 19 Apr 2023 10:47:43 +0100 Subject: [PATCH 042/298] Formatting --- src/changes/changes.xml | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/src/changes/changes.xml b/src/changes/changes.xml index 0d8d00f0..f51fa216 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -47,7 +47,9 @@ running in JVM mode. - Bump commons-parent from 54 to 55 #71. + + Bump commons-parent from 54 to 55 #71. + @@ -59,11 +61,21 @@ service does not stop cleanly. #64 - Bump actions/cache from 3.0.8 to 3.0.11 #60. - Bump actions/checkout from 3.0.2 to 3.1.0 #59. - Bump actions/setup-java from 3.5.1 to 3.6.0 #63. - Bump spotbugs-maven-plugin from 4.7.2.0 to 4.7.3.0 #61, #66. - Bump commons-parent from 55 to 56 #76. + + Bump actions/cache from 3.0.8 to 3.0.11 #60. + + + Bump actions/checkout from 3.0.2 to 3.1.0 #59. + + + Bump actions/setup-java from 3.5.1 to 3.6.0 #63. + + + Bump spotbugs-maven-plugin from 4.7.2.0 to 4.7.3.0 #61, #66. + + + Bump commons-parent from 55 to 56 #76 + From fee69094609d4bedd8dad275eb31ad37c485c164 Mon Sep 17 00:00:00 2001 From: Mark Thomas Date: Wed, 19 Apr 2023 11:13:37 +0100 Subject: [PATCH 043/298] Fix DAEMON-452 - create parent dirs as well as log dir if not present --- src/changes/changes.xml | 5 +++++ src/native/windows/src/log.c | 12 ++++++------ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/src/changes/changes.xml b/src/changes/changes.xml index f51fa216..ac41c294 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -46,6 +46,11 @@ Procrun. Configured stack size now applies to the main thread when running in JVM mode. + + Procrun. If the specified log directory does not exist, attempt to + create any missing parent directories, as well as the specified + directory, when the service starts. + Bump commons-parent from 54 to 55 #71. diff --git a/src/native/windows/src/log.c b/src/native/windows/src/log.c index d2fece41..4a05f367 100644 --- a/src/native/windows/src/log.c +++ b/src/native/windows/src/log.c @@ -161,7 +161,7 @@ LPWSTR apxLogFile( } sRet = apxPoolAlloc(hPool, (SIZ_PATHLEN) * sizeof(WCHAR)); /* Set default level to info */ - CreateDirectoryW(sPath, NULL); + SHCreateDirectoryExW(NULL, sPath, NULL); lstrlcpyW(sRet, SIZ_PATHMAX, sPath); lstrlcatW(sRet, SIZ_PATHMAX, sName); @@ -194,13 +194,13 @@ HANDLE apxLogOpen( if (GetSystemDirectoryW(sPath, MAX_PATH) == 0) return INVALID_HANDLE_VALUE; lstrlcatW(sPath, MAX_PATH, L"\\LogFiles"); - if (!CreateDirectoryW(sPath, NULL) && GetLastError() != ERROR_ALREADY_EXISTS) { - if (!CreateDirectoryW(sPath, NULL)) + if (!SHCreateDirectoryExW(NULL, sPath, NULL) && GetLastError() != ERROR_ALREADY_EXISTS) { + if (!SHCreateDirectoryExW(NULL, sPath, NULL)) return INVALID_HANDLE_VALUE; } lstrlcatW(sPath, MAX_PATH, L"\\Apache"); - if (!CreateDirectoryW(sPath, NULL) && GetLastError() != ERROR_ALREADY_EXISTS) { - if (!CreateDirectoryW(sPath, NULL)) + if (!SHCreateDirectoryExW(NULL, sPath, NULL) && GetLastError() != ERROR_ALREADY_EXISTS) { + if (!SHCreateDirectoryExW(NULL, sPath, NULL)) return INVALID_HANDLE_VALUE; } } @@ -232,7 +232,7 @@ HANDLE apxLogOpen( return INVALID_HANDLE_VALUE; /* Set default level to info */ h->dwLogLevel = APXLOG_LEVEL_INFO; - CreateDirectoryW(sPath, NULL); + SHCreateDirectoryExW(NULL, sPath, NULL); h->sysTime = sysTime; lstrlcpyW(h->szPath, MAX_PATH, sPath); From 3f2f406cd4a0042c5cf957534281e2901da1d7b5 Mon Sep 17 00:00:00 2001 From: Mark Thomas Date: Thu, 20 Apr 2023 13:53:12 +0100 Subject: [PATCH 044/298] Partial fix for DAEMON-458 Only use the configured dependencies if explicitly set. Otherwise use the existing setting including any set via 'sc config'. Note that once DependsOn has been used, the value set via 'DependsOn' will take priority any time the service is updated via Procrun. https://issues.apache.org/jira/browse/DAEMON-458 --- src/native/windows/src/service.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/native/windows/src/service.c b/src/native/windows/src/service.c index 538e980d..a6fbbde5 100644 --- a/src/native/windows/src/service.c +++ b/src/native/windows/src/service.c @@ -306,12 +306,10 @@ apxServiceSetOptions(APXHANDLE hService, return FALSE; } - /* Add the mandatory dependencies */ if (lpDependencies) { + /* Add the mandatory dependencies to the explicitly configured dependencies */ lpDependencies = apxMultiSzCombine(NULL, lpDependencies, L"Tcpip\0Afd\0", NULL); - } else { - lpDependencies = L"Tcpip\0Afd\0"; } if (!ChangeServiceConfig(lpService->hService, dwServiceType, From 57520a2ea880dcf46dcb8b8ad0e6240056c12f85 Mon Sep 17 00:00:00 2001 From: Mark Thomas Date: Thu, 20 Apr 2023 19:30:21 +0100 Subject: [PATCH 045/298] Fix DAEMON-458 All service dependencies to be managed via procrun or be 'sc config ...' --- src/changes/changes.xml | 4 +++ src/native/windows/apps/prunsrv/prunsrv.c | 2 +- src/native/windows/src/service.c | 37 +++++++++++++++++------ src/site/xdoc/procrun.xml | 11 +++++-- 4 files changed, 41 insertions(+), 13 deletions(-) diff --git a/src/changes/changes.xml b/src/changes/changes.xml index ac41c294..9d686699 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -51,6 +51,10 @@ create any missing parent directories, as well as the specified directory, when the service starts. + + Procrun. Allow Windows service dependencies to be managed by Procrun or + by 'sc config ...'. + Bump commons-parent from 54 to 55 #71. diff --git a/src/native/windows/apps/prunsrv/prunsrv.c b/src/native/windows/apps/prunsrv/prunsrv.c index 17bdc3c8..7789011b 100644 --- a/src/native/windows/apps/prunsrv/prunsrv.c +++ b/src/native/windows/apps/prunsrv/prunsrv.c @@ -113,8 +113,8 @@ static APXCMDLINEOPT _options[] = { /* 4 */ { L"ServicePassword", L"ServicePassword", NULL, APXCMDOPT_STR | APXCMDOPT_SRV, NULL, 0}, /* 5 */ { L"Startup", L"Startup", NULL, APXCMDOPT_STR | APXCMDOPT_SRV, NULL, 0}, /* 6 */ { L"Type", L"Type", NULL, APXCMDOPT_STR | APXCMDOPT_SRV, NULL, 0}, +/* 7 */ { L"DependsOn", L"DependOnService", NULL, APXCMDOPT_MSZ | APXCMDOPT_SRV, NULL, 0}, -/* 7 */ { L"DependsOn", L"DependsOn", NULL, APXCMDOPT_MSZ | APXCMDOPT_REG, NULL, 0}, /* 8 */ { L"Environment", L"Environment", NULL, APXCMDOPT_MSZ | APXCMDOPT_REG, NULL, 0}, /* 9 */ { L"User", L"User", NULL, APXCMDOPT_STR | APXCMDOPT_REG, NULL, 0}, /* 10 */ { L"Password", L"Password", NULL, APXCMDOPT_BIN | APXCMDOPT_REG, NULL, 0}, diff --git a/src/native/windows/src/service.c b/src/native/windows/src/service.c index a6fbbde5..d3db7d9e 100644 --- a/src/native/windows/src/service.c +++ b/src/native/windows/src/service.c @@ -306,12 +306,6 @@ apxServiceSetOptions(APXHANDLE hService, return FALSE; } - if (lpDependencies) { - /* Add the mandatory dependencies to the explicitly configured dependencies */ - lpDependencies = apxMultiSzCombine(NULL, lpDependencies, - L"Tcpip\0Afd\0", NULL); - } - if (!ChangeServiceConfig(lpService->hService, dwServiceType, dwStartType, dwErrorControl, NULL, NULL, NULL, @@ -692,11 +686,34 @@ apxServiceInstall(APXHANDLE hService, LPCWSTR szServiceName, lpService->stServiceEntry.lpConfig = NULL; AplZeroMemory(&lpService->stServiceEntry, sizeof(APXSERVENTRY)); - if (lpDependencies) - lpDependencies = apxMultiSzCombine(NULL, lpDependencies, - L"Tcpip\0Afd\0", NULL); - else + if (lpDependencies) { + /* Only add Tcpip and Afd if not already present. */ + BOOL needTcpip = TRUE; + BOOL needAfd = TRUE; + LPCWSTR p = lpDependencies; + while (*p && (needTcpip || needAfd)) { + if (lstrcmpiW(p, L"Tcpip") == 0) { + needTcpip = FALSE; + } + if (lstrcmpiW(p, L"Afd") == 0) { + needAfd = FALSE; + } + while (*p) { + p++; + } + p++; + } + if (needTcpip) { + lpDependencies = apxMultiSzCombine(NULL, lpDependencies, + L"Tcpip\0", NULL); + } + if (needAfd) { + lpDependencies = apxMultiSzCombine(NULL, lpDependencies, + L"Afd\0", NULL); + } + } else { lpDependencies = L"Tcpip\0Afd\0"; + } if ((dwServiceType & SERVICE_INTERACTIVE_PROCESS) == SERVICE_INTERACTIVE_PROCESS) { // Caller is responsible for checking the user is set appropriately diff --git a/src/site/xdoc/procrun.xml b/src/site/xdoc/procrun.xml index b259e70b..abaa2944 100644 --- a/src/site/xdoc/procrun.xml +++ b/src/site/xdoc/procrun.xml @@ -331,8 +331,15 @@ will add the new value(s) to any existing value(s). ++DependsOn - List of services that this service depends on. Dependent services - are separated using either # or ; characters + List of services that this service depends on. Services are separated + using either # or ; characters +
    + Note: At installation, additional dependencies will be created + on the services Tcpip and Afd if not explicitly + specified. These additional dependencies will not be created + automatically when updating the service configuration with + --DependsOn and must be explicitly defined if required in that + case. ++Environment From 026a8e9d4f982f0043b75c05853539a6844fd6be Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 28 Apr 2023 16:17:29 -0400 Subject: [PATCH 046/298] Bump commons-parent from 56 to 57 (#91) Bumps [commons-parent](https://github.com/apache/commons-parent) from 56 to 57. - [Release notes](https://github.com/apache/commons-parent/releases) - [Changelog](https://github.com/apache/commons-parent/blob/master/RELEASE-NOTES.txt) - [Commits](https://github.com/apache/commons-parent/commits) --- updated-dependencies: - dependency-name: org.apache.commons:commons-parent dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e25c61da..d3e99753 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ org.apache.commons commons-parent - 56 + 57 4.0.0 commons-daemon From bef9d5790e3a9853d8563ad793bb618294ca62b1 Mon Sep 17 00:00:00 2001 From: Gary Gregory Date: Fri, 28 Apr 2023 16:18:36 -0400 Subject: [PATCH 047/298] Bump commons-parent from 56 to 57 #91 --- src/changes/changes.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/changes/changes.xml b/src/changes/changes.xml index 9d686699..0abc7219 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -57,7 +57,7 @@     - Bump commons-parent from 54 to 55 #71. + Bump commons-parent from 54 to 57 #71, #91.     From dbb37bf3a444f8acb30ec19b846db21768134e71 Mon Sep 17 00:00:00 2001 From: Gary Gregory Date: Sun, 30 Apr 2023 09:24:12 -0400 Subject: [PATCH 048/298] Fix Javadoc link --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 2b282428..ddc3e18a 100644 --- a/README.md +++ b/README.md @@ -46,7 +46,7 @@ Apache Commons Daemon [![GitHub Actions Status](https://github.com/apache/commons-daemon/workflows/Java%20CI/badge.svg)](https://github.com/apache/commons-daemon/actions) [![Coverage Status](https://codecov.io/gh/apache/commons-daemon/branch/master/graph/badge.svg)](https://app.codecov.io/gh/apache/commons-daemon) [![Maven Central](https://maven-badges.herokuapp.com/maven-central/commons-daemon/commons-daemon/badge.svg)](https://maven-badges.herokuapp.com/maven-central/commons-daemon/commons-daemon/) -[![Javadocs](https://javadoc.io/badge/commons-daemon/commons-daemon/1.3.2.svg)](https://javadoc.io/doc/commons-daemon/commons-daemon/1.3.2) +[![Javadocs](https://javadoc.io/badge/commons-daemon/commons-daemon/1.3.3.svg)](https://javadoc.io/doc/commons-daemon/commons-daemon/1.3.3) [![CodeQL](https://github.com/apache/commons-daemon/workflows/CodeQL%20CPP/badge.svg)](https://github.com/apache/commons-daemon/actions/workflows/codeql-analysis-cpp.yml?query=workflow%3ACodeQL) [![CodeQL](https://github.com/apache/commons-daemon/workflows/CodeQL%20Java/badge.svg)](https://github.com/apache/commons-daemon/actions/workflows/codeql-analysis-java.yml?query=workflow%3ACodeQL) From dd25a6f94fac8832d31917d19a66f79b7cbcbb27 Mon Sep 17 00:00:00 2001 From: Mark Thomas Date: Thu, 4 May 2023 20:10:10 +0100 Subject: [PATCH 049/298] Fix DAEMON-459 - DaemonController.reload() now works more than once. --- src/changes/changes.xml | 4 ++++ src/native/unix/native/jsvc-unix.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/changes/changes.xml b/src/changes/changes.xml index 0abc7219..ca50edac 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -55,6 +55,10 @@ Procrun. Allow Windows service dependencies to be managed by Procrun or by 'sc config ...'. + + jsvc. Fix DaemonController.reload() only working the first time it is + called. + Bump commons-parent from 54 to 57 #71, #91. diff --git a/src/native/unix/native/jsvc-unix.c b/src/native/unix/native/jsvc-unix.c index a98757ac..cfb68f0f 100644 --- a/src/native/unix/native/jsvc-unix.c +++ b/src/native/unix/native/jsvc-unix.c @@ -910,7 +910,7 @@ static int child(arg_data *args, home_data *data, uid_t uid, gid_t gid) sigaction(SIGUSR2, &act, NULL); sigaction(SIGTERM, &act, NULL); sigaction(SIGINT, &act, NULL); - + controlled = getpid (); log_debug("Waiting for a signal to be delivered"); create_tmp_file(args); while (!stopping) { From e1d4d6ab8ce5ca1673510c21da9c90b010c8cc8c Mon Sep 17 00:00:00 2001 From: east Date: Tue, 3 Jan 2023 20:42:22 +0800 Subject: [PATCH 050/298] Fix incorrect definition in riscv64 architecture fix jsvc build error on riscv64. jni_md.h file could not be found. --- src/native/unix/support/apsupport.m4 | 1 - 1 file changed, 1 deletion(-) diff --git a/src/native/unix/support/apsupport.m4 b/src/native/unix/support/apsupport.m4 index c4f48fd8..c58e2a71 100644 --- a/src/native/unix/support/apsupport.m4 +++ b/src/native/unix/support/apsupport.m4 @@ -183,7 +183,6 @@ AC_DEFUN(AP_SUPPORTED_HOST,[ ;; riscv64) CFLAGS="$CFLAGS -DCPU=\\\"riscv64\\\"" - supported_os="riscv64" HOST_CPU=riscv64 ;; *) From 5853cbc50a949081cc1b0cffaf7b85d1732b981a Mon Sep 17 00:00:00 2001 From: Mark Thomas Date: Fri, 5 May 2023 09:19:51 +0100 Subject: [PATCH 051/298] Update Maven version to one that includes fix for MNG-7316 --- HOWTO-RELEASE.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/HOWTO-RELEASE.txt b/HOWTO-RELEASE.txt index 98f5a9e8..37986873 100644 --- a/HOWTO-RELEASE.txt +++ b/HOWTO-RELEASE.txt @@ -24,8 +24,7 @@ Review open PRs on GitHub. Update to latest commons-parent and fix any issues. Use Java 8. -Do not use Apache Maven 3.8.2 onwards due to - https://issues.apache.org/jira/browse/MNG-7316 +Use Maven 3.8.7 onwards If you haven't already, add your public PGP key to KEYS. From d1b6538e8ea1160a8327eab66a2f931e2f5893df Mon Sep 17 00:00:00 2001 From: Mark Thomas Date: Fri, 5 May 2023 09:23:56 +0100 Subject: [PATCH 052/298] Update change log --- src/changes/changes.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/changes/changes.xml b/src/changes/changes.xml index ca50edac..9fccb4b1 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -59,6 +59,10 @@ jsvc. Fix DaemonController.reload() only working the first time it is called. + + jsvc. Remove incorrent definition 'supported_os' which defined in + psupport.m4 file to fix jsvc build error on riscv64. + Bump commons-parent from 54 to 57 #71, #91. From b1c348892c5d97b7ee2db7f9b2d540fbae3a3f33 Mon Sep 17 00:00:00 2001 From: Mark Thomas Date: Fri, 5 May 2023 09:38:06 +0100 Subject: [PATCH 053/298] Ensure all versions updated for 1.3.4 release --- src/native/unix/native/version.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/native/unix/native/version.h b/src/native/unix/native/version.h index af4b0063..676dcafa 100644 --- a/src/native/unix/native/version.h +++ b/src/native/unix/native/version.h @@ -31,7 +31,7 @@ #define JSVC_MINOR_VERSION 3 /** patch level */ -#define JSVC_PATCH_VERSION 3 +#define JSVC_PATCH_VERSION 4 /** * This symbol is defined for internal, "development" copies of JSVC. From 842f15323bd7b3c6f0ee15114d1b420bad8c8ab0 Mon Sep 17 00:00:00 2001 From: Mark Thomas Date: Fri, 5 May 2023 09:38:26 +0100 Subject: [PATCH 054/298] Add nest guess at release date (today + 3 working days) --- src/changes/changes.xml | 2 +- src/native/unix/man/jsvc.1.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/changes/changes.xml b/src/changes/changes.xml index 9fccb4b1..f7a5ed79 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -40,7 +40,7 @@ Apache Commons Daemon Release Notes - + Procrun. Configured stack size now applies to the main thread when diff --git a/src/native/unix/man/jsvc.1.xml b/src/native/unix/man/jsvc.1.xml index 09bf6028..0860aab2 100644 --- a/src/native/unix/man/jsvc.1.xml +++ b/src/native/unix/man/jsvc.1.xml @@ -21,7 +21,7 @@ JSVC 1 - TBD + 2023-05-10 Jsvc version 1.3.4 Apache Commons Daemon project From e35696f3f1ab0c9408d4f7578291fd618249e5da Mon Sep 17 00:00:00 2001 From: Gary Gregory Date: Sat, 6 May 2023 13:46:12 -0400 Subject: [PATCH 055/298] Update text for new versions of MVS --- src/native/windows/README.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/native/windows/README.txt b/src/native/windows/README.txt index 0cff4ab5..014ddf2b 100644 --- a/src/native/windows/README.txt +++ b/src/native/windows/README.txt @@ -7,7 +7,12 @@ options, but a trivial build is simply; Windows X64 Build + For MVS under "C:\Program Files (x86)": "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars64.bat" + + For MVS under "C:\Program Files": + "C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvars64.bat" + nmake CPU=X64 Windows X86 Build From 7e64464002c317ced072a2f1c662d44a4c63e04d Mon Sep 17 00:00:00 2001 From: Mark Thomas Date: Fri, 12 May 2023 14:40:36 +0100 Subject: [PATCH 056/298] Update download links --- src/site/xdoc/download_daemon.xml | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/src/site/xdoc/download_daemon.xml b/src/site/xdoc/download_daemon.xml index 4e1323a7..2432fbc9 100644 --- a/src/site/xdoc/download_daemon.xml +++ b/src/site/xdoc/download_daemon.xml @@ -113,32 +113,32 @@ limitations under the License.

-
+
- - - + + + - - - + + +
commons-daemon-1.3.3-bin.tar.gzsha512pgpcommons-daemon-1.3.4-bin.tar.gzsha512pgp
commons-daemon-1.3.3-bin.zipsha512pgpcommons-daemon-1.3.4-bin.zipsha512pgp
- - - + + + - - - + + +
commons-daemon-1.3.3-src.tar.gzsha512pgpcommons-daemon-1.3.4-src.tar.gzsha512pgp
commons-daemon-1.3.3-src.zipsha512pgpcommons-daemon-1.3.4-src.zipsha512pgp
From 0938196350e06b0bb84db78abf6c196a48d18c90 Mon Sep 17 00:00:00 2001 From: Mark Thomas Date: Fri, 12 May 2023 14:46:48 +0100 Subject: [PATCH 057/298] Increment version for next development cycle --- RELEASE-NOTES.txt | 2 +- pom.xml | 6 +++--- src/changes/changes.xml | 7 ++++++- src/native/unix/man/jsvc.1.xml | 4 ++-- src/native/unix/native/version.h | 2 +- src/native/windows/apps/prunmgr/prunmgr.h | 2 +- src/native/windows/apps/prunmgr/prunmgr.rc | 6 +++--- src/native/windows/apps/prunsrv/prunsrv.h | 2 +- src/native/windows/apps/prunsrv/prunsrv.rc | 4 ++-- src/samples/SimpleApplication.sh | 2 +- src/site/xdoc/binaries.xml | 2 +- 11 files changed, 22 insertions(+), 17 deletions(-) diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt index 108658d9..5e7e7ef5 100644 --- a/RELEASE-NOTES.txt +++ b/RELEASE-NOTES.txt @@ -15,7 +15,7 @@ limitations under the License. ================================================================================ - Apache Commons Daemon 1.3.4 + Apache Commons Daemon 1.3.5 Release Notes This document contains the release notes for this version of the diff --git a/pom.xml b/pom.xml index d3e99753..bf550562 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ 4.0.0 commons-daemon commons-daemon - 1.3.4-SNAPSHOT + 1.3.5-SNAPSHOT Apache Commons Daemon @@ -131,9 +131,9 @@ ${commons.daemon.javaversion} daemon org.apache.commons.daemon - 1.3.4 + 1.3.5 RC1 - 1.3.3 + 1.3.4 DAEMON 12310468 diff --git a/src/changes/changes.xml b/src/changes/changes.xml index f7a5ed79..43593dd1 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -40,7 +40,12 @@ Apache Commons Daemon Release Notes - + + + + + + Procrun. Configured stack size now applies to the main thread when diff --git a/src/native/unix/man/jsvc.1.xml b/src/native/unix/man/jsvc.1.xml index 0860aab2..a11ac19c 100644 --- a/src/native/unix/man/jsvc.1.xml +++ b/src/native/unix/man/jsvc.1.xml @@ -21,8 +21,8 @@ JSVC 1 - 2023-05-10 - Jsvc version 1.3.4 + TBD + Jsvc version 1.3.5 Apache Commons Daemon project diff --git a/src/native/unix/native/version.h b/src/native/unix/native/version.h index 676dcafa..c229837b 100644 --- a/src/native/unix/native/version.h +++ b/src/native/unix/native/version.h @@ -31,7 +31,7 @@ #define JSVC_MINOR_VERSION 3 /** patch level */ -#define JSVC_PATCH_VERSION 4 +#define JSVC_PATCH_VERSION 5 /** * This symbol is defined for internal, "development" copies of JSVC. diff --git a/src/native/windows/apps/prunmgr/prunmgr.h b/src/native/windows/apps/prunmgr/prunmgr.h index 4656a334..6a8a6a4e 100644 --- a/src/native/windows/apps/prunmgr/prunmgr.h +++ b/src/native/windows/apps/prunmgr/prunmgr.h @@ -24,7 +24,7 @@ #define _PRUNMGR_H #undef PRG_VERSION -#define PRG_VERSION "1.3.4.0" +#define PRG_VERSION "1.3.5.0" #define PRG_REGROOT L"Apache Software Foundation\\Procrun 2.0" #define IDM_TM_EXIT 2000 diff --git a/src/native/windows/apps/prunmgr/prunmgr.rc b/src/native/windows/apps/prunmgr/prunmgr.rc index 011b9f41..c11740cb 100644 --- a/src/native/windows/apps/prunmgr/prunmgr.rc +++ b/src/native/windows/apps/prunmgr/prunmgr.rc @@ -228,7 +228,7 @@ END STRINGTABLE BEGIN IDS_APPLICATION RSTR_PSM - IDS_APPVERSION "Version 1.3.4" + IDS_APPVERSION "Version 1.3.5" IDS_APPFULLNAME RSTR_PSM " Version " PRG_VERSION IDS_APPCOPYRIGHT "Copyright (c) 2000-2022 The Apache Software Foundation" IDS_APPDESCRIPTION "Apache Commons Daemon Service Management Tool" @@ -259,8 +259,8 @@ BEGIN END 1 VERSIONINFO - FILEVERSION 1,3,4,0 - PRODUCTVERSION 1,3,4,0 + FILEVERSION 1,3,5,0 + PRODUCTVERSION 1,3,5,0 FILEFLAGSMASK 0x3fL #if defined(_DEBUG) FILEFLAGS 0x03L diff --git a/src/native/windows/apps/prunsrv/prunsrv.h b/src/native/windows/apps/prunsrv/prunsrv.h index 40254936..127d4e71 100644 --- a/src/native/windows/apps/prunsrv/prunsrv.h +++ b/src/native/windows/apps/prunsrv/prunsrv.h @@ -25,7 +25,7 @@ #define _PRUNSRV_H #undef PRG_VERSION -#define PRG_VERSION "1.3.4.0" +#define PRG_VERSION "1.3.5.0" #define PRG_REGROOT L"Apache Software Foundation\\Procrun 2.0" #endif /* _PRUNSRV_H */ diff --git a/src/native/windows/apps/prunsrv/prunsrv.rc b/src/native/windows/apps/prunsrv/prunsrv.rc index ee0ebe69..2fae8ae0 100644 --- a/src/native/windows/apps/prunsrv/prunsrv.rc +++ b/src/native/windows/apps/prunsrv/prunsrv.rc @@ -23,8 +23,8 @@ IDI_MAINICON ICON "../../resources/procrunw.ico" CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "prunsrv.manifest" 1 VERSIONINFO - FILEVERSION 1,3,4,0 - PRODUCTVERSION 1,3,4,0 + FILEVERSION 1,3,5,0 + PRODUCTVERSION 1,3,5,0 FILEFLAGSMASK 0x3fL #if defined(_DEBUG) FILEFLAGS 0x03L diff --git a/src/samples/SimpleApplication.sh b/src/samples/SimpleApplication.sh index 73a1c00b..385ed031 100755 --- a/src/samples/SimpleApplication.sh +++ b/src/samples/SimpleApplication.sh @@ -20,7 +20,7 @@ # Adapt the following lines to your configuration JAVA_HOME=/opt/java6 PROGRAM=SimpleApplication -CLASSPATH=`pwd`/$PROGRAM.jar:`pwd`/commons-daemon-1.3.4.jar +CLASSPATH=`pwd`/$PROGRAM.jar:`pwd`/commons-daemon-1.3.5.jar case "$1" in start ) diff --git a/src/site/xdoc/binaries.xml b/src/site/xdoc/binaries.xml index 6db9e51f..1f2bda0e 100644 --- a/src/site/xdoc/binaries.xml +++ b/src/site/xdoc/binaries.xml @@ -36,7 +36,7 @@ corresponding to your operating system. Only the Windows builds are provided as

-The Windows archive (e.g. commons-daemon-1.3.4-bin-windows.zip) contains 2 different executables: +The Windows archive (e.g. commons-daemon-1.3.5-bin-windows.zip) contains 2 different executables:

  • prunsrv.exe - service application for running applications as services.
  • prunmgr.exe - the GUI manager application used to monitor and configure installed services.
    • From d56dd73a1202b23363b856eacfb04eda7fe3664a Mon Sep 17 00:00:00 2001 From: Mark Thomas Date: Fri, 12 May 2023 14:49:12 +0100 Subject: [PATCH 058/298] Update copyright year --- src/native/unix/native/help.c | 2 +- src/native/unix/native/jsvc-unix.c | 2 +- src/native/windows/apps/prunmgr/prunmgr.rc | 6 +++--- src/native/windows/apps/prunsrv/prunsrv.c | 2 +- src/native/windows/apps/prunsrv/prunsrv.rc | 2 +- src/native/windows/resources/license.rtf | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/native/unix/native/help.c b/src/native/unix/native/help.c index d79aeea8..57339e14 100644 --- a/src/native/unix/native/help.c +++ b/src/native/unix/native/help.c @@ -124,7 +124,7 @@ void help(home_data *data) printf(" --enable-preview\n"); printf(" Java 11 --enable-preview option. Passed as it is to JVM\n"); printf("\njsvc (Apache Commons Daemon) " JSVC_VERSION_STRING "\n"); - printf("Copyright (c) 1999-2022 Apache Software Foundation.\n"); + printf("Copyright (c) 1999-2023 Apache Software Foundation.\n"); printf("\n"); } diff --git a/src/native/unix/native/jsvc-unix.c b/src/native/unix/native/jsvc-unix.c index cfb68f0f..e331a0fa 100644 --- a/src/native/unix/native/jsvc-unix.c +++ b/src/native/unix/native/jsvc-unix.c @@ -850,7 +850,7 @@ static int child(arg_data *args, home_data *data, uid_t uid, gid_t gid) /* Check wether we need to dump the VM version */ if (args->vers == true) { log_error("jsvc (Apache Commons Daemon) " JSVC_VERSION_STRING); - log_error("Copyright (c) 1999-2022 Apache Software Foundation."); + log_error("Copyright (c) 1999-2023 Apache Software Foundation."); if (java_version() != true) { return -1; } diff --git a/src/native/windows/apps/prunmgr/prunmgr.rc b/src/native/windows/apps/prunmgr/prunmgr.rc index c11740cb..3a418e9e 100644 --- a/src/native/windows/apps/prunmgr/prunmgr.rc +++ b/src/native/windows/apps/prunmgr/prunmgr.rc @@ -38,7 +38,7 @@ BEGIN ES_READONLY | WS_BORDER | WS_VSCROLL,0,31,335,115 CONTROL "BMP_COMMONS",IDC_STATIC,"Static",SS_BITMAP|0x00000040L,0,0,337,30 LTEXT " ",IDC_ABOUTAPP,2,150,270,12 - LTEXT "Copyright (c) 2000-2022 The Apache Software Foundation.",IDC_STATIC,2,160,270,12 + LTEXT "Copyright (c) 2000-2023 The Apache Software Foundation.",IDC_STATIC,2,160,270,12 LTEXT "https://commons.apache.org",IDC_STATIC,2,170,270,12 PUSHBUTTON "&System Info",IAB_SYSINF,285,170,50,14 END @@ -230,7 +230,7 @@ BEGIN IDS_APPLICATION RSTR_PSM IDS_APPVERSION "Version 1.3.5" IDS_APPFULLNAME RSTR_PSM " Version " PRG_VERSION - IDS_APPCOPYRIGHT "Copyright (c) 2000-2022 The Apache Software Foundation" + IDS_APPCOPYRIGHT "Copyright (c) 2000-2023 The Apache Software Foundation" IDS_APPDESCRIPTION "Apache Commons Daemon Service Management Tool" IDS_ALREAY_RUNING "An instance of '%S' application is already running" IDS_ERRORCMD "Unknown command line option '%s'\nSee the manual for command line usage." @@ -280,7 +280,7 @@ BEGIN VALUE "FileDescription", RSTR_PSM "\0" VALUE "FileVersion", PRG_VERSION VALUE "InternalName", RSTR_PSM "\0" - VALUE "LegalCopyright", "Copyright (c) 2000-2022 The Apache Software Foundation.\0" + VALUE "LegalCopyright", "Copyright (c) 2000-2023 The Apache Software Foundation.\0" VALUE "OriginalFilename", "prunmgr.exe\0" VALUE "ProductName", RSTR_PSM "\0" VALUE "ProductVersion", PRG_VERSION diff --git a/src/native/windows/apps/prunsrv/prunsrv.c b/src/native/windows/apps/prunsrv/prunsrv.c index 7789011b..c4dc9901 100644 --- a/src/native/windows/apps/prunsrv/prunsrv.c +++ b/src/native/windows/apps/prunsrv/prunsrv.c @@ -401,7 +401,7 @@ static void printVersion(void) { fwprintf(stderr, L"Apache Commons Daemon Service Runner version %S/Win%d (%S)\n", PRG_VERSION, PRG_BITS, __DATE__); - fwprintf(stderr, L"Copyright (c) 2000-2022 The Apache Software Foundation.\n\n" + fwprintf(stderr, L"Copyright (c) 2000-2023 The Apache Software Foundation.\n\n" L"For bug reporting instructions, please see:\n" L"."); } diff --git a/src/native/windows/apps/prunsrv/prunsrv.rc b/src/native/windows/apps/prunsrv/prunsrv.rc index 2fae8ae0..e583edd8 100644 --- a/src/native/windows/apps/prunsrv/prunsrv.rc +++ b/src/native/windows/apps/prunsrv/prunsrv.rc @@ -44,7 +44,7 @@ BEGIN VALUE "FileDescription", RSTR_PRUNSRV "\0" VALUE "FileVersion", PRG_VERSION VALUE "InternalName", RSTR_PRUNSRV "\0" - VALUE "LegalCopyright", "Copyright (c) 2000-2022 The Apache Software Foundation.\0" + VALUE "LegalCopyright", "Copyright (c) 2000-2023 The Apache Software Foundation.\0" VALUE "OriginalFilename", "prunsrv.exe\0" VALUE "ProductName", RSTR_PRUNSRV "\0" VALUE "ProductVersion", PRG_VERSION diff --git a/src/native/windows/resources/license.rtf b/src/native/windows/resources/license.rtf index 3c8d8ae9..ec5b4819 100644 --- a/src/native/windows/resources/license.rtf +++ b/src/native/windows/resources/license.rtf @@ -15,7 +15,7 @@ {\pntxtb (}{\pntxta )}}{\*\pnseclvl7\pnlcrm\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl8\pnlcltr\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl9\pnlcrm\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}\pard\plain \qc \li0\ri0\nowidctlpar\faauto\rin0\lin0\itap0\pararsid14358633 \fs24\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 {\b\f1\insrsid16132583\charrsid12321742 The Apache Software License, Version 2.0 \par }\pard \ql \li0\ri0\nowidctlpar\faauto\rin0\lin0\itap0 {\f1\fs18\insrsid16132583\charrsid16132583 -\par }\pard \ql \li0\ri0\nowidctlpar\faauto\rin0\lin0\itap0\pararsid9454304 {\f1\fs18\insrsid9454304 }{\f1\fs18\insrsid16132583\charrsid16132583 Copyright 2002-2022 The Apache Software Foundation. +\par }\pard \ql \li0\ri0\nowidctlpar\faauto\rin0\lin0\itap0\pararsid9454304 {\f1\fs18\insrsid9454304 }{\f1\fs18\insrsid16132583\charrsid16132583 Copyright 2002-2023 The Apache Software Foundation. \par }\pard \ql \li0\ri0\nowidctlpar\faauto\rin0\lin0\itap0\pararsid1379267 {\f1\fs18\insrsid16132583\charrsid16132583 \par }{\f1\fs18\insrsid14358633 }{\f1\fs18\insrsid16132583\charrsid16132583 Licensed under the Apache License, Version 2.0 (the "License"); \par }{\f1\fs18\insrsid14358633 }{\f1\fs18\insrsid16132583\charrsid16132583 you may not use this file except in compliance with the License. From 676e21319e9c8e4cc9eae36fd93116551c72ac38 Mon Sep 17 00:00:00 2001 From: Gary Gregory Date: Wed, 24 May 2023 13:27:26 -0400 Subject: [PATCH 059/298] Grammar --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ddc3e18a..69a311c5 100644 --- a/README.md +++ b/README.md @@ -66,7 +66,7 @@ Where can I get the latest release? ----------------------------------- You can download source and binaries from our [download page](https://commons.apache.org/proper/commons-daemon/download_daemon.cgi). -Alternatively you can pull it from the central Maven repositories: +Alternatively, you can pull it from the central Maven repositories: ```xml From 6d2bf8b1e79ac93b648134e2d44c9ce8e5a03318 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 2 Jun 2023 14:25:55 -0400 Subject: [PATCH 060/298] Bump commons-parent from 57 to 58 (#93) Bumps [commons-parent](https://github.com/apache/commons-parent) from 57 to 58. - [Changelog](https://github.com/apache/commons-parent/blob/master/RELEASE-NOTES.txt) - [Commits](https://github.com/apache/commons-parent/commits) --- updated-dependencies: - dependency-name: org.apache.commons:commons-parent dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index bf550562..7f5a9aca 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ org.apache.commons commons-parent - 57 + 58 4.0.0 commons-daemon From 87b2fffb8e6e71942f1ef495f57fec4d60242876 Mon Sep 17 00:00:00 2001 From: Gary Gregory Date: Fri, 2 Jun 2023 14:26:52 -0400 Subject: [PATCH 061/298] Bump commons-parent from 57 to 58 (#93) #132. --- src/changes/changes.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/changes/changes.xml b/src/changes/changes.xml index 43593dd1..01124790 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -44,6 +44,9 @@ + + Bump commons-parent from 57 to 58 (#93) #132. + From c2901de575194855609ff4d41521243b16cdcf75 Mon Sep 17 00:00:00 2001 From: Gary Gregory Date: Fri, 2 Jun 2023 14:29:09 -0400 Subject: [PATCH 062/298] Fix odd formatting --- .../apache/commons/daemon/SimpleDaemon.java | 226 +++++++++--------- 1 file changed, 107 insertions(+), 119 deletions(-) diff --git a/src/test/java/org/apache/commons/daemon/SimpleDaemon.java b/src/test/java/org/apache/commons/daemon/SimpleDaemon.java index 411bcda3..0740a1de 100644 --- a/src/test/java/org/apache/commons/daemon/SimpleDaemon.java +++ b/src/test/java/org/apache/commons/daemon/SimpleDaemon.java @@ -35,46 +35,42 @@ public class SimpleDaemon implements Daemon, Runnable, DaemonUserSignal { private boolean softReloadSignalled; public SimpleDaemon() { - System.err.println("SimpleDaemon: instance "+this.hashCode()+ - " created"); + System.err.println("SimpleDaemon: instance " + this.hashCode() + " created"); this.handlers = new Vector<>(); } @Override protected void finalize() { - System.err.println("SimpleDaemon: instance "+this.hashCode()+ - " garbage collected"); + System.err.println("SimpleDaemon: instance " + this.hashCode() + " garbage collected"); } /** * init and destroy were added in jakarta-tomcat-daemon. */ @Override - public void init(final DaemonContext context) - throws Exception { - System.err.println("SimpleDaemon: instance "+this.hashCode()+ - " init"); + public void init(final DaemonContext context) throws Exception { + System.err.println("SimpleDaemon: instance " + this.hashCode() + " init"); - int port=1200; + int port = 1200; final String[] a = context.getArguments(); - if (a.length>0) { - port=Integer.parseInt(a[0]); + if (a.length > 0) { + port = Integer.parseInt(a[0]); } - if (a.length>1) { - this.directory=a[1]; + if (a.length > 1) { + this.directory = a[1]; } else { - this.directory="/tmp"; + this.directory = "/tmp"; } /* Dump a message */ - System.err.println("SimpleDaemon: loading on port "+port); + System.err.println("SimpleDaemon: loading on port " + port); /* Set up this simple daemon */ - this.controller=context.getController(); - this.server=new ServerSocket(port); - this.thread=new Thread(this); + this.controller = context.getController(); + this.server = new ServerSocket(port); + this.thread = new Thread(this); } @Override @@ -87,13 +83,12 @@ public void start() { } @Override - public void stop() - throws IOException, InterruptedException { + public void stop() throws IOException, InterruptedException { /* Dump a message */ System.err.println("SimpleDaemon: stopping"); /* Close the ServerSocket. This will make our thread to terminate */ - this.stopping=true; + this.stopping = true; this.server.close(); /* Wait for the main thread to exit and dump a message */ @@ -103,40 +98,39 @@ public void stop() @Override public void destroy() { - System.err.println("SimpleDaemon: instance "+this.hashCode()+ - " destroy"); + System.err.println("SimpleDaemon: instance " + this.hashCode() + " destroy"); } @Override public void run() { - int number=0; + int number = 0; System.err.println("SimpleDaemon: started acceptor loop"); try { - while(!this.stopping) { + while (!this.stopping) { checkForReload(); - final Socket socket=this.server.accept(); + final Socket socket = this.server.accept(); checkForReload(); - final Handler handler=new Handler(socket,this,this.controller); + final Handler handler = new Handler(socket, this, this.controller); handler.setConnectionNumber(number++); handler.setDirectoryName(this.directory); new Thread(handler).start(); } } catch (final IOException e) { - /* Don't dump any error message if we are stopping. A IOException - is generated when the ServerSocket is closed in stop() */ + /* + * Don't dump any error message if we are stopping. A IOException is generated when the ServerSocket is closed in stop() + */ if (!this.stopping) { e.printStackTrace(System.err); } } /* Terminate all handlers that at this point are still open */ - final Enumeration openhandlers=this.handlers.elements(); + final Enumeration openhandlers = this.handlers.elements(); while (openhandlers.hasMoreElements()) { - final Handler handler=openhandlers.nextElement(); - System.err.println("SimpleDaemon: dropping connection "+ - handler.getConnectionNumber()); + final Handler handler = openhandlers.nextElement(); + System.err.println("SimpleDaemon: dropping connection " + handler.getConnectionNumber()); handler.close(); } @@ -145,8 +139,8 @@ is generated when the ServerSocket is closed in stop() */ @Override public void signal() { - /* In this example we are using soft reload on - * custom signal. + /* + * In this example we are using soft reload on custom signal. */ this.softReloadSignalled = true; } @@ -183,26 +177,24 @@ public static class Handler implements Runnable { private int number; public Handler(final Socket s, final SimpleDaemon p, final DaemonController c) { - this.socket=s; - this.parent=p; - this.controller=c; + this.socket = s; + this.parent = p; + this.controller = c; } @Override public void run() { this.parent.addHandler(this); - System.err.println("SimpleDaemon: connection "+this.number+ - " opened from "+this.socket.getInetAddress()); + System.err.println("SimpleDaemon: connection " + this.number + " opened from " + this.socket.getInetAddress()); try { - final InputStream in=this.socket.getInputStream(); - final OutputStream out=this.socket.getOutputStream(); - handle(in,out); + final InputStream in = this.socket.getInputStream(); + final OutputStream out = this.socket.getOutputStream(); + handle(in, out); this.socket.close(); } catch (final IOException e) { e.printStackTrace(System.err); } - System.err.println("SimpleDaemon: connection "+this.number+ - " closed"); + System.err.println("SimpleDaemon: connection " + this.number + " closed"); this.parent.removeHandler(this); } @@ -215,7 +207,7 @@ public void close() { } public void setConnectionNumber(final int number) { - this.number=number; + this.number = number; } public int getConnectionNumber() { @@ -223,7 +215,7 @@ public int getConnectionNumber() { } public void setDirectoryName(final String directory) { - this.directory=directory; + this.directory = directory; } public String getDirectoryName() { @@ -231,20 +223,21 @@ public String getDirectoryName() { } public void log(final String name) throws IOException { - try (final OutputStream file = new FileOutputStream(name, true); - final PrintStream out = new PrintStream(file)) { + try (final OutputStream file = new FileOutputStream(name, true); + final PrintStream out = new PrintStream(file)) { out.println(new SimpleDateFormat().format(new Date())); } } public void handle(final InputStream in, final OutputStream os) { - final PrintStream out=new PrintStream(os); + final PrintStream out = new PrintStream(os); - while(true) { + while (true) { try { - /* If we don't have data in the System InputStream, we want - to ask to the user for an option. */ - if (in.available()==0) { + /* + * If we don't have data in the System InputStream, we want to ask to the user for an option. + */ + if (in.available() == 0) { out.println(); out.println("Please select one of the following:"); out.println(" 1) Shutdown"); @@ -256,77 +249,72 @@ public void handle(final InputStream in, final OutputStream os) { } /* Read an option from the client */ - final int x=in.read(); + final int x = in.read(); switch (x) { - /* If the socket was closed, we simply return */ - case -1: - return; - - /* Attempt to shut down */ - case '1': - out.println("Attempting a shutdown..."); - try { - this.controller.shutdown(); - } catch (final IllegalStateException e) { - out.println(); - out.println("Can't shutdown now"); - e.printStackTrace(out); - } - break; - - /* Attempt to reload */ - case '2': - out.println("Attempting a reload..."); - try { - this.controller.reload(); - } catch (final IllegalStateException e) { - out.println(); - out.println("Can't reload now"); - e.printStackTrace(out); - } - break; - - /* Disconnect */ - case '3': - final String name=this.getDirectoryName()+ - "/SimpleDaemon."+ - this.getConnectionNumber()+ - ".tmp"; - try { - this.log(name); - out.println("File '"+name+"' created"); - } catch (final IOException e) { - e.printStackTrace(out); - } - break; - - /* Disconnect */ - case '4': - out.println("Disconnecting..."); - return; - case '5': - out.println("Reloading configuration..."); - this.parent.signal(); - return; - - /* Discard any carriage return / newline characters */ - case '\r': - case '\n': - break; - - /* We got something that we weren't supposed to get */ - default: - out.println("Unknown option '"+(char)x+"'"); - break; + /* If the socket was closed, we simply return */ + case -1: + return; + + /* Attempt to shut down */ + case '1': + out.println("Attempting a shutdown..."); + try { + this.controller.shutdown(); + } catch (final IllegalStateException e) { + out.println(); + out.println("Can't shutdown now"); + e.printStackTrace(out); + } + break; + + /* Attempt to reload */ + case '2': + out.println("Attempting a reload..."); + try { + this.controller.reload(); + } catch (final IllegalStateException e) { + out.println(); + out.println("Can't reload now"); + e.printStackTrace(out); + } + break; + + /* Disconnect */ + case '3': + final String name = this.getDirectoryName() + "/SimpleDaemon." + this.getConnectionNumber() + ".tmp"; + try { + this.log(name); + out.println("File '" + name + "' created"); + } catch (final IOException e) { + e.printStackTrace(out); + } + break; + + /* Disconnect */ + case '4': + out.println("Disconnecting..."); + return; + case '5': + out.println("Reloading configuration..."); + this.parent.signal(); + return; + + /* Discard any carriage return / newline characters */ + case '\r': + case '\n': + break; + + /* We got something that we weren't supposed to get */ + default: + out.println("Unknown option '" + (char) x + "'"); + break; } - /* If we get an IOException we return (disconnect) */ + /* If we get an IOException we return (disconnect) */ } catch (final IOException e) { - System.err.println("SimpleDaemon: IOException in "+ - "connection "+ - this.getConnectionNumber()); + System.err.println("SimpleDaemon: IOException in " + "connection " + this.getConnectionNumber()); return; } } From ecd7e63a89c2f98710ee5f5251a5eaa954908e5d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 9 Jun 2023 13:10:40 -0400 Subject: [PATCH 063/298] Bump actions/checkout from 3.5.2 to 3.5.3 (#94) Bumps [actions/checkout](https://github.com/actions/checkout) from 3.5.2 to 3.5.3. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v3.5.2...v3.5.3) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/codeql-analysis-cpp.yml | 2 +- .github/workflows/codeql-analysis-java.yml | 2 +- .github/workflows/coverage.yml | 2 +- .github/workflows/maven.yml | 2 +- .github/workflows/scorecards-analysis.yml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/codeql-analysis-cpp.yml b/.github/workflows/codeql-analysis-cpp.yml index 7d477002..964df233 100644 --- a/.github/workflows/codeql-analysis-cpp.yml +++ b/.github/workflows/codeql-analysis-cpp.yml @@ -45,7 +45,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v3.5.2 + uses: actions/checkout@v3.5.3 with: persist-credentials: false - uses: actions/cache@v3.3.1 diff --git a/.github/workflows/codeql-analysis-java.yml b/.github/workflows/codeql-analysis-java.yml index 75136f77..c3074ba6 100644 --- a/.github/workflows/codeql-analysis-java.yml +++ b/.github/workflows/codeql-analysis-java.yml @@ -45,7 +45,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v3.5.2 + uses: actions/checkout@v3.5.3 with: persist-credentials: false - uses: actions/cache@v3.3.1 diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index ce7402a8..7f1f8611 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -29,7 +29,7 @@ jobs: java: [ 8 ] steps: - - uses: actions/checkout@v3.5.2 + - uses: actions/checkout@v3.5.3 with: persist-credentials: false - uses: actions/cache@v3.3.1 diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index a29282d1..fbeca930 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -35,7 +35,7 @@ jobs: # experimental: true steps: - - uses: actions/checkout@v3.5.2 + - uses: actions/checkout@v3.5.3 with: persist-credentials: false - uses: actions/cache@v3.3.1 diff --git a/.github/workflows/scorecards-analysis.yml b/.github/workflows/scorecards-analysis.yml index 3e68a136..23c29372 100644 --- a/.github/workflows/scorecards-analysis.yml +++ b/.github/workflows/scorecards-analysis.yml @@ -40,7 +40,7 @@ jobs: steps: - name: "Checkout code" - uses: actions/checkout@v3.5.2 # 3.1.0 + uses: actions/checkout@v3.5.3 # 3.1.0 with: persist-credentials: false From 6fcbb5a85df03c189d8eb58dbcd2ba334b37a43e Mon Sep 17 00:00:00 2001 From: Gary Gregory Date: Sat, 24 Jun 2023 13:38:05 -0400 Subject: [PATCH 064/298] Spelling --- src/native/windows/src/service.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/native/windows/src/service.c b/src/native/windows/src/service.c index d3db7d9e..582d1119 100644 --- a/src/native/windows/src/service.c +++ b/src/native/windows/src/service.c @@ -469,7 +469,7 @@ apxServiceControl(APXHANDLE hService, DWORD dwControl, UINT uMsg, default: break; } - /* user defined controls */ + /* user-defined controls */ if (dwControl > 127 && dwControl < 224) { /* 128 ... 159 start signals * 160 ... 191 stop signals From 936271f57a151f0fa0726b9e136a0db5f38d38e8 Mon Sep 17 00:00:00 2001 From: StepSecurity Bot Date: Sat, 24 Jun 2023 11:56:07 -0700 Subject: [PATCH 065/298] [StepSecurity] ci: Harden GitHub Actions (#95) Signed-off-by: StepSecurity Bot --- .github/workflows/codeql-analysis-cpp.yml | 8 ++++---- .github/workflows/codeql-analysis-java.yml | 10 +++++----- .github/workflows/coverage.yml | 8 ++++---- .github/workflows/maven.yml | 6 +++--- .github/workflows/scorecards-analysis.yml | 2 +- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/.github/workflows/codeql-analysis-cpp.yml b/.github/workflows/codeql-analysis-cpp.yml index 964df233..61cba6e2 100644 --- a/.github/workflows/codeql-analysis-cpp.yml +++ b/.github/workflows/codeql-analysis-cpp.yml @@ -45,10 +45,10 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v3.5.3 + uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3 with: persist-credentials: false - - uses: actions/cache@v3.3.1 + - uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1 with: path: ~/.m2/repository key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} @@ -57,7 +57,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@v2 + uses: github/codeql-action/init@f6e388ebf0efc915c6c5b165b019ee61a6746a38 # v2.20.1 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -86,4 +86,4 @@ jobs: make - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v2 + uses: github/codeql-action/analyze@f6e388ebf0efc915c6c5b165b019ee61a6746a38 # v2.20.1 diff --git a/.github/workflows/codeql-analysis-java.yml b/.github/workflows/codeql-analysis-java.yml index c3074ba6..bca3b119 100644 --- a/.github/workflows/codeql-analysis-java.yml +++ b/.github/workflows/codeql-analysis-java.yml @@ -45,10 +45,10 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v3.5.3 + uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3 with: persist-credentials: false - - uses: actions/cache@v3.3.1 + - uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1 with: path: ~/.m2/repository key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} @@ -57,7 +57,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@v2 + uses: github/codeql-action/init@f6e388ebf0efc915c6c5b165b019ee61a6746a38 # v2.20.1 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -68,7 +68,7 @@ jobs: # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). # If this step fails, then you should remove it and run the build manually (see below) - name: Autobuild - uses: github/codeql-action/autobuild@v2 + uses: github/codeql-action/autobuild@f6e388ebf0efc915c6c5b165b019ee61a6746a38 # v2.20.1 # ℹī¸ Command-line programs to run using the OS shell. # 📚 https://git.io/JvXDl @@ -82,4 +82,4 @@ jobs: # make release - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v2 + uses: github/codeql-action/analyze@f6e388ebf0efc915c6c5b165b019ee61a6746a38 # v2.20.1 diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index 7f1f8611..d984e1f3 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -29,17 +29,17 @@ jobs: java: [ 8 ] steps: - - uses: actions/checkout@v3.5.3 + - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3 with: persist-credentials: false - - uses: actions/cache@v3.3.1 + - uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1 with: path: ~/.m2/repository key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} restore-keys: | ${{ runner.os }}-maven- - name: Set up JDK ${{ matrix.java }} - uses: actions/setup-java@v3.11.0 + uses: actions/setup-java@5ffc13f4174014e2d4d4572b3d74c3fa61aeb2c2 # v3.11.0 with: distribution: 'temurin' java-version: ${{ matrix.java }} @@ -47,6 +47,6 @@ jobs: run: mvn -V test jacoco:report --file pom.xml --no-transfer-progress - name: Upload coverage to Codecov - uses: codecov/codecov-action@v3 + uses: codecov/codecov-action@eaaf4bedf32dbdc6b720b63067d99c4d77d6047d # v3.1.4 with: files: ./target/site/jacoco/jacoco.xml diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index fbeca930..4c3605b7 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -35,17 +35,17 @@ jobs: # experimental: true steps: - - uses: actions/checkout@v3.5.3 + - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3 with: persist-credentials: false - - uses: actions/cache@v3.3.1 + - uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1 with: path: ~/.m2/repository key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} restore-keys: | ${{ runner.os }}-maven- - name: Set up JDK ${{ matrix.java }} - uses: actions/setup-java@v3.11.0 + uses: actions/setup-java@5ffc13f4174014e2d4d4572b3d74c3fa61aeb2c2 # v3.11.0 with: distribution: 'temurin' java-version: ${{ matrix.java }} diff --git a/.github/workflows/scorecards-analysis.yml b/.github/workflows/scorecards-analysis.yml index 23c29372..975383a9 100644 --- a/.github/workflows/scorecards-analysis.yml +++ b/.github/workflows/scorecards-analysis.yml @@ -40,7 +40,7 @@ jobs: steps: - name: "Checkout code" - uses: actions/checkout@v3.5.3 # 3.1.0 + uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3 with: persist-credentials: false From 8933315908026d3294f697a9385d5fca14f7bb4b Mon Sep 17 00:00:00 2001 From: Gary Gregory Date: Sat, 24 Jun 2023 14:57:13 -0400 Subject: [PATCH 066/298] [StepSecurity] ci: Harden GitHub Actions #95. --- src/changes/changes.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/changes/changes.xml b/src/changes/changes.xml index 01124790..5a9d15a3 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -42,6 +42,9 @@ + + [StepSecurity] ci: Harden GitHub Actions #95. + From 5cb1b3a5dcef35d5b6477b003cee3bf7ee53e77f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 30 Jun 2023 13:11:30 -0400 Subject: [PATCH 067/298] Bump ossf/scorecard-action from 2.1.3 to 2.2.0 (#96) Bumps [ossf/scorecard-action](https://github.com/ossf/scorecard-action) from 2.1.3 to 2.2.0. - [Release notes](https://github.com/ossf/scorecard-action/releases) - [Changelog](https://github.com/ossf/scorecard-action/blob/main/RELEASE.md) - [Commits](https://github.com/ossf/scorecard-action/compare/80e868c13c90f172d68d1f4501dee99e2479f7af...08b4669551908b1024bb425080c797723083c031) --- updated-dependencies: - dependency-name: ossf/scorecard-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/scorecards-analysis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/scorecards-analysis.yml b/.github/workflows/scorecards-analysis.yml index 975383a9..09795bcf 100644 --- a/.github/workflows/scorecards-analysis.yml +++ b/.github/workflows/scorecards-analysis.yml @@ -45,7 +45,7 @@ jobs: persist-credentials: false - name: "Run analysis" - uses: ossf/scorecard-action@80e868c13c90f172d68d1f4501dee99e2479f7af # 2.1.3 + uses: ossf/scorecard-action@08b4669551908b1024bb425080c797723083c031 # 2.2.0 with: results_file: results.sarif results_format: sarif From 4716f852ef6f556cc8f79e170b0cc93c0f2d4ae5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 30 Jun 2023 13:11:45 -0400 Subject: [PATCH 068/298] Bump github/codeql-action from 2.1.22 to 2.20.1 (#97) Bumps [github/codeql-action](https://github.com/github/codeql-action) from 2.1.22 to 2.20.1. - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/v2.1.22...f6e388ebf0efc915c6c5b165b019ee61a6746a38) --- updated-dependencies: - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/scorecards-analysis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/scorecards-analysis.yml b/.github/workflows/scorecards-analysis.yml index 09795bcf..3834d300 100644 --- a/.github/workflows/scorecards-analysis.yml +++ b/.github/workflows/scorecards-analysis.yml @@ -64,6 +64,6 @@ jobs: retention-days: 5 - name: "Upload to code-scanning" - uses: github/codeql-action/upload-sarif@b398f525a5587552e573b247ac661067fafa920b # 2.1.22 + uses: github/codeql-action/upload-sarif@f6e388ebf0efc915c6c5b165b019ee61a6746a38 # 2.20.1 with: sarif_file: results.sarif From ba85336dc4e3c248023524678af6f6252060ada4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 7 Jul 2023 14:52:46 -0400 Subject: [PATCH 069/298] Bump github/codeql-action from 2.20.1 to 2.20.3 (#98) Bumps [github/codeql-action](https://github.com/github/codeql-action) from 2.20.1 to 2.20.3. - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/f6e388ebf0efc915c6c5b165b019ee61a6746a38...46ed16ded91731b2df79a2893d3aea8e9f03b5c4) --- updated-dependencies: - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/codeql-analysis-cpp.yml | 4 ++-- .github/workflows/codeql-analysis-java.yml | 6 +++--- .github/workflows/scorecards-analysis.yml | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/codeql-analysis-cpp.yml b/.github/workflows/codeql-analysis-cpp.yml index 61cba6e2..cc461f87 100644 --- a/.github/workflows/codeql-analysis-cpp.yml +++ b/.github/workflows/codeql-analysis-cpp.yml @@ -57,7 +57,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@f6e388ebf0efc915c6c5b165b019ee61a6746a38 # v2.20.1 + uses: github/codeql-action/init@46ed16ded91731b2df79a2893d3aea8e9f03b5c4 # v2.20.3 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -86,4 +86,4 @@ jobs: make - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@f6e388ebf0efc915c6c5b165b019ee61a6746a38 # v2.20.1 + uses: github/codeql-action/analyze@46ed16ded91731b2df79a2893d3aea8e9f03b5c4 # v2.20.3 diff --git a/.github/workflows/codeql-analysis-java.yml b/.github/workflows/codeql-analysis-java.yml index bca3b119..4297910c 100644 --- a/.github/workflows/codeql-analysis-java.yml +++ b/.github/workflows/codeql-analysis-java.yml @@ -57,7 +57,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@f6e388ebf0efc915c6c5b165b019ee61a6746a38 # v2.20.1 + uses: github/codeql-action/init@46ed16ded91731b2df79a2893d3aea8e9f03b5c4 # v2.20.3 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -68,7 +68,7 @@ jobs: # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). # If this step fails, then you should remove it and run the build manually (see below) - name: Autobuild - uses: github/codeql-action/autobuild@f6e388ebf0efc915c6c5b165b019ee61a6746a38 # v2.20.1 + uses: github/codeql-action/autobuild@46ed16ded91731b2df79a2893d3aea8e9f03b5c4 # v2.20.3 # ℹī¸ Command-line programs to run using the OS shell. # 📚 https://git.io/JvXDl @@ -82,4 +82,4 @@ jobs: # make release - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@f6e388ebf0efc915c6c5b165b019ee61a6746a38 # v2.20.1 + uses: github/codeql-action/analyze@46ed16ded91731b2df79a2893d3aea8e9f03b5c4 # v2.20.3 diff --git a/.github/workflows/scorecards-analysis.yml b/.github/workflows/scorecards-analysis.yml index 3834d300..eba354fe 100644 --- a/.github/workflows/scorecards-analysis.yml +++ b/.github/workflows/scorecards-analysis.yml @@ -64,6 +64,6 @@ jobs: retention-days: 5 - name: "Upload to code-scanning" - uses: github/codeql-action/upload-sarif@f6e388ebf0efc915c6c5b165b019ee61a6746a38 # 2.20.1 + uses: github/codeql-action/upload-sarif@46ed16ded91731b2df79a2893d3aea8e9f03b5c4 # 2.20.3 with: sarif_file: results.sarif From 9cdbe79ab9b24099f4fc5ad3f9fd8b194c24fcc5 Mon Sep 17 00:00:00 2001 From: Gary Gregory Date: Sat, 8 Jul 2023 09:22:32 -0400 Subject: [PATCH 070/298] Fix formatting --- src/samples/AloneService.java | 2 +- src/samples/ProcrunService.java | 4 ++-- src/samples/ServiceDaemon.java | 2 +- src/samples/SimpleApplication.java | 27 ++++++++++++--------------- src/samples/SimpleDaemon.java | 27 ++++++++++++--------------- 5 files changed, 28 insertions(+), 34 deletions(-) diff --git a/src/samples/AloneService.java b/src/samples/AloneService.java index 71dc5af9..f0188763 100644 --- a/src/samples/AloneService.java +++ b/src/samples/AloneService.java @@ -47,7 +47,7 @@ protected void finalize() { */ public void init(String[] arguments) throws Exception { /* Set the err */ - System.setErr(new PrintStream(new FileOutputStream("/ServiceDaemon.err",true))); + System.setErr(new PrintStream(new FileOutputStream("/ServiceDaemon.err", true))); System.err.println("ServiceDaemon: instance "+this.hashCode()+ " init"); diff --git a/src/samples/ProcrunService.java b/src/samples/ProcrunService.java index 8dda938d..3497a88c 100644 --- a/src/samples/ProcrunService.java +++ b/src/samples/ProcrunService.java @@ -191,8 +191,8 @@ private static void startThread(String waitParam, File file) { if (waitParam != null) { wait = Integer.valueOf(waitParam).intValue(); } - log("Starting the thread, wait(seconds): "+wait); - thrd = new Thread(new ProcrunService(wait*MS_PER_SEC,file)); + log("Starting the thread, wait(seconds): " + wait); + thrd = new Thread(new ProcrunService(wait * MS_PER_SEC, file)); thrd.start(); } diff --git a/src/samples/ServiceDaemon.java b/src/samples/ServiceDaemon.java index d6905212..87894f28 100644 --- a/src/samples/ServiceDaemon.java +++ b/src/samples/ServiceDaemon.java @@ -52,7 +52,7 @@ protected void finalize() { public void init(DaemonContext context) throws Exception { /* Set the err */ - System.setErr(new PrintStream(new FileOutputStream(new File("ServiceDaemon.err")),true)); + System.setErr(new PrintStream(new FileOutputStream(new File("ServiceDaemon.err")), true)); System.err.println("ServiceDaemon: instance "+this.hashCode()+ " init"); diff --git a/src/samples/SimpleApplication.java b/src/samples/SimpleApplication.java index 057dbc65..697c9339 100644 --- a/src/samples/SimpleApplication.java +++ b/src/samples/SimpleApplication.java @@ -124,9 +124,9 @@ public void run() System.err.println("SimpleApplication: started acceptor loop"); try { - while(!this.stopping) { - Socket socket=this.server.accept(); - Handler handler=new Handler(socket,this); + while (!this.stopping) { + Socket socket = this.server.accept(); + Handler handler = new Handler(socket, this); handler.setConnectionNumber(number++); handler.setDirectoryName(this.directory); new Thread(handler).start(); @@ -198,18 +198,16 @@ public Handler(Socket s, SimpleApplication p) { @Override public void run() { this.parent.addHandler(this); - System.err.println("SimpleApplication: connection "+this.number+ - " opened from "+this.socket.getInetAddress()); + System.err.println("SimpleApplication: connection " + this.number + " opened from " + this.socket.getInetAddress()); try { - InputStream in=this.socket.getInputStream(); - OutputStream out=this.socket.getOutputStream(); - handle(in,out); + InputStream in = this.socket.getInputStream(); + OutputStream out = this.socket.getOutputStream(); + handle(in, out); this.socket.close(); } catch (IOException e) { e.printStackTrace(System.err); } - System.err.println("SimpleApplication: connection "+this.number+ - " closed"); + System.err.println("SimpleApplication: connection " + this.number + " closed"); this.parent.removeHandler(this); } @@ -237,11 +235,10 @@ public String getDirectoryName() { return(this.directory); } - public void createFile(String name) - throws IOException { - OutputStream file=new FileOutputStream(name,true); - PrintStream out=new PrintStream(file); - SimpleDateFormat fmt=new SimpleDateFormat(); + public void createFile(String name) throws IOException { + OutputStream file = new FileOutputStream(name, true); + PrintStream out = new PrintStream(file); + SimpleDateFormat fmt = new SimpleDateFormat(); out.println(fmt.format(new Date())); out.close(); diff --git a/src/samples/SimpleDaemon.java b/src/samples/SimpleDaemon.java index 2727e4f6..63757f4b 100644 --- a/src/samples/SimpleDaemon.java +++ b/src/samples/SimpleDaemon.java @@ -125,9 +125,9 @@ public void run() { System.err.println("SimpleDaemon: started acceptor loop"); try { - while(!this.stopping) { - Socket socket=this.server.accept(); - Handler handler=new Handler(socket,this,this.controller); + while (!this.stopping) { + Socket socket = this.server.accept(); + Handler handler = new Handler(socket, this, this.controller); handler.setConnectionNumber(number++); handler.setDirectoryName(this.directory); new Thread(handler).start(); @@ -180,18 +180,16 @@ public Handler(Socket s, SimpleDaemon p, DaemonController c) { @Override public void run() { this.parent.addHandler(this); - System.err.println("SimpleDaemon: connection "+this.number+ - " opened from "+this.socket.getInetAddress()); + System.err.println("SimpleDaemon: connection " + this.number + " opened from " + this.socket.getInetAddress()); try { - InputStream in=this.socket.getInputStream(); - OutputStream out=this.socket.getOutputStream(); - handle(in,out); + InputStream in = this.socket.getInputStream(); + OutputStream out = this.socket.getOutputStream(); + handle(in, out); this.socket.close(); } catch (IOException e) { e.printStackTrace(System.err); } - System.err.println("SimpleDaemon: connection "+this.number+ - " closed"); + System.err.println("SimpleDaemon: connection " + this.number + " closed"); this.parent.removeHandler(this); } @@ -219,11 +217,10 @@ public String getDirectoryName() { return(this.directory); } - public void createFile(String name) - throws IOException { - OutputStream file=new FileOutputStream(name,true); - PrintStream out=new PrintStream(file); - SimpleDateFormat fmt=new SimpleDateFormat(); + public void createFile(String name) throws IOException { + OutputStream file = new FileOutputStream(name, true); + PrintStream out = new PrintStream(file); + SimpleDateFormat fmt = new SimpleDateFormat(); out.println(fmt.format(new Date())); out.close(); From f674283615421c3aea6e54d28c28d7ed58b82428 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 14 Jul 2023 13:21:34 -0400 Subject: [PATCH 071/298] Bump github/codeql-action from 2.20.3 to 2.20.4 (#99) Bumps [github/codeql-action](https://github.com/github/codeql-action) from 2.20.3 to 2.20.4. - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/46ed16ded91731b2df79a2893d3aea8e9f03b5c4...489225d82a57396c6f426a40e66d461b16b3461d) --- updated-dependencies: - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/codeql-analysis-cpp.yml | 4 ++-- .github/workflows/codeql-analysis-java.yml | 6 +++--- .github/workflows/scorecards-analysis.yml | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/codeql-analysis-cpp.yml b/.github/workflows/codeql-analysis-cpp.yml index cc461f87..6611222a 100644 --- a/.github/workflows/codeql-analysis-cpp.yml +++ b/.github/workflows/codeql-analysis-cpp.yml @@ -57,7 +57,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@46ed16ded91731b2df79a2893d3aea8e9f03b5c4 # v2.20.3 + uses: github/codeql-action/init@489225d82a57396c6f426a40e66d461b16b3461d # v2.20.4 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -86,4 +86,4 @@ jobs: make - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@46ed16ded91731b2df79a2893d3aea8e9f03b5c4 # v2.20.3 + uses: github/codeql-action/analyze@489225d82a57396c6f426a40e66d461b16b3461d # v2.20.4 diff --git a/.github/workflows/codeql-analysis-java.yml b/.github/workflows/codeql-analysis-java.yml index 4297910c..0c81d6d5 100644 --- a/.github/workflows/codeql-analysis-java.yml +++ b/.github/workflows/codeql-analysis-java.yml @@ -57,7 +57,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@46ed16ded91731b2df79a2893d3aea8e9f03b5c4 # v2.20.3 + uses: github/codeql-action/init@489225d82a57396c6f426a40e66d461b16b3461d # v2.20.4 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -68,7 +68,7 @@ jobs: # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). # If this step fails, then you should remove it and run the build manually (see below) - name: Autobuild - uses: github/codeql-action/autobuild@46ed16ded91731b2df79a2893d3aea8e9f03b5c4 # v2.20.3 + uses: github/codeql-action/autobuild@489225d82a57396c6f426a40e66d461b16b3461d # v2.20.4 # ℹī¸ Command-line programs to run using the OS shell. # 📚 https://git.io/JvXDl @@ -82,4 +82,4 @@ jobs: # make release - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@46ed16ded91731b2df79a2893d3aea8e9f03b5c4 # v2.20.3 + uses: github/codeql-action/analyze@489225d82a57396c6f426a40e66d461b16b3461d # v2.20.4 diff --git a/.github/workflows/scorecards-analysis.yml b/.github/workflows/scorecards-analysis.yml index eba354fe..62e2afb0 100644 --- a/.github/workflows/scorecards-analysis.yml +++ b/.github/workflows/scorecards-analysis.yml @@ -64,6 +64,6 @@ jobs: retention-days: 5 - name: "Upload to code-scanning" - uses: github/codeql-action/upload-sarif@46ed16ded91731b2df79a2893d3aea8e9f03b5c4 # 2.20.3 + uses: github/codeql-action/upload-sarif@489225d82a57396c6f426a40e66d461b16b3461d # 2.20.4 with: sarif_file: results.sarif From 8b2b05b49f5b017cdfe19d060639ed57a621f326 Mon Sep 17 00:00:00 2001 From: Gary Gregory Date: Sun, 16 Jul 2023 11:45:39 -0400 Subject: [PATCH 072/298] Use HTTPS --- NOTICE.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NOTICE.txt b/NOTICE.txt index d6491d7d..14cb46cc 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -2,4 +2,4 @@ Apache Commons Daemon Copyright 1999-2023 The Apache Software Foundation This product includes software developed by -The Apache Software Foundation (http://www.apache.org/). +The Apache Software Foundation (https://www.apache.org/). From 8023d9a0ea6aa47ea926d199eef59d8dfe853f4b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 21 Jul 2023 13:04:47 -0400 Subject: [PATCH 073/298] Bump github/codeql-action from 2.20.4 to 2.21.0 (#100) Bumps [github/codeql-action](https://github.com/github/codeql-action) from 2.20.4 to 2.21.0. - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/489225d82a57396c6f426a40e66d461b16b3461d...1813ca74c3faaa3a2da2070b9b8a0b3e7373a0d8) --- updated-dependencies: - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/codeql-analysis-cpp.yml | 4 ++-- .github/workflows/codeql-analysis-java.yml | 6 +++--- .github/workflows/scorecards-analysis.yml | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/codeql-analysis-cpp.yml b/.github/workflows/codeql-analysis-cpp.yml index 6611222a..033491be 100644 --- a/.github/workflows/codeql-analysis-cpp.yml +++ b/.github/workflows/codeql-analysis-cpp.yml @@ -57,7 +57,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@489225d82a57396c6f426a40e66d461b16b3461d # v2.20.4 + uses: github/codeql-action/init@1813ca74c3faaa3a2da2070b9b8a0b3e7373a0d8 # v2.21.0 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -86,4 +86,4 @@ jobs: make - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@489225d82a57396c6f426a40e66d461b16b3461d # v2.20.4 + uses: github/codeql-action/analyze@1813ca74c3faaa3a2da2070b9b8a0b3e7373a0d8 # v2.21.0 diff --git a/.github/workflows/codeql-analysis-java.yml b/.github/workflows/codeql-analysis-java.yml index 0c81d6d5..6f37235c 100644 --- a/.github/workflows/codeql-analysis-java.yml +++ b/.github/workflows/codeql-analysis-java.yml @@ -57,7 +57,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@489225d82a57396c6f426a40e66d461b16b3461d # v2.20.4 + uses: github/codeql-action/init@1813ca74c3faaa3a2da2070b9b8a0b3e7373a0d8 # v2.21.0 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -68,7 +68,7 @@ jobs: # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). # If this step fails, then you should remove it and run the build manually (see below) - name: Autobuild - uses: github/codeql-action/autobuild@489225d82a57396c6f426a40e66d461b16b3461d # v2.20.4 + uses: github/codeql-action/autobuild@1813ca74c3faaa3a2da2070b9b8a0b3e7373a0d8 # v2.21.0 # ℹī¸ Command-line programs to run using the OS shell. # 📚 https://git.io/JvXDl @@ -82,4 +82,4 @@ jobs: # make release - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@489225d82a57396c6f426a40e66d461b16b3461d # v2.20.4 + uses: github/codeql-action/analyze@1813ca74c3faaa3a2da2070b9b8a0b3e7373a0d8 # v2.21.0 diff --git a/.github/workflows/scorecards-analysis.yml b/.github/workflows/scorecards-analysis.yml index 62e2afb0..b0892baa 100644 --- a/.github/workflows/scorecards-analysis.yml +++ b/.github/workflows/scorecards-analysis.yml @@ -64,6 +64,6 @@ jobs: retention-days: 5 - name: "Upload to code-scanning" - uses: github/codeql-action/upload-sarif@489225d82a57396c6f426a40e66d461b16b3461d # 2.20.4 + uses: github/codeql-action/upload-sarif@1813ca74c3faaa3a2da2070b9b8a0b3e7373a0d8 # 2.21.0 with: sarif_file: results.sarif From 3c91663c0804179e345a1cdc24e6bad8aca07371 Mon Sep 17 00:00:00 2001 From: Gary Gregory Date: Sat, 22 Jul 2023 16:17:26 -0400 Subject: [PATCH 074/298] Normalize spelling --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 69a311c5..a92c3e3b 100644 --- a/README.md +++ b/README.md @@ -91,7 +91,7 @@ You can learn more about contributing via GitHub in our [contribution guidelines License ------- -This code is under the [Apache Licence v2](https://www.apache.org/licenses/LICENSE-2.0). +This code is under the [Apache License v2](https://www.apache.org/licenses/LICENSE-2.0). See the `NOTICE.txt` file for required notices and attributions. From aa0551a6ef31f25ab7c937e902535c79cd7dc466 Mon Sep 17 00:00:00 2001 From: Gary Gregory Date: Fri, 28 Jul 2023 10:11:48 -0400 Subject: [PATCH 075/298] Bump commons-parent from 58 to 59 --- pom.xml | 2 +- src/changes/changes.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 7f5a9aca..a21a048b 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ org.apache.commons commons-parent - 58 + 59 4.0.0 commons-daemon diff --git a/src/changes/changes.xml b/src/changes/changes.xml index 5a9d15a3..61214b34 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -48,7 +48,7 @@ - Bump commons-parent from 57 to 58 (#93) #132. + Bump commons-parent from 57 to 59 (#93) #132. From 7c72b98018cff96903e1e388130770c142f2e178 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 28 Jul 2023 13:31:24 -0400 Subject: [PATCH 076/298] Bump actions/setup-java from 3.11.0 to 3.12.0 (#101) Bumps [actions/setup-java](https://github.com/actions/setup-java) from 3.11.0 to 3.12.0. - [Release notes](https://github.com/actions/setup-java/releases) - [Commits](https://github.com/actions/setup-java/compare/5ffc13f4174014e2d4d4572b3d74c3fa61aeb2c2...cd89f46ac9d01407894225f350157564c9c7cee2) --- updated-dependencies: - dependency-name: actions/setup-java dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/coverage.yml | 2 +- .github/workflows/maven.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index d984e1f3..a55c9bea 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -39,7 +39,7 @@ jobs: restore-keys: | ${{ runner.os }}-maven- - name: Set up JDK ${{ matrix.java }} - uses: actions/setup-java@5ffc13f4174014e2d4d4572b3d74c3fa61aeb2c2 # v3.11.0 + uses: actions/setup-java@cd89f46ac9d01407894225f350157564c9c7cee2 # v3.12.0 with: distribution: 'temurin' java-version: ${{ matrix.java }} diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 4c3605b7..fb81aa06 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -45,7 +45,7 @@ jobs: restore-keys: | ${{ runner.os }}-maven- - name: Set up JDK ${{ matrix.java }} - uses: actions/setup-java@5ffc13f4174014e2d4d4572b3d74c3fa61aeb2c2 # v3.11.0 + uses: actions/setup-java@cd89f46ac9d01407894225f350157564c9c7cee2 # v3.12.0 with: distribution: 'temurin' java-version: ${{ matrix.java }} From f5890b102402b1706beac4ad65db63cac383d275 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 28 Jul 2023 13:31:40 -0400 Subject: [PATCH 077/298] Bump github/codeql-action from 2.21.0 to 2.21.2 (#102) Bumps [github/codeql-action](https://github.com/github/codeql-action) from 2.21.0 to 2.21.2. - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/1813ca74c3faaa3a2da2070b9b8a0b3e7373a0d8...0ba4244466797eb048eb91a6cd43d5c03ca8bd05) --- updated-dependencies: - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/codeql-analysis-cpp.yml | 4 ++-- .github/workflows/codeql-analysis-java.yml | 6 +++--- .github/workflows/scorecards-analysis.yml | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/codeql-analysis-cpp.yml b/.github/workflows/codeql-analysis-cpp.yml index 033491be..7aa2fb48 100644 --- a/.github/workflows/codeql-analysis-cpp.yml +++ b/.github/workflows/codeql-analysis-cpp.yml @@ -57,7 +57,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@1813ca74c3faaa3a2da2070b9b8a0b3e7373a0d8 # v2.21.0 + uses: github/codeql-action/init@0ba4244466797eb048eb91a6cd43d5c03ca8bd05 # v2.21.2 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -86,4 +86,4 @@ jobs: make - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@1813ca74c3faaa3a2da2070b9b8a0b3e7373a0d8 # v2.21.0 + uses: github/codeql-action/analyze@0ba4244466797eb048eb91a6cd43d5c03ca8bd05 # v2.21.2 diff --git a/.github/workflows/codeql-analysis-java.yml b/.github/workflows/codeql-analysis-java.yml index 6f37235c..5c88117e 100644 --- a/.github/workflows/codeql-analysis-java.yml +++ b/.github/workflows/codeql-analysis-java.yml @@ -57,7 +57,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@1813ca74c3faaa3a2da2070b9b8a0b3e7373a0d8 # v2.21.0 + uses: github/codeql-action/init@0ba4244466797eb048eb91a6cd43d5c03ca8bd05 # v2.21.2 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -68,7 +68,7 @@ jobs: # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). # If this step fails, then you should remove it and run the build manually (see below) - name: Autobuild - uses: github/codeql-action/autobuild@1813ca74c3faaa3a2da2070b9b8a0b3e7373a0d8 # v2.21.0 + uses: github/codeql-action/autobuild@0ba4244466797eb048eb91a6cd43d5c03ca8bd05 # v2.21.2 # ℹī¸ Command-line programs to run using the OS shell. # 📚 https://git.io/JvXDl @@ -82,4 +82,4 @@ jobs: # make release - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@1813ca74c3faaa3a2da2070b9b8a0b3e7373a0d8 # v2.21.0 + uses: github/codeql-action/analyze@0ba4244466797eb048eb91a6cd43d5c03ca8bd05 # v2.21.2 diff --git a/.github/workflows/scorecards-analysis.yml b/.github/workflows/scorecards-analysis.yml index b0892baa..ca0d5970 100644 --- a/.github/workflows/scorecards-analysis.yml +++ b/.github/workflows/scorecards-analysis.yml @@ -64,6 +64,6 @@ jobs: retention-days: 5 - name: "Upload to code-scanning" - uses: github/codeql-action/upload-sarif@1813ca74c3faaa3a2da2070b9b8a0b3e7373a0d8 # 2.21.0 + uses: github/codeql-action/upload-sarif@0ba4244466797eb048eb91a6cd43d5c03ca8bd05 # 2.21.2 with: sarif_file: results.sarif From aa381b6ae080adf963a3f64c18e0dbe21cbcf857 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 11 Aug 2023 12:41:07 -0400 Subject: [PATCH 078/298] Bump github/codeql-action from 2.21.2 to 2.21.3 (#103) Bumps [github/codeql-action](https://github.com/github/codeql-action) from 2.21.2 to 2.21.3. - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/0ba4244466797eb048eb91a6cd43d5c03ca8bd05...5b6282e01c62d02e720b81eb8a51204f527c3624) --- updated-dependencies: - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/codeql-analysis-cpp.yml | 4 ++-- .github/workflows/codeql-analysis-java.yml | 6 +++--- .github/workflows/scorecards-analysis.yml | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/codeql-analysis-cpp.yml b/.github/workflows/codeql-analysis-cpp.yml index 7aa2fb48..4046cd36 100644 --- a/.github/workflows/codeql-analysis-cpp.yml +++ b/.github/workflows/codeql-analysis-cpp.yml @@ -57,7 +57,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@0ba4244466797eb048eb91a6cd43d5c03ca8bd05 # v2.21.2 + uses: github/codeql-action/init@5b6282e01c62d02e720b81eb8a51204f527c3624 # v2.21.3 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -86,4 +86,4 @@ jobs: make - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@0ba4244466797eb048eb91a6cd43d5c03ca8bd05 # v2.21.2 + uses: github/codeql-action/analyze@5b6282e01c62d02e720b81eb8a51204f527c3624 # v2.21.3 diff --git a/.github/workflows/codeql-analysis-java.yml b/.github/workflows/codeql-analysis-java.yml index 5c88117e..4848cffc 100644 --- a/.github/workflows/codeql-analysis-java.yml +++ b/.github/workflows/codeql-analysis-java.yml @@ -57,7 +57,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@0ba4244466797eb048eb91a6cd43d5c03ca8bd05 # v2.21.2 + uses: github/codeql-action/init@5b6282e01c62d02e720b81eb8a51204f527c3624 # v2.21.3 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -68,7 +68,7 @@ jobs: # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). # If this step fails, then you should remove it and run the build manually (see below) - name: Autobuild - uses: github/codeql-action/autobuild@0ba4244466797eb048eb91a6cd43d5c03ca8bd05 # v2.21.2 + uses: github/codeql-action/autobuild@5b6282e01c62d02e720b81eb8a51204f527c3624 # v2.21.3 # ℹī¸ Command-line programs to run using the OS shell. # 📚 https://git.io/JvXDl @@ -82,4 +82,4 @@ jobs: # make release - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@0ba4244466797eb048eb91a6cd43d5c03ca8bd05 # v2.21.2 + uses: github/codeql-action/analyze@5b6282e01c62d02e720b81eb8a51204f527c3624 # v2.21.3 diff --git a/.github/workflows/scorecards-analysis.yml b/.github/workflows/scorecards-analysis.yml index ca0d5970..999dfca1 100644 --- a/.github/workflows/scorecards-analysis.yml +++ b/.github/workflows/scorecards-analysis.yml @@ -64,6 +64,6 @@ jobs: retention-days: 5 - name: "Upload to code-scanning" - uses: github/codeql-action/upload-sarif@0ba4244466797eb048eb91a6cd43d5c03ca8bd05 # 2.21.2 + uses: github/codeql-action/upload-sarif@5b6282e01c62d02e720b81eb8a51204f527c3624 # 2.21.3 with: sarif_file: results.sarif From 5cfb8a5b415ff433dda4c200ab92be77beef72d0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 18 Aug 2023 13:53:00 -0400 Subject: [PATCH 079/298] Bump github/codeql-action from 2.21.3 to 2.21.4 (#104) Bumps [github/codeql-action](https://github.com/github/codeql-action) from 2.21.3 to 2.21.4. - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/5b6282e01c62d02e720b81eb8a51204f527c3624...a09933a12a80f87b87005513f0abb1494c27a716) --- updated-dependencies: - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/codeql-analysis-cpp.yml | 4 ++-- .github/workflows/codeql-analysis-java.yml | 6 +++--- .github/workflows/scorecards-analysis.yml | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/codeql-analysis-cpp.yml b/.github/workflows/codeql-analysis-cpp.yml index 4046cd36..7d8d37fa 100644 --- a/.github/workflows/codeql-analysis-cpp.yml +++ b/.github/workflows/codeql-analysis-cpp.yml @@ -57,7 +57,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@5b6282e01c62d02e720b81eb8a51204f527c3624 # v2.21.3 + uses: github/codeql-action/init@a09933a12a80f87b87005513f0abb1494c27a716 # v2.21.4 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -86,4 +86,4 @@ jobs: make - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@5b6282e01c62d02e720b81eb8a51204f527c3624 # v2.21.3 + uses: github/codeql-action/analyze@a09933a12a80f87b87005513f0abb1494c27a716 # v2.21.4 diff --git a/.github/workflows/codeql-analysis-java.yml b/.github/workflows/codeql-analysis-java.yml index 4848cffc..4b948ffc 100644 --- a/.github/workflows/codeql-analysis-java.yml +++ b/.github/workflows/codeql-analysis-java.yml @@ -57,7 +57,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@5b6282e01c62d02e720b81eb8a51204f527c3624 # v2.21.3 + uses: github/codeql-action/init@a09933a12a80f87b87005513f0abb1494c27a716 # v2.21.4 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -68,7 +68,7 @@ jobs: # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). # If this step fails, then you should remove it and run the build manually (see below) - name: Autobuild - uses: github/codeql-action/autobuild@5b6282e01c62d02e720b81eb8a51204f527c3624 # v2.21.3 + uses: github/codeql-action/autobuild@a09933a12a80f87b87005513f0abb1494c27a716 # v2.21.4 # ℹī¸ Command-line programs to run using the OS shell. # 📚 https://git.io/JvXDl @@ -82,4 +82,4 @@ jobs: # make release - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@5b6282e01c62d02e720b81eb8a51204f527c3624 # v2.21.3 + uses: github/codeql-action/analyze@a09933a12a80f87b87005513f0abb1494c27a716 # v2.21.4 diff --git a/.github/workflows/scorecards-analysis.yml b/.github/workflows/scorecards-analysis.yml index 999dfca1..a96099e6 100644 --- a/.github/workflows/scorecards-analysis.yml +++ b/.github/workflows/scorecards-analysis.yml @@ -64,6 +64,6 @@ jobs: retention-days: 5 - name: "Upload to code-scanning" - uses: github/codeql-action/upload-sarif@5b6282e01c62d02e720b81eb8a51204f527c3624 # 2.21.3 + uses: github/codeql-action/upload-sarif@a09933a12a80f87b87005513f0abb1494c27a716 # 2.21.4 with: sarif_file: results.sarif From 902aab4609ffe555613355deb2dc4815d22c16ff Mon Sep 17 00:00:00 2001 From: Gary Gregory Date: Mon, 21 Aug 2023 17:14:06 -0400 Subject: [PATCH 080/298] Don't initialize instance variable to their default values Fix formatting --- src/samples/SimpleDaemon.java | 64 +++++++++++++++++------------------ 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/src/samples/SimpleDaemon.java b/src/samples/SimpleDaemon.java index 63757f4b..b7810300 100644 --- a/src/samples/SimpleDaemon.java +++ b/src/samples/SimpleDaemon.java @@ -36,11 +36,11 @@ public class SimpleDaemon implements Daemon, Runnable { - private ServerSocket server=null; - private Thread thread=null; - private DaemonController controller=null; - private volatile boolean stopping=false; - private String directory=null; + private ServerSocket server; + private Thread thread; + private DaemonController controller; + private volatile boolean stopping; + private String directory; private final Vector handlers; public static native void toto(); @@ -63,30 +63,30 @@ protected void finalize() { */ @Override public void init(DaemonContext context) - throws Exception { - System.err.println("SimpleDaemon: instance "+this.hashCode()+ - " init"); + throws Exception { + System.err.println("SimpleDaemon: instance " + this.hashCode() + " init"); - int port=1200; + int port = 1200; String[] a = context.getArguments(); try { - if ( a.length > 0) - port=Integer.parseInt(a[0]); - } - catch (NumberFormatException ex) { + if (a.length > 0) + port = Integer.parseInt(a[0]); + } catch (NumberFormatException ex) { throw new DaemonInitException("parsing port", ex); } - if (a.length>1) this.directory=a[1]; - else this.directory="/tmp"; + if (a.length > 1) + this.directory = a[1]; + else + this.directory = "/tmp"; /* Dump a message */ - System.err.println("SimpleDaemon: loading on port "+port); + System.err.println("SimpleDaemon: loading on port " + port); /* Set up this simple daemon */ - this.controller=context.getController(); - this.server=new ServerSocket(port); - this.thread=new Thread(this); + this.controller = context.getController(); + this.server = new ServerSocket(port); + this.thread = new Thread(this); } @Override @@ -105,7 +105,7 @@ public void stop() System.err.println("SimpleDaemon: stopping"); /* Close the ServerSocket. This will make our thread to terminate */ - this.stopping=true; + this.stopping = true; this.server.close(); /* Wait for the main thread to exit and dump a message */ @@ -166,15 +166,15 @@ public static class Handler implements Runnable { private final DaemonController controller; private final SimpleDaemon parent; - private String directory=null; // Only set before thread is started + private String directory; // Only set before thread is started private final Socket socket; - private int number=0; // Only set before thread is started + private int number; // Only set before thread is started public Handler(Socket s, SimpleDaemon p, DaemonController c) { super(); - this.socket=s; - this.parent=p; - this.controller=c; + this.socket = s; + this.parent = p; + this.controller = c; } @Override @@ -210,7 +210,7 @@ public int getConnectionNumber() { } public void setDirectoryName(String directory) { - this.directory=directory; + this.directory = directory; } public String getDirectoryName() { @@ -231,24 +231,24 @@ public void createDir(String name) throws IOException { File file = new File(name); boolean ok = file.mkdirs(); - if(! ok) + if (!ok) throw new IOException("mkdirs for "+name+" failed"); createFile(name); } public void handle(InputStream in, OutputStream os) { - PrintStream out=null; + PrintStream out = null; try { - out=new PrintStream(os, true, "US-ASCII"); + out = new PrintStream(os, true, "US-ASCII"); } catch (UnsupportedEncodingException ex) { - out=new PrintStream(os, true); + out = new PrintStream(os, true); } while(true) { try { /* If we don't have data in the System InputStream, we want to ask to the user for an option. */ - if (in.available()==0) { + if (in.available() == 0) { out.println(); out.println("Please select one of the following:"); out.println(" 1) Shutdown"); @@ -261,7 +261,7 @@ public void handle(InputStream in, OutputStream os) { } /* Read an option from the client */ - int x=in.read(); + int x = in.read(); switch (x) { /* If the socket was closed, we simply return */ From a5d58578ea31959a78ba808cafe38047ae60b525 Mon Sep 17 00:00:00 2001 From: Gary Gregory Date: Tue, 22 Aug 2023 11:02:13 -0400 Subject: [PATCH 081/298] Fix formatting --- src/samples/SimpleApplication.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/samples/SimpleApplication.java b/src/samples/SimpleApplication.java index 697c9339..6876c9cb 100644 --- a/src/samples/SimpleApplication.java +++ b/src/samples/SimpleApplication.java @@ -249,7 +249,7 @@ public void createDir(String name) throws IOException { File file = new File(name); boolean ok = file.mkdirs(); - if(! ok) + if (!ok) throw new IOException("mkdirs for "+name+" failed"); createFile(name); } From 5b145734d7c2b9adb091c3bc42cd85bbc280a7da Mon Sep 17 00:00:00 2001 From: Gary Gregory Date: Wed, 23 Aug 2023 08:43:08 -0400 Subject: [PATCH 082/298] Normalize array type declarations --- src/samples/AloneService.java | 6 +++--- src/samples/ServiceDaemon.java | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/samples/AloneService.java b/src/samples/AloneService.java index f0188763..4defe6d3 100644 --- a/src/samples/AloneService.java +++ b/src/samples/AloneService.java @@ -28,9 +28,9 @@ public class AloneService { private Properties prop = null; - private Process proc[] = null; - private ServiceDaemonReadThread readout[] = null; - private ServiceDaemonReadThread readerr[] = null; + private Process[] proc = null; + private ServiceDaemonReadThread[] readout = null; + private ServiceDaemonReadThread[] readerr = null; @Override protected void finalize() { diff --git a/src/samples/ServiceDaemon.java b/src/samples/ServiceDaemon.java index 87894f28..b7f8f4dc 100644 --- a/src/samples/ServiceDaemon.java +++ b/src/samples/ServiceDaemon.java @@ -29,9 +29,9 @@ public class ServiceDaemon implements Daemon { private Properties prop = null; - private Process proc[] = null; - private ServiceDaemonReadThread readout[] = null; - private ServiceDaemonReadThread readerr[] = null; + private Process[] proc = null; + private ServiceDaemonReadThread[] readout = null; + private ServiceDaemonReadThread[] readerr = null; public ServiceDaemon() { super(); From 966cbe454869fce3b8e3841fa1a45ff867df403e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 25 Aug 2023 12:35:28 -0400 Subject: [PATCH 083/298] Bump actions/checkout from 3.5.3 to 3.6.0 (#105) Bumps [actions/checkout](https://github.com/actions/checkout) from 3.5.3 to 3.6.0. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/c85c95e3d7251135ab7dc9ce3241c5835cc595a9...f43a0e5ff2bd294095638e18286ca9a3d1956744) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/codeql-analysis-cpp.yml | 2 +- .github/workflows/codeql-analysis-java.yml | 2 +- .github/workflows/coverage.yml | 2 +- .github/workflows/maven.yml | 2 +- .github/workflows/scorecards-analysis.yml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/codeql-analysis-cpp.yml b/.github/workflows/codeql-analysis-cpp.yml index 7d8d37fa..687b056d 100644 --- a/.github/workflows/codeql-analysis-cpp.yml +++ b/.github/workflows/codeql-analysis-cpp.yml @@ -45,7 +45,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3 + uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0 with: persist-credentials: false - uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1 diff --git a/.github/workflows/codeql-analysis-java.yml b/.github/workflows/codeql-analysis-java.yml index 4b948ffc..6b93fa9a 100644 --- a/.github/workflows/codeql-analysis-java.yml +++ b/.github/workflows/codeql-analysis-java.yml @@ -45,7 +45,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3 + uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0 with: persist-credentials: false - uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1 diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index a55c9bea..56904c6f 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -29,7 +29,7 @@ jobs: java: [ 8 ] steps: - - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3 + - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0 with: persist-credentials: false - uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1 diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index fb81aa06..17a609e9 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -35,7 +35,7 @@ jobs: # experimental: true steps: - - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3 + - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0 with: persist-credentials: false - uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1 diff --git a/.github/workflows/scorecards-analysis.yml b/.github/workflows/scorecards-analysis.yml index a96099e6..f97d3d3e 100644 --- a/.github/workflows/scorecards-analysis.yml +++ b/.github/workflows/scorecards-analysis.yml @@ -40,7 +40,7 @@ jobs: steps: - name: "Checkout code" - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3 + uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0 with: persist-credentials: false From cf284220a0c4cf0ecde3ed892bb5b369fbd3f6bb Mon Sep 17 00:00:00 2001 From: Gary Gregory Date: Wed, 30 Aug 2023 12:11:58 -0400 Subject: [PATCH 084/298] Bump commons-parent from 59 to 61 --- pom.xml | 2 +- src/changes/changes.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index a21a048b..ac957129 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ org.apache.commons commons-parent - 59 + 61 4.0.0 commons-daemon diff --git a/src/changes/changes.xml b/src/changes/changes.xml index 61214b34..43a1a385 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -48,7 +48,7 @@ - Bump commons-parent from 57 to 59 (#93) #132. + Bump commons-parent from 57 to 61 (#93) #132. From 44604e08ae102b0acb4876eddc58c984ae5475ab Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 1 Sep 2023 13:55:53 -0400 Subject: [PATCH 085/298] Bump github/codeql-action from 2.21.4 to 2.21.5 (#106) Bumps [github/codeql-action](https://github.com/github/codeql-action) from 2.21.4 to 2.21.5. - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/a09933a12a80f87b87005513f0abb1494c27a716...00e563ead9f72a8461b24876bee2d0c2e8bd2ee8) --- updated-dependencies: - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/codeql-analysis-cpp.yml | 4 ++-- .github/workflows/codeql-analysis-java.yml | 6 +++--- .github/workflows/scorecards-analysis.yml | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/codeql-analysis-cpp.yml b/.github/workflows/codeql-analysis-cpp.yml index 687b056d..a1d7ebb7 100644 --- a/.github/workflows/codeql-analysis-cpp.yml +++ b/.github/workflows/codeql-analysis-cpp.yml @@ -57,7 +57,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@a09933a12a80f87b87005513f0abb1494c27a716 # v2.21.4 + uses: github/codeql-action/init@00e563ead9f72a8461b24876bee2d0c2e8bd2ee8 # v2.21.5 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -86,4 +86,4 @@ jobs: make - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@a09933a12a80f87b87005513f0abb1494c27a716 # v2.21.4 + uses: github/codeql-action/analyze@00e563ead9f72a8461b24876bee2d0c2e8bd2ee8 # v2.21.5 diff --git a/.github/workflows/codeql-analysis-java.yml b/.github/workflows/codeql-analysis-java.yml index 6b93fa9a..83282ff2 100644 --- a/.github/workflows/codeql-analysis-java.yml +++ b/.github/workflows/codeql-analysis-java.yml @@ -57,7 +57,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@a09933a12a80f87b87005513f0abb1494c27a716 # v2.21.4 + uses: github/codeql-action/init@00e563ead9f72a8461b24876bee2d0c2e8bd2ee8 # v2.21.5 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -68,7 +68,7 @@ jobs: # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). # If this step fails, then you should remove it and run the build manually (see below) - name: Autobuild - uses: github/codeql-action/autobuild@a09933a12a80f87b87005513f0abb1494c27a716 # v2.21.4 + uses: github/codeql-action/autobuild@00e563ead9f72a8461b24876bee2d0c2e8bd2ee8 # v2.21.5 # ℹī¸ Command-line programs to run using the OS shell. # 📚 https://git.io/JvXDl @@ -82,4 +82,4 @@ jobs: # make release - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@a09933a12a80f87b87005513f0abb1494c27a716 # v2.21.4 + uses: github/codeql-action/analyze@00e563ead9f72a8461b24876bee2d0c2e8bd2ee8 # v2.21.5 diff --git a/.github/workflows/scorecards-analysis.yml b/.github/workflows/scorecards-analysis.yml index f97d3d3e..47677f3c 100644 --- a/.github/workflows/scorecards-analysis.yml +++ b/.github/workflows/scorecards-analysis.yml @@ -64,6 +64,6 @@ jobs: retention-days: 5 - name: "Upload to code-scanning" - uses: github/codeql-action/upload-sarif@a09933a12a80f87b87005513f0abb1494c27a716 # 2.21.4 + uses: github/codeql-action/upload-sarif@00e563ead9f72a8461b24876bee2d0c2e8bd2ee8 # 2.21.5 with: sarif_file: results.sarif From 4b94c8ad6af9949a960144bb94a09a496d686367 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 8 Sep 2023 12:26:45 -0400 Subject: [PATCH 086/298] Bump actions/cache from 3.3.1 to 3.3.2 (#107) Bumps [actions/cache](https://github.com/actions/cache) from 3.3.1 to 3.3.2. - [Release notes](https://github.com/actions/cache/releases) - [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md) - [Commits](https://github.com/actions/cache/compare/88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8...704facf57e6136b1bc63b828d79edcd491f0ee84) --- updated-dependencies: - dependency-name: actions/cache dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/codeql-analysis-cpp.yml | 2 +- .github/workflows/codeql-analysis-java.yml | 2 +- .github/workflows/coverage.yml | 2 +- .github/workflows/maven.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/codeql-analysis-cpp.yml b/.github/workflows/codeql-analysis-cpp.yml index a1d7ebb7..e602a1c5 100644 --- a/.github/workflows/codeql-analysis-cpp.yml +++ b/.github/workflows/codeql-analysis-cpp.yml @@ -48,7 +48,7 @@ jobs: uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0 with: persist-credentials: false - - uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1 + - uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2 with: path: ~/.m2/repository key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} diff --git a/.github/workflows/codeql-analysis-java.yml b/.github/workflows/codeql-analysis-java.yml index 83282ff2..2a2bbf3c 100644 --- a/.github/workflows/codeql-analysis-java.yml +++ b/.github/workflows/codeql-analysis-java.yml @@ -48,7 +48,7 @@ jobs: uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0 with: persist-credentials: false - - uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1 + - uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2 with: path: ~/.m2/repository key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index 56904c6f..9f9243c0 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -32,7 +32,7 @@ jobs: - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0 with: persist-credentials: false - - uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1 + - uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2 with: path: ~/.m2/repository key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 17a609e9..dd39e6ce 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -38,7 +38,7 @@ jobs: - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0 with: persist-credentials: false - - uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1 + - uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2 with: path: ~/.m2/repository key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} From db657909d8a8dc62b6094521dd132bf0d24667c6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 8 Sep 2023 12:26:58 -0400 Subject: [PATCH 087/298] Bump actions/upload-artifact from 3.1.2 to 3.1.3 (#109) Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 3.1.2 to 3.1.3. - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](https://github.com/actions/upload-artifact/compare/0b7f8abb1508181956e8e162db84b466c27e18ce...a8a3f3ad30e3422c9c7b888a15615d19a852ae32) --- updated-dependencies: - dependency-name: actions/upload-artifact dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/scorecards-analysis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/scorecards-analysis.yml b/.github/workflows/scorecards-analysis.yml index 47677f3c..7e06526f 100644 --- a/.github/workflows/scorecards-analysis.yml +++ b/.github/workflows/scorecards-analysis.yml @@ -57,7 +57,7 @@ jobs: publish_results: true - name: "Upload artifact" - uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # 3.1.0 + uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # 3.1.0 with: name: SARIF file path: results.sarif From 7362d81cd5d6cfd45d3ccb2d884195cfbb0b58b3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 8 Sep 2023 12:27:10 -0400 Subject: [PATCH 088/298] Bump actions/checkout from 3.6.0 to 4.0.0 (#108) Bumps [actions/checkout](https://github.com/actions/checkout) from 3.6.0 to 4.0.0. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/f43a0e5ff2bd294095638e18286ca9a3d1956744...3df4ab11eba7bda6032a0b82a6bb43b11571feac) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/codeql-analysis-cpp.yml | 2 +- .github/workflows/codeql-analysis-java.yml | 2 +- .github/workflows/coverage.yml | 2 +- .github/workflows/maven.yml | 2 +- .github/workflows/scorecards-analysis.yml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/codeql-analysis-cpp.yml b/.github/workflows/codeql-analysis-cpp.yml index e602a1c5..88927248 100644 --- a/.github/workflows/codeql-analysis-cpp.yml +++ b/.github/workflows/codeql-analysis-cpp.yml @@ -45,7 +45,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0 + uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0 with: persist-credentials: false - uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2 diff --git a/.github/workflows/codeql-analysis-java.yml b/.github/workflows/codeql-analysis-java.yml index 2a2bbf3c..c06f82bb 100644 --- a/.github/workflows/codeql-analysis-java.yml +++ b/.github/workflows/codeql-analysis-java.yml @@ -45,7 +45,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0 + uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0 with: persist-credentials: false - uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2 diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index 9f9243c0..a30b3529 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -29,7 +29,7 @@ jobs: java: [ 8 ] steps: - - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0 + - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0 with: persist-credentials: false - uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2 diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index dd39e6ce..851c4af3 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -35,7 +35,7 @@ jobs: # experimental: true steps: - - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0 + - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0 with: persist-credentials: false - uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2 diff --git a/.github/workflows/scorecards-analysis.yml b/.github/workflows/scorecards-analysis.yml index 7e06526f..b7912d35 100644 --- a/.github/workflows/scorecards-analysis.yml +++ b/.github/workflows/scorecards-analysis.yml @@ -40,7 +40,7 @@ jobs: steps: - name: "Checkout code" - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0 + uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0 with: persist-credentials: false From 0865926f3acf453ab49de8f5a6c54dd1a8045660 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 15 Sep 2023 12:12:10 -0400 Subject: [PATCH 089/298] Bump github/codeql-action from 2.21.5 to 2.21.7 (#110) Bumps [github/codeql-action](https://github.com/github/codeql-action) from 2.21.5 to 2.21.7. - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/00e563ead9f72a8461b24876bee2d0c2e8bd2ee8...04daf014b50eaf774287bf3f0f1869d4b4c4b913) --- updated-dependencies: - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/codeql-analysis-cpp.yml | 4 ++-- .github/workflows/codeql-analysis-java.yml | 6 +++--- .github/workflows/scorecards-analysis.yml | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/codeql-analysis-cpp.yml b/.github/workflows/codeql-analysis-cpp.yml index 88927248..400ef05b 100644 --- a/.github/workflows/codeql-analysis-cpp.yml +++ b/.github/workflows/codeql-analysis-cpp.yml @@ -57,7 +57,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@00e563ead9f72a8461b24876bee2d0c2e8bd2ee8 # v2.21.5 + uses: github/codeql-action/init@04daf014b50eaf774287bf3f0f1869d4b4c4b913 # v2.21.7 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -86,4 +86,4 @@ jobs: make - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@00e563ead9f72a8461b24876bee2d0c2e8bd2ee8 # v2.21.5 + uses: github/codeql-action/analyze@04daf014b50eaf774287bf3f0f1869d4b4c4b913 # v2.21.7 diff --git a/.github/workflows/codeql-analysis-java.yml b/.github/workflows/codeql-analysis-java.yml index c06f82bb..d504424b 100644 --- a/.github/workflows/codeql-analysis-java.yml +++ b/.github/workflows/codeql-analysis-java.yml @@ -57,7 +57,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@00e563ead9f72a8461b24876bee2d0c2e8bd2ee8 # v2.21.5 + uses: github/codeql-action/init@04daf014b50eaf774287bf3f0f1869d4b4c4b913 # v2.21.7 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -68,7 +68,7 @@ jobs: # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). # If this step fails, then you should remove it and run the build manually (see below) - name: Autobuild - uses: github/codeql-action/autobuild@00e563ead9f72a8461b24876bee2d0c2e8bd2ee8 # v2.21.5 + uses: github/codeql-action/autobuild@04daf014b50eaf774287bf3f0f1869d4b4c4b913 # v2.21.7 # ℹī¸ Command-line programs to run using the OS shell. # 📚 https://git.io/JvXDl @@ -82,4 +82,4 @@ jobs: # make release - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@00e563ead9f72a8461b24876bee2d0c2e8bd2ee8 # v2.21.5 + uses: github/codeql-action/analyze@04daf014b50eaf774287bf3f0f1869d4b4c4b913 # v2.21.7 diff --git a/.github/workflows/scorecards-analysis.yml b/.github/workflows/scorecards-analysis.yml index b7912d35..d914a138 100644 --- a/.github/workflows/scorecards-analysis.yml +++ b/.github/workflows/scorecards-analysis.yml @@ -64,6 +64,6 @@ jobs: retention-days: 5 - name: "Upload to code-scanning" - uses: github/codeql-action/upload-sarif@00e563ead9f72a8461b24876bee2d0c2e8bd2ee8 # 2.21.5 + uses: github/codeql-action/upload-sarif@04daf014b50eaf774287bf3f0f1869d4b4c4b913 # 2.21.7 with: sarif_file: results.sarif From 034fc7ac6f75da92c5846a262e43c4b7afb166f8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 22 Sep 2023 13:13:05 -0400 Subject: [PATCH 090/298] Bump github/codeql-action from 2.21.7 to 2.21.8 (#111) Bumps [github/codeql-action](https://github.com/github/codeql-action) from 2.21.7 to 2.21.8. - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/04daf014b50eaf774287bf3f0f1869d4b4c4b913...6a28655e3dcb49cb0840ea372fd6d17733edd8a4) --- updated-dependencies: - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/codeql-analysis-cpp.yml | 4 ++-- .github/workflows/codeql-analysis-java.yml | 6 +++--- .github/workflows/scorecards-analysis.yml | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/codeql-analysis-cpp.yml b/.github/workflows/codeql-analysis-cpp.yml index 400ef05b..d8540101 100644 --- a/.github/workflows/codeql-analysis-cpp.yml +++ b/.github/workflows/codeql-analysis-cpp.yml @@ -57,7 +57,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@04daf014b50eaf774287bf3f0f1869d4b4c4b913 # v2.21.7 + uses: github/codeql-action/init@6a28655e3dcb49cb0840ea372fd6d17733edd8a4 # v2.21.8 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -86,4 +86,4 @@ jobs: make - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@04daf014b50eaf774287bf3f0f1869d4b4c4b913 # v2.21.7 + uses: github/codeql-action/analyze@6a28655e3dcb49cb0840ea372fd6d17733edd8a4 # v2.21.8 diff --git a/.github/workflows/codeql-analysis-java.yml b/.github/workflows/codeql-analysis-java.yml index d504424b..cada4e2e 100644 --- a/.github/workflows/codeql-analysis-java.yml +++ b/.github/workflows/codeql-analysis-java.yml @@ -57,7 +57,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@04daf014b50eaf774287bf3f0f1869d4b4c4b913 # v2.21.7 + uses: github/codeql-action/init@6a28655e3dcb49cb0840ea372fd6d17733edd8a4 # v2.21.8 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -68,7 +68,7 @@ jobs: # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). # If this step fails, then you should remove it and run the build manually (see below) - name: Autobuild - uses: github/codeql-action/autobuild@04daf014b50eaf774287bf3f0f1869d4b4c4b913 # v2.21.7 + uses: github/codeql-action/autobuild@6a28655e3dcb49cb0840ea372fd6d17733edd8a4 # v2.21.8 # ℹī¸ Command-line programs to run using the OS shell. # 📚 https://git.io/JvXDl @@ -82,4 +82,4 @@ jobs: # make release - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@04daf014b50eaf774287bf3f0f1869d4b4c4b913 # v2.21.7 + uses: github/codeql-action/analyze@6a28655e3dcb49cb0840ea372fd6d17733edd8a4 # v2.21.8 diff --git a/.github/workflows/scorecards-analysis.yml b/.github/workflows/scorecards-analysis.yml index d914a138..cdbb9b94 100644 --- a/.github/workflows/scorecards-analysis.yml +++ b/.github/workflows/scorecards-analysis.yml @@ -64,6 +64,6 @@ jobs: retention-days: 5 - name: "Upload to code-scanning" - uses: github/codeql-action/upload-sarif@04daf014b50eaf774287bf3f0f1869d4b4c4b913 # 2.21.7 + uses: github/codeql-action/upload-sarif@6a28655e3dcb49cb0840ea372fd6d17733edd8a4 # 2.21.8 with: sarif_file: results.sarif From ecfb340ee4d5c0127785c5acabc1f55a8857a2df Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 22 Sep 2023 13:13:17 -0400 Subject: [PATCH 091/298] Bump actions/setup-java from 3.12.0 to 3.13.0 (#112) Bumps [actions/setup-java](https://github.com/actions/setup-java) from 3.12.0 to 3.13.0. - [Release notes](https://github.com/actions/setup-java/releases) - [Commits](https://github.com/actions/setup-java/compare/cd89f46ac9d01407894225f350157564c9c7cee2...0ab4596768b603586c0de567f2430c30f5b0d2b0) --- updated-dependencies: - dependency-name: actions/setup-java dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/coverage.yml | 2 +- .github/workflows/maven.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index a30b3529..f100bf3f 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -39,7 +39,7 @@ jobs: restore-keys: | ${{ runner.os }}-maven- - name: Set up JDK ${{ matrix.java }} - uses: actions/setup-java@cd89f46ac9d01407894225f350157564c9c7cee2 # v3.12.0 + uses: actions/setup-java@0ab4596768b603586c0de567f2430c30f5b0d2b0 # v3.13.0 with: distribution: 'temurin' java-version: ${{ matrix.java }} diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 851c4af3..de110561 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -45,7 +45,7 @@ jobs: restore-keys: | ${{ runner.os }}-maven- - name: Set up JDK ${{ matrix.java }} - uses: actions/setup-java@cd89f46ac9d01407894225f350157564c9c7cee2 # v3.12.0 + uses: actions/setup-java@0ab4596768b603586c0de567f2430c30f5b0d2b0 # v3.13.0 with: distribution: 'temurin' java-version: ${{ matrix.java }} From 808f0a142fdaf5ec37dc630d8e9ba47ae9fe8d9c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 29 Sep 2023 13:18:19 -0400 Subject: [PATCH 092/298] Bump github/codeql-action from 2.21.8 to 2.21.9 (#113) Bumps [github/codeql-action](https://github.com/github/codeql-action) from 2.21.8 to 2.21.9. - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/6a28655e3dcb49cb0840ea372fd6d17733edd8a4...ddccb873888234080b77e9bc2d4764d5ccaaccf9) --- updated-dependencies: - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/codeql-analysis-cpp.yml | 4 ++-- .github/workflows/codeql-analysis-java.yml | 6 +++--- .github/workflows/scorecards-analysis.yml | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/codeql-analysis-cpp.yml b/.github/workflows/codeql-analysis-cpp.yml index d8540101..2e70a3ba 100644 --- a/.github/workflows/codeql-analysis-cpp.yml +++ b/.github/workflows/codeql-analysis-cpp.yml @@ -57,7 +57,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@6a28655e3dcb49cb0840ea372fd6d17733edd8a4 # v2.21.8 + uses: github/codeql-action/init@ddccb873888234080b77e9bc2d4764d5ccaaccf9 # v2.21.9 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -86,4 +86,4 @@ jobs: make - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@6a28655e3dcb49cb0840ea372fd6d17733edd8a4 # v2.21.8 + uses: github/codeql-action/analyze@ddccb873888234080b77e9bc2d4764d5ccaaccf9 # v2.21.9 diff --git a/.github/workflows/codeql-analysis-java.yml b/.github/workflows/codeql-analysis-java.yml index cada4e2e..06a51cd0 100644 --- a/.github/workflows/codeql-analysis-java.yml +++ b/.github/workflows/codeql-analysis-java.yml @@ -57,7 +57,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@6a28655e3dcb49cb0840ea372fd6d17733edd8a4 # v2.21.8 + uses: github/codeql-action/init@ddccb873888234080b77e9bc2d4764d5ccaaccf9 # v2.21.9 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -68,7 +68,7 @@ jobs: # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). # If this step fails, then you should remove it and run the build manually (see below) - name: Autobuild - uses: github/codeql-action/autobuild@6a28655e3dcb49cb0840ea372fd6d17733edd8a4 # v2.21.8 + uses: github/codeql-action/autobuild@ddccb873888234080b77e9bc2d4764d5ccaaccf9 # v2.21.9 # ℹī¸ Command-line programs to run using the OS shell. # 📚 https://git.io/JvXDl @@ -82,4 +82,4 @@ jobs: # make release - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@6a28655e3dcb49cb0840ea372fd6d17733edd8a4 # v2.21.8 + uses: github/codeql-action/analyze@ddccb873888234080b77e9bc2d4764d5ccaaccf9 # v2.21.9 diff --git a/.github/workflows/scorecards-analysis.yml b/.github/workflows/scorecards-analysis.yml index cdbb9b94..0438a4bc 100644 --- a/.github/workflows/scorecards-analysis.yml +++ b/.github/workflows/scorecards-analysis.yml @@ -64,6 +64,6 @@ jobs: retention-days: 5 - name: "Upload to code-scanning" - uses: github/codeql-action/upload-sarif@6a28655e3dcb49cb0840ea372fd6d17733edd8a4 # 2.21.8 + uses: github/codeql-action/upload-sarif@ddccb873888234080b77e9bc2d4764d5ccaaccf9 # 2.21.9 with: sarif_file: results.sarif From c45fc65a872aedd01be0633a03e226c3b9bfbac8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 29 Sep 2023 13:18:34 -0400 Subject: [PATCH 093/298] Bump actions/checkout from 4.0.0 to 4.1.0 (#114) Bumps [actions/checkout](https://github.com/actions/checkout) from 4.0.0 to 4.1.0. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/3df4ab11eba7bda6032a0b82a6bb43b11571feac...8ade135a41bc03ea155e62e844d188df1ea18608) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/codeql-analysis-cpp.yml | 2 +- .github/workflows/codeql-analysis-java.yml | 2 +- .github/workflows/coverage.yml | 2 +- .github/workflows/maven.yml | 2 +- .github/workflows/scorecards-analysis.yml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/codeql-analysis-cpp.yml b/.github/workflows/codeql-analysis-cpp.yml index 2e70a3ba..c4bcb2dd 100644 --- a/.github/workflows/codeql-analysis-cpp.yml +++ b/.github/workflows/codeql-analysis-cpp.yml @@ -45,7 +45,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0 + uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0 with: persist-credentials: false - uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2 diff --git a/.github/workflows/codeql-analysis-java.yml b/.github/workflows/codeql-analysis-java.yml index 06a51cd0..e3521544 100644 --- a/.github/workflows/codeql-analysis-java.yml +++ b/.github/workflows/codeql-analysis-java.yml @@ -45,7 +45,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0 + uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0 with: persist-credentials: false - uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2 diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index f100bf3f..11e15ef4 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -29,7 +29,7 @@ jobs: java: [ 8 ] steps: - - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0 + - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0 with: persist-credentials: false - uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2 diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index de110561..9f717079 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -35,7 +35,7 @@ jobs: # experimental: true steps: - - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0 + - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0 with: persist-credentials: false - uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2 diff --git a/.github/workflows/scorecards-analysis.yml b/.github/workflows/scorecards-analysis.yml index 0438a4bc..77792228 100644 --- a/.github/workflows/scorecards-analysis.yml +++ b/.github/workflows/scorecards-analysis.yml @@ -40,7 +40,7 @@ jobs: steps: - name: "Checkout code" - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0 + uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0 with: persist-credentials: false From b8d4af84b267c8e3b6ac8078ac5c17db822b1d33 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 6 Oct 2023 13:14:17 -0400 Subject: [PATCH 094/298] Bump github/codeql-action from 2.21.9 to 2.22.0 (#115) Bumps [github/codeql-action](https://github.com/github/codeql-action) from 2.21.9 to 2.22.0. - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/ddccb873888234080b77e9bc2d4764d5ccaaccf9...2cb752a87e96af96708ab57187ab6372ee1973ab) --- updated-dependencies: - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/codeql-analysis-cpp.yml | 4 ++-- .github/workflows/codeql-analysis-java.yml | 6 +++--- .github/workflows/scorecards-analysis.yml | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/codeql-analysis-cpp.yml b/.github/workflows/codeql-analysis-cpp.yml index c4bcb2dd..f8989224 100644 --- a/.github/workflows/codeql-analysis-cpp.yml +++ b/.github/workflows/codeql-analysis-cpp.yml @@ -57,7 +57,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@ddccb873888234080b77e9bc2d4764d5ccaaccf9 # v2.21.9 + uses: github/codeql-action/init@2cb752a87e96af96708ab57187ab6372ee1973ab # v2.22.0 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -86,4 +86,4 @@ jobs: make - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@ddccb873888234080b77e9bc2d4764d5ccaaccf9 # v2.21.9 + uses: github/codeql-action/analyze@2cb752a87e96af96708ab57187ab6372ee1973ab # v2.22.0 diff --git a/.github/workflows/codeql-analysis-java.yml b/.github/workflows/codeql-analysis-java.yml index e3521544..0dcac0c1 100644 --- a/.github/workflows/codeql-analysis-java.yml +++ b/.github/workflows/codeql-analysis-java.yml @@ -57,7 +57,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@ddccb873888234080b77e9bc2d4764d5ccaaccf9 # v2.21.9 + uses: github/codeql-action/init@2cb752a87e96af96708ab57187ab6372ee1973ab # v2.22.0 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -68,7 +68,7 @@ jobs: # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). # If this step fails, then you should remove it and run the build manually (see below) - name: Autobuild - uses: github/codeql-action/autobuild@ddccb873888234080b77e9bc2d4764d5ccaaccf9 # v2.21.9 + uses: github/codeql-action/autobuild@2cb752a87e96af96708ab57187ab6372ee1973ab # v2.22.0 # ℹī¸ Command-line programs to run using the OS shell. # 📚 https://git.io/JvXDl @@ -82,4 +82,4 @@ jobs: # make release - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@ddccb873888234080b77e9bc2d4764d5ccaaccf9 # v2.21.9 + uses: github/codeql-action/analyze@2cb752a87e96af96708ab57187ab6372ee1973ab # v2.22.0 diff --git a/.github/workflows/scorecards-analysis.yml b/.github/workflows/scorecards-analysis.yml index 77792228..51867b5a 100644 --- a/.github/workflows/scorecards-analysis.yml +++ b/.github/workflows/scorecards-analysis.yml @@ -64,6 +64,6 @@ jobs: retention-days: 5 - name: "Upload to code-scanning" - uses: github/codeql-action/upload-sarif@ddccb873888234080b77e9bc2d4764d5ccaaccf9 # 2.21.9 + uses: github/codeql-action/upload-sarif@2cb752a87e96af96708ab57187ab6372ee1973ab # 2.22.0 with: sarif_file: results.sarif From e9fc7b20f37e92d8595df481882f409eeb16ea54 Mon Sep 17 00:00:00 2001 From: Gary Gregory Date: Tue, 10 Oct 2023 07:54:31 -0400 Subject: [PATCH 095/298] Bump commons-parent --- pom.xml | 2 +- src/changes/changes.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index ac957129..4a1af252 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ org.apache.commons commons-parent - 61 + 64 4.0.0 commons-daemon diff --git a/src/changes/changes.xml b/src/changes/changes.xml index 43a1a385..f20d846f 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -48,7 +48,7 @@ - Bump commons-parent from 57 to 61 (#93) #132. + Bump commons-parent from 57 to 64, #93, #132. From 88c5f3f5774feaf61b5b68cea2dcc920adba4fc9 Mon Sep 17 00:00:00 2001 From: Gary Gregory Date: Wed, 11 Oct 2023 07:32:10 -0400 Subject: [PATCH 096/298] Normalize mvn invocation on GitHub --- .github/workflows/coverage.yml | 2 +- .github/workflows/maven.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index 11e15ef4..779e1321 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -44,7 +44,7 @@ jobs: distribution: 'temurin' java-version: ${{ matrix.java }} - name: Build with Maven - run: mvn -V test jacoco:report --file pom.xml --no-transfer-progress + run: mvn --show-version --batch-mode --no-transfer-progress test jacoco:report - name: Upload coverage to Codecov uses: codecov/codecov-action@eaaf4bedf32dbdc6b720b63067d99c4d77d6047d # v3.1.4 diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 9f717079..653e8335 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -50,4 +50,4 @@ jobs: distribution: 'temurin' java-version: ${{ matrix.java }} - name: Build with Maven - run: mvn -V -Ddoclint=all --file pom.xml --no-transfer-progress + run: mvn --show-version --batch-mode --no-transfer-progress -Ddoclint=all From 5de83132ffefe567989f2ed8ca244dd5fbdef5e3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 13 Oct 2023 14:13:46 -0400 Subject: [PATCH 097/298] Bump ossf/scorecard-action from 2.2.0 to 2.3.0 (#117) Bumps [ossf/scorecard-action](https://github.com/ossf/scorecard-action) from 2.2.0 to 2.3.0. - [Release notes](https://github.com/ossf/scorecard-action/releases) - [Changelog](https://github.com/ossf/scorecard-action/blob/main/RELEASE.md) - [Commits](https://github.com/ossf/scorecard-action/compare/08b4669551908b1024bb425080c797723083c031...483ef80eb98fb506c348f7d62e28055e49fe2398) --- updated-dependencies: - dependency-name: ossf/scorecard-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/scorecards-analysis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/scorecards-analysis.yml b/.github/workflows/scorecards-analysis.yml index 51867b5a..108163f3 100644 --- a/.github/workflows/scorecards-analysis.yml +++ b/.github/workflows/scorecards-analysis.yml @@ -45,7 +45,7 @@ jobs: persist-credentials: false - name: "Run analysis" - uses: ossf/scorecard-action@08b4669551908b1024bb425080c797723083c031 # 2.2.0 + uses: ossf/scorecard-action@483ef80eb98fb506c348f7d62e28055e49fe2398 # 2.3.0 with: results_file: results.sarif results_format: sarif From 4805f5051e35e72a13de4db8e81cb8177c05fd37 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 13 Oct 2023 14:13:59 -0400 Subject: [PATCH 098/298] Bump github/codeql-action from 2.22.0 to 2.22.3 (#116) Bumps [github/codeql-action](https://github.com/github/codeql-action) from 2.22.0 to 2.22.3. - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/2cb752a87e96af96708ab57187ab6372ee1973ab...0116bc2df50751f9724a2e35ef1f24d22f90e4e1) --- updated-dependencies: - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/codeql-analysis-cpp.yml | 4 ++-- .github/workflows/codeql-analysis-java.yml | 6 +++--- .github/workflows/scorecards-analysis.yml | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/codeql-analysis-cpp.yml b/.github/workflows/codeql-analysis-cpp.yml index f8989224..31f0ce4d 100644 --- a/.github/workflows/codeql-analysis-cpp.yml +++ b/.github/workflows/codeql-analysis-cpp.yml @@ -57,7 +57,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@2cb752a87e96af96708ab57187ab6372ee1973ab # v2.22.0 + uses: github/codeql-action/init@0116bc2df50751f9724a2e35ef1f24d22f90e4e1 # v2.22.3 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -86,4 +86,4 @@ jobs: make - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@2cb752a87e96af96708ab57187ab6372ee1973ab # v2.22.0 + uses: github/codeql-action/analyze@0116bc2df50751f9724a2e35ef1f24d22f90e4e1 # v2.22.3 diff --git a/.github/workflows/codeql-analysis-java.yml b/.github/workflows/codeql-analysis-java.yml index 0dcac0c1..cee89bf5 100644 --- a/.github/workflows/codeql-analysis-java.yml +++ b/.github/workflows/codeql-analysis-java.yml @@ -57,7 +57,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@2cb752a87e96af96708ab57187ab6372ee1973ab # v2.22.0 + uses: github/codeql-action/init@0116bc2df50751f9724a2e35ef1f24d22f90e4e1 # v2.22.3 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -68,7 +68,7 @@ jobs: # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). # If this step fails, then you should remove it and run the build manually (see below) - name: Autobuild - uses: github/codeql-action/autobuild@2cb752a87e96af96708ab57187ab6372ee1973ab # v2.22.0 + uses: github/codeql-action/autobuild@0116bc2df50751f9724a2e35ef1f24d22f90e4e1 # v2.22.3 # ℹī¸ Command-line programs to run using the OS shell. # 📚 https://git.io/JvXDl @@ -82,4 +82,4 @@ jobs: # make release - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@2cb752a87e96af96708ab57187ab6372ee1973ab # v2.22.0 + uses: github/codeql-action/analyze@0116bc2df50751f9724a2e35ef1f24d22f90e4e1 # v2.22.3 diff --git a/.github/workflows/scorecards-analysis.yml b/.github/workflows/scorecards-analysis.yml index 108163f3..f32ca852 100644 --- a/.github/workflows/scorecards-analysis.yml +++ b/.github/workflows/scorecards-analysis.yml @@ -64,6 +64,6 @@ jobs: retention-days: 5 - name: "Upload to code-scanning" - uses: github/codeql-action/upload-sarif@2cb752a87e96af96708ab57187ab6372ee1973ab # 2.22.0 + uses: github/codeql-action/upload-sarif@0116bc2df50751f9724a2e35ef1f24d22f90e4e1 # 2.22.3 with: sarif_file: results.sarif From c55f8ee5a3629f7377eb8368376aff0d842cdc69 Mon Sep 17 00:00:00 2001 From: Gary Gregory Date: Sun, 15 Oct 2023 10:14:02 -0400 Subject: [PATCH 099/298] Update comment --- .github/workflows/maven.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 653e8335..0507fcf3 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -31,7 +31,7 @@ jobs: java: [ 8, 11, 17 ] experimental: [false] # include: -# - java: 18-ea +# - java: 22-ea # experimental: true steps: From e5152c1e2c63d003c56e6a09812a269ffd9ea020 Mon Sep 17 00:00:00 2001 From: Gary Gregory Date: Thu, 19 Oct 2023 08:17:47 -0400 Subject: [PATCH 100/298] Camel-case parameter names --- src/samples/ProcrunService.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/samples/ProcrunService.java b/src/samples/ProcrunService.java index 3497a88c..3b89eee9 100644 --- a/src/samples/ProcrunService.java +++ b/src/samples/ProcrunService.java @@ -58,9 +58,9 @@ private ProcrunService(long wait, File file) { stopFile = file; } - private static File tmpFile(String filename) { + private static File tmpFile(String fileName) { return new File(System.getProperty("java.io.tmpdir"), - filename != null ? filename : "ProcrunService.tmp"); + fileName != null ? fileName : "ProcrunService.tmp"); } private static void usage(){ From 6d9348ba8554c0967bffcf23348eef8d5f58d6fb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 20 Oct 2023 12:31:45 -0400 Subject: [PATCH 101/298] Bump actions/checkout from 4.1.0 to 4.1.1 (#118) Bumps [actions/checkout](https://github.com/actions/checkout) from 4.1.0 to 4.1.1. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/8ade135a41bc03ea155e62e844d188df1ea18608...b4ffde65f46336ab88eb53be808477a3936bae11) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/codeql-analysis-cpp.yml | 2 +- .github/workflows/codeql-analysis-java.yml | 2 +- .github/workflows/coverage.yml | 2 +- .github/workflows/maven.yml | 2 +- .github/workflows/scorecards-analysis.yml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/codeql-analysis-cpp.yml b/.github/workflows/codeql-analysis-cpp.yml index 31f0ce4d..d9e8a1bc 100644 --- a/.github/workflows/codeql-analysis-cpp.yml +++ b/.github/workflows/codeql-analysis-cpp.yml @@ -45,7 +45,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0 + uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 with: persist-credentials: false - uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2 diff --git a/.github/workflows/codeql-analysis-java.yml b/.github/workflows/codeql-analysis-java.yml index cee89bf5..59d576c1 100644 --- a/.github/workflows/codeql-analysis-java.yml +++ b/.github/workflows/codeql-analysis-java.yml @@ -45,7 +45,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0 + uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 with: persist-credentials: false - uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2 diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index 779e1321..5c778d55 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -29,7 +29,7 @@ jobs: java: [ 8 ] steps: - - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0 + - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 with: persist-credentials: false - uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2 diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 0507fcf3..89827ef6 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -35,7 +35,7 @@ jobs: # experimental: true steps: - - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0 + - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 with: persist-credentials: false - uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2 diff --git a/.github/workflows/scorecards-analysis.yml b/.github/workflows/scorecards-analysis.yml index f32ca852..4220c81c 100644 --- a/.github/workflows/scorecards-analysis.yml +++ b/.github/workflows/scorecards-analysis.yml @@ -40,7 +40,7 @@ jobs: steps: - name: "Checkout code" - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0 + uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 with: persist-credentials: false From 8818b5de7ee43397902b25d44d322a1ea9002f3a Mon Sep 17 00:00:00 2001 From: Sebb Date: Sat, 21 Oct 2023 15:24:13 +0100 Subject: [PATCH 102/298] Specify encoding --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4a1af252..10c70965 100644 --- a/pom.xml +++ b/pom.xml @@ -1,4 +1,4 @@ - + - Bump commons-parent from 57 to 64, #93, #132. + Bump commons-parent from 57 to 65, #93, #125, #132. From 43d5eec96e207237ef6fd118fda5943d176ee270 Mon Sep 17 00:00:00 2001 From: Gary Gregory Date: Wed, 13 Dec 2023 07:41:31 -0500 Subject: [PATCH 123/298] Bump github/codeql-action from 2.22.9 to 2.22.10 --- .github/workflows/scorecards-analysis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/scorecards-analysis.yml b/.github/workflows/scorecards-analysis.yml index 21173016..dc74be10 100644 --- a/.github/workflows/scorecards-analysis.yml +++ b/.github/workflows/scorecards-analysis.yml @@ -64,6 +64,6 @@ jobs: retention-days: 5 - name: "Upload to code-scanning" - uses: github/codeql-action/upload-sarif@c0d1daa7f7e14667747d73a7dbbe8c074bc8bfe2 # 2.22.9 + uses: github/codeql-action/upload-sarif@305f6546310b9203e892c28c1484e82977f4f63d # 2.22.10 with: sarif_file: results.sarif From 9ace45244b29a1bd5bff5a3b15ef9aee4542d270 Mon Sep 17 00:00:00 2001 From: Gary Gregory Date: Wed, 13 Dec 2023 07:48:57 -0500 Subject: [PATCH 124/298] Bump github/codeql-action from 2.22.9 to 2.22.10 --- .github/workflows/codeql-analysis-cpp.yml | 4 ++-- .github/workflows/codeql-analysis-java.yml | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/codeql-analysis-cpp.yml b/.github/workflows/codeql-analysis-cpp.yml index cc91fcde..a0726c05 100644 --- a/.github/workflows/codeql-analysis-cpp.yml +++ b/.github/workflows/codeql-analysis-cpp.yml @@ -57,7 +57,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@c0d1daa7f7e14667747d73a7dbbe8c074bc8bfe2 # v2.22.9 + uses: github/codeql-action/init@305f6546310b9203e892c28c1484e82977f4f63d # 2.22.10 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -86,4 +86,4 @@ jobs: make - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@c0d1daa7f7e14667747d73a7dbbe8c074bc8bfe2 # v2.22.9 + uses: github/codeql-action/analyze@305f6546310b9203e892c28c1484e82977f4f63d # 2.22.10 diff --git a/.github/workflows/codeql-analysis-java.yml b/.github/workflows/codeql-analysis-java.yml index 700f0a9e..41780a7d 100644 --- a/.github/workflows/codeql-analysis-java.yml +++ b/.github/workflows/codeql-analysis-java.yml @@ -57,7 +57,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@c0d1daa7f7e14667747d73a7dbbe8c074bc8bfe2 # v2.22.9 + uses: github/codeql-action/init@305f6546310b9203e892c28c1484e82977f4f63d # 2.22.10 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -68,7 +68,7 @@ jobs: # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). # If this step fails, then you should remove it and run the build manually (see below) - name: Autobuild - uses: github/codeql-action/autobuild@c0d1daa7f7e14667747d73a7dbbe8c074bc8bfe2 # v2.22.9 + uses: github/codeql-action/autobuild@305f6546310b9203e892c28c1484e82977f4f63d # 2.22.10 # ℹī¸ Command-line programs to run using the OS shell. # 📚 https://git.io/JvXDl @@ -82,4 +82,4 @@ jobs: # make release - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@c0d1daa7f7e14667747d73a7dbbe8c074bc8bfe2 # v2.22.9 + uses: github/codeql-action/analyze@305f6546310b9203e892c28c1484e82977f4f63d # 2.22.10 From d2bcfe4fac7bff058b9601ea37d691844c6db5f2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 15 Dec 2023 11:54:44 -0500 Subject: [PATCH 125/298] Bump github/codeql-action from 2.22.10 to 3.22.11 (#126) Bumps [github/codeql-action](https://github.com/github/codeql-action) from 2.22.10 to 3.22.11. - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/305f6546310b9203e892c28c1484e82977f4f63d...b374143c1149a9115d881581d29b8390bbcbb59c) --- updated-dependencies: - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/codeql-analysis-cpp.yml | 4 ++-- .github/workflows/codeql-analysis-java.yml | 6 +++--- .github/workflows/scorecards-analysis.yml | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/codeql-analysis-cpp.yml b/.github/workflows/codeql-analysis-cpp.yml index a0726c05..ba281151 100644 --- a/.github/workflows/codeql-analysis-cpp.yml +++ b/.github/workflows/codeql-analysis-cpp.yml @@ -57,7 +57,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@305f6546310b9203e892c28c1484e82977f4f63d # 2.22.10 + uses: github/codeql-action/init@b374143c1149a9115d881581d29b8390bbcbb59c # 3.22.11 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -86,4 +86,4 @@ jobs: make - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@305f6546310b9203e892c28c1484e82977f4f63d # 2.22.10 + uses: github/codeql-action/analyze@b374143c1149a9115d881581d29b8390bbcbb59c # 3.22.11 diff --git a/.github/workflows/codeql-analysis-java.yml b/.github/workflows/codeql-analysis-java.yml index 41780a7d..4a985ca6 100644 --- a/.github/workflows/codeql-analysis-java.yml +++ b/.github/workflows/codeql-analysis-java.yml @@ -57,7 +57,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@305f6546310b9203e892c28c1484e82977f4f63d # 2.22.10 + uses: github/codeql-action/init@b374143c1149a9115d881581d29b8390bbcbb59c # 3.22.11 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -68,7 +68,7 @@ jobs: # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). # If this step fails, then you should remove it and run the build manually (see below) - name: Autobuild - uses: github/codeql-action/autobuild@305f6546310b9203e892c28c1484e82977f4f63d # 2.22.10 + uses: github/codeql-action/autobuild@b374143c1149a9115d881581d29b8390bbcbb59c # 3.22.11 # ℹī¸ Command-line programs to run using the OS shell. # 📚 https://git.io/JvXDl @@ -82,4 +82,4 @@ jobs: # make release - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@305f6546310b9203e892c28c1484e82977f4f63d # 2.22.10 + uses: github/codeql-action/analyze@b374143c1149a9115d881581d29b8390bbcbb59c # 3.22.11 diff --git a/.github/workflows/scorecards-analysis.yml b/.github/workflows/scorecards-analysis.yml index dc74be10..d344ba19 100644 --- a/.github/workflows/scorecards-analysis.yml +++ b/.github/workflows/scorecards-analysis.yml @@ -64,6 +64,6 @@ jobs: retention-days: 5 - name: "Upload to code-scanning" - uses: github/codeql-action/upload-sarif@305f6546310b9203e892c28c1484e82977f4f63d # 2.22.10 + uses: github/codeql-action/upload-sarif@b374143c1149a9115d881581d29b8390bbcbb59c # 3.22.11 with: sarif_file: results.sarif From f5ebc05ed854a7fc1ba21f3e7029c5255f63fc22 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 15 Dec 2023 11:54:54 -0500 Subject: [PATCH 126/298] Bump actions/upload-artifact from 3.1.3 to 4.0.0 (#127) Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 3.1.3 to 4.0.0. - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](https://github.com/actions/upload-artifact/compare/a8a3f3ad30e3422c9c7b888a15615d19a852ae32...c7d193f32edcb7bfad88892161225aeda64e9392) --- updated-dependencies: - dependency-name: actions/upload-artifact dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/scorecards-analysis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/scorecards-analysis.yml b/.github/workflows/scorecards-analysis.yml index d344ba19..d1049c90 100644 --- a/.github/workflows/scorecards-analysis.yml +++ b/.github/workflows/scorecards-analysis.yml @@ -57,7 +57,7 @@ jobs: publish_results: true - name: "Upload artifact" - uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # 3.1.0 + uses: actions/upload-artifact@c7d193f32edcb7bfad88892161225aeda64e9392 # 3.1.0 with: name: SARIF file path: results.sarif From 58b7e4e61960c7561f49e31e26bc722afc8ca4ce Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 22 Dec 2023 13:41:25 -0500 Subject: [PATCH 127/298] Bump github/codeql-action from 3.22.11 to 3.22.12 (#128) Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.22.11 to 3.22.12. - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/b374143c1149a9115d881581d29b8390bbcbb59c...012739e5082ff0c22ca6d6ab32e07c36df03c4a4) --- updated-dependencies: - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/codeql-analysis-cpp.yml | 4 ++-- .github/workflows/codeql-analysis-java.yml | 6 +++--- .github/workflows/scorecards-analysis.yml | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/codeql-analysis-cpp.yml b/.github/workflows/codeql-analysis-cpp.yml index ba281151..f95720a6 100644 --- a/.github/workflows/codeql-analysis-cpp.yml +++ b/.github/workflows/codeql-analysis-cpp.yml @@ -57,7 +57,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@b374143c1149a9115d881581d29b8390bbcbb59c # 3.22.11 + uses: github/codeql-action/init@012739e5082ff0c22ca6d6ab32e07c36df03c4a4 # 3.22.12 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -86,4 +86,4 @@ jobs: make - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@b374143c1149a9115d881581d29b8390bbcbb59c # 3.22.11 + uses: github/codeql-action/analyze@012739e5082ff0c22ca6d6ab32e07c36df03c4a4 # 3.22.12 diff --git a/.github/workflows/codeql-analysis-java.yml b/.github/workflows/codeql-analysis-java.yml index 4a985ca6..455160f6 100644 --- a/.github/workflows/codeql-analysis-java.yml +++ b/.github/workflows/codeql-analysis-java.yml @@ -57,7 +57,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@b374143c1149a9115d881581d29b8390bbcbb59c # 3.22.11 + uses: github/codeql-action/init@012739e5082ff0c22ca6d6ab32e07c36df03c4a4 # 3.22.12 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -68,7 +68,7 @@ jobs: # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). # If this step fails, then you should remove it and run the build manually (see below) - name: Autobuild - uses: github/codeql-action/autobuild@b374143c1149a9115d881581d29b8390bbcbb59c # 3.22.11 + uses: github/codeql-action/autobuild@012739e5082ff0c22ca6d6ab32e07c36df03c4a4 # 3.22.12 # ℹī¸ Command-line programs to run using the OS shell. # 📚 https://git.io/JvXDl @@ -82,4 +82,4 @@ jobs: # make release - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@b374143c1149a9115d881581d29b8390bbcbb59c # 3.22.11 + uses: github/codeql-action/analyze@012739e5082ff0c22ca6d6ab32e07c36df03c4a4 # 3.22.12 diff --git a/.github/workflows/scorecards-analysis.yml b/.github/workflows/scorecards-analysis.yml index d1049c90..73a0bc74 100644 --- a/.github/workflows/scorecards-analysis.yml +++ b/.github/workflows/scorecards-analysis.yml @@ -64,6 +64,6 @@ jobs: retention-days: 5 - name: "Upload to code-scanning" - uses: github/codeql-action/upload-sarif@b374143c1149a9115d881581d29b8390bbcbb59c # 3.22.11 + uses: github/codeql-action/upload-sarif@012739e5082ff0c22ca6d6ab32e07c36df03c4a4 # 3.22.12 with: sarif_file: results.sarif From b4dfbcb6ccf55675b39498c7ddd716562a3cc9e8 Mon Sep 17 00:00:00 2001 From: Sebb Date: Sat, 23 Dec 2023 00:50:13 +0000 Subject: [PATCH 128/298] Fix version comment [skip ci] --- .github/workflows/scorecards-analysis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/scorecards-analysis.yml b/.github/workflows/scorecards-analysis.yml index 73a0bc74..af06032a 100644 --- a/.github/workflows/scorecards-analysis.yml +++ b/.github/workflows/scorecards-analysis.yml @@ -57,7 +57,7 @@ jobs: publish_results: true - name: "Upload artifact" - uses: actions/upload-artifact@c7d193f32edcb7bfad88892161225aeda64e9392 # 3.1.0 + uses: actions/upload-artifact@c7d193f32edcb7bfad88892161225aeda64e9392 # 4.0.0 with: name: SARIF file path: results.sarif From 0879ce011e3757a73d56b833d05f6dac0c011675 Mon Sep 17 00:00:00 2001 From: Gary Gregory Date: Sat, 23 Dec 2023 11:19:25 -0500 Subject: [PATCH 129/298] Use StandardCharsets --- src/samples/SimpleApplication.java | 3 ++- src/samples/SimpleDaemon.java | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/samples/SimpleApplication.java b/src/samples/SimpleApplication.java index a35c3b1b..fb796efa 100644 --- a/src/samples/SimpleApplication.java +++ b/src/samples/SimpleApplication.java @@ -24,6 +24,7 @@ import java.io.UnsupportedEncodingException; import java.net.ServerSocket; import java.net.Socket; +import java.nio.charset.StandardCharsets; import java.text.SimpleDateFormat; import java.util.Date; import java.util.Enumeration; @@ -256,7 +257,7 @@ public void createDir(String name) public void handle(InputStream in, OutputStream os) { PrintStream out = null; try { - out = new PrintStream(os, true, "US-ASCII"); + out = new PrintStream(os, true, StandardCharsets.US_ASCII.name()); } catch (UnsupportedEncodingException ex) { out = new PrintStream(os, true); } diff --git a/src/samples/SimpleDaemon.java b/src/samples/SimpleDaemon.java index 14715914..cec9b2d1 100644 --- a/src/samples/SimpleDaemon.java +++ b/src/samples/SimpleDaemon.java @@ -24,6 +24,7 @@ import java.io.UnsupportedEncodingException; import java.net.ServerSocket; import java.net.Socket; +import java.nio.charset.StandardCharsets; import java.text.SimpleDateFormat; import java.util.Date; import java.util.Enumeration; @@ -239,7 +240,7 @@ public void createDir(String name) public void handle(InputStream in, OutputStream os) { PrintStream out = null; try { - out = new PrintStream(os, true, "US-ASCII"); + out = new PrintStream(os, true, StandardCharsets.US_ASCII.name()); } catch (UnsupportedEncodingException ex) { out = new PrintStream(os, true); } From bbda1bf325d8fe7e7a8588b16756bca7254f21e3 Mon Sep 17 00:00:00 2001 From: Gary Gregory Date: Sun, 24 Dec 2023 21:43:59 -0500 Subject: [PATCH 130/298] Update NOTICE file for 2024 --- NOTICE.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NOTICE.txt b/NOTICE.txt index 14cb46cc..d5457925 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -1,5 +1,5 @@ Apache Commons Daemon -Copyright 1999-2023 The Apache Software Foundation +Copyright 1999-2024 The Apache Software Foundation This product includes software developed by The Apache Software Foundation (https://www.apache.org/). From 3c29b54281304c01a87d5273f691c3064ea4df30 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 12 Jan 2024 11:57:55 -0500 Subject: [PATCH 131/298] Bump github/codeql-action from 3.22.12 to 3.23.0 (#130) Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.22.12 to 3.23.0. - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/012739e5082ff0c22ca6d6ab32e07c36df03c4a4...e5f05b81d5b6ff8cfa111c80c22c5fd02a384118) --- updated-dependencies: - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/codeql-analysis-cpp.yml | 4 ++-- .github/workflows/codeql-analysis-java.yml | 6 +++--- .github/workflows/scorecards-analysis.yml | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/codeql-analysis-cpp.yml b/.github/workflows/codeql-analysis-cpp.yml index f95720a6..64caf6aa 100644 --- a/.github/workflows/codeql-analysis-cpp.yml +++ b/.github/workflows/codeql-analysis-cpp.yml @@ -57,7 +57,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@012739e5082ff0c22ca6d6ab32e07c36df03c4a4 # 3.22.12 + uses: github/codeql-action/init@e5f05b81d5b6ff8cfa111c80c22c5fd02a384118 # 3.23.0 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -86,4 +86,4 @@ jobs: make - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@012739e5082ff0c22ca6d6ab32e07c36df03c4a4 # 3.22.12 + uses: github/codeql-action/analyze@e5f05b81d5b6ff8cfa111c80c22c5fd02a384118 # 3.23.0 diff --git a/.github/workflows/codeql-analysis-java.yml b/.github/workflows/codeql-analysis-java.yml index 455160f6..7db143d3 100644 --- a/.github/workflows/codeql-analysis-java.yml +++ b/.github/workflows/codeql-analysis-java.yml @@ -57,7 +57,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@012739e5082ff0c22ca6d6ab32e07c36df03c4a4 # 3.22.12 + uses: github/codeql-action/init@e5f05b81d5b6ff8cfa111c80c22c5fd02a384118 # 3.23.0 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -68,7 +68,7 @@ jobs: # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). # If this step fails, then you should remove it and run the build manually (see below) - name: Autobuild - uses: github/codeql-action/autobuild@012739e5082ff0c22ca6d6ab32e07c36df03c4a4 # 3.22.12 + uses: github/codeql-action/autobuild@e5f05b81d5b6ff8cfa111c80c22c5fd02a384118 # 3.23.0 # ℹī¸ Command-line programs to run using the OS shell. # 📚 https://git.io/JvXDl @@ -82,4 +82,4 @@ jobs: # make release - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@012739e5082ff0c22ca6d6ab32e07c36df03c4a4 # 3.22.12 + uses: github/codeql-action/analyze@e5f05b81d5b6ff8cfa111c80c22c5fd02a384118 # 3.23.0 diff --git a/.github/workflows/scorecards-analysis.yml b/.github/workflows/scorecards-analysis.yml index af06032a..e0abc6fa 100644 --- a/.github/workflows/scorecards-analysis.yml +++ b/.github/workflows/scorecards-analysis.yml @@ -64,6 +64,6 @@ jobs: retention-days: 5 - name: "Upload to code-scanning" - uses: github/codeql-action/upload-sarif@012739e5082ff0c22ca6d6ab32e07c36df03c4a4 # 3.22.12 + uses: github/codeql-action/upload-sarif@e5f05b81d5b6ff8cfa111c80c22c5fd02a384118 # 3.23.0 with: sarif_file: results.sarif From 995b7006d6ac46c5cfac02f23feaad952a1129c0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 12 Jan 2024 11:58:07 -0500 Subject: [PATCH 132/298] Bump actions/cache from 3.3.2 to 3.3.3 (#129) Bumps [actions/cache](https://github.com/actions/cache) from 3.3.2 to 3.3.3. - [Release notes](https://github.com/actions/cache/releases) - [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md) - [Commits](https://github.com/actions/cache/compare/704facf57e6136b1bc63b828d79edcd491f0ee84...e12d46a63a90f2fae62d114769bbf2a179198b5c) --- updated-dependencies: - dependency-name: actions/cache dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/codeql-analysis-cpp.yml | 2 +- .github/workflows/codeql-analysis-java.yml | 2 +- .github/workflows/coverage.yml | 2 +- .github/workflows/maven.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/codeql-analysis-cpp.yml b/.github/workflows/codeql-analysis-cpp.yml index 64caf6aa..d55c2e76 100644 --- a/.github/workflows/codeql-analysis-cpp.yml +++ b/.github/workflows/codeql-analysis-cpp.yml @@ -48,7 +48,7 @@ jobs: uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 with: persist-credentials: false - - uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2 + - uses: actions/cache@e12d46a63a90f2fae62d114769bbf2a179198b5c # v3.3.3 with: path: ~/.m2/repository key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} diff --git a/.github/workflows/codeql-analysis-java.yml b/.github/workflows/codeql-analysis-java.yml index 7db143d3..b93abbfd 100644 --- a/.github/workflows/codeql-analysis-java.yml +++ b/.github/workflows/codeql-analysis-java.yml @@ -48,7 +48,7 @@ jobs: uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 with: persist-credentials: false - - uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2 + - uses: actions/cache@e12d46a63a90f2fae62d114769bbf2a179198b5c # v3.3.3 with: path: ~/.m2/repository key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index 5dfe93ae..154cd22d 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -32,7 +32,7 @@ jobs: - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 with: persist-credentials: false - - uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2 + - uses: actions/cache@e12d46a63a90f2fae62d114769bbf2a179198b5c # v3.3.3 with: path: ~/.m2/repository key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 7fd12c7f..ad19c205 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -38,7 +38,7 @@ jobs: - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 with: persist-credentials: false - - uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2 + - uses: actions/cache@e12d46a63a90f2fae62d114769bbf2a179198b5c # v3.3.3 with: path: ~/.m2/repository key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} From 188948c37ade4bcbaef3fe872daf83546c160548 Mon Sep 17 00:00:00 2001 From: Gary Gregory Date: Mon, 15 Jan 2024 10:06:28 -0500 Subject: [PATCH 133/298] Use |= --- .../java/org/apache/commons/daemon/DaemonPermission.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/apache/commons/daemon/DaemonPermission.java b/src/main/java/org/apache/commons/daemon/DaemonPermission.java index 15303311..b7cd7978 100644 --- a/src/main/java/org/apache/commons/daemon/DaemonPermission.java +++ b/src/main/java/org/apache/commons/daemon/DaemonPermission.java @@ -373,16 +373,16 @@ private int createControlMask(final String actions) MASK_CONTROL_SHUTDOWN | MASK_CONTROL_RELOAD; } if (CONTROL_START.equalsIgnoreCase(val)) { - mask = mask | MASK_CONTROL_START; + mask |= MASK_CONTROL_START; } else if (CONTROL_STOP.equalsIgnoreCase(val)) { - mask = mask | MASK_CONTROL_STOP; + mask |= MASK_CONTROL_STOP; } else if (CONTROL_SHUTDOWN.equalsIgnoreCase(val)) { - mask = mask | MASK_CONTROL_SHUTDOWN; + mask |= MASK_CONTROL_SHUTDOWN; } else if (CONTROL_RELOAD.equalsIgnoreCase(val)) { - mask = mask | MASK_CONTROL_RELOAD; + mask |= MASK_CONTROL_RELOAD; } else { throw new IllegalArgumentException("Invalid action name \"" + From eb0ab4c9bc7238bbf8f008b26236bafe5890f8c3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 19 Jan 2024 12:22:03 -0500 Subject: [PATCH 134/298] Bump github/codeql-action from 3.23.0 to 3.23.1 (#131) Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.23.0 to 3.23.1. - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/e5f05b81d5b6ff8cfa111c80c22c5fd02a384118...0b21cf2492b6b02c465a3e5d7c473717ad7721ba) --- updated-dependencies: - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/codeql-analysis-cpp.yml | 4 ++-- .github/workflows/codeql-analysis-java.yml | 6 +++--- .github/workflows/scorecards-analysis.yml | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/codeql-analysis-cpp.yml b/.github/workflows/codeql-analysis-cpp.yml index d55c2e76..0d60d37d 100644 --- a/.github/workflows/codeql-analysis-cpp.yml +++ b/.github/workflows/codeql-analysis-cpp.yml @@ -57,7 +57,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@e5f05b81d5b6ff8cfa111c80c22c5fd02a384118 # 3.23.0 + uses: github/codeql-action/init@0b21cf2492b6b02c465a3e5d7c473717ad7721ba # 3.23.1 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -86,4 +86,4 @@ jobs: make - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@e5f05b81d5b6ff8cfa111c80c22c5fd02a384118 # 3.23.0 + uses: github/codeql-action/analyze@0b21cf2492b6b02c465a3e5d7c473717ad7721ba # 3.23.1 diff --git a/.github/workflows/codeql-analysis-java.yml b/.github/workflows/codeql-analysis-java.yml index b93abbfd..391c0329 100644 --- a/.github/workflows/codeql-analysis-java.yml +++ b/.github/workflows/codeql-analysis-java.yml @@ -57,7 +57,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@e5f05b81d5b6ff8cfa111c80c22c5fd02a384118 # 3.23.0 + uses: github/codeql-action/init@0b21cf2492b6b02c465a3e5d7c473717ad7721ba # 3.23.1 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -68,7 +68,7 @@ jobs: # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). # If this step fails, then you should remove it and run the build manually (see below) - name: Autobuild - uses: github/codeql-action/autobuild@e5f05b81d5b6ff8cfa111c80c22c5fd02a384118 # 3.23.0 + uses: github/codeql-action/autobuild@0b21cf2492b6b02c465a3e5d7c473717ad7721ba # 3.23.1 # ℹī¸ Command-line programs to run using the OS shell. # 📚 https://git.io/JvXDl @@ -82,4 +82,4 @@ jobs: # make release - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@e5f05b81d5b6ff8cfa111c80c22c5fd02a384118 # 3.23.0 + uses: github/codeql-action/analyze@0b21cf2492b6b02c465a3e5d7c473717ad7721ba # 3.23.1 diff --git a/.github/workflows/scorecards-analysis.yml b/.github/workflows/scorecards-analysis.yml index e0abc6fa..6e3d30eb 100644 --- a/.github/workflows/scorecards-analysis.yml +++ b/.github/workflows/scorecards-analysis.yml @@ -64,6 +64,6 @@ jobs: retention-days: 5 - name: "Upload to code-scanning" - uses: github/codeql-action/upload-sarif@e5f05b81d5b6ff8cfa111c80c22c5fd02a384118 # 3.23.0 + uses: github/codeql-action/upload-sarif@0b21cf2492b6b02c465a3e5d7c473717ad7721ba # 3.23.1 with: sarif_file: results.sarif From fc7a4052b9e639e2846ff29c813b6c9e81aeb353 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 19 Jan 2024 12:22:14 -0500 Subject: [PATCH 135/298] Bump actions/cache from 3.3.3 to 4.0.0 (#133) Bumps [actions/cache](https://github.com/actions/cache) from 3.3.3 to 4.0.0. - [Release notes](https://github.com/actions/cache/releases) - [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md) - [Commits](https://github.com/actions/cache/compare/e12d46a63a90f2fae62d114769bbf2a179198b5c...13aacd865c20de90d75de3b17ebe84f7a17d57d2) --- updated-dependencies: - dependency-name: actions/cache dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/codeql-analysis-cpp.yml | 2 +- .github/workflows/codeql-analysis-java.yml | 2 +- .github/workflows/coverage.yml | 2 +- .github/workflows/maven.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/codeql-analysis-cpp.yml b/.github/workflows/codeql-analysis-cpp.yml index 0d60d37d..eef0ae14 100644 --- a/.github/workflows/codeql-analysis-cpp.yml +++ b/.github/workflows/codeql-analysis-cpp.yml @@ -48,7 +48,7 @@ jobs: uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 with: persist-credentials: false - - uses: actions/cache@e12d46a63a90f2fae62d114769bbf2a179198b5c # v3.3.3 + - uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # v4.0.0 with: path: ~/.m2/repository key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} diff --git a/.github/workflows/codeql-analysis-java.yml b/.github/workflows/codeql-analysis-java.yml index 391c0329..145ea336 100644 --- a/.github/workflows/codeql-analysis-java.yml +++ b/.github/workflows/codeql-analysis-java.yml @@ -48,7 +48,7 @@ jobs: uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 with: persist-credentials: false - - uses: actions/cache@e12d46a63a90f2fae62d114769bbf2a179198b5c # v3.3.3 + - uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # v4.0.0 with: path: ~/.m2/repository key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index 154cd22d..de0d88b7 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -32,7 +32,7 @@ jobs: - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 with: persist-credentials: false - - uses: actions/cache@e12d46a63a90f2fae62d114769bbf2a179198b5c # v3.3.3 + - uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # v4.0.0 with: path: ~/.m2/repository key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index ad19c205..98f8dad5 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -38,7 +38,7 @@ jobs: - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 with: persist-credentials: false - - uses: actions/cache@e12d46a63a90f2fae62d114769bbf2a179198b5c # v3.3.3 + - uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # v4.0.0 with: path: ~/.m2/repository key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} From 91cd3e04854d3a45171ac2c76c9501a553739721 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 19 Jan 2024 12:22:24 -0500 Subject: [PATCH 136/298] Bump actions/upload-artifact from 4.0.0 to 4.2.0 (#132) Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 4.0.0 to 4.2.0. - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](https://github.com/actions/upload-artifact/compare/c7d193f32edcb7bfad88892161225aeda64e9392...694cdabd8bdb0f10b2cea11669e1bf5453eed0a6) --- updated-dependencies: - dependency-name: actions/upload-artifact dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/scorecards-analysis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/scorecards-analysis.yml b/.github/workflows/scorecards-analysis.yml index 6e3d30eb..912eeb21 100644 --- a/.github/workflows/scorecards-analysis.yml +++ b/.github/workflows/scorecards-analysis.yml @@ -57,7 +57,7 @@ jobs: publish_results: true - name: "Upload artifact" - uses: actions/upload-artifact@c7d193f32edcb7bfad88892161225aeda64e9392 # 4.0.0 + uses: actions/upload-artifact@694cdabd8bdb0f10b2cea11669e1bf5453eed0a6 # 4.2.0 with: name: SARIF file path: results.sarif From 973b761efff2535f6e03a7335c16db32f78f3650 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 26 Jan 2024 12:39:23 -0500 Subject: [PATCH 137/298] Bump codecov/codecov-action from 3.1.4 to 3.1.5 (#136) Bumps [codecov/codecov-action](https://github.com/codecov/codecov-action) from 3.1.4 to 3.1.5. - [Release notes](https://github.com/codecov/codecov-action/releases) - [Changelog](https://github.com/codecov/codecov-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/codecov/codecov-action/compare/eaaf4bedf32dbdc6b720b63067d99c4d77d6047d...4fe8c5f003fae66aa5ebb77cfd3e7bfbbda0b6b0) --- updated-dependencies: - dependency-name: codecov/codecov-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/coverage.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index de0d88b7..124155d8 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -47,6 +47,6 @@ jobs: run: mvn --show-version --batch-mode --no-transfer-progress test jacoco:report - name: Upload coverage to Codecov - uses: codecov/codecov-action@eaaf4bedf32dbdc6b720b63067d99c4d77d6047d # v3.1.4 + uses: codecov/codecov-action@4fe8c5f003fae66aa5ebb77cfd3e7bfbbda0b6b0 # v3.1.5 with: files: ./target/site/jacoco/jacoco.xml From 1231a23efa2b2ef4a1838963cf0a6978ed854eae Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 26 Jan 2024 12:39:33 -0500 Subject: [PATCH 138/298] Bump actions/upload-artifact from 4.2.0 to 4.3.0 (#135) Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 4.2.0 to 4.3.0. - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](https://github.com/actions/upload-artifact/compare/694cdabd8bdb0f10b2cea11669e1bf5453eed0a6...26f96dfa697d77e81fd5907df203aa23a56210a8) --- updated-dependencies: - dependency-name: actions/upload-artifact dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/scorecards-analysis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/scorecards-analysis.yml b/.github/workflows/scorecards-analysis.yml index 912eeb21..299a9e38 100644 --- a/.github/workflows/scorecards-analysis.yml +++ b/.github/workflows/scorecards-analysis.yml @@ -57,7 +57,7 @@ jobs: publish_results: true - name: "Upload artifact" - uses: actions/upload-artifact@694cdabd8bdb0f10b2cea11669e1bf5453eed0a6 # 4.2.0 + uses: actions/upload-artifact@26f96dfa697d77e81fd5907df203aa23a56210a8 # 4.3.0 with: name: SARIF file path: results.sarif From 619c8cc25bbc223d4b6bf2c8da90cd6f8df82353 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 26 Jan 2024 12:39:45 -0500 Subject: [PATCH 139/298] Bump github/codeql-action from 3.23.1 to 3.23.2 (#134) Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.23.1 to 3.23.2. - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/0b21cf2492b6b02c465a3e5d7c473717ad7721ba...b7bf0a3ed3ecfa44160715d7c442788f65f0f923) --- updated-dependencies: - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/codeql-analysis-cpp.yml | 4 ++-- .github/workflows/codeql-analysis-java.yml | 6 +++--- .github/workflows/scorecards-analysis.yml | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/codeql-analysis-cpp.yml b/.github/workflows/codeql-analysis-cpp.yml index eef0ae14..529d6abf 100644 --- a/.github/workflows/codeql-analysis-cpp.yml +++ b/.github/workflows/codeql-analysis-cpp.yml @@ -57,7 +57,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@0b21cf2492b6b02c465a3e5d7c473717ad7721ba # 3.23.1 + uses: github/codeql-action/init@b7bf0a3ed3ecfa44160715d7c442788f65f0f923 # 3.23.2 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -86,4 +86,4 @@ jobs: make - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@0b21cf2492b6b02c465a3e5d7c473717ad7721ba # 3.23.1 + uses: github/codeql-action/analyze@b7bf0a3ed3ecfa44160715d7c442788f65f0f923 # 3.23.2 diff --git a/.github/workflows/codeql-analysis-java.yml b/.github/workflows/codeql-analysis-java.yml index 145ea336..543e280f 100644 --- a/.github/workflows/codeql-analysis-java.yml +++ b/.github/workflows/codeql-analysis-java.yml @@ -57,7 +57,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@0b21cf2492b6b02c465a3e5d7c473717ad7721ba # 3.23.1 + uses: github/codeql-action/init@b7bf0a3ed3ecfa44160715d7c442788f65f0f923 # 3.23.2 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -68,7 +68,7 @@ jobs: # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). # If this step fails, then you should remove it and run the build manually (see below) - name: Autobuild - uses: github/codeql-action/autobuild@0b21cf2492b6b02c465a3e5d7c473717ad7721ba # 3.23.1 + uses: github/codeql-action/autobuild@b7bf0a3ed3ecfa44160715d7c442788f65f0f923 # 3.23.2 # ℹī¸ Command-line programs to run using the OS shell. # 📚 https://git.io/JvXDl @@ -82,4 +82,4 @@ jobs: # make release - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@0b21cf2492b6b02c465a3e5d7c473717ad7721ba # 3.23.1 + uses: github/codeql-action/analyze@b7bf0a3ed3ecfa44160715d7c442788f65f0f923 # 3.23.2 diff --git a/.github/workflows/scorecards-analysis.yml b/.github/workflows/scorecards-analysis.yml index 299a9e38..ab33678a 100644 --- a/.github/workflows/scorecards-analysis.yml +++ b/.github/workflows/scorecards-analysis.yml @@ -64,6 +64,6 @@ jobs: retention-days: 5 - name: "Upload to code-scanning" - uses: github/codeql-action/upload-sarif@0b21cf2492b6b02c465a3e5d7c473717ad7721ba # 3.23.1 + uses: github/codeql-action/upload-sarif@b7bf0a3ed3ecfa44160715d7c442788f65f0f923 # 3.23.2 with: sarif_file: results.sarif From 6a95175ba875977a59fa4be2e99d80d2fa8d053a Mon Sep 17 00:00:00 2001 From: Gary Gregory Date: Sun, 28 Jan 2024 14:29:54 -0500 Subject: [PATCH 140/298] Add missing XML Schema reference --- src/assembly/bin.xml | 4 +++- src/assembly/native-src.xml | 4 +++- src/assembly/src.xml | 4 +++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/assembly/bin.xml b/src/assembly/bin.xml index 01d37de6..54ec5dae 100644 --- a/src/assembly/bin.xml +++ b/src/assembly/bin.xml @@ -14,7 +14,9 @@ See the License for the specific language governing permissions and limitations under the License. --> - + bin tar.gz diff --git a/src/assembly/native-src.xml b/src/assembly/native-src.xml index d6279f1b..6ff43aa8 100644 --- a/src/assembly/native-src.xml +++ b/src/assembly/native-src.xml @@ -14,7 +14,9 @@ See the License for the specific language governing permissions and limitations under the License. --> - + native-src tar.gz diff --git a/src/assembly/src.xml b/src/assembly/src.xml index 7e1640df..a4ffa88e 100644 --- a/src/assembly/src.xml +++ b/src/assembly/src.xml @@ -14,7 +14,9 @@ See the License for the specific language governing permissions and limitations under the License. --> - + src tar.gz From 79c58317d2c0c2ce83603250571ad04b358541d5 Mon Sep 17 00:00:00 2001 From: Sebb Date: Wed, 31 Jan 2024 15:35:52 +0000 Subject: [PATCH 141/298] Canonical download location has moved --- src/site/xdoc/binaries.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/site/xdoc/binaries.xml b/src/site/xdoc/binaries.xml index 1f2bda0e..c67dabc3 100644 --- a/src/site/xdoc/binaries.xml +++ b/src/site/xdoc/binaries.xml @@ -27,7 +27,7 @@

    In the directory -binaries +binaries you will find subdirectories containing archives corresponding to your operating system. Only the Windows builds are provided as a zip file.

    From f41581d8281baed7cb036764782358965b2a5a53 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 2 Feb 2024 13:58:16 -0500 Subject: [PATCH 142/298] Bump codecov/codecov-action from 3.1.5 to 4.0.1 (#137) Bumps [codecov/codecov-action](https://github.com/codecov/codecov-action) from 3.1.5 to 4.0.1. - [Release notes](https://github.com/codecov/codecov-action/releases) - [Changelog](https://github.com/codecov/codecov-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/codecov/codecov-action/compare/4fe8c5f003fae66aa5ebb77cfd3e7bfbbda0b6b0...e0b68c6749509c5f83f984dd99a76a1c1a231044) --- updated-dependencies: - dependency-name: codecov/codecov-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/coverage.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index 124155d8..5b1518dc 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -47,6 +47,6 @@ jobs: run: mvn --show-version --batch-mode --no-transfer-progress test jacoco:report - name: Upload coverage to Codecov - uses: codecov/codecov-action@4fe8c5f003fae66aa5ebb77cfd3e7bfbbda0b6b0 # v3.1.5 + uses: codecov/codecov-action@e0b68c6749509c5f83f984dd99a76a1c1a231044 # v4.0.1 with: files: ./target/site/jacoco/jacoco.xml From 8a4a58ea85d19cd8f430b64433ca8a93334f1093 Mon Sep 17 00:00:00 2001 From: Gary Gregory Date: Fri, 2 Feb 2024 18:22:19 -0500 Subject: [PATCH 143/298] Add property project.build.outputTimestamp for build reproducibility --- pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/pom.xml b/pom.xml index 882bb19e..59dca589 100644 --- a/pom.xml +++ b/pom.xml @@ -136,6 +136,7 @@ 1.3.4 DAEMON 12310468 + 2024-01-01T00:00:00Z From 601c7604b05b3b5b8d43acf2c9ddadf3a86c755b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 2 Feb 2024 21:06:19 -0500 Subject: [PATCH 144/298] Bump org.apache.commons:commons-parent from 65 to 66 (#138) Bumps [org.apache.commons:commons-parent](https://github.com/apache/commons-parent) from 65 to 66. - [Changelog](https://github.com/apache/commons-parent/blob/master/RELEASE-NOTES.txt) - [Commits](https://github.com/apache/commons-parent/commits) --- updated-dependencies: - dependency-name: org.apache.commons:commons-parent dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 59dca589..330db495 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ org.apache.commons commons-parent - 65 + 66 4.0.0 commons-daemon From f44f1f491dc6ef743e39af9e4cca4b89aee5cd86 Mon Sep 17 00:00:00 2001 From: Gary Gregory Date: Fri, 2 Feb 2024 21:06:59 -0500 Subject: [PATCH 145/298] Bump org.apache.commons:commons-parent from 65 to 66 #138 --- src/changes/changes.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/changes/changes.xml b/src/changes/changes.xml index b825348c..638bd48c 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -48,7 +48,7 @@ - Bump commons-parent from 57 to 65, #93, #125, #132. + Bump commons-parent from 57 to 66. From 258cef1067aa22c447754bf047b63526b3be376c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 9 Feb 2024 11:51:14 -0500 Subject: [PATCH 146/298] Bump actions/upload-artifact from 4.3.0 to 4.3.1 (#139) Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 4.3.0 to 4.3.1. - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](https://github.com/actions/upload-artifact/compare/26f96dfa697d77e81fd5907df203aa23a56210a8...5d5d22a31266ced268874388b861e4b58bb5c2f3) --- updated-dependencies: - dependency-name: actions/upload-artifact dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/scorecards-analysis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/scorecards-analysis.yml b/.github/workflows/scorecards-analysis.yml index ab33678a..64d9dd84 100644 --- a/.github/workflows/scorecards-analysis.yml +++ b/.github/workflows/scorecards-analysis.yml @@ -57,7 +57,7 @@ jobs: publish_results: true - name: "Upload artifact" - uses: actions/upload-artifact@26f96dfa697d77e81fd5907df203aa23a56210a8 # 4.3.0 + uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # 4.3.1 with: name: SARIF file path: results.sarif From 37d45cc6889189a150ba7192971e56701af681a3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 9 Feb 2024 11:51:26 -0500 Subject: [PATCH 147/298] Bump github/codeql-action from 3.23.2 to 3.24.0 (#140) Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.23.2 to 3.24.0. - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/b7bf0a3ed3ecfa44160715d7c442788f65f0f923...e8893c57a1f3a2b659b6b55564fdfdbbd2982911) --- updated-dependencies: - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/codeql-analysis-cpp.yml | 4 ++-- .github/workflows/codeql-analysis-java.yml | 6 +++--- .github/workflows/scorecards-analysis.yml | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/codeql-analysis-cpp.yml b/.github/workflows/codeql-analysis-cpp.yml index 529d6abf..67414343 100644 --- a/.github/workflows/codeql-analysis-cpp.yml +++ b/.github/workflows/codeql-analysis-cpp.yml @@ -57,7 +57,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@b7bf0a3ed3ecfa44160715d7c442788f65f0f923 # 3.23.2 + uses: github/codeql-action/init@e8893c57a1f3a2b659b6b55564fdfdbbd2982911 # 3.24.0 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -86,4 +86,4 @@ jobs: make - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@b7bf0a3ed3ecfa44160715d7c442788f65f0f923 # 3.23.2 + uses: github/codeql-action/analyze@e8893c57a1f3a2b659b6b55564fdfdbbd2982911 # 3.24.0 diff --git a/.github/workflows/codeql-analysis-java.yml b/.github/workflows/codeql-analysis-java.yml index 543e280f..57b163a2 100644 --- a/.github/workflows/codeql-analysis-java.yml +++ b/.github/workflows/codeql-analysis-java.yml @@ -57,7 +57,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@b7bf0a3ed3ecfa44160715d7c442788f65f0f923 # 3.23.2 + uses: github/codeql-action/init@e8893c57a1f3a2b659b6b55564fdfdbbd2982911 # 3.24.0 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -68,7 +68,7 @@ jobs: # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). # If this step fails, then you should remove it and run the build manually (see below) - name: Autobuild - uses: github/codeql-action/autobuild@b7bf0a3ed3ecfa44160715d7c442788f65f0f923 # 3.23.2 + uses: github/codeql-action/autobuild@e8893c57a1f3a2b659b6b55564fdfdbbd2982911 # 3.24.0 # ℹī¸ Command-line programs to run using the OS shell. # 📚 https://git.io/JvXDl @@ -82,4 +82,4 @@ jobs: # make release - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@b7bf0a3ed3ecfa44160715d7c442788f65f0f923 # 3.23.2 + uses: github/codeql-action/analyze@e8893c57a1f3a2b659b6b55564fdfdbbd2982911 # 3.24.0 diff --git a/.github/workflows/scorecards-analysis.yml b/.github/workflows/scorecards-analysis.yml index 64d9dd84..50acf0ea 100644 --- a/.github/workflows/scorecards-analysis.yml +++ b/.github/workflows/scorecards-analysis.yml @@ -64,6 +64,6 @@ jobs: retention-days: 5 - name: "Upload to code-scanning" - uses: github/codeql-action/upload-sarif@b7bf0a3ed3ecfa44160715d7c442788f65f0f923 # 3.23.2 + uses: github/codeql-action/upload-sarif@e8893c57a1f3a2b659b6b55564fdfdbbd2982911 # 3.24.0 with: sarif_file: results.sarif From de45a87ee1a9c1175cfb6d9b06a08c219d3b1c5f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 16 Feb 2024 11:31:43 -0500 Subject: [PATCH 148/298] Bump github/codeql-action from 3.24.0 to 3.24.3 (#141) Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.24.0 to 3.24.3. - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/e8893c57a1f3a2b659b6b55564fdfdbbd2982911...379614612a29c9e28f31f39a59013eb8012a51f0) --- updated-dependencies: - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/codeql-analysis-cpp.yml | 4 ++-- .github/workflows/codeql-analysis-java.yml | 6 +++--- .github/workflows/scorecards-analysis.yml | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/codeql-analysis-cpp.yml b/.github/workflows/codeql-analysis-cpp.yml index 67414343..5ebd4f2f 100644 --- a/.github/workflows/codeql-analysis-cpp.yml +++ b/.github/workflows/codeql-analysis-cpp.yml @@ -57,7 +57,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@e8893c57a1f3a2b659b6b55564fdfdbbd2982911 # 3.24.0 + uses: github/codeql-action/init@379614612a29c9e28f31f39a59013eb8012a51f0 # 3.24.3 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -86,4 +86,4 @@ jobs: make - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@e8893c57a1f3a2b659b6b55564fdfdbbd2982911 # 3.24.0 + uses: github/codeql-action/analyze@379614612a29c9e28f31f39a59013eb8012a51f0 # 3.24.3 diff --git a/.github/workflows/codeql-analysis-java.yml b/.github/workflows/codeql-analysis-java.yml index 57b163a2..7cfc9590 100644 --- a/.github/workflows/codeql-analysis-java.yml +++ b/.github/workflows/codeql-analysis-java.yml @@ -57,7 +57,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@e8893c57a1f3a2b659b6b55564fdfdbbd2982911 # 3.24.0 + uses: github/codeql-action/init@379614612a29c9e28f31f39a59013eb8012a51f0 # 3.24.3 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -68,7 +68,7 @@ jobs: # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). # If this step fails, then you should remove it and run the build manually (see below) - name: Autobuild - uses: github/codeql-action/autobuild@e8893c57a1f3a2b659b6b55564fdfdbbd2982911 # 3.24.0 + uses: github/codeql-action/autobuild@379614612a29c9e28f31f39a59013eb8012a51f0 # 3.24.3 # ℹī¸ Command-line programs to run using the OS shell. # 📚 https://git.io/JvXDl @@ -82,4 +82,4 @@ jobs: # make release - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@e8893c57a1f3a2b659b6b55564fdfdbbd2982911 # 3.24.0 + uses: github/codeql-action/analyze@379614612a29c9e28f31f39a59013eb8012a51f0 # 3.24.3 diff --git a/.github/workflows/scorecards-analysis.yml b/.github/workflows/scorecards-analysis.yml index 50acf0ea..b0dfd692 100644 --- a/.github/workflows/scorecards-analysis.yml +++ b/.github/workflows/scorecards-analysis.yml @@ -64,6 +64,6 @@ jobs: retention-days: 5 - name: "Upload to code-scanning" - uses: github/codeql-action/upload-sarif@e8893c57a1f3a2b659b6b55564fdfdbbd2982911 # 3.24.0 + uses: github/codeql-action/upload-sarif@379614612a29c9e28f31f39a59013eb8012a51f0 # 3.24.3 with: sarif_file: results.sarif From 012bb215bf937e1b92c80290879fbddab0664d3a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 23 Feb 2024 08:53:30 -0800 Subject: [PATCH 149/298] Bump github/codeql-action from 3.24.3 to 3.24.5 (#142) Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.24.3 to 3.24.5. - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/379614612a29c9e28f31f39a59013eb8012a51f0...47b3d888fe66b639e431abf22ebca059152f1eea) --- updated-dependencies: - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/codeql-analysis-cpp.yml | 4 ++-- .github/workflows/codeql-analysis-java.yml | 6 +++--- .github/workflows/scorecards-analysis.yml | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/codeql-analysis-cpp.yml b/.github/workflows/codeql-analysis-cpp.yml index 5ebd4f2f..60bd0453 100644 --- a/.github/workflows/codeql-analysis-cpp.yml +++ b/.github/workflows/codeql-analysis-cpp.yml @@ -57,7 +57,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@379614612a29c9e28f31f39a59013eb8012a51f0 # 3.24.3 + uses: github/codeql-action/init@47b3d888fe66b639e431abf22ebca059152f1eea # 3.24.5 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -86,4 +86,4 @@ jobs: make - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@379614612a29c9e28f31f39a59013eb8012a51f0 # 3.24.3 + uses: github/codeql-action/analyze@47b3d888fe66b639e431abf22ebca059152f1eea # 3.24.5 diff --git a/.github/workflows/codeql-analysis-java.yml b/.github/workflows/codeql-analysis-java.yml index 7cfc9590..9243be05 100644 --- a/.github/workflows/codeql-analysis-java.yml +++ b/.github/workflows/codeql-analysis-java.yml @@ -57,7 +57,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@379614612a29c9e28f31f39a59013eb8012a51f0 # 3.24.3 + uses: github/codeql-action/init@47b3d888fe66b639e431abf22ebca059152f1eea # 3.24.5 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -68,7 +68,7 @@ jobs: # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). # If this step fails, then you should remove it and run the build manually (see below) - name: Autobuild - uses: github/codeql-action/autobuild@379614612a29c9e28f31f39a59013eb8012a51f0 # 3.24.3 + uses: github/codeql-action/autobuild@47b3d888fe66b639e431abf22ebca059152f1eea # 3.24.5 # ℹī¸ Command-line programs to run using the OS shell. # 📚 https://git.io/JvXDl @@ -82,4 +82,4 @@ jobs: # make release - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@379614612a29c9e28f31f39a59013eb8012a51f0 # 3.24.3 + uses: github/codeql-action/analyze@47b3d888fe66b639e431abf22ebca059152f1eea # 3.24.5 diff --git a/.github/workflows/scorecards-analysis.yml b/.github/workflows/scorecards-analysis.yml index b0dfd692..99391128 100644 --- a/.github/workflows/scorecards-analysis.yml +++ b/.github/workflows/scorecards-analysis.yml @@ -64,6 +64,6 @@ jobs: retention-days: 5 - name: "Upload to code-scanning" - uses: github/codeql-action/upload-sarif@379614612a29c9e28f31f39a59013eb8012a51f0 # 3.24.3 + uses: github/codeql-action/upload-sarif@47b3d888fe66b639e431abf22ebca059152f1eea # 3.24.5 with: sarif_file: results.sarif From af964bc2370da158a4fe5a980ef8754bc3c16600 Mon Sep 17 00:00:00 2001 From: Gary Gregory Date: Fri, 23 Feb 2024 10:30:58 -0800 Subject: [PATCH 150/298] Fix Javadoc banner --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 5c8888b3..7d254eb6 100644 --- a/README.md +++ b/README.md @@ -46,7 +46,7 @@ Apache Commons Daemon [![Java CI](https://github.com/apache/commons-daemon/actions/workflows/maven.yml/badge.svg)](https://github.com/apache/commons-daemon/actions/workflows/maven.yml) [![Coverage Status](https://codecov.io/gh/apache/commons-daemon/branch/master/graph/badge.svg)](https://app.codecov.io/gh/apache/commons-daemon) [![Maven Central](https://maven-badges.herokuapp.com/maven-central/commons-daemon/commons-daemon/badge.svg)](https://maven-badges.herokuapp.com/maven-central/commons-daemon/commons-daemon/) -[![Javadocs](https://javadoc.io/badge/commons-daemon/commons-daemon/1.3.3.svg)](https://javadoc.io/doc/commons-daemon/commons-daemon/1.3.3) +[![Javadocs](https://javadoc.io/badge/commons-daemon/commons-daemon/1.3.4.svg)](https://javadoc.io/doc/commons-daemon/commons-daemon/1.3.4) [![CodeQL CPP](https://github.com/apache/commons-daemon/actions/workflows/codeql-analysis-cpp.yml/badge.svg)](https://github.com/apache/commons-daemon/actions/workflows/codeql-analysis-cpp.yml) [![CodeQL Java](https://github.com/apache/commons-daemon/actions/workflows/codeql-analysis-java.yml/badge.svg)](https://github.com/apache/commons-daemon/actions/workflows/codeql-analysis-java.yml) From a3bd0ecf4a63a120727684c19a5cabd32be4e869 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 1 Mar 2024 11:39:18 -0500 Subject: [PATCH 151/298] Bump actions/cache from 4.0.0 to 4.0.1 (#143) Bumps [actions/cache](https://github.com/actions/cache) from 4.0.0 to 4.0.1. - [Release notes](https://github.com/actions/cache/releases) - [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md) - [Commits](https://github.com/actions/cache/compare/13aacd865c20de90d75de3b17ebe84f7a17d57d2...ab5e6d0c87105b4c9c2047343972218f562e4319) --- updated-dependencies: - dependency-name: actions/cache dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/codeql-analysis-cpp.yml | 2 +- .github/workflows/codeql-analysis-java.yml | 2 +- .github/workflows/coverage.yml | 2 +- .github/workflows/maven.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/codeql-analysis-cpp.yml b/.github/workflows/codeql-analysis-cpp.yml index 60bd0453..460e1c16 100644 --- a/.github/workflows/codeql-analysis-cpp.yml +++ b/.github/workflows/codeql-analysis-cpp.yml @@ -48,7 +48,7 @@ jobs: uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 with: persist-credentials: false - - uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # v4.0.0 + - uses: actions/cache@ab5e6d0c87105b4c9c2047343972218f562e4319 # v4.0.1 with: path: ~/.m2/repository key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} diff --git a/.github/workflows/codeql-analysis-java.yml b/.github/workflows/codeql-analysis-java.yml index 9243be05..b2459cbc 100644 --- a/.github/workflows/codeql-analysis-java.yml +++ b/.github/workflows/codeql-analysis-java.yml @@ -48,7 +48,7 @@ jobs: uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 with: persist-credentials: false - - uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # v4.0.0 + - uses: actions/cache@ab5e6d0c87105b4c9c2047343972218f562e4319 # v4.0.1 with: path: ~/.m2/repository key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index 5b1518dc..d7eafb26 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -32,7 +32,7 @@ jobs: - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 with: persist-credentials: false - - uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # v4.0.0 + - uses: actions/cache@ab5e6d0c87105b4c9c2047343972218f562e4319 # v4.0.1 with: path: ~/.m2/repository key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 98f8dad5..f731798e 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -38,7 +38,7 @@ jobs: - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 with: persist-credentials: false - - uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # v4.0.0 + - uses: actions/cache@ab5e6d0c87105b4c9c2047343972218f562e4319 # v4.0.1 with: path: ~/.m2/repository key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} From e1afdcae4dad187effcc5b980a2951dd494113ff Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 1 Mar 2024 11:39:28 -0500 Subject: [PATCH 152/298] Bump github/codeql-action from 3.24.5 to 3.24.6 (#146) Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.24.5 to 3.24.6. - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/47b3d888fe66b639e431abf22ebca059152f1eea...8a470fddafa5cbb6266ee11b37ef4d8aae19c571) --- updated-dependencies: - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/codeql-analysis-cpp.yml | 4 ++-- .github/workflows/codeql-analysis-java.yml | 6 +++--- .github/workflows/scorecards-analysis.yml | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/codeql-analysis-cpp.yml b/.github/workflows/codeql-analysis-cpp.yml index 460e1c16..f9b493c3 100644 --- a/.github/workflows/codeql-analysis-cpp.yml +++ b/.github/workflows/codeql-analysis-cpp.yml @@ -57,7 +57,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@47b3d888fe66b639e431abf22ebca059152f1eea # 3.24.5 + uses: github/codeql-action/init@8a470fddafa5cbb6266ee11b37ef4d8aae19c571 # 3.24.6 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -86,4 +86,4 @@ jobs: make - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@47b3d888fe66b639e431abf22ebca059152f1eea # 3.24.5 + uses: github/codeql-action/analyze@8a470fddafa5cbb6266ee11b37ef4d8aae19c571 # 3.24.6 diff --git a/.github/workflows/codeql-analysis-java.yml b/.github/workflows/codeql-analysis-java.yml index b2459cbc..177e3830 100644 --- a/.github/workflows/codeql-analysis-java.yml +++ b/.github/workflows/codeql-analysis-java.yml @@ -57,7 +57,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@47b3d888fe66b639e431abf22ebca059152f1eea # 3.24.5 + uses: github/codeql-action/init@8a470fddafa5cbb6266ee11b37ef4d8aae19c571 # 3.24.6 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -68,7 +68,7 @@ jobs: # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). # If this step fails, then you should remove it and run the build manually (see below) - name: Autobuild - uses: github/codeql-action/autobuild@47b3d888fe66b639e431abf22ebca059152f1eea # 3.24.5 + uses: github/codeql-action/autobuild@8a470fddafa5cbb6266ee11b37ef4d8aae19c571 # 3.24.6 # ℹī¸ Command-line programs to run using the OS shell. # 📚 https://git.io/JvXDl @@ -82,4 +82,4 @@ jobs: # make release - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@47b3d888fe66b639e431abf22ebca059152f1eea # 3.24.5 + uses: github/codeql-action/analyze@8a470fddafa5cbb6266ee11b37ef4d8aae19c571 # 3.24.6 diff --git a/.github/workflows/scorecards-analysis.yml b/.github/workflows/scorecards-analysis.yml index 99391128..2d6bb20c 100644 --- a/.github/workflows/scorecards-analysis.yml +++ b/.github/workflows/scorecards-analysis.yml @@ -64,6 +64,6 @@ jobs: retention-days: 5 - name: "Upload to code-scanning" - uses: github/codeql-action/upload-sarif@47b3d888fe66b639e431abf22ebca059152f1eea # 3.24.5 + uses: github/codeql-action/upload-sarif@8a470fddafa5cbb6266ee11b37ef4d8aae19c571 # 3.24.6 with: sarif_file: results.sarif From 900a4475290dce58c873fb297f9f0d6215a7f896 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 1 Mar 2024 11:39:38 -0500 Subject: [PATCH 153/298] Bump codecov/codecov-action from 4.0.1 to 4.1.0 (#145) Bumps [codecov/codecov-action](https://github.com/codecov/codecov-action) from 4.0.1 to 4.1.0. - [Release notes](https://github.com/codecov/codecov-action/releases) - [Changelog](https://github.com/codecov/codecov-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/codecov/codecov-action/compare/e0b68c6749509c5f83f984dd99a76a1c1a231044...54bcd8715eee62d40e33596ef5e8f0f48dbbccab) --- updated-dependencies: - dependency-name: codecov/codecov-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/coverage.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index d7eafb26..e801e853 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -47,6 +47,6 @@ jobs: run: mvn --show-version --batch-mode --no-transfer-progress test jacoco:report - name: Upload coverage to Codecov - uses: codecov/codecov-action@e0b68c6749509c5f83f984dd99a76a1c1a231044 # v4.0.1 + uses: codecov/codecov-action@54bcd8715eee62d40e33596ef5e8f0f48dbbccab # v4.1.0 with: files: ./target/site/jacoco/jacoco.xml From 00faae3e4565f0b22b5bf2f27c9cea4298e2e8f4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 1 Mar 2024 11:39:50 -0500 Subject: [PATCH 154/298] Bump actions/setup-java from 4.0.0 to 4.1.0 (#144) Bumps [actions/setup-java](https://github.com/actions/setup-java) from 4.0.0 to 4.1.0. - [Release notes](https://github.com/actions/setup-java/releases) - [Commits](https://github.com/actions/setup-java/compare/387ac29b308b003ca37ba93a6cab5eb57c8f5f93...9704b39bf258b59bc04b50fa2dd55e9ed76b47a8) --- updated-dependencies: - dependency-name: actions/setup-java dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/coverage.yml | 2 +- .github/workflows/maven.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index e801e853..29624fac 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -39,7 +39,7 @@ jobs: restore-keys: | ${{ runner.os }}-maven- - name: Set up JDK ${{ matrix.java }} - uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v4.0.0 + uses: actions/setup-java@9704b39bf258b59bc04b50fa2dd55e9ed76b47a8 # v4.1.0 with: distribution: 'temurin' java-version: ${{ matrix.java }} diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index f731798e..aacafa41 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -45,7 +45,7 @@ jobs: restore-keys: | ${{ runner.os }}-maven- - name: Set up JDK ${{ matrix.java }} - uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v4.0.0 + uses: actions/setup-java@9704b39bf258b59bc04b50fa2dd55e9ed76b47a8 # v4.1.0 with: distribution: 'temurin' java-version: ${{ matrix.java }} From c8f80385db1c92905d03304b19e19c2f20d3e693 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 6 Mar 2024 09:15:02 -0500 Subject: [PATCH 155/298] Bump org.apache.commons:commons-parent from 66 to 67 (#147) Bumps [org.apache.commons:commons-parent](https://github.com/apache/commons-parent) from 66 to 67. - [Changelog](https://github.com/apache/commons-parent/blob/master/RELEASE-NOTES.txt) - [Commits](https://github.com/apache/commons-parent/commits) --- updated-dependencies: - dependency-name: org.apache.commons:commons-parent dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 330db495..99781dfb 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ org.apache.commons commons-parent - 66 + 67 4.0.0 commons-daemon From d1f8407394a3b85e797e9443974588c6950ca24d Mon Sep 17 00:00:00 2001 From: Gary Gregory Date: Wed, 6 Mar 2024 09:15:34 -0500 Subject: [PATCH 156/298] Bump org.apache.commons:commons-parent from 66 to 67 #147 --- src/changes/changes.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/changes/changes.xml b/src/changes/changes.xml index 638bd48c..7fa2bf18 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -48,7 +48,7 @@ - Bump commons-parent from 57 to 66. + Bump commons-parent from 57 to 67. From 7530074366dd46cd7b58f18ebfc5278c2e0a5437 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 15 Mar 2024 13:22:39 -0400 Subject: [PATCH 157/298] Bump actions/checkout from 4.1.1 to 4.1.2 (#148) Bumps [actions/checkout](https://github.com/actions/checkout) from 4.1.1 to 4.1.2. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/b4ffde65f46336ab88eb53be808477a3936bae11...9bb56186c3b09b4f86b1c65136769dd318469633) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/codeql-analysis-cpp.yml | 2 +- .github/workflows/codeql-analysis-java.yml | 2 +- .github/workflows/coverage.yml | 2 +- .github/workflows/maven.yml | 2 +- .github/workflows/scorecards-analysis.yml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/codeql-analysis-cpp.yml b/.github/workflows/codeql-analysis-cpp.yml index f9b493c3..72cb5e0c 100644 --- a/.github/workflows/codeql-analysis-cpp.yml +++ b/.github/workflows/codeql-analysis-cpp.yml @@ -45,7 +45,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 + uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2 with: persist-credentials: false - uses: actions/cache@ab5e6d0c87105b4c9c2047343972218f562e4319 # v4.0.1 diff --git a/.github/workflows/codeql-analysis-java.yml b/.github/workflows/codeql-analysis-java.yml index 177e3830..43ed73d3 100644 --- a/.github/workflows/codeql-analysis-java.yml +++ b/.github/workflows/codeql-analysis-java.yml @@ -45,7 +45,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 + uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2 with: persist-credentials: false - uses: actions/cache@ab5e6d0c87105b4c9c2047343972218f562e4319 # v4.0.1 diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index 29624fac..42d5562a 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -29,7 +29,7 @@ jobs: java: [ 8 ] steps: - - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 + - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2 with: persist-credentials: false - uses: actions/cache@ab5e6d0c87105b4c9c2047343972218f562e4319 # v4.0.1 diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index aacafa41..b8a37440 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -35,7 +35,7 @@ jobs: # experimental: true steps: - - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 + - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2 with: persist-credentials: false - uses: actions/cache@ab5e6d0c87105b4c9c2047343972218f562e4319 # v4.0.1 diff --git a/.github/workflows/scorecards-analysis.yml b/.github/workflows/scorecards-analysis.yml index 2d6bb20c..a6e439f8 100644 --- a/.github/workflows/scorecards-analysis.yml +++ b/.github/workflows/scorecards-analysis.yml @@ -40,7 +40,7 @@ jobs: steps: - name: "Checkout code" - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 + uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2 with: persist-credentials: false From 049635a004dd7b668a38a6985841d62bf73f4188 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 15 Mar 2024 13:22:49 -0400 Subject: [PATCH 158/298] Bump actions/setup-java from 4.1.0 to 4.2.1 (#150) Bumps [actions/setup-java](https://github.com/actions/setup-java) from 4.1.0 to 4.2.1. - [Release notes](https://github.com/actions/setup-java/releases) - [Commits](https://github.com/actions/setup-java/compare/9704b39bf258b59bc04b50fa2dd55e9ed76b47a8...99b8673ff64fbf99d8d325f52d9a5bdedb8483e9) --- updated-dependencies: - dependency-name: actions/setup-java dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/coverage.yml | 2 +- .github/workflows/maven.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index 42d5562a..03e66304 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -39,7 +39,7 @@ jobs: restore-keys: | ${{ runner.os }}-maven- - name: Set up JDK ${{ matrix.java }} - uses: actions/setup-java@9704b39bf258b59bc04b50fa2dd55e9ed76b47a8 # v4.1.0 + uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1 with: distribution: 'temurin' java-version: ${{ matrix.java }} diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index b8a37440..88a99597 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -45,7 +45,7 @@ jobs: restore-keys: | ${{ runner.os }}-maven- - name: Set up JDK ${{ matrix.java }} - uses: actions/setup-java@9704b39bf258b59bc04b50fa2dd55e9ed76b47a8 # v4.1.0 + uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1 with: distribution: 'temurin' java-version: ${{ matrix.java }} From 503981f498b45561eb03de714ca07b979aefad05 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 15 Mar 2024 13:22:59 -0400 Subject: [PATCH 159/298] Bump github/codeql-action from 3.24.6 to 3.24.7 (#149) Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.24.6 to 3.24.7. - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/8a470fddafa5cbb6266ee11b37ef4d8aae19c571...3ab4101902695724f9365a384f86c1074d94e18c) --- updated-dependencies: - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/codeql-analysis-cpp.yml | 4 ++-- .github/workflows/codeql-analysis-java.yml | 6 +++--- .github/workflows/scorecards-analysis.yml | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/codeql-analysis-cpp.yml b/.github/workflows/codeql-analysis-cpp.yml index 72cb5e0c..948c2b88 100644 --- a/.github/workflows/codeql-analysis-cpp.yml +++ b/.github/workflows/codeql-analysis-cpp.yml @@ -57,7 +57,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@8a470fddafa5cbb6266ee11b37ef4d8aae19c571 # 3.24.6 + uses: github/codeql-action/init@3ab4101902695724f9365a384f86c1074d94e18c # 3.24.7 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -86,4 +86,4 @@ jobs: make - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@8a470fddafa5cbb6266ee11b37ef4d8aae19c571 # 3.24.6 + uses: github/codeql-action/analyze@3ab4101902695724f9365a384f86c1074d94e18c # 3.24.7 diff --git a/.github/workflows/codeql-analysis-java.yml b/.github/workflows/codeql-analysis-java.yml index 43ed73d3..623f497e 100644 --- a/.github/workflows/codeql-analysis-java.yml +++ b/.github/workflows/codeql-analysis-java.yml @@ -57,7 +57,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@8a470fddafa5cbb6266ee11b37ef4d8aae19c571 # 3.24.6 + uses: github/codeql-action/init@3ab4101902695724f9365a384f86c1074d94e18c # 3.24.7 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -68,7 +68,7 @@ jobs: # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). # If this step fails, then you should remove it and run the build manually (see below) - name: Autobuild - uses: github/codeql-action/autobuild@8a470fddafa5cbb6266ee11b37ef4d8aae19c571 # 3.24.6 + uses: github/codeql-action/autobuild@3ab4101902695724f9365a384f86c1074d94e18c # 3.24.7 # ℹī¸ Command-line programs to run using the OS shell. # 📚 https://git.io/JvXDl @@ -82,4 +82,4 @@ jobs: # make release - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@8a470fddafa5cbb6266ee11b37ef4d8aae19c571 # 3.24.6 + uses: github/codeql-action/analyze@3ab4101902695724f9365a384f86c1074d94e18c # 3.24.7 diff --git a/.github/workflows/scorecards-analysis.yml b/.github/workflows/scorecards-analysis.yml index a6e439f8..a13d447f 100644 --- a/.github/workflows/scorecards-analysis.yml +++ b/.github/workflows/scorecards-analysis.yml @@ -64,6 +64,6 @@ jobs: retention-days: 5 - name: "Upload to code-scanning" - uses: github/codeql-action/upload-sarif@8a470fddafa5cbb6266ee11b37ef4d8aae19c571 # 3.24.6 + uses: github/codeql-action/upload-sarif@3ab4101902695724f9365a384f86c1074d94e18c # 3.24.7 with: sarif_file: results.sarif From a2fd5721ef3dd77dc9777cf4fe622c42de7f6658 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 22 Mar 2024 12:31:22 -0400 Subject: [PATCH 160/298] Bump github/codeql-action from 3.24.7 to 3.24.9 (#151) Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.24.7 to 3.24.9. - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/3ab4101902695724f9365a384f86c1074d94e18c...1b1aada464948af03b950897e5eb522f92603cc2) --- updated-dependencies: - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/codeql-analysis-cpp.yml | 4 ++-- .github/workflows/codeql-analysis-java.yml | 6 +++--- .github/workflows/scorecards-analysis.yml | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/codeql-analysis-cpp.yml b/.github/workflows/codeql-analysis-cpp.yml index 948c2b88..7cc285c2 100644 --- a/.github/workflows/codeql-analysis-cpp.yml +++ b/.github/workflows/codeql-analysis-cpp.yml @@ -57,7 +57,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@3ab4101902695724f9365a384f86c1074d94e18c # 3.24.7 + uses: github/codeql-action/init@1b1aada464948af03b950897e5eb522f92603cc2 # 3.24.9 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -86,4 +86,4 @@ jobs: make - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@3ab4101902695724f9365a384f86c1074d94e18c # 3.24.7 + uses: github/codeql-action/analyze@1b1aada464948af03b950897e5eb522f92603cc2 # 3.24.9 diff --git a/.github/workflows/codeql-analysis-java.yml b/.github/workflows/codeql-analysis-java.yml index 623f497e..2a3d1726 100644 --- a/.github/workflows/codeql-analysis-java.yml +++ b/.github/workflows/codeql-analysis-java.yml @@ -57,7 +57,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@3ab4101902695724f9365a384f86c1074d94e18c # 3.24.7 + uses: github/codeql-action/init@1b1aada464948af03b950897e5eb522f92603cc2 # 3.24.9 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -68,7 +68,7 @@ jobs: # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). # If this step fails, then you should remove it and run the build manually (see below) - name: Autobuild - uses: github/codeql-action/autobuild@3ab4101902695724f9365a384f86c1074d94e18c # 3.24.7 + uses: github/codeql-action/autobuild@1b1aada464948af03b950897e5eb522f92603cc2 # 3.24.9 # ℹī¸ Command-line programs to run using the OS shell. # 📚 https://git.io/JvXDl @@ -82,4 +82,4 @@ jobs: # make release - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@3ab4101902695724f9365a384f86c1074d94e18c # 3.24.7 + uses: github/codeql-action/analyze@1b1aada464948af03b950897e5eb522f92603cc2 # 3.24.9 diff --git a/.github/workflows/scorecards-analysis.yml b/.github/workflows/scorecards-analysis.yml index a13d447f..e16004d0 100644 --- a/.github/workflows/scorecards-analysis.yml +++ b/.github/workflows/scorecards-analysis.yml @@ -64,6 +64,6 @@ jobs: retention-days: 5 - name: "Upload to code-scanning" - uses: github/codeql-action/upload-sarif@3ab4101902695724f9365a384f86c1074d94e18c # 3.24.7 + uses: github/codeql-action/upload-sarif@1b1aada464948af03b950897e5eb522f92603cc2 # 3.24.9 with: sarif_file: results.sarif From 75cf6be3b18eae55db6afd16120c564bdc300654 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 22 Mar 2024 12:31:32 -0400 Subject: [PATCH 161/298] Bump actions/cache from 4.0.1 to 4.0.2 (#152) Bumps [actions/cache](https://github.com/actions/cache) from 4.0.1 to 4.0.2. - [Release notes](https://github.com/actions/cache/releases) - [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md) - [Commits](https://github.com/actions/cache/compare/ab5e6d0c87105b4c9c2047343972218f562e4319...0c45773b623bea8c8e75f6c82b208c3cf94ea4f9) --- updated-dependencies: - dependency-name: actions/cache dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/codeql-analysis-cpp.yml | 2 +- .github/workflows/codeql-analysis-java.yml | 2 +- .github/workflows/coverage.yml | 2 +- .github/workflows/maven.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/codeql-analysis-cpp.yml b/.github/workflows/codeql-analysis-cpp.yml index 7cc285c2..69f014fb 100644 --- a/.github/workflows/codeql-analysis-cpp.yml +++ b/.github/workflows/codeql-analysis-cpp.yml @@ -48,7 +48,7 @@ jobs: uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2 with: persist-credentials: false - - uses: actions/cache@ab5e6d0c87105b4c9c2047343972218f562e4319 # v4.0.1 + - uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2 with: path: ~/.m2/repository key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} diff --git a/.github/workflows/codeql-analysis-java.yml b/.github/workflows/codeql-analysis-java.yml index 2a3d1726..da0304ae 100644 --- a/.github/workflows/codeql-analysis-java.yml +++ b/.github/workflows/codeql-analysis-java.yml @@ -48,7 +48,7 @@ jobs: uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2 with: persist-credentials: false - - uses: actions/cache@ab5e6d0c87105b4c9c2047343972218f562e4319 # v4.0.1 + - uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2 with: path: ~/.m2/repository key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index 03e66304..8036df16 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -32,7 +32,7 @@ jobs: - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2 with: persist-credentials: false - - uses: actions/cache@ab5e6d0c87105b4c9c2047343972218f562e4319 # v4.0.1 + - uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2 with: path: ~/.m2/repository key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 88a99597..04b79793 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -38,7 +38,7 @@ jobs: - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2 with: persist-credentials: false - - uses: actions/cache@ab5e6d0c87105b4c9c2047343972218f562e4319 # v4.0.1 + - uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2 with: path: ~/.m2/repository key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} From 23e0bf203293722a50edc0ce93ed3b6fefffe25b Mon Sep 17 00:00:00 2001 From: Gary Gregory Date: Sat, 23 Mar 2024 18:00:01 -0400 Subject: [PATCH 162/298] Uppercase acronym in comment --- src/main/java/org/apache/commons/daemon/Daemon.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/apache/commons/daemon/Daemon.java b/src/main/java/org/apache/commons/daemon/Daemon.java index 7c4e75e6..a2ff8cc8 100644 --- a/src/main/java/org/apache/commons/daemon/Daemon.java +++ b/src/main/java/org/apache/commons/daemon/Daemon.java @@ -40,7 +40,7 @@ public interface Daemon * constructor. *

    *

    - * Under certain operating systems (typically Unix based operating + * Under certain operating systems (typically UNIX based operating * systems) and if the native invocation framework is configured to do * so, this method might be called with super-user privileges. *

    From 833c70a09010fad16f807b1668ce717fcecb198e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 29 Mar 2024 13:32:14 -0400 Subject: [PATCH 163/298] Bump codecov/codecov-action from 4.1.0 to 4.1.1 (#154) Bumps [codecov/codecov-action](https://github.com/codecov/codecov-action) from 4.1.0 to 4.1.1. - [Release notes](https://github.com/codecov/codecov-action/releases) - [Changelog](https://github.com/codecov/codecov-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/codecov/codecov-action/compare/54bcd8715eee62d40e33596ef5e8f0f48dbbccab...c16abc29c95fcf9174b58eb7e1abf4c866893bc8) --- updated-dependencies: - dependency-name: codecov/codecov-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/coverage.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index 8036df16..1038d0c1 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -47,6 +47,6 @@ jobs: run: mvn --show-version --batch-mode --no-transfer-progress test jacoco:report - name: Upload coverage to Codecov - uses: codecov/codecov-action@54bcd8715eee62d40e33596ef5e8f0f48dbbccab # v4.1.0 + uses: codecov/codecov-action@c16abc29c95fcf9174b58eb7e1abf4c866893bc8 # v4.1.1 with: files: ./target/site/jacoco/jacoco.xml From 0753a26cb41b494b5bbe450dd47a81fae1dfeccd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 1 Apr 2024 14:12:48 -0400 Subject: [PATCH 164/298] Bump org.apache.commons:commons-parent from 67 to 69 (#155) Bumps [org.apache.commons:commons-parent](https://github.com/apache/commons-parent) from 67 to 69. - [Changelog](https://github.com/apache/commons-parent/blob/master/RELEASE-NOTES.txt) - [Commits](https://github.com/apache/commons-parent/commits) --- updated-dependencies: - dependency-name: org.apache.commons:commons-parent dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 99781dfb..4893e7a7 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ org.apache.commons commons-parent - 67 + 69 4.0.0 commons-daemon From f7c639dc4ef3fb14039e502acf3fec9640e268a2 Mon Sep 17 00:00:00 2001 From: Gary Gregory Date: Mon, 1 Apr 2024 14:13:17 -0400 Subject: [PATCH 165/298] Bump org.apache.commons:commons-parent from 67 to 69 #155 --- src/changes/changes.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/changes/changes.xml b/src/changes/changes.xml index 7fa2bf18..00a12ee0 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -48,7 +48,7 @@ - Bump commons-parent from 57 to 67. + Bump commons-parent from 57 to 69 #155.     From ade93547c08da878cb8010efc77bde9ceeb3c2ee Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 5 Apr 2024 13:20:10 -0400 Subject: [PATCH 166/298] Bump github/codeql-action from 3.24.9 to 3.24.10 (#157) Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.24.9 to 3.24.10. - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/1b1aada464948af03b950897e5eb522f92603cc2...4355270be187e1b672a7a1c7c7bae5afdc1ab94a) --- updated-dependencies: - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/codeql-analysis-cpp.yml | 4 ++-- .github/workflows/codeql-analysis-java.yml | 6 +++--- .github/workflows/scorecards-analysis.yml | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/codeql-analysis-cpp.yml b/.github/workflows/codeql-analysis-cpp.yml index 69f014fb..9877a79c 100644 --- a/.github/workflows/codeql-analysis-cpp.yml +++ b/.github/workflows/codeql-analysis-cpp.yml @@ -57,7 +57,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@1b1aada464948af03b950897e5eb522f92603cc2 # 3.24.9 + uses: github/codeql-action/init@4355270be187e1b672a7a1c7c7bae5afdc1ab94a # 3.24.10 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -86,4 +86,4 @@ jobs: make - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@1b1aada464948af03b950897e5eb522f92603cc2 # 3.24.9 + uses: github/codeql-action/analyze@4355270be187e1b672a7a1c7c7bae5afdc1ab94a # 3.24.10 diff --git a/.github/workflows/codeql-analysis-java.yml b/.github/workflows/codeql-analysis-java.yml index da0304ae..e63ffd73 100644 --- a/.github/workflows/codeql-analysis-java.yml +++ b/.github/workflows/codeql-analysis-java.yml @@ -57,7 +57,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@1b1aada464948af03b950897e5eb522f92603cc2 # 3.24.9 + uses: github/codeql-action/init@4355270be187e1b672a7a1c7c7bae5afdc1ab94a # 3.24.10 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -68,7 +68,7 @@ jobs: # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). # If this step fails, then you should remove it and run the build manually (see below) - name: Autobuild - uses: github/codeql-action/autobuild@1b1aada464948af03b950897e5eb522f92603cc2 # 3.24.9 + uses: github/codeql-action/autobuild@4355270be187e1b672a7a1c7c7bae5afdc1ab94a # 3.24.10 # ℹī¸ Command-line programs to run using the OS shell. # 📚 https://git.io/JvXDl @@ -82,4 +82,4 @@ jobs: # make release - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@1b1aada464948af03b950897e5eb522f92603cc2 # 3.24.9 + uses: github/codeql-action/analyze@4355270be187e1b672a7a1c7c7bae5afdc1ab94a # 3.24.10 diff --git a/.github/workflows/scorecards-analysis.yml b/.github/workflows/scorecards-analysis.yml index e16004d0..b0dd5f54 100644 --- a/.github/workflows/scorecards-analysis.yml +++ b/.github/workflows/scorecards-analysis.yml @@ -64,6 +64,6 @@ jobs: retention-days: 5 - name: "Upload to code-scanning" - uses: github/codeql-action/upload-sarif@1b1aada464948af03b950897e5eb522f92603cc2 # 3.24.9 + uses: github/codeql-action/upload-sarif@4355270be187e1b672a7a1c7c7bae5afdc1ab94a # 3.24.10 with: sarif_file: results.sarif From efc9d4ea1825d3d70457654a3a72a738ea1121d6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 5 Apr 2024 13:20:23 -0400 Subject: [PATCH 167/298] Bump codecov/codecov-action from 4.1.1 to 4.2.0 (#156) Bumps [codecov/codecov-action](https://github.com/codecov/codecov-action) from 4.1.1 to 4.2.0. - [Release notes](https://github.com/codecov/codecov-action/releases) - [Changelog](https://github.com/codecov/codecov-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/codecov/codecov-action/compare/c16abc29c95fcf9174b58eb7e1abf4c866893bc8...7afa10ed9b269c561c2336fd862446844e0cbf71) --- updated-dependencies: - dependency-name: codecov/codecov-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/coverage.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index 1038d0c1..5d98f42e 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -47,6 +47,6 @@ jobs: run: mvn --show-version --batch-mode --no-transfer-progress test jacoco:report - name: Upload coverage to Codecov - uses: codecov/codecov-action@c16abc29c95fcf9174b58eb7e1abf4c866893bc8 # v4.1.1 + uses: codecov/codecov-action@7afa10ed9b269c561c2336fd862446844e0cbf71 # v4.2.0 with: files: ./target/site/jacoco/jacoco.xml From cf2b2fec32b16d19b2221e3e1682d3b544fc858d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 12 Apr 2024 13:06:22 -0400 Subject: [PATCH 168/298] Bump codecov/codecov-action from 4.2.0 to 4.3.0 (#158) Bumps [codecov/codecov-action](https://github.com/codecov/codecov-action) from 4.2.0 to 4.3.0. - [Release notes](https://github.com/codecov/codecov-action/releases) - [Changelog](https://github.com/codecov/codecov-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/codecov/codecov-action/compare/7afa10ed9b269c561c2336fd862446844e0cbf71...84508663e988701840491b86de86b666e8a86bed) --- updated-dependencies: - dependency-name: codecov/codecov-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/coverage.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index 5d98f42e..60c2c60f 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -47,6 +47,6 @@ jobs: run: mvn --show-version --batch-mode --no-transfer-progress test jacoco:report - name: Upload coverage to Codecov - uses: codecov/codecov-action@7afa10ed9b269c561c2336fd862446844e0cbf71 # v4.2.0 + uses: codecov/codecov-action@84508663e988701840491b86de86b666e8a86bed # v4.3.0 with: files: ./target/site/jacoco/jacoco.xml From 8ae59bba645a64d1417da773b4d95ba9b541cfdc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 19 Apr 2024 14:09:56 -0400 Subject: [PATCH 169/298] Bump github/codeql-action from 3.24.10 to 3.25.1 (#159) Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.24.10 to 3.25.1. - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/4355270be187e1b672a7a1c7c7bae5afdc1ab94a...c7f9125735019aa87cfc361530512d50ea439c71) --- updated-dependencies: - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/codeql-analysis-cpp.yml | 4 ++-- .github/workflows/codeql-analysis-java.yml | 6 +++--- .github/workflows/scorecards-analysis.yml | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/codeql-analysis-cpp.yml b/.github/workflows/codeql-analysis-cpp.yml index 9877a79c..dc256965 100644 --- a/.github/workflows/codeql-analysis-cpp.yml +++ b/.github/workflows/codeql-analysis-cpp.yml @@ -57,7 +57,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@4355270be187e1b672a7a1c7c7bae5afdc1ab94a # 3.24.10 + uses: github/codeql-action/init@c7f9125735019aa87cfc361530512d50ea439c71 # 3.25.1 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -86,4 +86,4 @@ jobs: make - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@4355270be187e1b672a7a1c7c7bae5afdc1ab94a # 3.24.10 + uses: github/codeql-action/analyze@c7f9125735019aa87cfc361530512d50ea439c71 # 3.25.1 diff --git a/.github/workflows/codeql-analysis-java.yml b/.github/workflows/codeql-analysis-java.yml index e63ffd73..61cdd6c9 100644 --- a/.github/workflows/codeql-analysis-java.yml +++ b/.github/workflows/codeql-analysis-java.yml @@ -57,7 +57,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@4355270be187e1b672a7a1c7c7bae5afdc1ab94a # 3.24.10 + uses: github/codeql-action/init@c7f9125735019aa87cfc361530512d50ea439c71 # 3.25.1 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -68,7 +68,7 @@ jobs: # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). # If this step fails, then you should remove it and run the build manually (see below) - name: Autobuild - uses: github/codeql-action/autobuild@4355270be187e1b672a7a1c7c7bae5afdc1ab94a # 3.24.10 + uses: github/codeql-action/autobuild@c7f9125735019aa87cfc361530512d50ea439c71 # 3.25.1 # ℹī¸ Command-line programs to run using the OS shell. # 📚 https://git.io/JvXDl @@ -82,4 +82,4 @@ jobs: # make release - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@4355270be187e1b672a7a1c7c7bae5afdc1ab94a # 3.24.10 + uses: github/codeql-action/analyze@c7f9125735019aa87cfc361530512d50ea439c71 # 3.25.1 diff --git a/.github/workflows/scorecards-analysis.yml b/.github/workflows/scorecards-analysis.yml index b0dd5f54..6157b6bd 100644 --- a/.github/workflows/scorecards-analysis.yml +++ b/.github/workflows/scorecards-analysis.yml @@ -64,6 +64,6 @@ jobs: retention-days: 5 - name: "Upload to code-scanning" - uses: github/codeql-action/upload-sarif@4355270be187e1b672a7a1c7c7bae5afdc1ab94a # 3.24.10 + uses: github/codeql-action/upload-sarif@c7f9125735019aa87cfc361530512d50ea439c71 # 3.25.1 with: sarif_file: results.sarif From 15d78182ab4985004f545e4dcb729fa47af328ef Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 19 Apr 2024 14:10:09 -0400 Subject: [PATCH 170/298] Bump actions/checkout from 4.1.2 to 4.1.3 (#161) Bumps [actions/checkout](https://github.com/actions/checkout) from 4.1.2 to 4.1.3. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/9bb56186c3b09b4f86b1c65136769dd318469633...1d96c772d19495a3b5c517cd2bc0cb401ea0529f) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/codeql-analysis-cpp.yml | 2 +- .github/workflows/codeql-analysis-java.yml | 2 +- .github/workflows/coverage.yml | 2 +- .github/workflows/maven.yml | 2 +- .github/workflows/scorecards-analysis.yml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/codeql-analysis-cpp.yml b/.github/workflows/codeql-analysis-cpp.yml index dc256965..c480976b 100644 --- a/.github/workflows/codeql-analysis-cpp.yml +++ b/.github/workflows/codeql-analysis-cpp.yml @@ -45,7 +45,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2 + uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3 with: persist-credentials: false - uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2 diff --git a/.github/workflows/codeql-analysis-java.yml b/.github/workflows/codeql-analysis-java.yml index 61cdd6c9..c051a4a9 100644 --- a/.github/workflows/codeql-analysis-java.yml +++ b/.github/workflows/codeql-analysis-java.yml @@ -45,7 +45,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2 + uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3 with: persist-credentials: false - uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2 diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index 60c2c60f..f88ab081 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -29,7 +29,7 @@ jobs: java: [ 8 ] steps: - - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2 + - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3 with: persist-credentials: false - uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2 diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 04b79793..2816c3b2 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -35,7 +35,7 @@ jobs: # experimental: true steps: - - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2 + - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3 with: persist-credentials: false - uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2 diff --git a/.github/workflows/scorecards-analysis.yml b/.github/workflows/scorecards-analysis.yml index 6157b6bd..1d26eba5 100644 --- a/.github/workflows/scorecards-analysis.yml +++ b/.github/workflows/scorecards-analysis.yml @@ -40,7 +40,7 @@ jobs: steps: - name: "Checkout code" - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2 + uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3 with: persist-credentials: false From 56085b481c7d590ffd17679088de62dc50cdb506 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 19 Apr 2024 14:10:23 -0400 Subject: [PATCH 171/298] Bump actions/upload-artifact from 4.3.1 to 4.3.2 (#160) Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 4.3.1 to 4.3.2. - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](https://github.com/actions/upload-artifact/compare/5d5d22a31266ced268874388b861e4b58bb5c2f3...1746f4ab65b179e0ea60a494b83293b640dd5bba) --- updated-dependencies: - dependency-name: actions/upload-artifact dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/scorecards-analysis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/scorecards-analysis.yml b/.github/workflows/scorecards-analysis.yml index 1d26eba5..28df47de 100644 --- a/.github/workflows/scorecards-analysis.yml +++ b/.github/workflows/scorecards-analysis.yml @@ -57,7 +57,7 @@ jobs: publish_results: true - name: "Upload artifact" - uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # 4.3.1 + uses: actions/upload-artifact@1746f4ab65b179e0ea60a494b83293b640dd5bba # 4.3.2 with: name: SARIF file path: results.sarif From 731a12b5ce881ed0c82aa8a44be182adcfb8c306 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 26 Apr 2024 12:19:07 -0400 Subject: [PATCH 172/298] Bump actions/checkout from 4.1.3 to 4.1.4 (#162) Bumps [actions/checkout](https://github.com/actions/checkout) from 4.1.3 to 4.1.4. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/1d96c772d19495a3b5c517cd2bc0cb401ea0529f...0ad4b8fadaa221de15dcec353f45205ec38ea70b) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/codeql-analysis-cpp.yml | 2 +- .github/workflows/codeql-analysis-java.yml | 2 +- .github/workflows/coverage.yml | 2 +- .github/workflows/maven.yml | 2 +- .github/workflows/scorecards-analysis.yml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/codeql-analysis-cpp.yml b/.github/workflows/codeql-analysis-cpp.yml index c480976b..30af5d7e 100644 --- a/.github/workflows/codeql-analysis-cpp.yml +++ b/.github/workflows/codeql-analysis-cpp.yml @@ -45,7 +45,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3 + uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 with: persist-credentials: false - uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2 diff --git a/.github/workflows/codeql-analysis-java.yml b/.github/workflows/codeql-analysis-java.yml index c051a4a9..3ce7b5a3 100644 --- a/.github/workflows/codeql-analysis-java.yml +++ b/.github/workflows/codeql-analysis-java.yml @@ -45,7 +45,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3 + uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 with: persist-credentials: false - uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2 diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index f88ab081..60155809 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -29,7 +29,7 @@ jobs: java: [ 8 ] steps: - - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3 + - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 with: persist-credentials: false - uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2 diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 2816c3b2..04c2628b 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -35,7 +35,7 @@ jobs: # experimental: true steps: - - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3 + - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 with: persist-credentials: false - uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2 diff --git a/.github/workflows/scorecards-analysis.yml b/.github/workflows/scorecards-analysis.yml index 28df47de..bf1e2c5e 100644 --- a/.github/workflows/scorecards-analysis.yml +++ b/.github/workflows/scorecards-analysis.yml @@ -40,7 +40,7 @@ jobs: steps: - name: "Checkout code" - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3 + uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 with: persist-credentials: false From e92f236028be2106cc6817ed0f788354a06f5b0b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 26 Apr 2024 12:19:49 -0400 Subject: [PATCH 173/298] Bump github/codeql-action from 3.25.1 to 3.25.3 (#164) Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.25.1 to 3.25.3. - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/c7f9125735019aa87cfc361530512d50ea439c71...d39d31e687223d841ef683f52467bd88e9b21c14) --- updated-dependencies: - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/codeql-analysis-cpp.yml | 4 ++-- .github/workflows/codeql-analysis-java.yml | 6 +++--- .github/workflows/scorecards-analysis.yml | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/codeql-analysis-cpp.yml b/.github/workflows/codeql-analysis-cpp.yml index 30af5d7e..4427a437 100644 --- a/.github/workflows/codeql-analysis-cpp.yml +++ b/.github/workflows/codeql-analysis-cpp.yml @@ -57,7 +57,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@c7f9125735019aa87cfc361530512d50ea439c71 # 3.25.1 + uses: github/codeql-action/init@d39d31e687223d841ef683f52467bd88e9b21c14 # 3.25.3 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -86,4 +86,4 @@ jobs: make - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@c7f9125735019aa87cfc361530512d50ea439c71 # 3.25.1 + uses: github/codeql-action/analyze@d39d31e687223d841ef683f52467bd88e9b21c14 # 3.25.3 diff --git a/.github/workflows/codeql-analysis-java.yml b/.github/workflows/codeql-analysis-java.yml index 3ce7b5a3..0063863a 100644 --- a/.github/workflows/codeql-analysis-java.yml +++ b/.github/workflows/codeql-analysis-java.yml @@ -57,7 +57,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@c7f9125735019aa87cfc361530512d50ea439c71 # 3.25.1 + uses: github/codeql-action/init@d39d31e687223d841ef683f52467bd88e9b21c14 # 3.25.3 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -68,7 +68,7 @@ jobs: # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). # If this step fails, then you should remove it and run the build manually (see below) - name: Autobuild - uses: github/codeql-action/autobuild@c7f9125735019aa87cfc361530512d50ea439c71 # 3.25.1 + uses: github/codeql-action/autobuild@d39d31e687223d841ef683f52467bd88e9b21c14 # 3.25.3 # ℹī¸ Command-line programs to run using the OS shell. # 📚 https://git.io/JvXDl @@ -82,4 +82,4 @@ jobs: # make release - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@c7f9125735019aa87cfc361530512d50ea439c71 # 3.25.1 + uses: github/codeql-action/analyze@d39d31e687223d841ef683f52467bd88e9b21c14 # 3.25.3 diff --git a/.github/workflows/scorecards-analysis.yml b/.github/workflows/scorecards-analysis.yml index bf1e2c5e..6ebc09b3 100644 --- a/.github/workflows/scorecards-analysis.yml +++ b/.github/workflows/scorecards-analysis.yml @@ -64,6 +64,6 @@ jobs: retention-days: 5 - name: "Upload to code-scanning" - uses: github/codeql-action/upload-sarif@c7f9125735019aa87cfc361530512d50ea439c71 # 3.25.1 + uses: github/codeql-action/upload-sarif@d39d31e687223d841ef683f52467bd88e9b21c14 # 3.25.3 with: sarif_file: results.sarif From 4be566d2881622bf9423b8b00a3fee30fe2eb868 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 26 Apr 2024 12:20:02 -0400 Subject: [PATCH 174/298] Bump actions/upload-artifact from 4.3.2 to 4.3.3 (#163) Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 4.3.2 to 4.3.3. - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](https://github.com/actions/upload-artifact/compare/1746f4ab65b179e0ea60a494b83293b640dd5bba...65462800fd760344b1a7b4382951275a0abb4808) --- updated-dependencies: - dependency-name: actions/upload-artifact dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/scorecards-analysis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/scorecards-analysis.yml b/.github/workflows/scorecards-analysis.yml index 6ebc09b3..61142437 100644 --- a/.github/workflows/scorecards-analysis.yml +++ b/.github/workflows/scorecards-analysis.yml @@ -57,7 +57,7 @@ jobs: publish_results: true - name: "Upload artifact" - uses: actions/upload-artifact@1746f4ab65b179e0ea60a494b83293b640dd5bba # 4.3.2 + uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # 4.3.3 with: name: SARIF file path: results.sarif From c4f7b10e8e8f5aab711a1268ececdaa457b81ccc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 3 May 2024 12:42:26 -0400 Subject: [PATCH 175/298] Bump codecov/codecov-action from 4.3.0 to 4.3.1 (#165) Bumps [codecov/codecov-action](https://github.com/codecov/codecov-action) from 4.3.0 to 4.3.1. - [Release notes](https://github.com/codecov/codecov-action/releases) - [Changelog](https://github.com/codecov/codecov-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/codecov/codecov-action/compare/84508663e988701840491b86de86b666e8a86bed...5ecb98a3c6b747ed38dc09f787459979aebb39be) --- updated-dependencies: - dependency-name: codecov/codecov-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/coverage.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index 60155809..c08fd7d7 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -47,6 +47,6 @@ jobs: run: mvn --show-version --batch-mode --no-transfer-progress test jacoco:report - name: Upload coverage to Codecov - uses: codecov/codecov-action@84508663e988701840491b86de86b666e8a86bed # v4.3.0 + uses: codecov/codecov-action@5ecb98a3c6b747ed38dc09f787459979aebb39be # v4.3.1 with: files: ./target/site/jacoco/jacoco.xml From 76044e1f2d67e40c79b36cb2d058c94804981a4a Mon Sep 17 00:00:00 2001 From: Gary Gregory Date: Thu, 9 May 2024 14:19:26 -0400 Subject: [PATCH 176/298] Add macos-latest to GH CI --- .github/workflows/maven.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 04c2628b..97097c46 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -27,7 +27,7 @@ jobs: continue-on-error: ${{ matrix.experimental }} strategy: matrix: - os: [ubuntu-latest, windows-latest] + os: [ubuntu-latest, windows-latest, macos-latest] java: [ 8, 11, 17 ] experimental: [false] # include: From 98ab4bd0cd578a1437084d8afc2329f46563e717 Mon Sep 17 00:00:00 2001 From: Gary Gregory Date: Thu, 9 May 2024 14:20:19 -0400 Subject: [PATCH 177/298] Replace macos-latest with macos-13 for Java 8 req --- .github/workflows/maven.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 97097c46..132f89af 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -27,7 +27,7 @@ jobs: continue-on-error: ${{ matrix.experimental }} strategy: matrix: - os: [ubuntu-latest, windows-latest, macos-latest] + os: [ubuntu-latest, windows-latest, macos-13] java: [ 8, 11, 17 ] experimental: [false] # include: From 53c899fe0943c551526df5daf1bec91808f0fd4b Mon Sep 17 00:00:00 2001 From: Gary Gregory Date: Thu, 9 May 2024 14:24:48 -0400 Subject: [PATCH 178/298] Set a (very low) baseline for JaCoCo checks --- pom.xml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4893e7a7..15c7ff6a 100644 --- a/pom.xml +++ b/pom.xml @@ -137,8 +137,16 @@ DAEMON 12310468 2024-01-01T00:00:00Z + true + + true + 0.12 + 0.00 + 0.01 + 0.00 + 0.00 + 0.00 - From 1a31b99ef2f588faa7c67345616b6f18f8685f02 Mon Sep 17 00:00:00 2001 From: Mark Thomas Date: Fri, 10 May 2024 15:31:18 +0100 Subject: [PATCH 179/298] Increment minimum Java version to Java 8 (triggers minor version update) --- RELEASE-NOTES.txt | 8 ++++---- pom.xml | 12 ++++++------ src/changes/changes.xml | 6 +++++- src/native/unix/man/jsvc.1.xml | 2 +- src/native/unix/native/version.h | 4 ++-- src/native/windows/apps/prunmgr/prunmgr.h | 2 +- src/native/windows/apps/prunmgr/prunmgr.rc | 6 +++--- src/native/windows/apps/prunsrv/prunsrv.h | 2 +- src/native/windows/apps/prunsrv/prunsrv.rc | 4 ++-- src/samples/SimpleApplication.sh | 2 +- src/site/xdoc/binaries.xml | 2 +- 11 files changed, 27 insertions(+), 23 deletions(-) diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt index 5e7e7ef5..445eeaae 100644 --- a/RELEASE-NOTES.txt +++ b/RELEASE-NOTES.txt @@ -15,18 +15,18 @@ limitations under the License. ================================================================================ - Apache Commons Daemon 1.3.5 + Apache Commons Daemon 1.4.0 Release Notes This document contains the release notes for this version of the -Apache Commons Daemon package, and highlights new features in the 1.3 -releases compared to the 1.2 releases. +Apache Commons Daemon package, and highlights new features in the 1.4 +releases compared to the 1.3 releases. New Features ------------ - - The minimum Java version has been increased to Java 7 + - The minimum Java version has been increased to Java 8 Bug Fixes diff --git a/pom.xml b/pom.xml index 15c7ff6a..e8ff6075 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ 4.0.0 commons-daemon commons-daemon - 1.3.5-SNAPSHOT + 1.4.0-SNAPSHOT Apache Commons Daemon @@ -122,16 +122,16 @@ - java17 - 1.7 + java18 + 1.8 ${commons.daemon.javaversion} ${commons.daemon.javaversion} daemon org.apache.commons.daemon - 1.3.5 + 1.4.0 RC1 1.3.4 DAEMON diff --git a/src/changes/changes.xml b/src/changes/changes.xml index 00a12ee0..d4eb16eb 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -40,7 +40,7 @@ Apache Commons Daemon Release Notes - + [StepSecurity] ci: Harden GitHub Actions #95. @@ -50,6 +50,10 @@ Bump commons-parent from 57 to 69 #155. + + The minimum support Java version has been upgraded from Java 7 to Java + 8. + diff --git a/src/native/unix/man/jsvc.1.xml b/src/native/unix/man/jsvc.1.xml index a11ac19c..4c1ee3f5 100644 --- a/src/native/unix/man/jsvc.1.xml +++ b/src/native/unix/man/jsvc.1.xml @@ -22,7 +22,7 @@ JSVC 1 TBD - Jsvc version 1.3.5 + Jsvc version 1.4.0 Apache Commons Daemon project diff --git a/src/native/unix/native/version.h b/src/native/unix/native/version.h index c229837b..34426f59 100644 --- a/src/native/unix/native/version.h +++ b/src/native/unix/native/version.h @@ -28,10 +28,10 @@ * Minor API changes that do not cause binary compatibility problems. * Should be reset to 0 when upgrading JSVC_MAJOR_VERSION */ -#define JSVC_MINOR_VERSION 3 +#define JSVC_MINOR_VERSION 4 /** patch level */ -#define JSVC_PATCH_VERSION 5 +#define JSVC_PATCH_VERSION 0 /** * This symbol is defined for internal, "development" copies of JSVC. diff --git a/src/native/windows/apps/prunmgr/prunmgr.h b/src/native/windows/apps/prunmgr/prunmgr.h index 6a8a6a4e..2060aa02 100644 --- a/src/native/windows/apps/prunmgr/prunmgr.h +++ b/src/native/windows/apps/prunmgr/prunmgr.h @@ -24,7 +24,7 @@ #define _PRUNMGR_H #undef PRG_VERSION -#define PRG_VERSION "1.3.5.0" +#define PRG_VERSION "1.4.0.0" #define PRG_REGROOT L"Apache Software Foundation\\Procrun 2.0" #define IDM_TM_EXIT 2000 diff --git a/src/native/windows/apps/prunmgr/prunmgr.rc b/src/native/windows/apps/prunmgr/prunmgr.rc index 3a418e9e..b9e5be76 100644 --- a/src/native/windows/apps/prunmgr/prunmgr.rc +++ b/src/native/windows/apps/prunmgr/prunmgr.rc @@ -228,7 +228,7 @@ END STRINGTABLE BEGIN IDS_APPLICATION RSTR_PSM - IDS_APPVERSION "Version 1.3.5" + IDS_APPVERSION "Version 1.4.0" IDS_APPFULLNAME RSTR_PSM " Version " PRG_VERSION IDS_APPCOPYRIGHT "Copyright (c) 2000-2023 The Apache Software Foundation" IDS_APPDESCRIPTION "Apache Commons Daemon Service Management Tool" @@ -259,8 +259,8 @@ BEGIN END 1 VERSIONINFO - FILEVERSION 1,3,5,0 - PRODUCTVERSION 1,3,5,0 + FILEVERSION 1,4,0,0 + PRODUCTVERSION 1,4,0,0 FILEFLAGSMASK 0x3fL #if defined(_DEBUG) FILEFLAGS 0x03L diff --git a/src/native/windows/apps/prunsrv/prunsrv.h b/src/native/windows/apps/prunsrv/prunsrv.h index 127d4e71..460d1526 100644 --- a/src/native/windows/apps/prunsrv/prunsrv.h +++ b/src/native/windows/apps/prunsrv/prunsrv.h @@ -25,7 +25,7 @@ #define _PRUNSRV_H #undef PRG_VERSION -#define PRG_VERSION "1.3.5.0" +#define PRG_VERSION "1.4.0.0" #define PRG_REGROOT L"Apache Software Foundation\\Procrun 2.0" #endif /* _PRUNSRV_H */ diff --git a/src/native/windows/apps/prunsrv/prunsrv.rc b/src/native/windows/apps/prunsrv/prunsrv.rc index e583edd8..c037e2ee 100644 --- a/src/native/windows/apps/prunsrv/prunsrv.rc +++ b/src/native/windows/apps/prunsrv/prunsrv.rc @@ -23,8 +23,8 @@ IDI_MAINICON ICON "../../resources/procrunw.ico" CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "prunsrv.manifest" 1 VERSIONINFO - FILEVERSION 1,3,5,0 - PRODUCTVERSION 1,3,5,0 + FILEVERSION 1,4,0,0 + PRODUCTVERSION 1,4,0,0 FILEFLAGSMASK 0x3fL #if defined(_DEBUG) FILEFLAGS 0x03L diff --git a/src/samples/SimpleApplication.sh b/src/samples/SimpleApplication.sh index 385ed031..c3e90b8d 100755 --- a/src/samples/SimpleApplication.sh +++ b/src/samples/SimpleApplication.sh @@ -20,7 +20,7 @@ # Adapt the following lines to your configuration JAVA_HOME=/opt/java6 PROGRAM=SimpleApplication -CLASSPATH=`pwd`/$PROGRAM.jar:`pwd`/commons-daemon-1.3.5.jar +CLASSPATH=`pwd`/$PROGRAM.jar:`pwd`/commons-daemon-1.4.0.jar case "$1" in start ) diff --git a/src/site/xdoc/binaries.xml b/src/site/xdoc/binaries.xml index c67dabc3..d669022f 100644 --- a/src/site/xdoc/binaries.xml +++ b/src/site/xdoc/binaries.xml @@ -36,7 +36,7 @@ corresponding to your operating system. Only the Windows builds are provided as

    -The Windows archive (e.g. commons-daemon-1.3.5-bin-windows.zip) contains 2 different executables: +The Windows archive (e.g. commons-daemon-1.4.0-bin-windows.zip) contains 2 different executables:

    • prunsrv.exe - service application for running applications as services.
    • prunmgr.exe - the GUI manager application used to monitor and configure installed services.
      • From 322add236873120d7856f6a9649583c1fcbd5734 Mon Sep 17 00:00:00 2001 From: Mark Thomas Date: Fri, 10 May 2024 15:38:50 +0100 Subject: [PATCH 180/298] Increase minimum Windows versions to Windows 10 / Server 2016 This is more a statement of the platforms that we will support DAEMON on at this point. Subsequent fixes may make use of features that make this a hard requirement, --- RELEASE-NOTES.txt | 3 +++ src/changes/changes.xml | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt index 445eeaae..f6b3e0a9 100644 --- a/RELEASE-NOTES.txt +++ b/RELEASE-NOTES.txt @@ -27,6 +27,9 @@ New Features ------------ - The minimum Java version has been increased to Java 8 + + - The minimum supported Windows versions have been increased to Windows 10 and + Windows Server 2016. Bug Fixes diff --git a/src/changes/changes.xml b/src/changes/changes.xml index d4eb16eb..9c203cb6 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -54,6 +54,10 @@ The minimum support Java version has been upgraded from Java 7 to Java 8. + + The minimum Windows versions supported are now Windows 10 and Windows + Server 2016. + From 4306b9800d5018d43ec5c00fa052bf531a532251 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 10 May 2024 12:54:10 -0400 Subject: [PATCH 181/298] Bump actions/checkout from 4.1.4 to 4.1.5 (#167) Bumps [actions/checkout](https://github.com/actions/checkout) from 4.1.4 to 4.1.5. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/0ad4b8fadaa221de15dcec353f45205ec38ea70b...44c2b7a8a4ea60a981eaca3cf939b5f4305c123b) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/codeql-analysis-cpp.yml | 2 +- .github/workflows/codeql-analysis-java.yml | 2 +- .github/workflows/coverage.yml | 2 +- .github/workflows/maven.yml | 2 +- .github/workflows/scorecards-analysis.yml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/codeql-analysis-cpp.yml b/.github/workflows/codeql-analysis-cpp.yml index 4427a437..b0e78d45 100644 --- a/.github/workflows/codeql-analysis-cpp.yml +++ b/.github/workflows/codeql-analysis-cpp.yml @@ -45,7 +45,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 + uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5 with: persist-credentials: false - uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2 diff --git a/.github/workflows/codeql-analysis-java.yml b/.github/workflows/codeql-analysis-java.yml index 0063863a..4f1a5b33 100644 --- a/.github/workflows/codeql-analysis-java.yml +++ b/.github/workflows/codeql-analysis-java.yml @@ -45,7 +45,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 + uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5 with: persist-credentials: false - uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2 diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index c08fd7d7..6fb2996e 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -29,7 +29,7 @@ jobs: java: [ 8 ] steps: - - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 + - uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5 with: persist-credentials: false - uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2 diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 132f89af..b1d045d2 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -35,7 +35,7 @@ jobs: # experimental: true steps: - - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 + - uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5 with: persist-credentials: false - uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2 diff --git a/.github/workflows/scorecards-analysis.yml b/.github/workflows/scorecards-analysis.yml index 61142437..61caee1e 100644 --- a/.github/workflows/scorecards-analysis.yml +++ b/.github/workflows/scorecards-analysis.yml @@ -40,7 +40,7 @@ jobs: steps: - name: "Checkout code" - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 + uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5 with: persist-credentials: false From 0d2647baac9672e1bb70445f83ec27b4cf5aa401 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 10 May 2024 12:54:22 -0400 Subject: [PATCH 182/298] Bump ossf/scorecard-action from 2.3.1 to 2.3.3 (#169) Bumps [ossf/scorecard-action](https://github.com/ossf/scorecard-action) from 2.3.1 to 2.3.3. - [Release notes](https://github.com/ossf/scorecard-action/releases) - [Changelog](https://github.com/ossf/scorecard-action/blob/main/RELEASE.md) - [Commits](https://github.com/ossf/scorecard-action/compare/0864cf19026789058feabb7e87baa5f140aac736...dc50aa9510b46c811795eb24b2f1ba02a914e534) --- updated-dependencies: - dependency-name: ossf/scorecard-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/scorecards-analysis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/scorecards-analysis.yml b/.github/workflows/scorecards-analysis.yml index 61caee1e..1bc85721 100644 --- a/.github/workflows/scorecards-analysis.yml +++ b/.github/workflows/scorecards-analysis.yml @@ -45,7 +45,7 @@ jobs: persist-credentials: false - name: "Run analysis" - uses: ossf/scorecard-action@0864cf19026789058feabb7e87baa5f140aac736 # 2.3.1 + uses: ossf/scorecard-action@dc50aa9510b46c811795eb24b2f1ba02a914e534 # 2.3.3 with: results_file: results.sarif results_format: sarif From 0ae8a1fae9b7c1af72920c9c51c7b6d53fa1f171 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 10 May 2024 12:54:33 -0400 Subject: [PATCH 183/298] Bump github/codeql-action from 3.25.3 to 3.25.4 (#168) Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.25.3 to 3.25.4. - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/d39d31e687223d841ef683f52467bd88e9b21c14...ccf74c947955fd1cf117aef6a0e4e66191ef6f61) --- updated-dependencies: - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/codeql-analysis-cpp.yml | 4 ++-- .github/workflows/codeql-analysis-java.yml | 6 +++--- .github/workflows/scorecards-analysis.yml | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/codeql-analysis-cpp.yml b/.github/workflows/codeql-analysis-cpp.yml index b0e78d45..58f5a458 100644 --- a/.github/workflows/codeql-analysis-cpp.yml +++ b/.github/workflows/codeql-analysis-cpp.yml @@ -57,7 +57,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@d39d31e687223d841ef683f52467bd88e9b21c14 # 3.25.3 + uses: github/codeql-action/init@ccf74c947955fd1cf117aef6a0e4e66191ef6f61 # 3.25.4 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -86,4 +86,4 @@ jobs: make - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@d39d31e687223d841ef683f52467bd88e9b21c14 # 3.25.3 + uses: github/codeql-action/analyze@ccf74c947955fd1cf117aef6a0e4e66191ef6f61 # 3.25.4 diff --git a/.github/workflows/codeql-analysis-java.yml b/.github/workflows/codeql-analysis-java.yml index 4f1a5b33..c6d107c0 100644 --- a/.github/workflows/codeql-analysis-java.yml +++ b/.github/workflows/codeql-analysis-java.yml @@ -57,7 +57,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@d39d31e687223d841ef683f52467bd88e9b21c14 # 3.25.3 + uses: github/codeql-action/init@ccf74c947955fd1cf117aef6a0e4e66191ef6f61 # 3.25.4 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -68,7 +68,7 @@ jobs: # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). # If this step fails, then you should remove it and run the build manually (see below) - name: Autobuild - uses: github/codeql-action/autobuild@d39d31e687223d841ef683f52467bd88e9b21c14 # 3.25.3 + uses: github/codeql-action/autobuild@ccf74c947955fd1cf117aef6a0e4e66191ef6f61 # 3.25.4 # ℹī¸ Command-line programs to run using the OS shell. # 📚 https://git.io/JvXDl @@ -82,4 +82,4 @@ jobs: # make release - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@d39d31e687223d841ef683f52467bd88e9b21c14 # 3.25.3 + uses: github/codeql-action/analyze@ccf74c947955fd1cf117aef6a0e4e66191ef6f61 # 3.25.4 diff --git a/.github/workflows/scorecards-analysis.yml b/.github/workflows/scorecards-analysis.yml index 1bc85721..a13c3f59 100644 --- a/.github/workflows/scorecards-analysis.yml +++ b/.github/workflows/scorecards-analysis.yml @@ -64,6 +64,6 @@ jobs: retention-days: 5 - name: "Upload to code-scanning" - uses: github/codeql-action/upload-sarif@d39d31e687223d841ef683f52467bd88e9b21c14 # 3.25.3 + uses: github/codeql-action/upload-sarif@ccf74c947955fd1cf117aef6a0e4e66191ef6f61 # 3.25.4 with: sarif_file: results.sarif From 2febafe4dcc8b717092b133de428329cc4780ab9 Mon Sep 17 00:00:00 2001 From: Mark Thomas Date: Fri, 10 May 2024 16:13:47 +0100 Subject: [PATCH 184/298] Simplify --- src/native/windows/include/Makefile.inc | 33 +++---------------------- 1 file changed, 3 insertions(+), 30 deletions(-) diff --git a/src/native/windows/include/Makefile.inc b/src/native/windows/include/Makefile.inc index 007dbce4..addca0f9 100644 --- a/src/native/windows/include/Makefile.inc +++ b/src/native/windows/include/Makefile.inc @@ -28,15 +28,6 @@ # It will default to the # PROCESSOR_ARCHITECTURE/ARCHITEW6432 environment variables # or failing that it will default to X86. -# WINVER Compile for specified Windows version -# WINXP for Windows XP and up (default) -# WIN2003 for Windows 2003 and up -# VISTA for Windows Vista and up -# WIN7 for Windows 7 and up -# Deprecated targets (may not even compile): -# WINNT for Windows 2000 and up -# NT4 for Windows NT4 and up -# WIN9X for Windows 95, 98 and Me # BUILD Build version # RETAIL or RELEASE (default) # DEBUG @@ -137,27 +128,9 @@ TARGET=EXE !ENDIF !ENDIF -!IF !DEFINED(WINVER) || "$(WINVER)" == "" -WINVER=WINXP -!ENDIF - - -!IF "$(WINVER)" == "WINXP" -NMAKE_WINVER = 0x0501 -_WIN32_IE = 0x0600 -!ELSEIF "$(WINVER)" == "WIN2003" -NMAKE_WINVER = 0x0502 -_WIN32_IE = 0x0600 -!ELSEIF "$(WINVER)" == "VISTA" -NMAKE_WINVER = 0x0600 -_WIN32_IE = 0x0700 -!ELSEIF "$(WINVER)" == "WIN7" -NMAKE_WINVER = 0x0601 -_WIN32_IE = 0x0800 -!ELSE -NMAKE_WINVER = $(WINVER) -_WIN32_IE = 0x0800 -!ENDIF +WINVER=WIN10 +NMAKE_WINVER = 0x0A00 +_WIN32_IE = 0x0A00 NMAKE_WINNT = -D_WINNT -D_WIN32_WINNT=$(NMAKE_WINVER) -DWINVER=$(NMAKE_WINVER) -D_WIN32_IE=$(_WIN32_IE) From 212700b78818c0bd670f6366dc5c6a7461080f97 Mon Sep 17 00:00:00 2001 From: Mark Thomas Date: Mon, 13 May 2024 17:26:21 +0100 Subject: [PATCH 185/298] Enable hybrid CRT build --- src/changes/changes.xml | 3 +++ src/native/windows/include/Makefile.inc | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/src/changes/changes.xml b/src/changes/changes.xml index 9c203cb6..8445ffae 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -46,6 +46,9 @@ [StepSecurity] ci: Harden GitHub Actions #95. + + Add support for hybrid CRT builds. + Bump commons-parent from 57 to 69 #155. diff --git a/src/native/windows/include/Makefile.inc b/src/native/windows/include/Makefile.inc index addca0f9..1e7ebc0c 100644 --- a/src/native/windows/include/Makefile.inc +++ b/src/native/windows/include/Makefile.inc @@ -42,6 +42,7 @@ # EXTRA_LIBS Added to the common LIBS # EXTRA_LFLAGS Added to the common LFLAGS # EXTRA_RCFLAGS Added to the common RCFLAGS +# STATIC_CRT Enables a hybrid CRT technique # # Compiler tools environment variables: # CC C compiler (defaults to cl.exe) @@ -227,6 +228,9 @@ COMMON_LFLAGS = /NOLOGO OPT_LFLAGS = /INCREMENTAL:NO /DEBUG !IF "$(BUILD)" == "RELEASE" OPT_LFLAGS = $(OPT_LFLAGS) /OPT:REF +!IF DEFINED(STATIC_CRT) && "$(STATIC_CRT)" == "Hybrid" +OPT_LFLAGS = $(OPT_LFLAGS) /NODEFAULTLIB:libucrt.lib /DEFAULTLIB:ucrt.lib +!ENDIF !ENDIF !IF "$(TARGET)" == "EXE" From 0dff7e51779a6151f88faf6cc1970cb414310d1d Mon Sep 17 00:00:00 2001 From: Mark Thomas Date: Mon, 13 May 2024 17:29:42 +0100 Subject: [PATCH 186/298] Remove unnecessary libraries --- src/native/windows/include/Makefile.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/native/windows/include/Makefile.inc b/src/native/windows/include/Makefile.inc index 1e7ebc0c..b68766ec 100644 --- a/src/native/windows/include/Makefile.inc +++ b/src/native/windows/include/Makefile.inc @@ -208,7 +208,7 @@ CXXFLAGS = $(EXTRA_CXXFLAGS) !ENDIF # Linker section -LIBS = kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib shell32.lib rpcrt4.lib +LIBS = kernel32.lib advapi32.lib ole32.lib shell32.lib # Extra libs from command line or env !IF DEFINED(EXTRA_LIBS) LIBS = $(LIBS) $(EXTRA_LIBS) From 14e2a941f6262c68100e5da2d65f4b088cee033f Mon Sep 17 00:00:00 2001 From: Mark Thomas Date: Mon, 13 May 2024 17:44:46 +0100 Subject: [PATCH 187/298] Update readme for new, simpler build process --- src/native/windows/README.txt | 58 +++++++++++++++-------------------- 1 file changed, 24 insertions(+), 34 deletions(-) diff --git a/src/native/windows/README.txt b/src/native/windows/README.txt index 014ddf2b..12cf6fe1 100644 --- a/src/native/windows/README.txt +++ b/src/native/windows/README.txt @@ -3,7 +3,11 @@ Configuring and Building Apache Commons Daemon on Windows Using Visual Studio, you can build Apache Commons Daemon. The Makefile make file has a bunch of documentation about its -options, but a trivial build is simply; +options, but a trivial build is simply: + +All builds + +Set the JAVA_HOME environment variable to point to a Java 8 (or later) SDK. Windows X64 Build @@ -17,47 +21,33 @@ Windows X64 Build Windows X86 Build + For MVS under "C:\Program Files (x86)": + "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars32.bat" + + For MVS under "C:\Program Files": + "C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvars.bat" + nmake CPU=X86 - nmake CPU=X86 PREFIX=c:\desired\path\of\daemon install - - -Release Builds -============== -We jump through some additional hoops for release builds to avoid additional -dependencies over and above those DLLs that are known to be present on every -Windows install. If you build the binaries with a recent version of Visual -Studio then it is likely the resulting binaries will have additional -dependencies. You can check this with the Depends.exe tool provided with Visual -Studio. -Release builds are build with Mladen Turk's (mturk) Custom Microsoft Compiler -Toolkit Compilation. This can be obtained from: -https://github.com/mturk/cmsc -Version: 15.0.44 +Additional configuration +======================== -Later versions of CMSC should also work. +Specifying the installation location (defaults to .\..\..\..\..\..\target which +places the binary in the correct location for a release build): -A detailed description of the full environment used for recent release builds is -provided at: -https://cwiki.apache.org/confluence/display/TOMCAT/Common+Native+Build+Environment - -The steps to produce the Windows binaries is then: - -1. cd $GIT_CLONE_DIR\src\native\windows\apps\prunmgr - -2. $CMSC_ROOT\setenv.bat x86 - -3. nmake -f Makefile - -4. cd ..\prunsrv - -5. nmake -f Makefile + nmake CPU=X86 PREFIX=c:\desired\path\of\daemon install -6. $CMCS_ROOT\setenv.bat x64 +Use the 'Hybrid CRT' technique so the resulting binaries work on a clean Windows +installation with no additional dependencies: -7. nmake -f Makefile + nmake CPU=X86 STATIC_CRT=Hybrid + + +Release Builds +============== +Release builds must use STATIC_CRT=Hybrid. It is not necessary to build a 64-bit version of prunmgr since the 32-bit version works with both 32-bit and 64-bit services. From fed36896cbac1c7b524a047f4e973228d2d41ab7 Mon Sep 17 00:00:00 2001 From: Mark Thomas Date: Tue, 14 May 2024 14:48:12 +0100 Subject: [PATCH 188/298] Fix DAEMON-429 Enable control flow guard --- src/changes/changes.xml | 9 ++++++--- src/native/windows/include/Makefile.inc | 6 +++--- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/changes/changes.xml b/src/changes/changes.xml index 8445ffae..d697071e 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -45,9 +45,12 @@ [StepSecurity] ci: Harden GitHub Actions #95. + + Procrun. Enable Control Flow Guard for Windows binaries. + - Add support for hybrid CRT builds. + Procrun. Add support for hybrid CRT builds. @@ -58,8 +61,8 @@ 8. - The minimum Windows versions supported are now Windows 10 and Windows - Server 2016. + Procrun. The minimum Windows versions supported are now Windows 10 and + Windows Server 2016. diff --git a/src/native/windows/include/Makefile.inc b/src/native/windows/include/Makefile.inc index b68766ec..f26913e0 100644 --- a/src/native/windows/include/Makefile.inc +++ b/src/native/windows/include/Makefile.inc @@ -177,9 +177,9 @@ MACHINE_LC=amd64 !IF "$(BUILD)" == "RELEASE" !IF "$(CPU)" == "X86" -OPT_CFLAGS = -O2 -Ob2 -Oy- -Zi -DNDEBUG +OPT_CFLAGS = -O2 -Ob2 -Oy- -Zi -DNDEBUG -guard:cf !ELSE -OPT_CFLAGS = -O2 -Ob2 -Zi -DNDEBUG +OPT_CFLAGS = -O2 -Ob2 -Zi -DNDEBUG -guard:cf !ENDIF !ELSE OPT_CFLAGS = -Od -Zi -DDEBUG -D_DEBUG @@ -227,7 +227,7 @@ COMMON_LFLAGS = /NOLOGO # Always add debugging to the linker OPT_LFLAGS = /INCREMENTAL:NO /DEBUG !IF "$(BUILD)" == "RELEASE" -OPT_LFLAGS = $(OPT_LFLAGS) /OPT:REF +OPT_LFLAGS = $(OPT_LFLAGS) /OPT:REF /guard:cf !IF DEFINED(STATIC_CRT) && "$(STATIC_CRT)" == "Hybrid" OPT_LFLAGS = $(OPT_LFLAGS) /NODEFAULTLIB:libucrt.lib /DEFAULTLIB:ucrt.lib !ENDIF From bee3e024067a82c4c3a0bdeab2425041908b98ed Mon Sep 17 00:00:00 2001 From: Mark Thomas Date: Tue, 14 May 2024 15:24:47 +0100 Subject: [PATCH 189/298] Fix DAEMON-461 - better label for command used to start service --- src/changes/changes.xml | 4 ++++ src/native/windows/apps/prunmgr/prunmgr.rc | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/changes/changes.xml b/src/changes/changes.xml index d697071e..d4be951f 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -48,6 +48,10 @@ Procrun. Enable Control Flow Guard for Windows binaries. + + Procrun. Better label for command used to start service shown in + Prunmgr.exe. + Procrun. Add support for hybrid CRT builds. diff --git a/src/native/windows/apps/prunmgr/prunmgr.rc b/src/native/windows/apps/prunmgr/prunmgr.rc index b9e5be76..b0909a66 100644 --- a/src/native/windows/apps/prunmgr/prunmgr.rc +++ b/src/native/windows/apps/prunmgr/prunmgr.rc @@ -89,7 +89,7 @@ BEGIN EDITTEXT IDC_PPSGDISP,70,22,180,12,ES_AUTOHSCROLL LTEXT "&Description: ",IDC_STATIC,10,41,43,8 EDITTEXT IDC_PPSGDESC,70,40,180,12,ES_AUTOHSCROLL - LTEXT "Pat&h to executable:",IDC_STATIC,10,63,66,8 + LTEXT "Command used to start service:",IDC_STATIC,10,63,66,8 EDITTEXT IDC_PPSGDEXE,10,75,240,12,ES_AUTOHSCROLL | WS_DISABLED LTEXT "Startup typ&e:",IDC_STATIC,10,94,46,8 COMBOBOX IDC_PPSGCMBST,70,93,180,80,CBS_DROPDOWNLIST | WS_VSCROLL | From 086ee661080b5a6df15e9dd84f9aa03f6a26bda3 Mon Sep 17 00:00:00 2001 From: Mark Thomas Date: Tue, 14 May 2024 15:31:05 +0100 Subject: [PATCH 190/298] Make box bigger as text is now longer --- src/native/windows/apps/prunmgr/prunmgr.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/native/windows/apps/prunmgr/prunmgr.rc b/src/native/windows/apps/prunmgr/prunmgr.rc index b0909a66..6cfb0f93 100644 --- a/src/native/windows/apps/prunmgr/prunmgr.rc +++ b/src/native/windows/apps/prunmgr/prunmgr.rc @@ -89,7 +89,7 @@ BEGIN EDITTEXT IDC_PPSGDISP,70,22,180,12,ES_AUTOHSCROLL LTEXT "&Description: ",IDC_STATIC,10,41,43,8 EDITTEXT IDC_PPSGDESC,70,40,180,12,ES_AUTOHSCROLL - LTEXT "Command used to start service:",IDC_STATIC,10,63,66,8 + LTEXT "Command used to start service:",IDC_STATIC,10,63,110,8 EDITTEXT IDC_PPSGDEXE,10,75,240,12,ES_AUTOHSCROLL | WS_DISABLED LTEXT "Startup typ&e:",IDC_STATIC,10,94,46,8 COMBOBOX IDC_PPSGCMBST,70,93,180,80,CBS_DROPDOWNLIST | WS_VSCROLL | From d8c956d7fd7b82b67f5e2e3c136c00765091f8c5 Mon Sep 17 00:00:00 2001 From: Jingyun Hua Date: Wed, 17 May 2023 14:05:01 +0800 Subject: [PATCH 191/298] Add LoongArch64 support Signed-off-by: Jingyun Hua --- src/native/unix/support/apsupport.m4 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/native/unix/support/apsupport.m4 b/src/native/unix/support/apsupport.m4 index c58e2a71..dbca23fb 100644 --- a/src/native/unix/support/apsupport.m4 +++ b/src/native/unix/support/apsupport.m4 @@ -185,6 +185,10 @@ AC_DEFUN(AP_SUPPORTED_HOST,[ CFLAGS="$CFLAGS -DCPU=\\\"riscv64\\\"" HOST_CPU=riscv64 ;; + loongarch64) + CFLAGS="$CFLAGS -DCPU=\\\"loongarch64\\\"" + HOST_CPU=loongarch64 + ;; *) AC_MSG_RESULT([failed]) AC_MSG_ERROR([Unsupported CPU architecture "$host_cpu"]);; From f73823fc3284061a7daaba88c42b6eeac9392c23 Mon Sep 17 00:00:00 2001 From: Mark Thomas Date: Tue, 14 May 2024 16:58:22 +0100 Subject: [PATCH 192/298] Add chnagelog entry --- src/changes/changes.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/changes/changes.xml b/src/changes/changes.xml index d4be951f..a4f7334b 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -56,6 +56,9 @@ Procrun. Add support for hybrid CRT builds. + + jsvc. Add support for LoongArch64 support #92. + Bump commons-parent from 57 to 69 #155. From 75716c795ba34d581d0f8628782a6c15919a61dd Mon Sep 17 00:00:00 2001 From: Mark Thomas Date: Wed, 15 May 2024 09:24:16 +0100 Subject: [PATCH 193/298] Remove escapes to fix warning when running buildconf.sh --- src/native/unix/support/apfunctions.m4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/native/unix/support/apfunctions.m4 b/src/native/unix/support/apfunctions.m4 index e8d7ef07..c9b71506 100644 --- a/src/native/unix/support/apfunctions.m4 +++ b/src/native/unix/support/apfunctions.m4 @@ -26,7 +26,7 @@ AC_DEFUN(AP_CANONICAL_HOST_CHECK,[ test x"$ac_cv_host_system_type" != x"$host" ; } then AC_MSG_RESULT([$ac_cv_host_system_type]) - AC_MSG_ERROR([remove the \"$cache_file\" file and re-run configure]) + AC_MSG_ERROR([remove the "$cache_file" file and re-run configure]) else AC_MSG_RESULT(ok) ac_cv_host_system_type="$host" From 8109d12ec724abcf1a6dc05fa6dffc46de347adb Mon Sep 17 00:00:00 2001 From: Mark Thomas Date: Wed, 15 May 2024 09:27:25 +0100 Subject: [PATCH 194/298] Fix AC_OUTPUT usage warning when running buildconf.sh --- src/changes/changes.xml | 3 +++ src/native/unix/configure.in | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/changes/changes.xml b/src/changes/changes.xml index a4f7334b..1c91dc0a 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -52,6 +52,9 @@ Procrun. Better label for command used to start service shown in Prunmgr.exe. + + jsvc. Fix warnings when running support/buildconf.sh + Procrun. Add support for hybrid CRT builds. diff --git a/src/native/unix/configure.in b/src/native/unix/configure.in index e3eedb9e..b411f016 100644 --- a/src/native/unix/configure.in +++ b/src/native/unix/configure.in @@ -135,7 +135,8 @@ dnl ------------------------------------------------------------------------- dnl Random programs we need to compile locally dnl ------------------------------------------------------------------------- AP_MSG_HEADER([Writing output files]) -AC_OUTPUT(Makefile Makedefs native/Makefile) +AC_CONFIG_FILES(Makefile Makedefs native/Makefile) +AC_OUTPUT dnl ------------------------------------------------------------------------- dnl Done From 17f07fb7b41092f1a98be0fb5e3613beaaa2f93f Mon Sep 17 00:00:00 2001 From: Mark Thomas Date: Wed, 15 May 2024 10:04:16 +0100 Subject: [PATCH 195/298] Fix DAEMON-463 - compilation issue with newer compilers --- src/changes/changes.xml | 3 +++ src/native/unix/native/jsvc-unix.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/changes/changes.xml b/src/changes/changes.xml index 1c91dc0a..18b48c99 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -55,6 +55,9 @@ jsvc. Fix warnings when running support/buildconf.sh + + jsvc. Fix compilation issue with newer compilers. + Procrun. Add support for hybrid CRT builds. diff --git a/src/native/unix/native/jsvc-unix.c b/src/native/unix/native/jsvc-unix.c index e331a0fa..187e4042 100644 --- a/src/native/unix/native/jsvc-unix.c +++ b/src/native/unix/native/jsvc-unix.c @@ -1308,7 +1308,7 @@ static int run_controller(arg_data *args, home_data *data, uid_t uid, gid_t gid) * These will be replaced in the child process. */ memset(&act, '\0', sizeof(act)); - act.sa_handler = controller; + act.sa_sigaction = controller; sigemptyset(&act.sa_mask); act.sa_flags = SA_RESTART | SA_NOCLDSTOP | SA_SIGINFO; From 30e5f343e0ebbf824d137bfe1d4fc177b630218a Mon Sep 17 00:00:00 2001 From: Mark Thomas Date: Wed, 15 May 2024 15:36:34 +0100 Subject: [PATCH 196/298] Update commons-parent to 70 --- pom.xml | 2 +- src/changes/changes.xml | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e8ff6075..f8eaa26a 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ org.apache.commons commons-parent - 69 + 70 4.0.0 commons-daemon diff --git a/src/changes/changes.xml b/src/changes/changes.xml index 18b48c99..72d0b514 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -77,6 +77,9 @@ Procrun. The minimum Windows versions supported are now Windows 10 and Windows Server 2016. + + Bump commons-parent from 69 to 70. + From 871dd0c9134ee56507884233899860c55211ad08 Mon Sep 17 00:00:00 2001 From: Mark Thomas Date: Wed, 15 May 2024 15:37:12 +0100 Subject: [PATCH 197/298] Re-generate generated files to pick up new templates --- CONTRIBUTING.md | 5 ++-- README.md | 45 +++++++++++++++++++------------ src/site/xdoc/download_daemon.xml | 28 +++++++++---------- src/site/xdoc/issue-tracking.xml | 2 +- src/site/xdoc/mail-lists.xml | 38 +++++++++++++------------- 5 files changed, 63 insertions(+), 55 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index dfb95359..3796f160 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -49,13 +49,13 @@ Getting Started --------------- + Make sure you have a [JIRA account](https://issues.apache.org/jira/). -+ Make sure you have a [GitHub account](https://github.com/signup/free). ++ Make sure you have a [GitHub account](https://github.com/signup/free). This is not essential, but makes providing patches much easier. + If you're planning to implement a new feature it makes sense to discuss your changes on the [dev list](https://commons.apache.org/mail-lists.html) first. This way you can make sure you're not wasting your time on something that isn't considered to be in Apache Commons Daemon's scope. + Submit a [Jira Ticket][jira] for your issue, assuming one does not already exist. + Clearly describe the issue including steps to reproduce when it is a bug. + Make sure you fill in the earliest version that you know has the issue. + Find the corresponding [repository on GitHub](https://github.com/apache/?query=commons-), -[fork](https://help.github.com/articles/fork-a-repo/) and check out your forked repository. +[fork](https://help.github.com/articles/fork-a-repo/) and check out your forked repository. If you don't have a GitHub account, you can still clone the Commons repository. Making Changes -------------- @@ -109,7 +109,6 @@ Additional Resources + [General GitHub documentation](https://help.github.com/) + [GitHub pull request documentation](https://help.github.com/articles/creating-a-pull-request/) + [Apache Commons Twitter Account](https://twitter.com/ApacheCommons) -+ `#apache-commons` IRC channel on `irc.freenode.net` [cla]:https://www.apache.org/licenses/#clas [jira]:https://issues.apache.org/jira/browse/DAEMON diff --git a/README.md b/README.md index 7d254eb6..28285b70 100644 --- a/README.md +++ b/README.md @@ -45,10 +45,10 @@ Apache Commons Daemon [![Java CI](https://github.com/apache/commons-daemon/actions/workflows/maven.yml/badge.svg)](https://github.com/apache/commons-daemon/actions/workflows/maven.yml) [![Coverage Status](https://codecov.io/gh/apache/commons-daemon/branch/master/graph/badge.svg)](https://app.codecov.io/gh/apache/commons-daemon) -[![Maven Central](https://maven-badges.herokuapp.com/maven-central/commons-daemon/commons-daemon/badge.svg)](https://maven-badges.herokuapp.com/maven-central/commons-daemon/commons-daemon/) -[![Javadocs](https://javadoc.io/badge/commons-daemon/commons-daemon/1.3.4.svg)](https://javadoc.io/doc/commons-daemon/commons-daemon/1.3.4) -[![CodeQL CPP](https://github.com/apache/commons-daemon/actions/workflows/codeql-analysis-cpp.yml/badge.svg)](https://github.com/apache/commons-daemon/actions/workflows/codeql-analysis-cpp.yml) -[![CodeQL Java](https://github.com/apache/commons-daemon/actions/workflows/codeql-analysis-java.yml/badge.svg)](https://github.com/apache/commons-daemon/actions/workflows/codeql-analysis-java.yml) +[![Maven Central](https://maven-badges.herokuapp.com/maven-central/commons-daemon/commons-daemon/badge.svg?gav=true)](https://maven-badges.herokuapp.com/maven-central/commons-daemon/commons-daemon/?gav=true) +[![Javadocs](https://javadoc.io/badge/commons-daemon/commons-daemon/1.4.0.svg)](https://javadoc.io/doc/commons-daemon/commons-daemon/1.4.0) +[![CodeQL](https://github.com/apache/commons-daemon/actions/workflows/codeql-analysis.yml/badge.svg)](https://github.com/apache/commons-daemon/actions/workflows/codeql-analysis.yml) +[![OpenSSF Scorecard](https://api.securityscorecards.dev/projects/github.com/apache/commons-daemon/badge)](https://api.securityscorecards.dev/projects/github.com/apache/commons-daemon) Apache Commons Daemon software is a set of utilities and Java support classes for running Java applications as server processes. These are @@ -62,49 +62,60 @@ More information can be found on the [Apache Commons Daemon homepage](https://co The [Javadoc](https://commons.apache.org/proper/commons-daemon/apidocs) can be browsed. Questions related to the usage of Apache Commons Daemon should be posted to the [user mailing list](https://commons.apache.org/mail-lists.html). -Where can I get the latest release? ------------------------------------ +Getting the latest release +-------------------------- You can download source and binaries from our [download page](https://commons.apache.org/proper/commons-daemon/download_daemon.cgi). -Alternatively, you can pull it from the central Maven repositories: +Alternatively, you can pull it from the central Maven repositories: ```xml commons-daemon commons-daemon - 1.3.3 + 1.4.0 ``` +Building +-------- + +Building requires a Java JDK and [Apache Maven](https://maven.apache.org/). +The required Java version is found in the `pom.xml` as the `maven.compiler.source` property. + +From a command shell, run `mvn` without arguments to invoke the default Maven goal to run all tests and checks. + Contributing ------------ -We accept Pull Requests via GitHub. The [developer mailing list][ml] is the main channel of communication for contributors. +We accept Pull Requests via GitHub. The [developer mailing list](https://commons.apache.org/mail-lists.html) is the main channel of communication for contributors. There are some guidelines which will make applying PRs easier for us: + No tabs! Please use spaces for indentation. -+ Respect the code style. ++ Respect the existing code style for each file. + Create minimal diffs - disable on save actions like reformat source code or organize imports. If you feel the source code should be reformatted create a separate PR for this change. -+ Provide JUnit tests for your changes and make sure your changes don't break any existing tests by running ```mvn clean test```. ++ Provide JUnit tests for your changes and make sure your changes don't break any existing tests by running ```mvn```. If you plan to contribute on a regular basis, please consider filing a [contributor license agreement](https://www.apache.org/licenses/#clas). You can learn more about contributing via GitHub in our [contribution guidelines](CONTRIBUTING.md). License ------- -This code is under the [Apache License v2](https://www.apache.org/licenses/LICENSE-2.0). +This code is licensed under the [Apache License v2](https://www.apache.org/licenses/LICENSE-2.0). See the `NOTICE.txt` file for required notices and attributions. -Donations ---------- -You like Apache Commons Daemon? Then [donate back to the ASF](https://www.apache.org/foundation/contributing.html) to support the development. +Donating +-------- +You like Apache Commons Daemon? Then [donate back to the ASF](https://www.apache.org/foundation/contributing.html) to support development. Additional Resources -------------------- + [Apache Commons Homepage](https://commons.apache.org/) + [Apache Issue Tracker (JIRA)](https://issues.apache.org/jira/browse/DAEMON) ++ [Apache Commons Slack Channel](https://the-asf.slack.com/archives/C60NVB8AD) + [Apache Commons Twitter Account](https://twitter.com/ApacheCommons) -+ `#apache-commons` IRC channel on `irc.freenode.org` -[ml]:https://commons.apache.org/mail-lists.html +Apache Commons Components +------------------------- + +Please see the [list of components](https://commons.apache.org/components.html) diff --git a/src/site/xdoc/download_daemon.xml b/src/site/xdoc/download_daemon.xml index 2432fbc9..27c2e9c4 100644 --- a/src/site/xdoc/download_daemon.xml +++ b/src/site/xdoc/download_daemon.xml @@ -107,38 +107,38 @@ limitations under the License. failing that using the SHA512 hash (*.sha512 checksum files).

      - The KEYS + The KEYS file contains the public PGP keys used by Apache Commons developers to sign releases.

    -
    +
    - - - + + + - - - + + +
    commons-daemon-1.3.4-bin.tar.gzsha512pgpcommons-daemon-1.4.0-bin.tar.gzsha512pgp
    commons-daemon-1.3.4-bin.zipsha512pgpcommons-daemon-1.4.0-bin.zipsha512pgp
    - - - + + + - - - + + +
    commons-daemon-1.3.4-src.tar.gzsha512pgpcommons-daemon-1.4.0-src.tar.gzsha512pgp
    commons-daemon-1.3.4-src.zipsha512pgpcommons-daemon-1.4.0-src.zipsha512pgp
    diff --git a/src/site/xdoc/issue-tracking.xml b/src/site/xdoc/issue-tracking.xml index 9debeb80..463de375 100644 --- a/src/site/xdoc/issue-tracking.xml +++ b/src/site/xdoc/issue-tracking.xml @@ -85,7 +85,7 @@ limitations under the License.

    - For more information on subversion and creating patches see the + For more information on creating patches see the Apache Contributors Guide.

    diff --git a/src/site/xdoc/mail-lists.xml b/src/site/xdoc/mail-lists.xml index a6b61019..9992469f 100644 --- a/src/site/xdoc/mail-lists.xml +++ b/src/site/xdoc/mail-lists.xml @@ -59,9 +59,9 @@ limitations under the License.

    Questions related to the usage of Apache Commons Daemon should be posted to the - User List. + User List.
    - The Developer List + The Developer List is for questions and discussion related to the development of Apache Commons Daemon.
    Please do not cross-post; developers are also subscribed to the user list. @@ -70,8 +70,10 @@ limitations under the License. to subscribe.

    - Note: please don't send patches or attachments to any of the mailing lists. + Note: please don't send patches or attachments to any of the mailing lists; + most of the lists are set up to drop attachments. Patches are best handled via the Issue Tracking system. + If you have a GitHub account, most components also accept PRs (pull requests). Otherwise, please upload the file to a public server and include the URL in the mail.

    @@ -105,12 +107,11 @@ limitations under the License. Subscribe Unsubscribe Post - mail-archives.apache.org
    + lists.apache.org - markmail.org
    - www.mail-archive.com
    - news.gmane.org + + www.mail-archive.com @@ -125,12 +126,11 @@ limitations under the License. Subscribe Unsubscribe Post - mail-archives.apache.org
    + lists.apache.org - markmail.org
    - www.mail-archive.com
    - news.gmane.org + + www.mail-archive.com @@ -145,10 +145,10 @@ limitations under the License. Subscribe Unsubscribe read only - mail-archives.apache.org
    + lists.apache.org - markmail.org
    + www.mail-archive.com @@ -164,10 +164,10 @@ limitations under the License. Subscribe Unsubscribe read only - mail-archives.apache.org
    + lists.apache.org - markmail.org
    + www.mail-archive.com @@ -199,13 +199,11 @@ limitations under the License. Subscribe Unsubscribe read only - mail-archives.apache.org
    + lists.apache.org - markmail.org
    - old.nabble.com
    - www.mail-archive.com
    - news.gmane.org + + www.mail-archive.com From 19bedd3c5f434f5a4f552b5d553de7c2569ebd6b Mon Sep 17 00:00:00 2001 From: Gary Gregory Date: Thu, 16 May 2024 14:47:53 -0400 Subject: [PATCH 198/298] Show Maven stack traces on errors in GH CI --- .github/workflows/maven.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index b1d045d2..60465144 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -50,4 +50,4 @@ jobs: distribution: 'temurin' java-version: ${{ matrix.java }} - name: Build with Maven - run: mvn --show-version --batch-mode --no-transfer-progress -Ddoclint=all + run: mvn --errors --show-version --batch-mode --no-transfer-progress -Ddoclint=all From 7219698dfff088f12560970dd2d4468232a666fd Mon Sep 17 00:00:00 2001 From: Mark Thomas Date: Fri, 17 May 2024 13:16:44 +0100 Subject: [PATCH 199/298] Refactoring UAC support so prunsrv does not always require elevation --- src/changes/changes.xml | 4 + src/native/windows/apps/prunsrv/prunsrv.c | 92 +++++++++++++++++-- .../windows/apps/prunsrv/prunsrv.manifest | 4 - 3 files changed, 90 insertions(+), 10 deletions(-) diff --git a/src/changes/changes.xml b/src/changes/changes.xml index 72d0b514..42515da8 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -58,6 +58,10 @@ jsvc. Fix compilation issue with newer compilers. + + Procrun. Refactor UAC support so that elevation is only requested for + actions that require administrator privileges. + Procrun. Add support for hybrid CRT builds. diff --git a/src/native/windows/apps/prunsrv/prunsrv.c b/src/native/windows/apps/prunsrv/prunsrv.c index c4dc9901..10323d43 100644 --- a/src/native/windows/apps/prunsrv/prunsrv.c +++ b/src/native/windows/apps/prunsrv/prunsrv.c @@ -1936,6 +1936,64 @@ BOOL docmdRunService(LPAPXCMDLINE lpCmdline) return rv; } +BOOL isRunningAsAdministrator(BOOL *bElevated) { + BOOL rv = FALSE; + HANDLE hToken; + TOKEN_ELEVATION tokenInformation; + DWORD dwSize; + + if (!OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &hToken)) { + goto cleanup; + } + + if (!GetTokenInformation(hToken, TokenElevation, &tokenInformation, sizeof(tokenInformation), &dwSize)) { + goto cleanup; + } + + *bElevated = tokenInformation.TokenIsElevated; + rv = TRUE; + +cleanup: + if (hToken) { + CloseHandle(hToken); + } + return rv; +} + +BOOL restartCurrentProcessWithElevation(DWORD *dwExitCode) { + BOOL rv = FALSE; + TCHAR szPath[MAX_PATH]; + SHELLEXECUTEINFO shellExecuteInfo; + + SetLastError(0); + GetModuleFileName(NULL, szPath, MAX_PATH); + if (GetLastError()) { + goto cleanup; + } + + shellExecuteInfo.cbSize = sizeof(SHELLEXECUTEINFO); + shellExecuteInfo.fMask = SEE_MASK_NOCLOSEPROCESS; + shellExecuteInfo.hwnd = NULL; + shellExecuteInfo.lpVerb = L"runas"; + shellExecuteInfo.lpFile = szPath; + shellExecuteInfo.lpParameters = PathGetArgs(GetCommandLine()); + shellExecuteInfo.lpDirectory = NULL; + shellExecuteInfo.nShow = SW_SHOWNORMAL; + shellExecuteInfo.hInstApp = NULL; + + if (!ShellExecuteEx(&shellExecuteInfo)) { + goto cleanup; + } + WaitForSingleObject(shellExecuteInfo.hProcess, INFINITE); + GetExitCodeProcess(shellExecuteInfo.hProcess, dwExitCode); + + rv = TRUE; + +cleanup: + return rv; +} + + static const char *gSzProc[] = { "", "parse command line arguments", @@ -2039,6 +2097,28 @@ void __cdecl main(int argc, char **argv) t.wYear, t.wMonth, t.wDay, t.wHour, t.wMinute, t.wSecond); } + + if (lpCmdline->dwCmdIndex > 2 && lpCmdline->dwCmdIndex < 8) { + /* Command requires elevation */ + BOOL bElevated; + if (!isRunningAsAdministrator(&bElevated)) { + apxDisplayError(FALSE, NULL, 0, "Unable to determine if process has administrator privileges. Continuing as if it has.\n"); + } else { + if (!bElevated) { + DWORD dwExitCode; + if (!restartCurrentProcessWithElevation(&dwExitCode)) { + apxDisplayError(FALSE, NULL, 0, "Failed to elevate current process.\n"); + rv = lpCmdline->dwCmdIndex + 2; + } else { + if (dwExitCode) { + apxDisplayError(FALSE, NULL, 0, "Running from a command prompt with administrative privileges may show further error details.\n"); + } + rv = dwExitCode; + } + goto cleanup; + } + } + } switch (lpCmdline->dwCmdIndex) { case 1: /* Run Service as console application */ if (!docmdDebugService(lpCmdline)) @@ -2048,23 +2128,23 @@ void __cdecl main(int argc, char **argv) if (!docmdRunService(lpCmdline)) rv = 4; break; - case 3: /* Start service */ + case 3: /* Start service - requires elevation */ if (!docmdStartService(lpCmdline)) rv = 5; break; - case 4: /* Stop Service */ + case 4: /* Stop Service - requires elevation */ if (!docmdStopService(lpCmdline)) rv = 6; break; - case 5: /* Update Service parameters */ + case 5: /* Update Service parameters - requires elevation */ if (!docmdUpdateService(lpCmdline)) rv = 7; break; - case 6: /* Install Service */ + case 6: /* Install Service - requires elevation */ if (!docmdInstallService(lpCmdline)) rv = 8; break; - case 7: /* Delete Service */ + case 7: /* Delete Service - requires elevation */ if (!docmdDeleteService(lpCmdline)) rv = 9; break; @@ -2095,7 +2175,7 @@ void __cdecl main(int argc, char **argv) rv, gSzProc[ix]); if (ix > 2 && !_service_mode) { /* Print something to the user console */ - apxDisplayError(FALSE, NULL, 0, "Failed to %s.", gSzProc[ix]); + apxDisplayError(FALSE, NULL, 0, "Failed to %s.\n", gSzProc[ix]); } } else diff --git a/src/native/windows/apps/prunsrv/prunsrv.manifest b/src/native/windows/apps/prunsrv/prunsrv.manifest index 204a914f..431c5d15 100644 --- a/src/native/windows/apps/prunsrv/prunsrv.manifest +++ b/src/native/windows/apps/prunsrv/prunsrv.manifest @@ -25,10 +25,6 @@ - - - - From 4337f428bbb3d02280eb07b5c9e158e2760fa47b Mon Sep 17 00:00:00 2001 From: Gary Gregory Date: Fri, 17 May 2024 10:02:13 -0400 Subject: [PATCH 200/298] Simplify (via PMD check) --- .../java/org/apache/commons/daemon/support/DaemonLoader.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/apache/commons/daemon/support/DaemonLoader.java b/src/main/java/org/apache/commons/daemon/support/DaemonLoader.java index cf2f9c9e..47178b8d 100644 --- a/src/main/java/org/apache/commons/daemon/support/DaemonLoader.java +++ b/src/main/java/org/apache/commons/daemon/support/DaemonLoader.java @@ -370,7 +370,7 @@ public void fail(final String message, final Exception exception) msg = exception.toString(); } } - DaemonLoader.failed(msg); + failed(msg); } } From 1928ed7f0b58a511fa57d0da35cdd0f73ac7f2bf Mon Sep 17 00:00:00 2001 From: Mark Thomas Date: Fri, 17 May 2024 15:21:01 +0100 Subject: [PATCH 201/298] Update copyright year to 2024 --- src/changes/changes.xml | 2 +- src/native/unix/man/jsvc.1.xml | 2 +- src/native/unix/native/help.c | 2 +- src/native/unix/native/jsvc-unix.c | 2 +- src/native/windows/apps/prunmgr/prunmgr.rc | 6 +++--- src/native/windows/apps/prunsrv/prunsrv.c | 2 +- src/native/windows/apps/prunsrv/prunsrv.rc | 2 +- src/native/windows/resources/license.rtf | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/changes/changes.xml b/src/changes/changes.xml index 42515da8..3941c3d6 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -40,7 +40,7 @@ Apache Commons Daemon Release Notes - + [StepSecurity] ci: Harden GitHub Actions #95. diff --git a/src/native/unix/man/jsvc.1.xml b/src/native/unix/man/jsvc.1.xml index 4c1ee3f5..2b63c8cd 100644 --- a/src/native/unix/man/jsvc.1.xml +++ b/src/native/unix/man/jsvc.1.xml @@ -21,7 +21,7 @@ JSVC 1 - TBD + 2024-05-24 Jsvc version 1.4.0 Apache Commons Daemon project diff --git a/src/native/unix/native/help.c b/src/native/unix/native/help.c index 57339e14..d8b6b5eb 100644 --- a/src/native/unix/native/help.c +++ b/src/native/unix/native/help.c @@ -124,7 +124,7 @@ void help(home_data *data) printf(" --enable-preview\n"); printf(" Java 11 --enable-preview option. Passed as it is to JVM\n"); printf("\njsvc (Apache Commons Daemon) " JSVC_VERSION_STRING "\n"); - printf("Copyright (c) 1999-2023 Apache Software Foundation.\n"); + printf("Copyright (c) 1999-2024 Apache Software Foundation.\n"); printf("\n"); } diff --git a/src/native/unix/native/jsvc-unix.c b/src/native/unix/native/jsvc-unix.c index 187e4042..6428b9dd 100644 --- a/src/native/unix/native/jsvc-unix.c +++ b/src/native/unix/native/jsvc-unix.c @@ -850,7 +850,7 @@ static int child(arg_data *args, home_data *data, uid_t uid, gid_t gid) /* Check wether we need to dump the VM version */ if (args->vers == true) { log_error("jsvc (Apache Commons Daemon) " JSVC_VERSION_STRING); - log_error("Copyright (c) 1999-2023 Apache Software Foundation."); + log_error("Copyright (c) 1999-2024 Apache Software Foundation."); if (java_version() != true) { return -1; } diff --git a/src/native/windows/apps/prunmgr/prunmgr.rc b/src/native/windows/apps/prunmgr/prunmgr.rc index 6cfb0f93..ad449586 100644 --- a/src/native/windows/apps/prunmgr/prunmgr.rc +++ b/src/native/windows/apps/prunmgr/prunmgr.rc @@ -38,7 +38,7 @@ BEGIN ES_READONLY | WS_BORDER | WS_VSCROLL,0,31,335,115 CONTROL "BMP_COMMONS",IDC_STATIC,"Static",SS_BITMAP|0x00000040L,0,0,337,30 LTEXT " ",IDC_ABOUTAPP,2,150,270,12 - LTEXT "Copyright (c) 2000-2023 The Apache Software Foundation.",IDC_STATIC,2,160,270,12 + LTEXT "Copyright (c) 2000-2024 The Apache Software Foundation.",IDC_STATIC,2,160,270,12 LTEXT "https://commons.apache.org",IDC_STATIC,2,170,270,12 PUSHBUTTON "&System Info",IAB_SYSINF,285,170,50,14 END @@ -230,7 +230,7 @@ BEGIN IDS_APPLICATION RSTR_PSM IDS_APPVERSION "Version 1.4.0" IDS_APPFULLNAME RSTR_PSM " Version " PRG_VERSION - IDS_APPCOPYRIGHT "Copyright (c) 2000-2023 The Apache Software Foundation" + IDS_APPCOPYRIGHT "Copyright (c) 2000-2024 The Apache Software Foundation" IDS_APPDESCRIPTION "Apache Commons Daemon Service Management Tool" IDS_ALREAY_RUNING "An instance of '%S' application is already running" IDS_ERRORCMD "Unknown command line option '%s'\nSee the manual for command line usage." @@ -280,7 +280,7 @@ BEGIN VALUE "FileDescription", RSTR_PSM "\0" VALUE "FileVersion", PRG_VERSION VALUE "InternalName", RSTR_PSM "\0" - VALUE "LegalCopyright", "Copyright (c) 2000-2023 The Apache Software Foundation.\0" + VALUE "LegalCopyright", "Copyright (c) 2000-2024 The Apache Software Foundation.\0" VALUE "OriginalFilename", "prunmgr.exe\0" VALUE "ProductName", RSTR_PSM "\0" VALUE "ProductVersion", PRG_VERSION diff --git a/src/native/windows/apps/prunsrv/prunsrv.c b/src/native/windows/apps/prunsrv/prunsrv.c index 10323d43..92ab69f2 100644 --- a/src/native/windows/apps/prunsrv/prunsrv.c +++ b/src/native/windows/apps/prunsrv/prunsrv.c @@ -401,7 +401,7 @@ static void printVersion(void) { fwprintf(stderr, L"Apache Commons Daemon Service Runner version %S/Win%d (%S)\n", PRG_VERSION, PRG_BITS, __DATE__); - fwprintf(stderr, L"Copyright (c) 2000-2023 The Apache Software Foundation.\n\n" + fwprintf(stderr, L"Copyright (c) 2000-2024 The Apache Software Foundation.\n\n" L"For bug reporting instructions, please see:\n" L"."); } diff --git a/src/native/windows/apps/prunsrv/prunsrv.rc b/src/native/windows/apps/prunsrv/prunsrv.rc index c037e2ee..1e73f45d 100644 --- a/src/native/windows/apps/prunsrv/prunsrv.rc +++ b/src/native/windows/apps/prunsrv/prunsrv.rc @@ -44,7 +44,7 @@ BEGIN VALUE "FileDescription", RSTR_PRUNSRV "\0" VALUE "FileVersion", PRG_VERSION VALUE "InternalName", RSTR_PRUNSRV "\0" - VALUE "LegalCopyright", "Copyright (c) 2000-2023 The Apache Software Foundation.\0" + VALUE "LegalCopyright", "Copyright (c) 2000-2024 The Apache Software Foundation.\0" VALUE "OriginalFilename", "prunsrv.exe\0" VALUE "ProductName", RSTR_PRUNSRV "\0" VALUE "ProductVersion", PRG_VERSION diff --git a/src/native/windows/resources/license.rtf b/src/native/windows/resources/license.rtf index ec5b4819..620bf8f6 100644 --- a/src/native/windows/resources/license.rtf +++ b/src/native/windows/resources/license.rtf @@ -15,7 +15,7 @@ {\pntxtb (}{\pntxta )}}{\*\pnseclvl7\pnlcrm\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl8\pnlcltr\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl9\pnlcrm\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}\pard\plain \qc \li0\ri0\nowidctlpar\faauto\rin0\lin0\itap0\pararsid14358633 \fs24\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 {\b\f1\insrsid16132583\charrsid12321742 The Apache Software License, Version 2.0 \par }\pard \ql \li0\ri0\nowidctlpar\faauto\rin0\lin0\itap0 {\f1\fs18\insrsid16132583\charrsid16132583 -\par }\pard \ql \li0\ri0\nowidctlpar\faauto\rin0\lin0\itap0\pararsid9454304 {\f1\fs18\insrsid9454304 }{\f1\fs18\insrsid16132583\charrsid16132583 Copyright 2002-2023 The Apache Software Foundation. +\par }\pard \ql \li0\ri0\nowidctlpar\faauto\rin0\lin0\itap0\pararsid9454304 {\f1\fs18\insrsid9454304 }{\f1\fs18\insrsid16132583\charrsid16132583 Copyright 2002-2024 The Apache Software Foundation. \par }\pard \ql \li0\ri0\nowidctlpar\faauto\rin0\lin0\itap0\pararsid1379267 {\f1\fs18\insrsid16132583\charrsid16132583 \par }{\f1\fs18\insrsid14358633 }{\f1\fs18\insrsid16132583\charrsid16132583 Licensed under the Apache License, Version 2.0 (the "License"); \par }{\f1\fs18\insrsid14358633 }{\f1\fs18\insrsid16132583\charrsid16132583 you may not use this file except in compliance with the License. From 8fb92c16cb5d84c27a7833b46d605bddd00c4a28 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 17 May 2024 13:22:47 -0400 Subject: [PATCH 202/298] Bump codecov/codecov-action from 4.3.1 to 4.4.0 (#171) Bumps [codecov/codecov-action](https://github.com/codecov/codecov-action) from 4.3.1 to 4.4.0. - [Release notes](https://github.com/codecov/codecov-action/releases) - [Changelog](https://github.com/codecov/codecov-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/codecov/codecov-action/compare/5ecb98a3c6b747ed38dc09f787459979aebb39be...6d798873df2b1b8e5846dba6fb86631229fbcb17) --- updated-dependencies: - dependency-name: codecov/codecov-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/coverage.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index 6fb2996e..29a71b78 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -47,6 +47,6 @@ jobs: run: mvn --show-version --batch-mode --no-transfer-progress test jacoco:report - name: Upload coverage to Codecov - uses: codecov/codecov-action@5ecb98a3c6b747ed38dc09f787459979aebb39be # v4.3.1 + uses: codecov/codecov-action@6d798873df2b1b8e5846dba6fb86631229fbcb17 # v4.4.0 with: files: ./target/site/jacoco/jacoco.xml From 294906be22b1fccefbbb119f59d8e6dd18fe7008 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 17 May 2024 13:23:00 -0400 Subject: [PATCH 203/298] Bump actions/checkout from 4.1.5 to 4.1.6 (#173) Bumps [actions/checkout](https://github.com/actions/checkout) from 4.1.5 to 4.1.6. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/44c2b7a8a4ea60a981eaca3cf939b5f4305c123b...a5ac7e51b41094c92402da3b24376905380afc29) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/codeql-analysis-cpp.yml | 2 +- .github/workflows/codeql-analysis-java.yml | 2 +- .github/workflows/coverage.yml | 2 +- .github/workflows/maven.yml | 2 +- .github/workflows/scorecards-analysis.yml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/codeql-analysis-cpp.yml b/.github/workflows/codeql-analysis-cpp.yml index 58f5a458..cd386809 100644 --- a/.github/workflows/codeql-analysis-cpp.yml +++ b/.github/workflows/codeql-analysis-cpp.yml @@ -45,7 +45,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5 + uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6 with: persist-credentials: false - uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2 diff --git a/.github/workflows/codeql-analysis-java.yml b/.github/workflows/codeql-analysis-java.yml index c6d107c0..26d0ca08 100644 --- a/.github/workflows/codeql-analysis-java.yml +++ b/.github/workflows/codeql-analysis-java.yml @@ -45,7 +45,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5 + uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6 with: persist-credentials: false - uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2 diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index 29a71b78..eec12696 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -29,7 +29,7 @@ jobs: java: [ 8 ] steps: - - uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5 + - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6 with: persist-credentials: false - uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2 diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 60465144..94ac86e5 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -35,7 +35,7 @@ jobs: # experimental: true steps: - - uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5 + - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6 with: persist-credentials: false - uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2 diff --git a/.github/workflows/scorecards-analysis.yml b/.github/workflows/scorecards-analysis.yml index a13c3f59..c3b83947 100644 --- a/.github/workflows/scorecards-analysis.yml +++ b/.github/workflows/scorecards-analysis.yml @@ -40,7 +40,7 @@ jobs: steps: - name: "Checkout code" - uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5 + uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6 with: persist-credentials: false From cd3e7364e11e96ab446af222c2a579ca5ba7f5ee Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 17 May 2024 13:23:17 -0400 Subject: [PATCH 204/298] Bump github/codeql-action from 3.25.4 to 3.25.5 (#172) Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.25.4 to 3.25.5. - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/ccf74c947955fd1cf117aef6a0e4e66191ef6f61...b7cec7526559c32f1616476ff32d17ba4c59b2d6) --- updated-dependencies: - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/codeql-analysis-cpp.yml | 4 ++-- .github/workflows/codeql-analysis-java.yml | 6 +++--- .github/workflows/scorecards-analysis.yml | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/codeql-analysis-cpp.yml b/.github/workflows/codeql-analysis-cpp.yml index cd386809..2bcc4b7c 100644 --- a/.github/workflows/codeql-analysis-cpp.yml +++ b/.github/workflows/codeql-analysis-cpp.yml @@ -57,7 +57,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@ccf74c947955fd1cf117aef6a0e4e66191ef6f61 # 3.25.4 + uses: github/codeql-action/init@b7cec7526559c32f1616476ff32d17ba4c59b2d6 # 3.25.5 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -86,4 +86,4 @@ jobs: make - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@ccf74c947955fd1cf117aef6a0e4e66191ef6f61 # 3.25.4 + uses: github/codeql-action/analyze@b7cec7526559c32f1616476ff32d17ba4c59b2d6 # 3.25.5 diff --git a/.github/workflows/codeql-analysis-java.yml b/.github/workflows/codeql-analysis-java.yml index 26d0ca08..22c58385 100644 --- a/.github/workflows/codeql-analysis-java.yml +++ b/.github/workflows/codeql-analysis-java.yml @@ -57,7 +57,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@ccf74c947955fd1cf117aef6a0e4e66191ef6f61 # 3.25.4 + uses: github/codeql-action/init@b7cec7526559c32f1616476ff32d17ba4c59b2d6 # 3.25.5 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -68,7 +68,7 @@ jobs: # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). # If this step fails, then you should remove it and run the build manually (see below) - name: Autobuild - uses: github/codeql-action/autobuild@ccf74c947955fd1cf117aef6a0e4e66191ef6f61 # 3.25.4 + uses: github/codeql-action/autobuild@b7cec7526559c32f1616476ff32d17ba4c59b2d6 # 3.25.5 # ℹī¸ Command-line programs to run using the OS shell. # 📚 https://git.io/JvXDl @@ -82,4 +82,4 @@ jobs: # make release - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@ccf74c947955fd1cf117aef6a0e4e66191ef6f61 # 3.25.4 + uses: github/codeql-action/analyze@b7cec7526559c32f1616476ff32d17ba4c59b2d6 # 3.25.5 diff --git a/.github/workflows/scorecards-analysis.yml b/.github/workflows/scorecards-analysis.yml index c3b83947..db88898f 100644 --- a/.github/workflows/scorecards-analysis.yml +++ b/.github/workflows/scorecards-analysis.yml @@ -64,6 +64,6 @@ jobs: retention-days: 5 - name: "Upload to code-scanning" - uses: github/codeql-action/upload-sarif@ccf74c947955fd1cf117aef6a0e4e66191ef6f61 # 3.25.4 + uses: github/codeql-action/upload-sarif@b7cec7526559c32f1616476ff32d17ba4c59b2d6 # 3.25.5 with: sarif_file: results.sarif From 7a1c8ad33f2bded62b33cc344b921800f2998f0a Mon Sep 17 00:00:00 2001 From: Mark Thomas Date: Fri, 24 May 2024 10:56:58 +0100 Subject: [PATCH 205/298] Increment version ready for next development cycle. --- RELEASE-NOTES.txt | 2 +- pom.xml | 6 +++--- src/changes/changes.xml | 2 ++ src/native/unix/man/jsvc.1.xml | 2 +- src/native/unix/native/version.h | 2 +- src/native/windows/apps/prunmgr/prunmgr.h | 2 +- src/native/windows/apps/prunmgr/prunmgr.rc | 6 +++--- src/native/windows/apps/prunsrv/prunsrv.h | 2 +- src/native/windows/apps/prunsrv/prunsrv.rc | 4 ++-- src/samples/SimpleApplication.sh | 2 +- src/site/xdoc/binaries.xml | 2 +- 11 files changed, 17 insertions(+), 15 deletions(-) diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt index f6b3e0a9..d5820ca6 100644 --- a/RELEASE-NOTES.txt +++ b/RELEASE-NOTES.txt @@ -15,7 +15,7 @@ limitations under the License. ================================================================================ - Apache Commons Daemon 1.4.0 + Apache Commons Daemon 1.4.1 Release Notes This document contains the release notes for this version of the diff --git a/pom.xml b/pom.xml index f8eaa26a..102fa8f8 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ 4.0.0 commons-daemon commons-daemon - 1.4.0-SNAPSHOT + 1.4.1-SNAPSHOT Apache Commons Daemon @@ -131,9 +131,9 @@ ${commons.daemon.javaversion} daemon org.apache.commons.daemon - 1.4.0 + 1.4.1 RC1 - 1.3.4 + 1.4.0 DAEMON 12310468 2024-01-01T00:00:00Z diff --git a/src/changes/changes.xml b/src/changes/changes.xml index 3941c3d6..e5ae19f5 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -40,6 +40,8 @@ Apache Commons Daemon Release Notes + + diff --git a/src/native/unix/man/jsvc.1.xml b/src/native/unix/man/jsvc.1.xml index 2b63c8cd..25dfd274 100644 --- a/src/native/unix/man/jsvc.1.xml +++ b/src/native/unix/man/jsvc.1.xml @@ -22,7 +22,7 @@ JSVC 1 2024-05-24 - Jsvc version 1.4.0 + Jsvc version 1.4.1 Apache Commons Daemon project diff --git a/src/native/unix/native/version.h b/src/native/unix/native/version.h index 34426f59..7af2f2e7 100644 --- a/src/native/unix/native/version.h +++ b/src/native/unix/native/version.h @@ -31,7 +31,7 @@ #define JSVC_MINOR_VERSION 4 /** patch level */ -#define JSVC_PATCH_VERSION 0 +#define JSVC_PATCH_VERSION 1 /** * This symbol is defined for internal, "development" copies of JSVC. diff --git a/src/native/windows/apps/prunmgr/prunmgr.h b/src/native/windows/apps/prunmgr/prunmgr.h index 2060aa02..020a1647 100644 --- a/src/native/windows/apps/prunmgr/prunmgr.h +++ b/src/native/windows/apps/prunmgr/prunmgr.h @@ -24,7 +24,7 @@ #define _PRUNMGR_H #undef PRG_VERSION -#define PRG_VERSION "1.4.0.0" +#define PRG_VERSION "1.4.1.0" #define PRG_REGROOT L"Apache Software Foundation\\Procrun 2.0" #define IDM_TM_EXIT 2000 diff --git a/src/native/windows/apps/prunmgr/prunmgr.rc b/src/native/windows/apps/prunmgr/prunmgr.rc index ad449586..6b21a8e1 100644 --- a/src/native/windows/apps/prunmgr/prunmgr.rc +++ b/src/native/windows/apps/prunmgr/prunmgr.rc @@ -228,7 +228,7 @@ END STRINGTABLE BEGIN IDS_APPLICATION RSTR_PSM - IDS_APPVERSION "Version 1.4.0" + IDS_APPVERSION "Version 1.4.1" IDS_APPFULLNAME RSTR_PSM " Version " PRG_VERSION IDS_APPCOPYRIGHT "Copyright (c) 2000-2024 The Apache Software Foundation" IDS_APPDESCRIPTION "Apache Commons Daemon Service Management Tool" @@ -259,8 +259,8 @@ BEGIN END 1 VERSIONINFO - FILEVERSION 1,4,0,0 - PRODUCTVERSION 1,4,0,0 + FILEVERSION 1,4,1,0 + PRODUCTVERSION 1,4,1,0 FILEFLAGSMASK 0x3fL #if defined(_DEBUG) FILEFLAGS 0x03L diff --git a/src/native/windows/apps/prunsrv/prunsrv.h b/src/native/windows/apps/prunsrv/prunsrv.h index 460d1526..c3ca2357 100644 --- a/src/native/windows/apps/prunsrv/prunsrv.h +++ b/src/native/windows/apps/prunsrv/prunsrv.h @@ -25,7 +25,7 @@ #define _PRUNSRV_H #undef PRG_VERSION -#define PRG_VERSION "1.4.0.0" +#define PRG_VERSION "1.4.1.0" #define PRG_REGROOT L"Apache Software Foundation\\Procrun 2.0" #endif /* _PRUNSRV_H */ diff --git a/src/native/windows/apps/prunsrv/prunsrv.rc b/src/native/windows/apps/prunsrv/prunsrv.rc index 1e73f45d..c38cdd15 100644 --- a/src/native/windows/apps/prunsrv/prunsrv.rc +++ b/src/native/windows/apps/prunsrv/prunsrv.rc @@ -23,8 +23,8 @@ IDI_MAINICON ICON "../../resources/procrunw.ico" CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "prunsrv.manifest" 1 VERSIONINFO - FILEVERSION 1,4,0,0 - PRODUCTVERSION 1,4,0,0 + FILEVERSION 1,4,1,0 + PRODUCTVERSION 1,4,1,0 FILEFLAGSMASK 0x3fL #if defined(_DEBUG) FILEFLAGS 0x03L diff --git a/src/samples/SimpleApplication.sh b/src/samples/SimpleApplication.sh index c3e90b8d..cf696cc3 100755 --- a/src/samples/SimpleApplication.sh +++ b/src/samples/SimpleApplication.sh @@ -20,7 +20,7 @@ # Adapt the following lines to your configuration JAVA_HOME=/opt/java6 PROGRAM=SimpleApplication -CLASSPATH=`pwd`/$PROGRAM.jar:`pwd`/commons-daemon-1.4.0.jar +CLASSPATH=`pwd`/$PROGRAM.jar:`pwd`/commons-daemon-1.4.1.jar case "$1" in start ) diff --git a/src/site/xdoc/binaries.xml b/src/site/xdoc/binaries.xml index d669022f..fb38e918 100644 --- a/src/site/xdoc/binaries.xml +++ b/src/site/xdoc/binaries.xml @@ -36,7 +36,7 @@ corresponding to your operating system. Only the Windows builds are provided as

    -The Windows archive (e.g. commons-daemon-1.4.0-bin-windows.zip) contains 2 different executables: +The Windows archive (e.g. commons-daemon-1.4.1-bin-windows.zip) contains 2 different executables:

    • prunsrv.exe - service application for running applications as services.
    • prunmgr.exe - the GUI manager application used to monitor and configure installed services.
      • From 462dd3f3853b43664db569ad49fa4f8faf179a47 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 24 May 2024 13:41:40 -0400 Subject: [PATCH 206/298] Bump codecov/codecov-action from 4.4.0 to 4.4.1 (#174) Bumps [codecov/codecov-action](https://github.com/codecov/codecov-action) from 4.4.0 to 4.4.1. - [Release notes](https://github.com/codecov/codecov-action/releases) - [Changelog](https://github.com/codecov/codecov-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/codecov/codecov-action/compare/6d798873df2b1b8e5846dba6fb86631229fbcb17...125fc84a9a348dbcf27191600683ec096ec9021c) --- updated-dependencies: - dependency-name: codecov/codecov-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/coverage.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index eec12696..5cd1566c 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -47,6 +47,6 @@ jobs: run: mvn --show-version --batch-mode --no-transfer-progress test jacoco:report - name: Upload coverage to Codecov - uses: codecov/codecov-action@6d798873df2b1b8e5846dba6fb86631229fbcb17 # v4.4.0 + uses: codecov/codecov-action@125fc84a9a348dbcf27191600683ec096ec9021c # v4.4.1 with: files: ./target/site/jacoco/jacoco.xml From bd543b2083dbe043e7733a03e790416c15992654 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 24 May 2024 13:41:51 -0400 Subject: [PATCH 207/298] Bump github/codeql-action from 3.25.5 to 3.25.6 (#175) Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.25.5 to 3.25.6. - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/b7cec7526559c32f1616476ff32d17ba4c59b2d6...9fdb3e49720b44c48891d036bb502feb25684276) --- updated-dependencies: - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/codeql-analysis-cpp.yml | 4 ++-- .github/workflows/codeql-analysis-java.yml | 6 +++--- .github/workflows/scorecards-analysis.yml | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/codeql-analysis-cpp.yml b/.github/workflows/codeql-analysis-cpp.yml index 2bcc4b7c..d2ce50cf 100644 --- a/.github/workflows/codeql-analysis-cpp.yml +++ b/.github/workflows/codeql-analysis-cpp.yml @@ -57,7 +57,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@b7cec7526559c32f1616476ff32d17ba4c59b2d6 # 3.25.5 + uses: github/codeql-action/init@9fdb3e49720b44c48891d036bb502feb25684276 # 3.25.6 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -86,4 +86,4 @@ jobs: make - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@b7cec7526559c32f1616476ff32d17ba4c59b2d6 # 3.25.5 + uses: github/codeql-action/analyze@9fdb3e49720b44c48891d036bb502feb25684276 # 3.25.6 diff --git a/.github/workflows/codeql-analysis-java.yml b/.github/workflows/codeql-analysis-java.yml index 22c58385..8ecdb997 100644 --- a/.github/workflows/codeql-analysis-java.yml +++ b/.github/workflows/codeql-analysis-java.yml @@ -57,7 +57,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@b7cec7526559c32f1616476ff32d17ba4c59b2d6 # 3.25.5 + uses: github/codeql-action/init@9fdb3e49720b44c48891d036bb502feb25684276 # 3.25.6 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -68,7 +68,7 @@ jobs: # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). # If this step fails, then you should remove it and run the build manually (see below) - name: Autobuild - uses: github/codeql-action/autobuild@b7cec7526559c32f1616476ff32d17ba4c59b2d6 # 3.25.5 + uses: github/codeql-action/autobuild@9fdb3e49720b44c48891d036bb502feb25684276 # 3.25.6 # ℹī¸ Command-line programs to run using the OS shell. # 📚 https://git.io/JvXDl @@ -82,4 +82,4 @@ jobs: # make release - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@b7cec7526559c32f1616476ff32d17ba4c59b2d6 # 3.25.5 + uses: github/codeql-action/analyze@9fdb3e49720b44c48891d036bb502feb25684276 # 3.25.6 diff --git a/.github/workflows/scorecards-analysis.yml b/.github/workflows/scorecards-analysis.yml index db88898f..0aaeb8d3 100644 --- a/.github/workflows/scorecards-analysis.yml +++ b/.github/workflows/scorecards-analysis.yml @@ -64,6 +64,6 @@ jobs: retention-days: 5 - name: "Upload to code-scanning" - uses: github/codeql-action/upload-sarif@b7cec7526559c32f1616476ff32d17ba4c59b2d6 # 3.25.5 + uses: github/codeql-action/upload-sarif@9fdb3e49720b44c48891d036bb502feb25684276 # 3.25.6 with: sarif_file: results.sarif From 311d1ec1c59f28ed6e8b0b31d27c935bd0c643dd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 31 May 2024 12:54:57 -0400 Subject: [PATCH 208/298] Bump github/codeql-action from 3.25.6 to 3.25.7 (#176) Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.25.6 to 3.25.7. - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/9fdb3e49720b44c48891d036bb502feb25684276...f079b8493333aace61c81488f8bd40919487bd9f) --- updated-dependencies: - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/codeql-analysis-cpp.yml | 4 ++-- .github/workflows/codeql-analysis-java.yml | 6 +++--- .github/workflows/scorecards-analysis.yml | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/codeql-analysis-cpp.yml b/.github/workflows/codeql-analysis-cpp.yml index d2ce50cf..842fc2e7 100644 --- a/.github/workflows/codeql-analysis-cpp.yml +++ b/.github/workflows/codeql-analysis-cpp.yml @@ -57,7 +57,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@9fdb3e49720b44c48891d036bb502feb25684276 # 3.25.6 + uses: github/codeql-action/init@f079b8493333aace61c81488f8bd40919487bd9f # 3.25.7 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -86,4 +86,4 @@ jobs: make - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@9fdb3e49720b44c48891d036bb502feb25684276 # 3.25.6 + uses: github/codeql-action/analyze@f079b8493333aace61c81488f8bd40919487bd9f # 3.25.7 diff --git a/.github/workflows/codeql-analysis-java.yml b/.github/workflows/codeql-analysis-java.yml index 8ecdb997..4d0c5742 100644 --- a/.github/workflows/codeql-analysis-java.yml +++ b/.github/workflows/codeql-analysis-java.yml @@ -57,7 +57,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@9fdb3e49720b44c48891d036bb502feb25684276 # 3.25.6 + uses: github/codeql-action/init@f079b8493333aace61c81488f8bd40919487bd9f # 3.25.7 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -68,7 +68,7 @@ jobs: # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). # If this step fails, then you should remove it and run the build manually (see below) - name: Autobuild - uses: github/codeql-action/autobuild@9fdb3e49720b44c48891d036bb502feb25684276 # 3.25.6 + uses: github/codeql-action/autobuild@f079b8493333aace61c81488f8bd40919487bd9f # 3.25.7 # ℹī¸ Command-line programs to run using the OS shell. # 📚 https://git.io/JvXDl @@ -82,4 +82,4 @@ jobs: # make release - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@9fdb3e49720b44c48891d036bb502feb25684276 # 3.25.6 + uses: github/codeql-action/analyze@f079b8493333aace61c81488f8bd40919487bd9f # 3.25.7 diff --git a/.github/workflows/scorecards-analysis.yml b/.github/workflows/scorecards-analysis.yml index 0aaeb8d3..6468b77f 100644 --- a/.github/workflows/scorecards-analysis.yml +++ b/.github/workflows/scorecards-analysis.yml @@ -64,6 +64,6 @@ jobs: retention-days: 5 - name: "Upload to code-scanning" - uses: github/codeql-action/upload-sarif@9fdb3e49720b44c48891d036bb502feb25684276 # 3.25.6 + uses: github/codeql-action/upload-sarif@f079b8493333aace61c81488f8bd40919487bd9f # 3.25.7 with: sarif_file: results.sarif From 77539ae0cee5d84a7485618d81432cd6f44a55e9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 7 Jun 2024 13:00:39 -0400 Subject: [PATCH 209/298] Bump github/codeql-action from 3.25.7 to 3.25.8 (#179) Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.25.7 to 3.25.8. - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/f079b8493333aace61c81488f8bd40919487bd9f...2e230e8fe0ad3a14a340ad0815ddb96d599d2aff) --- updated-dependencies: - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/codeql-analysis-cpp.yml | 4 ++-- .github/workflows/codeql-analysis-java.yml | 6 +++--- .github/workflows/scorecards-analysis.yml | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/codeql-analysis-cpp.yml b/.github/workflows/codeql-analysis-cpp.yml index 842fc2e7..ba43bbd2 100644 --- a/.github/workflows/codeql-analysis-cpp.yml +++ b/.github/workflows/codeql-analysis-cpp.yml @@ -57,7 +57,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@f079b8493333aace61c81488f8bd40919487bd9f # 3.25.7 + uses: github/codeql-action/init@2e230e8fe0ad3a14a340ad0815ddb96d599d2aff # 3.25.8 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -86,4 +86,4 @@ jobs: make - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@f079b8493333aace61c81488f8bd40919487bd9f # 3.25.7 + uses: github/codeql-action/analyze@2e230e8fe0ad3a14a340ad0815ddb96d599d2aff # 3.25.8 diff --git a/.github/workflows/codeql-analysis-java.yml b/.github/workflows/codeql-analysis-java.yml index 4d0c5742..59e5def9 100644 --- a/.github/workflows/codeql-analysis-java.yml +++ b/.github/workflows/codeql-analysis-java.yml @@ -57,7 +57,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@f079b8493333aace61c81488f8bd40919487bd9f # 3.25.7 + uses: github/codeql-action/init@2e230e8fe0ad3a14a340ad0815ddb96d599d2aff # 3.25.8 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -68,7 +68,7 @@ jobs: # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). # If this step fails, then you should remove it and run the build manually (see below) - name: Autobuild - uses: github/codeql-action/autobuild@f079b8493333aace61c81488f8bd40919487bd9f # 3.25.7 + uses: github/codeql-action/autobuild@2e230e8fe0ad3a14a340ad0815ddb96d599d2aff # 3.25.8 # ℹī¸ Command-line programs to run using the OS shell. # 📚 https://git.io/JvXDl @@ -82,4 +82,4 @@ jobs: # make release - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@f079b8493333aace61c81488f8bd40919487bd9f # 3.25.7 + uses: github/codeql-action/analyze@2e230e8fe0ad3a14a340ad0815ddb96d599d2aff # 3.25.8 diff --git a/.github/workflows/scorecards-analysis.yml b/.github/workflows/scorecards-analysis.yml index 6468b77f..ae7a6eac 100644 --- a/.github/workflows/scorecards-analysis.yml +++ b/.github/workflows/scorecards-analysis.yml @@ -64,6 +64,6 @@ jobs: retention-days: 5 - name: "Upload to code-scanning" - uses: github/codeql-action/upload-sarif@f079b8493333aace61c81488f8bd40919487bd9f # 3.25.7 + uses: github/codeql-action/upload-sarif@2e230e8fe0ad3a14a340ad0815ddb96d599d2aff # 3.25.8 with: sarif_file: results.sarif From 2bec5be1599fefaef91d457c86c0b12ada01ad41 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 14 Jun 2024 12:16:35 -0400 Subject: [PATCH 210/298] Bump github/codeql-action from 3.25.8 to 3.25.10 (#180) Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.25.8 to 3.25.10. - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/2e230e8fe0ad3a14a340ad0815ddb96d599d2aff...23acc5c183826b7a8a97bce3cecc52db901f8251) --- updated-dependencies: - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/codeql-analysis-cpp.yml | 4 ++-- .github/workflows/codeql-analysis-java.yml | 6 +++--- .github/workflows/scorecards-analysis.yml | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/codeql-analysis-cpp.yml b/.github/workflows/codeql-analysis-cpp.yml index ba43bbd2..5f3bba38 100644 --- a/.github/workflows/codeql-analysis-cpp.yml +++ b/.github/workflows/codeql-analysis-cpp.yml @@ -57,7 +57,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@2e230e8fe0ad3a14a340ad0815ddb96d599d2aff # 3.25.8 + uses: github/codeql-action/init@23acc5c183826b7a8a97bce3cecc52db901f8251 # 3.25.10 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -86,4 +86,4 @@ jobs: make - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@2e230e8fe0ad3a14a340ad0815ddb96d599d2aff # 3.25.8 + uses: github/codeql-action/analyze@23acc5c183826b7a8a97bce3cecc52db901f8251 # 3.25.10 diff --git a/.github/workflows/codeql-analysis-java.yml b/.github/workflows/codeql-analysis-java.yml index 59e5def9..e23b59b8 100644 --- a/.github/workflows/codeql-analysis-java.yml +++ b/.github/workflows/codeql-analysis-java.yml @@ -57,7 +57,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@2e230e8fe0ad3a14a340ad0815ddb96d599d2aff # 3.25.8 + uses: github/codeql-action/init@23acc5c183826b7a8a97bce3cecc52db901f8251 # 3.25.10 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -68,7 +68,7 @@ jobs: # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). # If this step fails, then you should remove it and run the build manually (see below) - name: Autobuild - uses: github/codeql-action/autobuild@2e230e8fe0ad3a14a340ad0815ddb96d599d2aff # 3.25.8 + uses: github/codeql-action/autobuild@23acc5c183826b7a8a97bce3cecc52db901f8251 # 3.25.10 # ℹī¸ Command-line programs to run using the OS shell. # 📚 https://git.io/JvXDl @@ -82,4 +82,4 @@ jobs: # make release - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@2e230e8fe0ad3a14a340ad0815ddb96d599d2aff # 3.25.8 + uses: github/codeql-action/analyze@23acc5c183826b7a8a97bce3cecc52db901f8251 # 3.25.10 diff --git a/.github/workflows/scorecards-analysis.yml b/.github/workflows/scorecards-analysis.yml index ae7a6eac..61d000dd 100644 --- a/.github/workflows/scorecards-analysis.yml +++ b/.github/workflows/scorecards-analysis.yml @@ -64,6 +64,6 @@ jobs: retention-days: 5 - name: "Upload to code-scanning" - uses: github/codeql-action/upload-sarif@2e230e8fe0ad3a14a340ad0815ddb96d599d2aff # 3.25.8 + uses: github/codeql-action/upload-sarif@23acc5c183826b7a8a97bce3cecc52db901f8251 # 3.25.10 with: sarif_file: results.sarif From ca75b98bf9740373faac12e9ae8cc401acff15c9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 14 Jun 2024 12:16:46 -0400 Subject: [PATCH 211/298] Bump codecov/codecov-action from 4.4.1 to 4.5.0 (#182) Bumps [codecov/codecov-action](https://github.com/codecov/codecov-action) from 4.4.1 to 4.5.0. - [Release notes](https://github.com/codecov/codecov-action/releases) - [Changelog](https://github.com/codecov/codecov-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/codecov/codecov-action/compare/125fc84a9a348dbcf27191600683ec096ec9021c...e28ff129e5465c2c0dcc6f003fc735cb6ae0c673) --- updated-dependencies: - dependency-name: codecov/codecov-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/coverage.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index 5cd1566c..c6a3d9a2 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -47,6 +47,6 @@ jobs: run: mvn --show-version --batch-mode --no-transfer-progress test jacoco:report - name: Upload coverage to Codecov - uses: codecov/codecov-action@125fc84a9a348dbcf27191600683ec096ec9021c # v4.4.1 + uses: codecov/codecov-action@e28ff129e5465c2c0dcc6f003fc735cb6ae0c673 # v4.5.0 with: files: ./target/site/jacoco/jacoco.xml From e37d5fe138bfc69c045b149d34381a1e0437fcd7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 14 Jun 2024 12:16:57 -0400 Subject: [PATCH 212/298] Bump actions/checkout from 4.1.6 to 4.1.7 (#181) Bumps [actions/checkout](https://github.com/actions/checkout) from 4.1.6 to 4.1.7. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/a5ac7e51b41094c92402da3b24376905380afc29...692973e3d937129bcbf40652eb9f2f61becf3332) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/codeql-analysis-cpp.yml | 2 +- .github/workflows/codeql-analysis-java.yml | 2 +- .github/workflows/coverage.yml | 2 +- .github/workflows/maven.yml | 2 +- .github/workflows/scorecards-analysis.yml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/codeql-analysis-cpp.yml b/.github/workflows/codeql-analysis-cpp.yml index 5f3bba38..1750e140 100644 --- a/.github/workflows/codeql-analysis-cpp.yml +++ b/.github/workflows/codeql-analysis-cpp.yml @@ -45,7 +45,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6 + uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 with: persist-credentials: false - uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2 diff --git a/.github/workflows/codeql-analysis-java.yml b/.github/workflows/codeql-analysis-java.yml index e23b59b8..d3e71d71 100644 --- a/.github/workflows/codeql-analysis-java.yml +++ b/.github/workflows/codeql-analysis-java.yml @@ -45,7 +45,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6 + uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 with: persist-credentials: false - uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2 diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index c6a3d9a2..8367dfe1 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -29,7 +29,7 @@ jobs: java: [ 8 ] steps: - - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6 + - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 with: persist-credentials: false - uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2 diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 94ac86e5..66b3b54c 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -35,7 +35,7 @@ jobs: # experimental: true steps: - - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6 + - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 with: persist-credentials: false - uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2 diff --git a/.github/workflows/scorecards-analysis.yml b/.github/workflows/scorecards-analysis.yml index 61d000dd..7efca317 100644 --- a/.github/workflows/scorecards-analysis.yml +++ b/.github/workflows/scorecards-analysis.yml @@ -40,7 +40,7 @@ jobs: steps: - name: "Checkout code" - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6 + uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 with: persist-credentials: false From a343dd4be0aea8c1352b557e73ab61acbfeca5a0 Mon Sep 17 00:00:00 2001 From: Mark Thomas Date: Thu, 20 Jun 2024 14:21:27 +0100 Subject: [PATCH 213/298] tab -> 8 spaces, fix indent --- src/native/windows/apps/prunsrv/prunsrv.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/native/windows/apps/prunsrv/prunsrv.c b/src/native/windows/apps/prunsrv/prunsrv.c index 92ab69f2..a30417c4 100644 --- a/src/native/windows/apps/prunsrv/prunsrv.c +++ b/src/native/windows/apps/prunsrv/prunsrv.c @@ -1839,15 +1839,15 @@ void WINAPI serviceMain(DWORD argc, LPTSTR *argv) if (SO_STOPTIMEOUT) { /* we have a stop timeout */ - do { + do { /* wait 2 seconds */ apxHandleWait(gWorker, 2000, FALSE); } while (!_exe_shutdown); apxLogWrite(APXLOG_MARK_DEBUG "waiting %d sec... shutdown: %d", SO_STOPTIMEOUT, _exe_shutdown); apxHandleWait(gWorker, SO_STOPTIMEOUT*1000, FALSE); - } else { - apxHandleWait(gWorker, INFINITE, FALSE); - } + } else { + apxHandleWait(gWorker, INFINITE, FALSE); + } apxLogWrite(APXLOG_MARK_DEBUG "Worker finished."); } else { From e1de0fd5f915748b40ce8b7fd31e656b6dc5314e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 14 Jun 2024 16:57:05 +0000 Subject: [PATCH 214/298] Bump org.apache.commons:commons-parent from 70 to 71 Bumps [org.apache.commons:commons-parent](https://github.com/apache/commons-parent) from 70 to 71. - [Changelog](https://github.com/apache/commons-parent/blob/master/RELEASE-NOTES.txt) - [Commits](https://github.com/apache/commons-parent/commits) --- updated-dependencies: - dependency-name: org.apache.commons:commons-parent dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 102fa8f8..c744e2b9 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ org.apache.commons commons-parent - 70 + 71 4.0.0 commons-daemon From c511080338747f96436a8417528933ae980d9567 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 28 Jun 2024 13:11:17 -0400 Subject: [PATCH 215/298] Bump github/codeql-action from 3.25.10 to 3.25.11 (#184) Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.25.10 to 3.25.11. - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/23acc5c183826b7a8a97bce3cecc52db901f8251...b611370bb5703a7efb587f9d136a52ea24c5c38c) --- updated-dependencies: - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/codeql-analysis-cpp.yml | 4 ++-- .github/workflows/codeql-analysis-java.yml | 6 +++--- .github/workflows/scorecards-analysis.yml | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/codeql-analysis-cpp.yml b/.github/workflows/codeql-analysis-cpp.yml index 1750e140..466a2178 100644 --- a/.github/workflows/codeql-analysis-cpp.yml +++ b/.github/workflows/codeql-analysis-cpp.yml @@ -57,7 +57,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@23acc5c183826b7a8a97bce3cecc52db901f8251 # 3.25.10 + uses: github/codeql-action/init@b611370bb5703a7efb587f9d136a52ea24c5c38c # 3.25.11 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -86,4 +86,4 @@ jobs: make - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@23acc5c183826b7a8a97bce3cecc52db901f8251 # 3.25.10 + uses: github/codeql-action/analyze@b611370bb5703a7efb587f9d136a52ea24c5c38c # 3.25.11 diff --git a/.github/workflows/codeql-analysis-java.yml b/.github/workflows/codeql-analysis-java.yml index d3e71d71..16f1858c 100644 --- a/.github/workflows/codeql-analysis-java.yml +++ b/.github/workflows/codeql-analysis-java.yml @@ -57,7 +57,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@23acc5c183826b7a8a97bce3cecc52db901f8251 # 3.25.10 + uses: github/codeql-action/init@b611370bb5703a7efb587f9d136a52ea24c5c38c # 3.25.11 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -68,7 +68,7 @@ jobs: # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). # If this step fails, then you should remove it and run the build manually (see below) - name: Autobuild - uses: github/codeql-action/autobuild@23acc5c183826b7a8a97bce3cecc52db901f8251 # 3.25.10 + uses: github/codeql-action/autobuild@b611370bb5703a7efb587f9d136a52ea24c5c38c # 3.25.11 # ℹī¸ Command-line programs to run using the OS shell. # 📚 https://git.io/JvXDl @@ -82,4 +82,4 @@ jobs: # make release - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@23acc5c183826b7a8a97bce3cecc52db901f8251 # 3.25.10 + uses: github/codeql-action/analyze@b611370bb5703a7efb587f9d136a52ea24c5c38c # 3.25.11 diff --git a/.github/workflows/scorecards-analysis.yml b/.github/workflows/scorecards-analysis.yml index 7efca317..b8c14b15 100644 --- a/.github/workflows/scorecards-analysis.yml +++ b/.github/workflows/scorecards-analysis.yml @@ -64,6 +64,6 @@ jobs: retention-days: 5 - name: "Upload to code-scanning" - uses: github/codeql-action/upload-sarif@23acc5c183826b7a8a97bce3cecc52db901f8251 # 3.25.10 + uses: github/codeql-action/upload-sarif@b611370bb5703a7efb587f9d136a52ea24c5c38c # 3.25.11 with: sarif_file: results.sarif From cce236a4103a3d9134367c3a79ef4468b780be47 Mon Sep 17 00:00:00 2001 From: Gary Gregory Date: Sat, 29 Jun 2024 08:02:27 -0400 Subject: [PATCH 216/298] Drop CodeQL - It now requires an API key and a login to view reports - Instead, use 'mvn clean install site -P jacoco' to view JaCoCo HTML reports --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index 28285b70..c80e9ea4 100644 --- a/README.md +++ b/README.md @@ -47,7 +47,6 @@ Apache Commons Daemon [![Coverage Status](https://codecov.io/gh/apache/commons-daemon/branch/master/graph/badge.svg)](https://app.codecov.io/gh/apache/commons-daemon) [![Maven Central](https://maven-badges.herokuapp.com/maven-central/commons-daemon/commons-daemon/badge.svg?gav=true)](https://maven-badges.herokuapp.com/maven-central/commons-daemon/commons-daemon/?gav=true) [![Javadocs](https://javadoc.io/badge/commons-daemon/commons-daemon/1.4.0.svg)](https://javadoc.io/doc/commons-daemon/commons-daemon/1.4.0) -[![CodeQL](https://github.com/apache/commons-daemon/actions/workflows/codeql-analysis.yml/badge.svg)](https://github.com/apache/commons-daemon/actions/workflows/codeql-analysis.yml) [![OpenSSF Scorecard](https://api.securityscorecards.dev/projects/github.com/apache/commons-daemon/badge)](https://api.securityscorecards.dev/projects/github.com/apache/commons-daemon) Apache Commons Daemon software is a set of utilities and Java support From f2457236d69900f7028cd506cdda37a6ccdae5e7 Mon Sep 17 00:00:00 2001 From: Gary Gregory Date: Sat, 29 Jun 2024 10:49:09 -0400 Subject: [PATCH 217/298] Revert "Drop CodeQL" This reverts commit cce236a4103a3d9134367c3a79ef4468b780be47. --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index c80e9ea4..28285b70 100644 --- a/README.md +++ b/README.md @@ -47,6 +47,7 @@ Apache Commons Daemon [![Coverage Status](https://codecov.io/gh/apache/commons-daemon/branch/master/graph/badge.svg)](https://app.codecov.io/gh/apache/commons-daemon) [![Maven Central](https://maven-badges.herokuapp.com/maven-central/commons-daemon/commons-daemon/badge.svg?gav=true)](https://maven-badges.herokuapp.com/maven-central/commons-daemon/commons-daemon/?gav=true) [![Javadocs](https://javadoc.io/badge/commons-daemon/commons-daemon/1.4.0.svg)](https://javadoc.io/doc/commons-daemon/commons-daemon/1.4.0) +[![CodeQL](https://github.com/apache/commons-daemon/actions/workflows/codeql-analysis.yml/badge.svg)](https://github.com/apache/commons-daemon/actions/workflows/codeql-analysis.yml) [![OpenSSF Scorecard](https://api.securityscorecards.dev/projects/github.com/apache/commons-daemon/badge)](https://api.securityscorecards.dev/projects/github.com/apache/commons-daemon) Apache Commons Daemon software is a set of utilities and Java support From 4fecfcf7ef748a749fa9c6ebcfa4bf9918d1ef25 Mon Sep 17 00:00:00 2001 From: Gary Gregory Date: Sat, 29 Jun 2024 14:24:16 -0400 Subject: [PATCH 218/298] Drop codecov.io - It now requires an API key and a login to view reports - Instead, use 'mvn clean install site -P jacoco' to view JaCoCo HTML reports --- .github/workflows/coverage.yml | 52 ---------------------------------- README.md | 1 - 2 files changed, 53 deletions(-) delete mode 100644 .github/workflows/coverage.yml diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml deleted file mode 100644 index 8367dfe1..00000000 --- a/.github/workflows/coverage.yml +++ /dev/null @@ -1,52 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to 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. - -name: Coverage - -on: [push, pull_request] - -permissions: - contents: read - -jobs: - build: - - runs-on: ubuntu-latest - strategy: - matrix: - java: [ 8 ] - - steps: - - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - with: - persist-credentials: false - - uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2 - with: - path: ~/.m2/repository - key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} - restore-keys: | - ${{ runner.os }}-maven- - - name: Set up JDK ${{ matrix.java }} - uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1 - with: - distribution: 'temurin' - java-version: ${{ matrix.java }} - - name: Build with Maven - run: mvn --show-version --batch-mode --no-transfer-progress test jacoco:report - - - name: Upload coverage to Codecov - uses: codecov/codecov-action@e28ff129e5465c2c0dcc6f003fc735cb6ae0c673 # v4.5.0 - with: - files: ./target/site/jacoco/jacoco.xml diff --git a/README.md b/README.md index 28285b70..cc1223a7 100644 --- a/README.md +++ b/README.md @@ -44,7 +44,6 @@ Apache Commons Daemon =================== [![Java CI](https://github.com/apache/commons-daemon/actions/workflows/maven.yml/badge.svg)](https://github.com/apache/commons-daemon/actions/workflows/maven.yml) -[![Coverage Status](https://codecov.io/gh/apache/commons-daemon/branch/master/graph/badge.svg)](https://app.codecov.io/gh/apache/commons-daemon) [![Maven Central](https://maven-badges.herokuapp.com/maven-central/commons-daemon/commons-daemon/badge.svg?gav=true)](https://maven-badges.herokuapp.com/maven-central/commons-daemon/commons-daemon/?gav=true) [![Javadocs](https://javadoc.io/badge/commons-daemon/commons-daemon/1.4.0.svg)](https://javadoc.io/doc/commons-daemon/commons-daemon/1.4.0) [![CodeQL](https://github.com/apache/commons-daemon/actions/workflows/codeql-analysis.yml/badge.svg)](https://github.com/apache/commons-daemon/actions/workflows/codeql-analysis.yml) From 2ad75a40a20855eeba21ddb3ec2fe4e88f0f681e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 5 Jul 2024 13:01:34 -0400 Subject: [PATCH 219/298] Bump actions/upload-artifact from 4.3.3 to 4.3.4 (#185) Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 4.3.3 to 4.3.4. - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](https://github.com/actions/upload-artifact/compare/65462800fd760344b1a7b4382951275a0abb4808...0b2256b8c012f0828dc542b3febcab082c67f72b) --- updated-dependencies: - dependency-name: actions/upload-artifact dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/scorecards-analysis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/scorecards-analysis.yml b/.github/workflows/scorecards-analysis.yml index b8c14b15..9c3dcf97 100644 --- a/.github/workflows/scorecards-analysis.yml +++ b/.github/workflows/scorecards-analysis.yml @@ -57,7 +57,7 @@ jobs: publish_results: true - name: "Upload artifact" - uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # 4.3.3 + uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # 4.3.4 with: name: SARIF file path: results.sarif From 87917cc5ca3ec75099ed56b49e157bd5cc7a30a7 Mon Sep 17 00:00:00 2001 From: Gary Gregory Date: Tue, 9 Jul 2024 10:13:51 -0400 Subject: [PATCH 220/298] Remove trailing whitespace --- .../org/apache/commons/daemon/support/DaemonConfiguration.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/apache/commons/daemon/support/DaemonConfiguration.java b/src/main/java/org/apache/commons/daemon/support/DaemonConfiguration.java index 3b09157a..de01ea27 100644 --- a/src/main/java/org/apache/commons/daemon/support/DaemonConfiguration.java +++ b/src/main/java/org/apache/commons/daemon/support/DaemonConfiguration.java @@ -86,7 +86,7 @@ public boolean load(String fileName) if (fileName == null) { fileName = DEFAULT_CONFIG; } - + try (InputStream inputStream = new FileInputStream(fileName)) { configurationProperties.clear(); configurationProperties.load(inputStream); From 44d4e5c5cca7ad56c2d349edfa5ea3de1f721b29 Mon Sep 17 00:00:00 2001 From: Gary Gregory Date: Tue, 9 Jul 2024 10:14:00 -0400 Subject: [PATCH 221/298] Remove trailing whitespace --- .../java/org/apache/commons/daemon/DaemonInitExceptionTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/org/apache/commons/daemon/DaemonInitExceptionTest.java b/src/test/java/org/apache/commons/daemon/DaemonInitExceptionTest.java index 6e86b4fb..04c9393a 100644 --- a/src/test/java/org/apache/commons/daemon/DaemonInitExceptionTest.java +++ b/src/test/java/org/apache/commons/daemon/DaemonInitExceptionTest.java @@ -27,7 +27,7 @@ public class DaemonInitExceptionTest { @Test public void test() { - final IOException e = new IOException(); + final IOException e = new IOException(); assertEquals(e, new DaemonInitException("Test", e).getCause()); } From 22f884b7b3f55dca71d22c77f331d24ca256dd79 Mon Sep 17 00:00:00 2001 From: Gary Gregory Date: Tue, 9 Jul 2024 10:14:10 -0400 Subject: [PATCH 222/298] Remove redundant keywords --- .../apache/commons/daemon/support/DaemonLoader.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/org/apache/commons/daemon/support/DaemonLoader.java b/src/main/java/org/apache/commons/daemon/support/DaemonLoader.java index 47178b8d..e3507c79 100644 --- a/src/main/java/org/apache/commons/daemon/support/DaemonLoader.java +++ b/src/main/java/org/apache/commons/daemon/support/DaemonLoader.java @@ -295,7 +295,7 @@ public static class Controller private Controller() { - this.setAvailable(false); + setAvailable(false); } private boolean isAvailable() @@ -317,10 +317,10 @@ public void shutdown() throws IllegalStateException { synchronized (this) { - if (!this.isAvailable()) { + if (!isAvailable()) { throw new IllegalStateException(); } - this.setAvailable(false); + setAvailable(false); DaemonLoader.shutdown(false); } } @@ -330,10 +330,10 @@ public void reload() throws IllegalStateException { synchronized (this) { - if (!this.isAvailable()) { + if (!isAvailable()) { throw new IllegalStateException(); } - this.setAvailable(false); + setAvailable(false); DaemonLoader.shutdown(true); } } @@ -360,7 +360,7 @@ public void fail(final Exception exception) public void fail(final String message, final Exception exception) { synchronized (this) { - this.setAvailable(false); + setAvailable(false); String msg = message; if (exception != null) { if (msg != null) { From 9cc242ee20d19c8ccd9b3a26e2a4d247168d6da7 Mon Sep 17 00:00:00 2001 From: Gary Gregory Date: Tue, 9 Jul 2024 10:14:27 -0400 Subject: [PATCH 223/298] Remove redundant keywords --- .../org/apache/commons/daemon/DaemonPermission.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/org/apache/commons/daemon/DaemonPermission.java b/src/main/java/org/apache/commons/daemon/DaemonPermission.java index b7cd7978..a49b48ae 100644 --- a/src/main/java/org/apache/commons/daemon/DaemonPermission.java +++ b/src/main/java/org/apache/commons/daemon/DaemonPermission.java @@ -221,7 +221,7 @@ public DaemonPermission(final String target, final String actions) // Create the appropriate mask if this is a control permission. if (this.type == TYPE_CONTROL) { - this.mask = this.createControlMask(actions); + this.mask = createControlMask(actions); } } @@ -239,7 +239,7 @@ public DaemonPermission(final String target, final String actions) public String getActions() { if (this.type == TYPE_CONTROL) { - return this.createControlActions(this.mask); + return createControlActions(this.mask); } return ""; } @@ -252,7 +252,7 @@ public String getActions() @Override public int hashCode() { - this.setupDescription(); + setupDescription(); return this.desc.hashCode(); } @@ -317,7 +317,7 @@ public boolean implies(final Permission permission) @Override public String toString() { - this.setupDescription(); + setupDescription(); return this.desc; } @@ -346,7 +346,7 @@ private void setupDescription() break; } buf.append(':'); - buf.append(this.getActions()); + buf.append(getActions()); buf.append(']'); this.desc = buf.toString(); From e033ce06448e2550f926df80f9687e375f9802a8 Mon Sep 17 00:00:00 2001 From: Gary Gregory Date: Tue, 9 Jul 2024 10:14:43 -0400 Subject: [PATCH 224/298] Remove redundant keywords --- .../java/org/apache/commons/daemon/support/DaemonWrapper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/apache/commons/daemon/support/DaemonWrapper.java b/src/main/java/org/apache/commons/daemon/support/DaemonWrapper.java index 475aecfa..7ecc9ce2 100644 --- a/src/main/java/org/apache/commons/daemon/support/DaemonWrapper.java +++ b/src/main/java/org/apache/commons/daemon/support/DaemonWrapper.java @@ -188,7 +188,7 @@ public void stop() public void destroy() { // Nothing for the moment - System.err.println("DaemonWrapper: instance " + this.hashCode() + " destroy"); + System.err.println("DaemonWrapper: instance " + hashCode() + " destroy"); } // Internal class for wrapping the start/stop methods From 365eddbe0b0162983c6b868d41976987208374a8 Mon Sep 17 00:00:00 2001 From: Gary Gregory Date: Tue, 9 Jul 2024 10:15:05 -0400 Subject: [PATCH 225/298] Remove redundant keywords --- .../org/apache/commons/daemon/SimpleDaemon.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/test/java/org/apache/commons/daemon/SimpleDaemon.java b/src/test/java/org/apache/commons/daemon/SimpleDaemon.java index fad60def..a815e942 100644 --- a/src/test/java/org/apache/commons/daemon/SimpleDaemon.java +++ b/src/test/java/org/apache/commons/daemon/SimpleDaemon.java @@ -35,13 +35,13 @@ public class SimpleDaemon implements Daemon, Runnable, DaemonUserSignal { private boolean softReloadSignalled; public SimpleDaemon() { - System.err.println("SimpleDaemon: instance " + this.hashCode() + " created"); + System.err.println("SimpleDaemon: instance " + hashCode() + " created"); this.handlers = new Vector<>(); } @Override protected void finalize() { - System.err.println("SimpleDaemon: instance " + this.hashCode() + " garbage collected"); + System.err.println("SimpleDaemon: instance " + hashCode() + " garbage collected"); } /** @@ -49,7 +49,7 @@ protected void finalize() { */ @Override public void init(final DaemonContext context) throws Exception { - System.err.println("SimpleDaemon: instance " + this.hashCode() + " init"); + System.err.println("SimpleDaemon: instance " + hashCode() + " init"); int port = 1200; @@ -98,7 +98,7 @@ public void stop() throws IOException, InterruptedException { @Override public void destroy() { - System.err.println("SimpleDaemon: instance " + this.hashCode() + " destroy"); + System.err.println("SimpleDaemon: instance " + hashCode() + " destroy"); } @Override @@ -282,9 +282,9 @@ public void handle(final InputStream in, final OutputStream os) { /* Disconnect */ case '3': - final String name = this.getDirectoryName() + "/SimpleDaemon." + this.getConnectionNumber() + ".tmp"; + final String name = getDirectoryName() + "/SimpleDaemon." + getConnectionNumber() + ".tmp"; try { - this.log(name); + log(name); out.println("File '" + name + "' created"); } catch (final IOException e) { e.printStackTrace(out); @@ -314,7 +314,7 @@ public void handle(final InputStream in, final OutputStream os) { /* If we get an IOException we return (disconnect) */ } catch (final IOException e) { - System.err.println("SimpleDaemon: IOException in " + "connection " + this.getConnectionNumber()); + System.err.println("SimpleDaemon: IOException in " + "connection " + getConnectionNumber()); return; } } From f57359cc5b41a6ed01646daef44446de32c001e9 Mon Sep 17 00:00:00 2001 From: Michael Osipov Date: Thu, 6 Jun 2024 13:32:54 +0200 Subject: [PATCH 226/298] Fix several issues around Java OS and header files location detection This closes #177 --- src/changes/changes.xml | 3 +++ src/native/unix/configure.in | 4 ++-- src/native/unix/support/apjava.m4 | 6 +++--- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/changes/changes.xml b/src/changes/changes.xml index e5ae19f5..819261c9 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -41,6 +41,9 @@ + + Fix several issues around Java OS and header files location detection. + diff --git a/src/native/unix/configure.in b/src/native/unix/configure.in index b411f016..8f01244e 100644 --- a/src/native/unix/configure.in +++ b/src/native/unix/configure.in @@ -95,9 +95,9 @@ AP_FIND_JAVA_OS() if test -z "${JAVA_OS}" then AC_MSG_RESULT([jni_md.h found in $JAVA_HOME/$JAVA_INC]) - INCLUDES="$INCLUDES -I$JAVA_HOME/include -I$JAVA_HOME/$JAVA_INC" + INCLUDES="$INCLUDES -I$JAVA_HOME/$JAVA_INC" else - INCLUDES="$INCLUDES -I$JAVA_HOME/include -I$JAVA_HOME/include/$supported_os" + INCLUDES="$INCLUDES -I$JAVA_HOME/$JAVA_INC -I$JAVA_HOME/$JAVA_INC/$JAVA_OS" fi dnl ------------------------------------------------------------------------- diff --git a/src/native/unix/support/apjava.m4 b/src/native/unix/support/apjava.m4 index cd92280d..921b5fb8 100644 --- a/src/native/unix/support/apjava.m4 +++ b/src/native/unix/support/apjava.m4 @@ -57,9 +57,9 @@ AC_DEFUN([AP_FIND_JAVA_OS],[ AC_ARG_WITH(os-type,[ --with-os-type[=SUBDIR] Location of JDK os-type subdirectory.], [ tempval=$withval - if test ! -d "$JAVA_HOME/$tempval" + if test ! -d "$JAVA_HOME/$JAVA_INC/$tempval" then - AC_MSG_ERROR(Not a directory: ${JAVA_HOME}/${tempval}) + AC_MSG_ERROR(Not a directory: ${JAVA_HOME}/$JAVA_INC/${tempval}) fi JAVA_OS=$tempval ], @@ -80,7 +80,7 @@ AC_DEFUN([AP_FIND_JAVA_OS],[ fi done if test "x$JAVA_OS" = "xNONE"; then - AC_MSG_RESULT(Cannot find jni_md.h in ${JAVA_HOME}/${OS}) + AC_MSG_RESULT(Cannot find jni_md.h in ${JAVA_HOME}/${JAVA_INC}/\${OS}) AC_MSG_ERROR(You should retry --with-os-type=SUBDIR) fi fi From 70bf9c3f417f121132ab85b91da2700bbd3168f5 Mon Sep 17 00:00:00 2001 From: Michael Osipov Date: Thu, 6 Jun 2024 14:17:36 +0200 Subject: [PATCH 227/298] Remove autogenerated files and rely on autoreconf only This closes #178 --- .gitignore | 2 + src/changes/changes.xml | 3 + src/native/unix/support/buildconf.sh | 2 +- src/native/unix/support/config.guess | 1658 ------------------------ src/native/unix/support/config.sub | 1798 -------------------------- src/native/unix/support/install.sh | 128 -- 6 files changed, 6 insertions(+), 3585 deletions(-) delete mode 100755 src/native/unix/support/config.guess delete mode 100755 src/native/unix/support/config.sub delete mode 100755 src/native/unix/support/install.sh diff --git a/.gitignore b/.gitignore index 64be9284..4d880d82 100644 --- a/.gitignore +++ b/.gitignore @@ -13,6 +13,8 @@ /src/native/unix/native/*.o /src/native/unix/native/Makefile /src/native/unix/native/libservice.a +/src/native/unix/support/config.guess +/src/native/unix/support/config.sub /src/native/windows/apps/prunmgr/*_GUI_RELEASE /src/native/windows/apps/prunsrv/*_RELEASE /target/ diff --git a/src/changes/changes.xml b/src/changes/changes.xml index 819261c9..da16b564 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -44,6 +44,9 @@ Fix several issues around Java OS and header files location detection. + + Remove autogenerated files and rely on autoreconf only. + diff --git a/src/native/unix/support/buildconf.sh b/src/native/unix/support/buildconf.sh index 72c4f437..eaaa1180 100755 --- a/src/native/unix/support/buildconf.sh +++ b/src/native/unix/support/buildconf.sh @@ -19,7 +19,7 @@ rm -rf autom4te.cache if test -f configure.in ; then - autoconf + autoreconf -fi if test $? -ne 0 ; then echo "$0: cannot generate configure script" else diff --git a/src/native/unix/support/config.guess b/src/native/unix/support/config.guess deleted file mode 100755 index 6b31c7f2..00000000 --- a/src/native/unix/support/config.guess +++ /dev/null @@ -1,1658 +0,0 @@ -#! /bin/sh -# Attempt to guess a canonical system name. -# Copyright 1992-2019 Free Software Foundation, Inc. - -timestamp='2019-04-28' - -# This file is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, see . -# -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that -# program. This Exception is an additional permission under section 7 -# of the GNU General Public License, version 3 ("GPLv3"). -# -# Originally written by Per Bothner; maintained since 2000 by Ben Elliston. -# -# You can get the latest version of this script from: -# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess -# -# Please send patches to . - - -me=`echo "$0" | sed -e 's,.*/,,'` - -usage="\ -Usage: $0 [OPTION] - -Output the configuration name of the system \`$me' is run on. - -Options: - -h, --help print this help, then exit - -t, --time-stamp print date of last modification, then exit - -v, --version print version number, then exit - -Report bugs and patches to ." - -version="\ -GNU config.guess ($timestamp) - -Originally written by Per Bothner. -Copyright 1992-2019 Free Software Foundation, Inc. - -This is free software; see the source for copying conditions. There is NO -warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." - -help=" -Try \`$me --help' for more information." - -# Parse command line -while test $# -gt 0 ; do - case $1 in - --time-stamp | --time* | -t ) - echo "$timestamp" ; exit ;; - --version | -v ) - echo "$version" ; exit ;; - --help | --h* | -h ) - echo "$usage"; exit ;; - -- ) # Stop option processing - shift; break ;; - - ) # Use stdin as input. - break ;; - -* ) - echo "$me: invalid option $1$help" >&2 - exit 1 ;; - * ) - break ;; - esac -done - -if test $# != 0; then - echo "$me: too many arguments$help" >&2 - exit 1 -fi - -# CC_FOR_BUILD -- compiler used by this script. Note that the use of a -# compiler to aid in system detection is discouraged as it requires -# temporary files to be created and, as you can see below, it is a -# headache to deal with in a portable fashion. - -# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still -# use `HOST_CC' if defined, but it is deprecated. - -# Portable tmp directory creation inspired by the Autoconf team. - -tmp= -# shellcheck disable=SC2172 -trap 'test -z "$tmp" || rm -fr "$tmp"' 0 1 2 13 15 - -set_cc_for_build() { - : "${TMPDIR=/tmp}" - # shellcheck disable=SC2039 - { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || - { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir "$tmp" 2>/dev/null) ; } || - { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir "$tmp" 2>/dev/null) && echo "Warning: creating insecure temp directory" >&2 ; } || - { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } - dummy=$tmp/dummy - case ${CC_FOR_BUILD-},${HOST_CC-},${CC-} in - ,,) echo "int x;" > "$dummy.c" - for driver in cc gcc c89 c99 ; do - if ($driver -c -o "$dummy.o" "$dummy.c") >/dev/null 2>&1 ; then - CC_FOR_BUILD="$driver" - break - fi - done - if test x"$CC_FOR_BUILD" = x ; then - CC_FOR_BUILD=no_compiler_found - fi - ;; - ,,*) CC_FOR_BUILD=$CC ;; - ,*,*) CC_FOR_BUILD=$HOST_CC ;; - esac -} - -# This is needed to find uname on a Pyramid OSx when run in the BSD universe. -# (ghazi@noc.rutgers.edu 1994-08-24) -if test -f /.attbin/uname ; then - PATH=$PATH:/.attbin ; export PATH -fi - -UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown -UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown -UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown -UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown - -case "$UNAME_SYSTEM" in -Linux|GNU|GNU/*) - # If the system lacks a compiler, then just pick glibc. - # We could probably try harder. - LIBC=gnu - - set_cc_for_build - cat <<-EOF > "$dummy.c" - #include - #if defined(__UCLIBC__) - LIBC=uclibc - #elif defined(__dietlibc__) - LIBC=dietlibc - #else - LIBC=gnu - #endif - EOF - eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`" - - # If ldd exists, use it to detect musl libc. - if command -v ldd >/dev/null && \ - ldd --version 2>&1 | grep -q ^musl - then - LIBC=musl - fi - ;; -esac - -# Note: order is significant - the case branches are not exclusive. - -case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in - *:NetBSD:*:*) - # NetBSD (nbsd) targets should (where applicable) match one or - # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*, - # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently - # switched to ELF, *-*-netbsd* would select the old - # object file format. This provides both forward - # compatibility and a consistent mechanism for selecting the - # object file format. - # - # Note: NetBSD doesn't particularly care about the vendor - # portion of the name. We always set it to "unknown". - sysctl="sysctl -n hw.machine_arch" - UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \ - "/sbin/$sysctl" 2>/dev/null || \ - "/usr/sbin/$sysctl" 2>/dev/null || \ - echo unknown)` - case "$UNAME_MACHINE_ARCH" in - armeb) machine=armeb-unknown ;; - arm*) machine=arm-unknown ;; - sh3el) machine=shl-unknown ;; - sh3eb) machine=sh-unknown ;; - sh5el) machine=sh5le-unknown ;; - earmv*) - arch=`echo "$UNAME_MACHINE_ARCH" | sed -e 's,^e\(armv[0-9]\).*$,\1,'` - endian=`echo "$UNAME_MACHINE_ARCH" | sed -ne 's,^.*\(eb\)$,\1,p'` - machine="${arch}${endian}"-unknown - ;; - *) machine="$UNAME_MACHINE_ARCH"-unknown ;; - esac - # The Operating System including object format, if it has switched - # to ELF recently (or will in the future) and ABI. - case "$UNAME_MACHINE_ARCH" in - earm*) - os=netbsdelf - ;; - arm*|i386|m68k|ns32k|sh3*|sparc|vax) - set_cc_for_build - if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ - | grep -q __ELF__ - then - # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout). - # Return netbsd for either. FIX? - os=netbsd - else - os=netbsdelf - fi - ;; - *) - os=netbsd - ;; - esac - # Determine ABI tags. - case "$UNAME_MACHINE_ARCH" in - earm*) - expr='s/^earmv[0-9]/-eabi/;s/eb$//' - abi=`echo "$UNAME_MACHINE_ARCH" | sed -e "$expr"` - ;; - esac - # The OS release - # Debian GNU/NetBSD machines have a different userland, and - # thus, need a distinct triplet. However, they do not need - # kernel version information, so it can be replaced with a - # suitable tag, in the style of linux-gnu. - case "$UNAME_VERSION" in - Debian*) - release='-gnu' - ;; - *) - release=`echo "$UNAME_RELEASE" | sed -e 's/[-_].*//' | cut -d. -f1,2` - ;; - esac - # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: - # contains redundant information, the shorter form: - # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. - echo "$machine-${os}${release}${abi-}" - exit ;; - *:Bitrig:*:*) - UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` - echo "$UNAME_MACHINE_ARCH"-unknown-bitrig"$UNAME_RELEASE" - exit ;; - *:OpenBSD:*:*) - UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` - echo "$UNAME_MACHINE_ARCH"-unknown-openbsd"$UNAME_RELEASE" - exit ;; - *:LibertyBSD:*:*) - UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'` - echo "$UNAME_MACHINE_ARCH"-unknown-libertybsd"$UNAME_RELEASE" - exit ;; - *:MidnightBSD:*:*) - echo "$UNAME_MACHINE"-unknown-midnightbsd"$UNAME_RELEASE" - exit ;; - *:ekkoBSD:*:*) - echo "$UNAME_MACHINE"-unknown-ekkobsd"$UNAME_RELEASE" - exit ;; - *:SolidBSD:*:*) - echo "$UNAME_MACHINE"-unknown-solidbsd"$UNAME_RELEASE" - exit ;; - macppc:MirBSD:*:*) - echo powerpc-unknown-mirbsd"$UNAME_RELEASE" - exit ;; - *:MirBSD:*:*) - echo "$UNAME_MACHINE"-unknown-mirbsd"$UNAME_RELEASE" - exit ;; - *:Sortix:*:*) - echo "$UNAME_MACHINE"-unknown-sortix - exit ;; - *:Redox:*:*) - echo "$UNAME_MACHINE"-unknown-redox - exit ;; - mips:OSF1:*.*) - echo mips-dec-osf1 - exit ;; - alpha:OSF1:*:*) - case $UNAME_RELEASE in - *4.0) - UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` - ;; - *5.*) - UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` - ;; - esac - # According to Compaq, /usr/sbin/psrinfo has been available on - # OSF/1 and Tru64 systems produced since 1995. I hope that - # covers most systems running today. This code pipes the CPU - # types through head -n 1, so we only detect the type of CPU 0. - ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1` - case "$ALPHA_CPU_TYPE" in - "EV4 (21064)") - UNAME_MACHINE=alpha ;; - "EV4.5 (21064)") - UNAME_MACHINE=alpha ;; - "LCA4 (21066/21068)") - UNAME_MACHINE=alpha ;; - "EV5 (21164)") - UNAME_MACHINE=alphaev5 ;; - "EV5.6 (21164A)") - UNAME_MACHINE=alphaev56 ;; - "EV5.6 (21164PC)") - UNAME_MACHINE=alphapca56 ;; - "EV5.7 (21164PC)") - UNAME_MACHINE=alphapca57 ;; - "EV6 (21264)") - UNAME_MACHINE=alphaev6 ;; - "EV6.7 (21264A)") - UNAME_MACHINE=alphaev67 ;; - "EV6.8CB (21264C)") - UNAME_MACHINE=alphaev68 ;; - "EV6.8AL (21264B)") - UNAME_MACHINE=alphaev68 ;; - "EV6.8CX (21264D)") - UNAME_MACHINE=alphaev68 ;; - "EV6.9A (21264/EV69A)") - UNAME_MACHINE=alphaev69 ;; - "EV7 (21364)") - UNAME_MACHINE=alphaev7 ;; - "EV7.9 (21364A)") - UNAME_MACHINE=alphaev79 ;; - esac - # A Pn.n version is a patched version. - # A Vn.n version is a released version. - # A Tn.n version is a released field test version. - # A Xn.n version is an unreleased experimental baselevel. - # 1.2 uses "1.2" for uname -r. - echo "$UNAME_MACHINE"-dec-osf"`echo "$UNAME_RELEASE" | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`" - # Reset EXIT trap before exiting to avoid spurious non-zero exit code. - exitcode=$? - trap '' 0 - exit $exitcode ;; - Amiga*:UNIX_System_V:4.0:*) - echo m68k-unknown-sysv4 - exit ;; - *:[Aa]miga[Oo][Ss]:*:*) - echo "$UNAME_MACHINE"-unknown-amigaos - exit ;; - *:[Mm]orph[Oo][Ss]:*:*) - echo "$UNAME_MACHINE"-unknown-morphos - exit ;; - *:OS/390:*:*) - echo i370-ibm-openedition - exit ;; - *:z/VM:*:*) - echo s390-ibm-zvmoe - exit ;; - *:OS400:*:*) - echo powerpc-ibm-os400 - exit ;; - arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) - echo arm-acorn-riscix"$UNAME_RELEASE" - exit ;; - arm*:riscos:*:*|arm*:RISCOS:*:*) - echo arm-unknown-riscos - exit ;; - SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) - echo hppa1.1-hitachi-hiuxmpp - exit ;; - Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*) - # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE. - if test "`(/bin/universe) 2>/dev/null`" = att ; then - echo pyramid-pyramid-sysv3 - else - echo pyramid-pyramid-bsd - fi - exit ;; - NILE*:*:*:dcosx) - echo pyramid-pyramid-svr4 - exit ;; - DRS?6000:unix:4.0:6*) - echo sparc-icl-nx6 - exit ;; - DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*) - case `/usr/bin/uname -p` in - sparc) echo sparc-icl-nx7; exit ;; - esac ;; - s390x:SunOS:*:*) - echo "$UNAME_MACHINE"-ibm-solaris2"`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`" - exit ;; - sun4H:SunOS:5.*:*) - echo sparc-hal-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`" - exit ;; - sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) - echo sparc-sun-solaris2"`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`" - exit ;; - i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*) - echo i386-pc-auroraux"$UNAME_RELEASE" - exit ;; - i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) - set_cc_for_build - SUN_ARCH=i386 - # If there is a compiler, see if it is configured for 64-bit objects. - # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. - # This test works for both compilers. - if [ "$CC_FOR_BUILD" != no_compiler_found ]; then - if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ - (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ - grep IS_64BIT_ARCH >/dev/null - then - SUN_ARCH=x86_64 - fi - fi - echo "$SUN_ARCH"-pc-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`" - exit ;; - sun4*:SunOS:6*:*) - # According to config.sub, this is the proper way to canonicalize - # SunOS6. Hard to guess exactly what SunOS6 will be like, but - # it's likely to be more like Solaris than SunOS4. - echo sparc-sun-solaris3"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`" - exit ;; - sun4*:SunOS:*:*) - case "`/usr/bin/arch -k`" in - Series*|S4*) - UNAME_RELEASE=`uname -v` - ;; - esac - # Japanese Language versions have a version number like `4.1.3-JL'. - echo sparc-sun-sunos"`echo "$UNAME_RELEASE"|sed -e 's/-/_/'`" - exit ;; - sun3*:SunOS:*:*) - echo m68k-sun-sunos"$UNAME_RELEASE" - exit ;; - sun*:*:4.2BSD:*) - UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` - test "x$UNAME_RELEASE" = x && UNAME_RELEASE=3 - case "`/bin/arch`" in - sun3) - echo m68k-sun-sunos"$UNAME_RELEASE" - ;; - sun4) - echo sparc-sun-sunos"$UNAME_RELEASE" - ;; - esac - exit ;; - aushp:SunOS:*:*) - echo sparc-auspex-sunos"$UNAME_RELEASE" - exit ;; - # The situation for MiNT is a little confusing. The machine name - # can be virtually everything (everything which is not - # "atarist" or "atariste" at least should have a processor - # > m68000). The system name ranges from "MiNT" over "FreeMiNT" - # to the lowercase version "mint" (or "freemint"). Finally - # the system name "TOS" denotes a system which is actually not - # MiNT. But MiNT is downward compatible to TOS, so this should - # be no problem. - atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) - echo m68k-atari-mint"$UNAME_RELEASE" - exit ;; - atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) - echo m68k-atari-mint"$UNAME_RELEASE" - exit ;; - *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) - echo m68k-atari-mint"$UNAME_RELEASE" - exit ;; - milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) - echo m68k-milan-mint"$UNAME_RELEASE" - exit ;; - hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) - echo m68k-hades-mint"$UNAME_RELEASE" - exit ;; - *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) - echo m68k-unknown-mint"$UNAME_RELEASE" - exit ;; - m68k:machten:*:*) - echo m68k-apple-machten"$UNAME_RELEASE" - exit ;; - powerpc:machten:*:*) - echo powerpc-apple-machten"$UNAME_RELEASE" - exit ;; - RISC*:Mach:*:*) - echo mips-dec-mach_bsd4.3 - exit ;; - RISC*:ULTRIX:*:*) - echo mips-dec-ultrix"$UNAME_RELEASE" - exit ;; - VAX*:ULTRIX*:*:*) - echo vax-dec-ultrix"$UNAME_RELEASE" - exit ;; - 2020:CLIX:*:* | 2430:CLIX:*:*) - echo clipper-intergraph-clix"$UNAME_RELEASE" - exit ;; - mips:*:*:UMIPS | mips:*:*:RISCos) - set_cc_for_build - sed 's/^ //' << EOF > "$dummy.c" -#ifdef __cplusplus -#include /* for printf() prototype */ - int main (int argc, char *argv[]) { -#else - int main (argc, argv) int argc; char *argv[]; { -#endif - #if defined (host_mips) && defined (MIPSEB) - #if defined (SYSTYPE_SYSV) - printf ("mips-mips-riscos%ssysv\\n", argv[1]); exit (0); - #endif - #if defined (SYSTYPE_SVR4) - printf ("mips-mips-riscos%ssvr4\\n", argv[1]); exit (0); - #endif - #if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD) - printf ("mips-mips-riscos%sbsd\\n", argv[1]); exit (0); - #endif - #endif - exit (-1); - } -EOF - $CC_FOR_BUILD -o "$dummy" "$dummy.c" && - dummyarg=`echo "$UNAME_RELEASE" | sed -n 's/\([0-9]*\).*/\1/p'` && - SYSTEM_NAME=`"$dummy" "$dummyarg"` && - { echo "$SYSTEM_NAME"; exit; } - echo mips-mips-riscos"$UNAME_RELEASE" - exit ;; - Motorola:PowerMAX_OS:*:*) - echo powerpc-motorola-powermax - exit ;; - Motorola:*:4.3:PL8-*) - echo powerpc-harris-powermax - exit ;; - Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*) - echo powerpc-harris-powermax - exit ;; - Night_Hawk:Power_UNIX:*:*) - echo powerpc-harris-powerunix - exit ;; - m88k:CX/UX:7*:*) - echo m88k-harris-cxux7 - exit ;; - m88k:*:4*:R4*) - echo m88k-motorola-sysv4 - exit ;; - m88k:*:3*:R3*) - echo m88k-motorola-sysv3 - exit ;; - AViiON:dgux:*:*) - # DG/UX returns AViiON for all architectures - UNAME_PROCESSOR=`/usr/bin/uname -p` - if [ "$UNAME_PROCESSOR" = mc88100 ] || [ "$UNAME_PROCESSOR" = mc88110 ] - then - if [ "$TARGET_BINARY_INTERFACE"x = m88kdguxelfx ] || \ - [ "$TARGET_BINARY_INTERFACE"x = x ] - then - echo m88k-dg-dgux"$UNAME_RELEASE" - else - echo m88k-dg-dguxbcs"$UNAME_RELEASE" - fi - else - echo i586-dg-dgux"$UNAME_RELEASE" - fi - exit ;; - M88*:DolphinOS:*:*) # DolphinOS (SVR3) - echo m88k-dolphin-sysv3 - exit ;; - M88*:*:R3*:*) - # Delta 88k system running SVR3 - echo m88k-motorola-sysv3 - exit ;; - XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3) - echo m88k-tektronix-sysv3 - exit ;; - Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD) - echo m68k-tektronix-bsd - exit ;; - *:IRIX*:*:*) - echo mips-sgi-irix"`echo "$UNAME_RELEASE"|sed -e 's/-/_/g'`" - exit ;; - ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX. - echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id - exit ;; # Note that: echo "'`uname -s`'" gives 'AIX ' - i*86:AIX:*:*) - echo i386-ibm-aix - exit ;; - ia64:AIX:*:*) - if [ -x /usr/bin/oslevel ] ; then - IBM_REV=`/usr/bin/oslevel` - else - IBM_REV="$UNAME_VERSION.$UNAME_RELEASE" - fi - echo "$UNAME_MACHINE"-ibm-aix"$IBM_REV" - exit ;; - *:AIX:2:3) - if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then - set_cc_for_build - sed 's/^ //' << EOF > "$dummy.c" - #include - - main() - { - if (!__power_pc()) - exit(1); - puts("powerpc-ibm-aix3.2.5"); - exit(0); - } -EOF - if $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"` - then - echo "$SYSTEM_NAME" - else - echo rs6000-ibm-aix3.2.5 - fi - elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then - echo rs6000-ibm-aix3.2.4 - else - echo rs6000-ibm-aix3.2 - fi - exit ;; - *:AIX:*:[4567]) - IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` - if /usr/sbin/lsattr -El "$IBM_CPU_ID" | grep ' POWER' >/dev/null 2>&1; then - IBM_ARCH=rs6000 - else - IBM_ARCH=powerpc - fi - if [ -x /usr/bin/lslpp ] ; then - IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc | - awk -F: '{ print $3 }' | sed s/[0-9]*$/0/` - else - IBM_REV="$UNAME_VERSION.$UNAME_RELEASE" - fi - echo "$IBM_ARCH"-ibm-aix"$IBM_REV" - exit ;; - *:AIX:*:*) - echo rs6000-ibm-aix - exit ;; - ibmrt:4.4BSD:*|romp-ibm:4.4BSD:*) - echo romp-ibm-bsd4.4 - exit ;; - ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and - echo romp-ibm-bsd"$UNAME_RELEASE" # 4.3 with uname added to - exit ;; # report: romp-ibm BSD 4.3 - *:BOSX:*:*) - echo rs6000-bull-bosx - exit ;; - DPX/2?00:B.O.S.:*:*) - echo m68k-bull-sysv3 - exit ;; - 9000/[34]??:4.3bsd:1.*:*) - echo m68k-hp-bsd - exit ;; - hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*) - echo m68k-hp-bsd4.4 - exit ;; - 9000/[34678]??:HP-UX:*:*) - HPUX_REV=`echo "$UNAME_RELEASE"|sed -e 's/[^.]*.[0B]*//'` - case "$UNAME_MACHINE" in - 9000/31?) HP_ARCH=m68000 ;; - 9000/[34]??) HP_ARCH=m68k ;; - 9000/[678][0-9][0-9]) - if [ -x /usr/bin/getconf ]; then - sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` - sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` - case "$sc_cpu_version" in - 523) HP_ARCH=hppa1.0 ;; # CPU_PA_RISC1_0 - 528) HP_ARCH=hppa1.1 ;; # CPU_PA_RISC1_1 - 532) # CPU_PA_RISC2_0 - case "$sc_kernel_bits" in - 32) HP_ARCH=hppa2.0n ;; - 64) HP_ARCH=hppa2.0w ;; - '') HP_ARCH=hppa2.0 ;; # HP-UX 10.20 - esac ;; - esac - fi - if [ "$HP_ARCH" = "" ]; then - set_cc_for_build - sed 's/^ //' << EOF > "$dummy.c" - - #define _HPUX_SOURCE - #include - #include - - int main () - { - #if defined(_SC_KERNEL_BITS) - long bits = sysconf(_SC_KERNEL_BITS); - #endif - long cpu = sysconf (_SC_CPU_VERSION); - - switch (cpu) - { - case CPU_PA_RISC1_0: puts ("hppa1.0"); break; - case CPU_PA_RISC1_1: puts ("hppa1.1"); break; - case CPU_PA_RISC2_0: - #if defined(_SC_KERNEL_BITS) - switch (bits) - { - case 64: puts ("hppa2.0w"); break; - case 32: puts ("hppa2.0n"); break; - default: puts ("hppa2.0"); break; - } break; - #else /* !defined(_SC_KERNEL_BITS) */ - puts ("hppa2.0"); break; - #endif - default: puts ("hppa1.0"); break; - } - exit (0); - } -EOF - (CCOPTS="" $CC_FOR_BUILD -o "$dummy" "$dummy.c" 2>/dev/null) && HP_ARCH=`"$dummy"` - test -z "$HP_ARCH" && HP_ARCH=hppa - fi ;; - esac - if [ "$HP_ARCH" = hppa2.0w ] - then - set_cc_for_build - - # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating - # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler - # generating 64-bit code. GNU and HP use different nomenclature: - # - # $ CC_FOR_BUILD=cc ./config.guess - # => hppa2.0w-hp-hpux11.23 - # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess - # => hppa64-hp-hpux11.23 - - if echo __LP64__ | (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | - grep -q __LP64__ - then - HP_ARCH=hppa2.0w - else - HP_ARCH=hppa64 - fi - fi - echo "$HP_ARCH"-hp-hpux"$HPUX_REV" - exit ;; - ia64:HP-UX:*:*) - HPUX_REV=`echo "$UNAME_RELEASE"|sed -e 's/[^.]*.[0B]*//'` - echo ia64-hp-hpux"$HPUX_REV" - exit ;; - 3050*:HI-UX:*:*) - set_cc_for_build - sed 's/^ //' << EOF > "$dummy.c" - #include - int - main () - { - long cpu = sysconf (_SC_CPU_VERSION); - /* The order matters, because CPU_IS_HP_MC68K erroneously returns - true for CPU_PA_RISC1_0. CPU_IS_PA_RISC returns correct - results, however. */ - if (CPU_IS_PA_RISC (cpu)) - { - switch (cpu) - { - case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break; - case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break; - case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break; - default: puts ("hppa-hitachi-hiuxwe2"); break; - } - } - else if (CPU_IS_HP_MC68K (cpu)) - puts ("m68k-hitachi-hiuxwe2"); - else puts ("unknown-hitachi-hiuxwe2"); - exit (0); - } -EOF - $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"` && - { echo "$SYSTEM_NAME"; exit; } - echo unknown-hitachi-hiuxwe2 - exit ;; - 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:*) - echo hppa1.1-hp-bsd - exit ;; - 9000/8??:4.3bsd:*:*) - echo hppa1.0-hp-bsd - exit ;; - *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*) - echo hppa1.0-hp-mpeix - exit ;; - hp7??:OSF1:*:* | hp8?[79]:OSF1:*:*) - echo hppa1.1-hp-osf - exit ;; - hp8??:OSF1:*:*) - echo hppa1.0-hp-osf - exit ;; - i*86:OSF1:*:*) - if [ -x /usr/sbin/sysversion ] ; then - echo "$UNAME_MACHINE"-unknown-osf1mk - else - echo "$UNAME_MACHINE"-unknown-osf1 - fi - exit ;; - parisc*:Lites*:*:*) - echo hppa1.1-hp-lites - exit ;; - C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) - echo c1-convex-bsd - exit ;; - C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) - if getsysinfo -f scalar_acc - then echo c32-convex-bsd - else echo c2-convex-bsd - fi - exit ;; - C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) - echo c34-convex-bsd - exit ;; - C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) - echo c38-convex-bsd - exit ;; - C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) - echo c4-convex-bsd - exit ;; - CRAY*Y-MP:*:*:*) - echo ymp-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/' - exit ;; - CRAY*[A-Z]90:*:*:*) - echo "$UNAME_MACHINE"-cray-unicos"$UNAME_RELEASE" \ - | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \ - -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \ - -e 's/\.[^.]*$/.X/' - exit ;; - CRAY*TS:*:*:*) - echo t90-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/' - exit ;; - CRAY*T3E:*:*:*) - echo alphaev5-cray-unicosmk"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/' - exit ;; - CRAY*SV1:*:*:*) - echo sv1-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/' - exit ;; - *:UNICOS/mp:*:*) - echo craynv-cray-unicosmp"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/' - exit ;; - F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) - FUJITSU_PROC=`uname -m | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz` - FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'` - FUJITSU_REL=`echo "$UNAME_RELEASE" | sed -e 's/ /_/'` - echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" - exit ;; - 5000:UNIX_System_V:4.*:*) - FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'` - FUJITSU_REL=`echo "$UNAME_RELEASE" | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/ /_/'` - echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" - exit ;; - i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) - echo "$UNAME_MACHINE"-pc-bsdi"$UNAME_RELEASE" - exit ;; - sparc*:BSD/OS:*:*) - echo sparc-unknown-bsdi"$UNAME_RELEASE" - exit ;; - *:BSD/OS:*:*) - echo "$UNAME_MACHINE"-unknown-bsdi"$UNAME_RELEASE" - exit ;; - arm:FreeBSD:*:*) - UNAME_PROCESSOR=`uname -p` - set_cc_for_build - if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ - | grep -q __ARM_PCS_VFP - then - echo "${UNAME_PROCESSOR}"-unknown-freebsd"`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`"-gnueabi - else - echo "${UNAME_PROCESSOR}"-unknown-freebsd"`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`"-gnueabihf - fi - exit ;; - *:FreeBSD:*:*) - UNAME_PROCESSOR=`/usr/bin/uname -p` - case "$UNAME_PROCESSOR" in - amd64) - UNAME_PROCESSOR=x86_64 ;; - i386) - UNAME_PROCESSOR=i586 ;; - esac - echo "$UNAME_PROCESSOR"-unknown-freebsd"`echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`" - exit ;; - i*:CYGWIN*:*) - echo "$UNAME_MACHINE"-pc-cygwin - exit ;; - *:MINGW64*:*) - echo "$UNAME_MACHINE"-pc-mingw64 - exit ;; - *:MINGW*:*) - echo "$UNAME_MACHINE"-pc-mingw32 - exit ;; - *:MSYS*:*) - echo "$UNAME_MACHINE"-pc-msys - exit ;; - i*:PW*:*) - echo "$UNAME_MACHINE"-pc-pw32 - exit ;; - *:Interix*:*) - case "$UNAME_MACHINE" in - x86) - echo i586-pc-interix"$UNAME_RELEASE" - exit ;; - authenticamd | genuineintel | EM64T) - echo x86_64-unknown-interix"$UNAME_RELEASE" - exit ;; - IA64) - echo ia64-unknown-interix"$UNAME_RELEASE" - exit ;; - esac ;; - i*:UWIN*:*) - echo "$UNAME_MACHINE"-pc-uwin - exit ;; - amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) - echo x86_64-pc-cygwin - exit ;; - prep*:SunOS:5.*:*) - echo powerpcle-unknown-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`" - exit ;; - *:GNU:*:*) - # the GNU system - echo "`echo "$UNAME_MACHINE"|sed -e 's,[-/].*$,,'`-unknown-$LIBC`echo "$UNAME_RELEASE"|sed -e 's,/.*$,,'`" - exit ;; - *:GNU/*:*:*) - # other systems with GNU libc and userland - echo "$UNAME_MACHINE-unknown-`echo "$UNAME_SYSTEM" | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`-$LIBC" - exit ;; - *:Minix:*:*) - echo "$UNAME_MACHINE"-unknown-minix - exit ;; - aarch64:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - exit ;; - aarch64_be:Linux:*:*) - UNAME_MACHINE=aarch64_be - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - exit ;; - alpha:Linux:*:*) - case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in - EV5) UNAME_MACHINE=alphaev5 ;; - EV56) UNAME_MACHINE=alphaev56 ;; - PCA56) UNAME_MACHINE=alphapca56 ;; - PCA57) UNAME_MACHINE=alphapca56 ;; - EV6) UNAME_MACHINE=alphaev6 ;; - EV67) UNAME_MACHINE=alphaev67 ;; - EV68*) UNAME_MACHINE=alphaev68 ;; - esac - objdump --private-headers /bin/sh | grep -q ld.so.1 - if test "$?" = 0 ; then LIBC=gnulibc1 ; fi - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - exit ;; - arc:Linux:*:* | arceb:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - exit ;; - arm*:Linux:*:*) - set_cc_for_build - if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ - | grep -q __ARM_EABI__ - then - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - else - if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ - | grep -q __ARM_PCS_VFP - then - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"eabi - else - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"eabihf - fi - fi - exit ;; - avr32*:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - exit ;; - cris:Linux:*:*) - echo "$UNAME_MACHINE"-axis-linux-"$LIBC" - exit ;; - crisv32:Linux:*:*) - echo "$UNAME_MACHINE"-axis-linux-"$LIBC" - exit ;; - e2k:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - exit ;; - frv:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - exit ;; - hexagon:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - exit ;; - i*86:Linux:*:*) - echo "$UNAME_MACHINE"-pc-linux-"$LIBC" - exit ;; - ia64:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - exit ;; - k1om:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - exit ;; - m32r*:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - exit ;; - m68*:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - exit ;; - mips:Linux:*:* | mips64:Linux:*:*) - set_cc_for_build - IS_GLIBC=0 - test x"${LIBC}" = xgnu && IS_GLIBC=1 - sed 's/^ //' << EOF > "$dummy.c" - #undef CPU - #undef mips - #undef mipsel - #undef mips64 - #undef mips64el - #if ${IS_GLIBC} && defined(_ABI64) - LIBCABI=gnuabi64 - #else - #if ${IS_GLIBC} && defined(_ABIN32) - LIBCABI=gnuabin32 - #else - LIBCABI=${LIBC} - #endif - #endif - - #if ${IS_GLIBC} && defined(__mips64) && defined(__mips_isa_rev) && __mips_isa_rev>=6 - CPU=mipsisa64r6 - #else - #if ${IS_GLIBC} && !defined(__mips64) && defined(__mips_isa_rev) && __mips_isa_rev>=6 - CPU=mipsisa32r6 - #else - #if defined(__mips64) - CPU=mips64 - #else - CPU=mips - #endif - #endif - #endif - - #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) - MIPS_ENDIAN=el - #else - #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) - MIPS_ENDIAN= - #else - MIPS_ENDIAN= - #endif - #endif -EOF - eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^CPU\|^MIPS_ENDIAN\|^LIBCABI'`" - test "x$CPU" != x && { echo "$CPU${MIPS_ENDIAN}-unknown-linux-$LIBCABI"; exit; } - ;; - mips64el:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - exit ;; - openrisc*:Linux:*:*) - echo or1k-unknown-linux-"$LIBC" - exit ;; - or32:Linux:*:* | or1k*:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - exit ;; - padre:Linux:*:*) - echo sparc-unknown-linux-"$LIBC" - exit ;; - parisc64:Linux:*:* | hppa64:Linux:*:*) - echo hppa64-unknown-linux-"$LIBC" - exit ;; - parisc:Linux:*:* | hppa:Linux:*:*) - # Look for CPU level - case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in - PA7*) echo hppa1.1-unknown-linux-"$LIBC" ;; - PA8*) echo hppa2.0-unknown-linux-"$LIBC" ;; - *) echo hppa-unknown-linux-"$LIBC" ;; - esac - exit ;; - ppc64:Linux:*:*) - echo powerpc64-unknown-linux-"$LIBC" - exit ;; - ppc:Linux:*:*) - echo powerpc-unknown-linux-"$LIBC" - exit ;; - ppc64le:Linux:*:*) - echo powerpc64le-unknown-linux-"$LIBC" - exit ;; - ppcle:Linux:*:*) - echo powerpcle-unknown-linux-"$LIBC" - exit ;; - riscv32:Linux:*:* | riscv64:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - exit ;; - s390:Linux:*:* | s390x:Linux:*:*) - echo "$UNAME_MACHINE"-ibm-linux-"$LIBC" - exit ;; - sh64*:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - exit ;; - sh*:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - exit ;; - sparc:Linux:*:* | sparc64:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - exit ;; - tile*:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - exit ;; - vax:Linux:*:*) - echo "$UNAME_MACHINE"-dec-linux-"$LIBC" - exit ;; - x86_64:Linux:*:*) - echo "$UNAME_MACHINE"-pc-linux-"$LIBC" - exit ;; - xtensa*:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - exit ;; - i*86:DYNIX/ptx:4*:*) - # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. - # earlier versions are messed up and put the nodename in both - # sysname and nodename. - echo i386-sequent-sysv4 - exit ;; - i*86:UNIX_SV:4.2MP:2.*) - # Unixware is an offshoot of SVR4, but it has its own version - # number series starting with 2... - # I am not positive that other SVR4 systems won't match this, - # I just have to hope. -- rms. - # Use sysv4.2uw... so that sysv4* matches it. - echo "$UNAME_MACHINE"-pc-sysv4.2uw"$UNAME_VERSION" - exit ;; - i*86:OS/2:*:*) - # If we were able to find `uname', then EMX Unix compatibility - # is probably installed. - echo "$UNAME_MACHINE"-pc-os2-emx - exit ;; - i*86:XTS-300:*:STOP) - echo "$UNAME_MACHINE"-unknown-stop - exit ;; - i*86:atheos:*:*) - echo "$UNAME_MACHINE"-unknown-atheos - exit ;; - i*86:syllable:*:*) - echo "$UNAME_MACHINE"-pc-syllable - exit ;; - i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*) - echo i386-unknown-lynxos"$UNAME_RELEASE" - exit ;; - i*86:*DOS:*:*) - echo "$UNAME_MACHINE"-pc-msdosdjgpp - exit ;; - i*86:*:4.*:*) - UNAME_REL=`echo "$UNAME_RELEASE" | sed 's/\/MP$//'` - if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then - echo "$UNAME_MACHINE"-univel-sysv"$UNAME_REL" - else - echo "$UNAME_MACHINE"-pc-sysv"$UNAME_REL" - fi - exit ;; - i*86:*:5:[678]*) - # UnixWare 7.x, OpenUNIX and OpenServer 6. - case `/bin/uname -X | grep "^Machine"` in - *486*) UNAME_MACHINE=i486 ;; - *Pentium) UNAME_MACHINE=i586 ;; - *Pent*|*Celeron) UNAME_MACHINE=i686 ;; - esac - echo "$UNAME_MACHINE-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}" - exit ;; - i*86:*:3.2:*) - if test -f /usr/options/cb.name; then - UNAME_REL=`sed -n 's/.*Version //p' /dev/null >/dev/null ; then - UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')` - (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486 - (/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \ - && UNAME_MACHINE=i586 - (/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \ - && UNAME_MACHINE=i686 - (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \ - && UNAME_MACHINE=i686 - echo "$UNAME_MACHINE"-pc-sco"$UNAME_REL" - else - echo "$UNAME_MACHINE"-pc-sysv32 - fi - exit ;; - pc:*:*:*) - # Left here for compatibility: - # uname -m prints for DJGPP always 'pc', but it prints nothing about - # the processor, so we play safe by assuming i586. - # Note: whatever this is, it MUST be the same as what config.sub - # prints for the "djgpp" host, or else GDB configure will decide that - # this is a cross-build. - echo i586-pc-msdosdjgpp - exit ;; - Intel:Mach:3*:*) - echo i386-pc-mach3 - exit ;; - paragon:*:*:*) - echo i860-intel-osf1 - exit ;; - i860:*:4.*:*) # i860-SVR4 - if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then - echo i860-stardent-sysv"$UNAME_RELEASE" # Stardent Vistra i860-SVR4 - else # Add other i860-SVR4 vendors below as they are discovered. - echo i860-unknown-sysv"$UNAME_RELEASE" # Unknown i860-SVR4 - fi - exit ;; - mini*:CTIX:SYS*5:*) - # "miniframe" - echo m68010-convergent-sysv - exit ;; - mc68k:UNIX:SYSTEM5:3.51m) - echo m68k-convergent-sysv - exit ;; - M680?0:D-NIX:5.3:*) - echo m68k-diab-dnix - exit ;; - M68*:*:R3V[5678]*:*) - test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;; - 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0) - OS_REL='' - test -r /etc/.relid \ - && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` - /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && { echo i486-ncr-sysv4.3"$OS_REL"; exit; } - /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ - && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } ;; - 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) - /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && { echo i486-ncr-sysv4; exit; } ;; - NCR*:*:4.2:* | MPRAS*:*:4.2:*) - OS_REL='.3' - test -r /etc/.relid \ - && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` - /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && { echo i486-ncr-sysv4.3"$OS_REL"; exit; } - /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ - && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } - /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \ - && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } ;; - m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) - echo m68k-unknown-lynxos"$UNAME_RELEASE" - exit ;; - mc68030:UNIX_System_V:4.*:*) - echo m68k-atari-sysv4 - exit ;; - TSUNAMI:LynxOS:2.*:*) - echo sparc-unknown-lynxos"$UNAME_RELEASE" - exit ;; - rs6000:LynxOS:2.*:*) - echo rs6000-unknown-lynxos"$UNAME_RELEASE" - exit ;; - PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*) - echo powerpc-unknown-lynxos"$UNAME_RELEASE" - exit ;; - SM[BE]S:UNIX_SV:*:*) - echo mips-dde-sysv"$UNAME_RELEASE" - exit ;; - RM*:ReliantUNIX-*:*:*) - echo mips-sni-sysv4 - exit ;; - RM*:SINIX-*:*:*) - echo mips-sni-sysv4 - exit ;; - *:SINIX-*:*:*) - if uname -p 2>/dev/null >/dev/null ; then - UNAME_MACHINE=`(uname -p) 2>/dev/null` - echo "$UNAME_MACHINE"-sni-sysv4 - else - echo ns32k-sni-sysv - fi - exit ;; - PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort - # says - echo i586-unisys-sysv4 - exit ;; - *:UNIX_System_V:4*:FTX*) - # From Gerald Hewes . - # How about differentiating between stratus architectures? -djm - echo hppa1.1-stratus-sysv4 - exit ;; - *:*:*:FTX*) - # From seanf@swdc.stratus.com. - echo i860-stratus-sysv4 - exit ;; - i*86:VOS:*:*) - # From Paul.Green@stratus.com. - echo "$UNAME_MACHINE"-stratus-vos - exit ;; - *:VOS:*:*) - # From Paul.Green@stratus.com. - echo hppa1.1-stratus-vos - exit ;; - mc68*:A/UX:*:*) - echo m68k-apple-aux"$UNAME_RELEASE" - exit ;; - news*:NEWS-OS:6*:*) - echo mips-sony-newsos6 - exit ;; - R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) - if [ -d /usr/nec ]; then - echo mips-nec-sysv"$UNAME_RELEASE" - else - echo mips-unknown-sysv"$UNAME_RELEASE" - fi - exit ;; - BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. - echo powerpc-be-beos - exit ;; - BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only. - echo powerpc-apple-beos - exit ;; - BePC:BeOS:*:*) # BeOS running on Intel PC compatible. - echo i586-pc-beos - exit ;; - BePC:Haiku:*:*) # Haiku running on Intel PC compatible. - echo i586-pc-haiku - exit ;; - x86_64:Haiku:*:*) - echo x86_64-unknown-haiku - exit ;; - SX-4:SUPER-UX:*:*) - echo sx4-nec-superux"$UNAME_RELEASE" - exit ;; - SX-5:SUPER-UX:*:*) - echo sx5-nec-superux"$UNAME_RELEASE" - exit ;; - SX-6:SUPER-UX:*:*) - echo sx6-nec-superux"$UNAME_RELEASE" - exit ;; - SX-7:SUPER-UX:*:*) - echo sx7-nec-superux"$UNAME_RELEASE" - exit ;; - SX-8:SUPER-UX:*:*) - echo sx8-nec-superux"$UNAME_RELEASE" - exit ;; - SX-8R:SUPER-UX:*:*) - echo sx8r-nec-superux"$UNAME_RELEASE" - exit ;; - SX-ACE:SUPER-UX:*:*) - echo sxace-nec-superux"$UNAME_RELEASE" - exit ;; - Power*:Rhapsody:*:*) - echo powerpc-apple-rhapsody"$UNAME_RELEASE" - exit ;; - *:Rhapsody:*:*) - echo "$UNAME_MACHINE"-apple-rhapsody"$UNAME_RELEASE" - exit ;; - *:Darwin:*:*) - UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown - set_cc_for_build - if test "$UNAME_PROCESSOR" = unknown ; then - UNAME_PROCESSOR=powerpc - fi - if test "`echo "$UNAME_RELEASE" | sed -e 's/\..*//'`" -le 10 ; then - if [ "$CC_FOR_BUILD" != no_compiler_found ]; then - if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ - (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ - grep IS_64BIT_ARCH >/dev/null - then - case $UNAME_PROCESSOR in - i386) UNAME_PROCESSOR=x86_64 ;; - powerpc) UNAME_PROCESSOR=powerpc64 ;; - esac - fi - # On 10.4-10.6 one might compile for PowerPC via gcc -arch ppc - if (echo '#ifdef __POWERPC__'; echo IS_PPC; echo '#endif') | \ - (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ - grep IS_PPC >/dev/null - then - UNAME_PROCESSOR=powerpc - fi - fi - elif test "$UNAME_PROCESSOR" = i386 ; then - # Avoid executing cc on OS X 10.9, as it ships with a stub - # that puts up a graphical alert prompting to install - # developer tools. Any system running Mac OS X 10.7 or - # later (Darwin 11 and later) is required to have a 64-bit - # processor. This is not true of the ARM version of Darwin - # that Apple uses in portable devices. - UNAME_PROCESSOR=x86_64 - fi - echo "$UNAME_PROCESSOR"-apple-darwin"$UNAME_RELEASE" - exit ;; - *:procnto*:*:* | *:QNX:[0123456789]*:*) - UNAME_PROCESSOR=`uname -p` - if test "$UNAME_PROCESSOR" = x86; then - UNAME_PROCESSOR=i386 - UNAME_MACHINE=pc - fi - echo "$UNAME_PROCESSOR"-"$UNAME_MACHINE"-nto-qnx"$UNAME_RELEASE" - exit ;; - *:QNX:*:4*) - echo i386-pc-qnx - exit ;; - NEO-*:NONSTOP_KERNEL:*:*) - echo neo-tandem-nsk"$UNAME_RELEASE" - exit ;; - NSE-*:NONSTOP_KERNEL:*:*) - echo nse-tandem-nsk"$UNAME_RELEASE" - exit ;; - NSR-*:NONSTOP_KERNEL:*:*) - echo nsr-tandem-nsk"$UNAME_RELEASE" - exit ;; - NSV-*:NONSTOP_KERNEL:*:*) - echo nsv-tandem-nsk"$UNAME_RELEASE" - exit ;; - NSX-*:NONSTOP_KERNEL:*:*) - echo nsx-tandem-nsk"$UNAME_RELEASE" - exit ;; - *:NonStop-UX:*:*) - echo mips-compaq-nonstopux - exit ;; - BS2000:POSIX*:*:*) - echo bs2000-siemens-sysv - exit ;; - DS/*:UNIX_System_V:*:*) - echo "$UNAME_MACHINE"-"$UNAME_SYSTEM"-"$UNAME_RELEASE" - exit ;; - *:Plan9:*:*) - # "uname -m" is not consistent, so use $cputype instead. 386 - # is converted to i386 for consistency with other x86 - # operating systems. - # shellcheck disable=SC2154 - if test "$cputype" = 386; then - UNAME_MACHINE=i386 - else - UNAME_MACHINE="$cputype" - fi - echo "$UNAME_MACHINE"-unknown-plan9 - exit ;; - *:TOPS-10:*:*) - echo pdp10-unknown-tops10 - exit ;; - *:TENEX:*:*) - echo pdp10-unknown-tenex - exit ;; - KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*) - echo pdp10-dec-tops20 - exit ;; - XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*) - echo pdp10-xkl-tops20 - exit ;; - *:TOPS-20:*:*) - echo pdp10-unknown-tops20 - exit ;; - *:ITS:*:*) - echo pdp10-unknown-its - exit ;; - SEI:*:*:SEIUX) - echo mips-sei-seiux"$UNAME_RELEASE" - exit ;; - *:DragonFly:*:*) - echo "$UNAME_MACHINE"-unknown-dragonfly"`echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`" - exit ;; - *:*VMS:*:*) - UNAME_MACHINE=`(uname -p) 2>/dev/null` - case "$UNAME_MACHINE" in - A*) echo alpha-dec-vms ; exit ;; - I*) echo ia64-dec-vms ; exit ;; - V*) echo vax-dec-vms ; exit ;; - esac ;; - *:XENIX:*:SysV) - echo i386-pc-xenix - exit ;; - i*86:skyos:*:*) - echo "$UNAME_MACHINE"-pc-skyos"`echo "$UNAME_RELEASE" | sed -e 's/ .*$//'`" - exit ;; - i*86:rdos:*:*) - echo "$UNAME_MACHINE"-pc-rdos - exit ;; - i*86:AROS:*:*) - echo "$UNAME_MACHINE"-pc-aros - exit ;; - x86_64:VMkernel:*:*) - echo "$UNAME_MACHINE"-unknown-esx - exit ;; - amd64:Isilon\ OneFS:*:*) - echo x86_64-unknown-onefs - exit ;; - *:Unleashed:*:*) - echo "$UNAME_MACHINE"-unknown-unleashed"$UNAME_RELEASE" - exit ;; -esac - -# No uname command or uname output not recognized. -set_cc_for_build -cat > "$dummy.c" < -#include -#endif -#if defined(ultrix) || defined(_ultrix) || defined(__ultrix) || defined(__ultrix__) -#if defined (vax) || defined (__vax) || defined (__vax__) || defined(mips) || defined(__mips) || defined(__mips__) || defined(MIPS) || defined(__MIPS__) -#include -#if defined(_SIZE_T_) || defined(SIGLOST) -#include -#endif -#endif -#endif -main () -{ -#if defined (sony) -#if defined (MIPSEB) - /* BFD wants "bsd" instead of "newsos". Perhaps BFD should be changed, - I don't know.... */ - printf ("mips-sony-bsd\n"); exit (0); -#else -#include - printf ("m68k-sony-newsos%s\n", -#ifdef NEWSOS4 - "4" -#else - "" -#endif - ); exit (0); -#endif -#endif - -#if defined (NeXT) -#if !defined (__ARCHITECTURE__) -#define __ARCHITECTURE__ "m68k" -#endif - int version; - version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`; - if (version < 4) - printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version); - else - printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version); - exit (0); -#endif - -#if defined (MULTIMAX) || defined (n16) -#if defined (UMAXV) - printf ("ns32k-encore-sysv\n"); exit (0); -#else -#if defined (CMU) - printf ("ns32k-encore-mach\n"); exit (0); -#else - printf ("ns32k-encore-bsd\n"); exit (0); -#endif -#endif -#endif - -#if defined (__386BSD__) - printf ("i386-pc-bsd\n"); exit (0); -#endif - -#if defined (sequent) -#if defined (i386) - printf ("i386-sequent-dynix\n"); exit (0); -#endif -#if defined (ns32000) - printf ("ns32k-sequent-dynix\n"); exit (0); -#endif -#endif - -#if defined (_SEQUENT_) - struct utsname un; - - uname(&un); - if (strncmp(un.version, "V2", 2) == 0) { - printf ("i386-sequent-ptx2\n"); exit (0); - } - if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */ - printf ("i386-sequent-ptx1\n"); exit (0); - } - printf ("i386-sequent-ptx\n"); exit (0); -#endif - -#if defined (vax) -#if !defined (ultrix) -#include -#if defined (BSD) -#if BSD == 43 - printf ("vax-dec-bsd4.3\n"); exit (0); -#else -#if BSD == 199006 - printf ("vax-dec-bsd4.3reno\n"); exit (0); -#else - printf ("vax-dec-bsd\n"); exit (0); -#endif -#endif -#else - printf ("vax-dec-bsd\n"); exit (0); -#endif -#else -#if defined(_SIZE_T_) || defined(SIGLOST) - struct utsname un; - uname (&un); - printf ("vax-dec-ultrix%s\n", un.release); exit (0); -#else - printf ("vax-dec-ultrix\n"); exit (0); -#endif -#endif -#endif -#if defined(ultrix) || defined(_ultrix) || defined(__ultrix) || defined(__ultrix__) -#if defined(mips) || defined(__mips) || defined(__mips__) || defined(MIPS) || defined(__MIPS__) -#if defined(_SIZE_T_) || defined(SIGLOST) - struct utsname *un; - uname (&un); - printf ("mips-dec-ultrix%s\n", un.release); exit (0); -#else - printf ("mips-dec-ultrix\n"); exit (0); -#endif -#endif -#endif - -#if defined (alliant) && defined (i860) - printf ("i860-alliant-bsd\n"); exit (0); -#endif - - exit (1); -} -EOF - -$CC_FOR_BUILD -o "$dummy" "$dummy.c" 2>/dev/null && SYSTEM_NAME=`$dummy` && - { echo "$SYSTEM_NAME"; exit; } - -# Apollos put the system type in the environment. -test -d /usr/apollo && { echo "$ISP-apollo-$SYSTYPE"; exit; } - -echo "$0: unable to guess system type" >&2 - -case "$UNAME_MACHINE:$UNAME_SYSTEM" in - mips:Linux | mips64:Linux) - # If we got here on MIPS GNU/Linux, output extra information. - cat >&2 <&2 </dev/null || echo unknown` -uname -r = `(uname -r) 2>/dev/null || echo unknown` -uname -s = `(uname -s) 2>/dev/null || echo unknown` -uname -v = `(uname -v) 2>/dev/null || echo unknown` - -/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null` -/bin/uname -X = `(/bin/uname -X) 2>/dev/null` - -hostinfo = `(hostinfo) 2>/dev/null` -/bin/universe = `(/bin/universe) 2>/dev/null` -/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null` -/bin/arch = `(/bin/arch) 2>/dev/null` -/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null` -/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null` - -UNAME_MACHINE = "$UNAME_MACHINE" -UNAME_RELEASE = "$UNAME_RELEASE" -UNAME_SYSTEM = "$UNAME_SYSTEM" -UNAME_VERSION = "$UNAME_VERSION" -EOF - -exit 1 - -# Local variables: -# eval: (add-hook 'before-save-hook 'time-stamp) -# time-stamp-start: "timestamp='" -# time-stamp-format: "%:y-%02m-%02d" -# time-stamp-end: "'" -# End: \ No newline at end of file diff --git a/src/native/unix/support/config.sub b/src/native/unix/support/config.sub deleted file mode 100755 index 22371e67..00000000 --- a/src/native/unix/support/config.sub +++ /dev/null @@ -1,1798 +0,0 @@ -#! /bin/sh -# Configuration validation subroutine script. -# Copyright 1992-2019 Free Software Foundation, Inc. - -timestamp='2019-01-05' - -# This file is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, see . -# -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that -# program. This Exception is an additional permission under section 7 -# of the GNU General Public License, version 3 ("GPLv3"). - - -# Please send patches to . -# -# Configuration subroutine to validate and canonicalize a configuration type. -# Supply the specified configuration type as an argument. -# If it is invalid, we print an error message on stderr and exit with code 1. -# Otherwise, we print the canonical config type on stdout and succeed. - -# You can get the latest version of this script from: -# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub - -# This file is supposed to be the same for all GNU packages -# and recognize all the CPU types, system types and aliases -# that are meaningful with *any* GNU software. -# Each package is responsible for reporting which valid configurations -# it does not support. The user should be able to distinguish -# a failure to support a valid configuration from a meaningless -# configuration. - -# The goal of this file is to map all the various variations of a given -# machine specification into a single specification in the form: -# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM -# or in some cases, the newer four-part form: -# CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM -# It is wrong to echo any other type of specification. - -me=`echo "$0" | sed -e 's,.*/,,'` - -usage="\ -Usage: $0 [OPTION] CPU-MFR-OPSYS or ALIAS - -Canonicalize a configuration name. - -Options: - -h, --help print this help, then exit - -t, --time-stamp print date of last modification, then exit - -v, --version print version number, then exit - -Report bugs and patches to ." - -version="\ -GNU config.sub ($timestamp) - -Copyright 1992-2019 Free Software Foundation, Inc. - -This is free software; see the source for copying conditions. There is NO -warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." - -help=" -Try \`$me --help' for more information." - -# Parse command line -while test $# -gt 0 ; do - case $1 in - --time-stamp | --time* | -t ) - echo "$timestamp" ; exit ;; - --version | -v ) - echo "$version" ; exit ;; - --help | --h* | -h ) - echo "$usage"; exit ;; - -- ) # Stop option processing - shift; break ;; - - ) # Use stdin as input. - break ;; - -* ) - echo "$me: invalid option $1$help" >&2 - exit 1 ;; - - *local*) - # First pass through any local machine types. - echo "$1" - exit ;; - - * ) - break ;; - esac -done - -case $# in - 0) echo "$me: missing argument$help" >&2 - exit 1;; - 1) ;; - *) echo "$me: too many arguments$help" >&2 - exit 1;; -esac - -# Split fields of configuration type -# shellcheck disable=SC2162 -IFS="-" read field1 field2 field3 field4 <&2 - exit 1 - ;; - *-*-*-*) - basic_machine=$field1-$field2 - os=$field3-$field4 - ;; - *-*-*) - # Ambiguous whether COMPANY is present, or skipped and KERNEL-OS is two - # parts - maybe_os=$field2-$field3 - case $maybe_os in - nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc \ - | linux-newlib* | linux-musl* | linux-uclibc* | uclinux-uclibc* \ - | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* \ - | netbsd*-eabi* | kopensolaris*-gnu* | cloudabi*-eabi* \ - | storm-chaos* | os2-emx* | rtmk-nova*) - basic_machine=$field1 - os=$maybe_os - ;; - android-linux) - basic_machine=$field1-unknown - os=linux-android - ;; - *) - basic_machine=$field1-$field2 - os=$field3 - ;; - esac - ;; - *-*) - # A lone config we happen to match not fitting any pattern - case $field1-$field2 in - decstation-3100) - basic_machine=mips-dec - os= - ;; - *-*) - # Second component is usually, but not always the OS - case $field2 in - # Prevent following clause from handling this valid os - sun*os*) - basic_machine=$field1 - os=$field2 - ;; - # Manufacturers - dec* | mips* | sequent* | encore* | pc533* | sgi* | sony* \ - | att* | 7300* | 3300* | delta* | motorola* | sun[234]* \ - | unicom* | ibm* | next | hp | isi* | apollo | altos* \ - | convergent* | ncr* | news | 32* | 3600* | 3100* \ - | hitachi* | c[123]* | convex* | sun | crds | omron* | dg \ - | ultra | tti* | harris | dolphin | highlevel | gould \ - | cbm | ns | masscomp | apple | axis | knuth | cray \ - | microblaze* | sim | cisco \ - | oki | wec | wrs | winbond) - basic_machine=$field1-$field2 - os= - ;; - *) - basic_machine=$field1 - os=$field2 - ;; - esac - ;; - esac - ;; - *) - # Convert single-component short-hands not valid as part of - # multi-component configurations. - case $field1 in - 386bsd) - basic_machine=i386-pc - os=bsd - ;; - a29khif) - basic_machine=a29k-amd - os=udi - ;; - adobe68k) - basic_machine=m68010-adobe - os=scout - ;; - alliant) - basic_machine=fx80-alliant - os= - ;; - altos | altos3068) - basic_machine=m68k-altos - os= - ;; - am29k) - basic_machine=a29k-none - os=bsd - ;; - amdahl) - basic_machine=580-amdahl - os=sysv - ;; - amiga) - basic_machine=m68k-unknown - os= - ;; - amigaos | amigados) - basic_machine=m68k-unknown - os=amigaos - ;; - amigaunix | amix) - basic_machine=m68k-unknown - os=sysv4 - ;; - apollo68) - basic_machine=m68k-apollo - os=sysv - ;; - apollo68bsd) - basic_machine=m68k-apollo - os=bsd - ;; - aros) - basic_machine=i386-pc - os=aros - ;; - aux) - basic_machine=m68k-apple - os=aux - ;; - balance) - basic_machine=ns32k-sequent - os=dynix - ;; - blackfin) - basic_machine=bfin-unknown - os=linux - ;; - cegcc) - basic_machine=arm-unknown - os=cegcc - ;; - convex-c1) - basic_machine=c1-convex - os=bsd - ;; - convex-c2) - basic_machine=c2-convex - os=bsd - ;; - convex-c32) - basic_machine=c32-convex - os=bsd - ;; - convex-c34) - basic_machine=c34-convex - os=bsd - ;; - convex-c38) - basic_machine=c38-convex - os=bsd - ;; - cray) - basic_machine=j90-cray - os=unicos - ;; - crds | unos) - basic_machine=m68k-crds - os= - ;; - da30) - basic_machine=m68k-da30 - os= - ;; - decstation | pmax | pmin | dec3100 | decstatn) - basic_machine=mips-dec - os= - ;; - delta88) - basic_machine=m88k-motorola - os=sysv3 - ;; - dicos) - basic_machine=i686-pc - os=dicos - ;; - djgpp) - basic_machine=i586-pc - os=msdosdjgpp - ;; - ebmon29k) - basic_machine=a29k-amd - os=ebmon - ;; - es1800 | OSE68k | ose68k | ose | OSE) - basic_machine=m68k-ericsson - os=ose - ;; - gmicro) - basic_machine=tron-gmicro - os=sysv - ;; - go32) - basic_machine=i386-pc - os=go32 - ;; - h8300hms) - basic_machine=h8300-hitachi - os=hms - ;; - h8300xray) - basic_machine=h8300-hitachi - os=xray - ;; - h8500hms) - basic_machine=h8500-hitachi - os=hms - ;; - harris) - basic_machine=m88k-harris - os=sysv3 - ;; - hp300) - basic_machine=m68k-hp - ;; - hp300bsd) - basic_machine=m68k-hp - os=bsd - ;; - hp300hpux) - basic_machine=m68k-hp - os=hpux - ;; - hppaosf) - basic_machine=hppa1.1-hp - os=osf - ;; - hppro) - basic_machine=hppa1.1-hp - os=proelf - ;; - i386mach) - basic_machine=i386-mach - os=mach - ;; - vsta) - basic_machine=i386-pc - os=vsta - ;; - isi68 | isi) - basic_machine=m68k-isi - os=sysv - ;; - m68knommu) - basic_machine=m68k-unknown - os=linux - ;; - magnum | m3230) - basic_machine=mips-mips - os=sysv - ;; - merlin) - basic_machine=ns32k-utek - os=sysv - ;; - mingw64) - basic_machine=x86_64-pc - os=mingw64 - ;; - mingw32) - basic_machine=i686-pc - os=mingw32 - ;; - mingw32ce) - basic_machine=arm-unknown - os=mingw32ce - ;; - monitor) - basic_machine=m68k-rom68k - os=coff - ;; - morphos) - basic_machine=powerpc-unknown - os=morphos - ;; - moxiebox) - basic_machine=moxie-unknown - os=moxiebox - ;; - msdos) - basic_machine=i386-pc - os=msdos - ;; - msys) - basic_machine=i686-pc - os=msys - ;; - mvs) - basic_machine=i370-ibm - os=mvs - ;; - nacl) - basic_machine=le32-unknown - os=nacl - ;; - ncr3000) - basic_machine=i486-ncr - os=sysv4 - ;; - netbsd386) - basic_machine=i386-pc - os=netbsd - ;; - netwinder) - basic_machine=armv4l-rebel - os=linux - ;; - news | news700 | news800 | news900) - basic_machine=m68k-sony - os=newsos - ;; - news1000) - basic_machine=m68030-sony - os=newsos - ;; - necv70) - basic_machine=v70-nec - os=sysv - ;; - nh3000) - basic_machine=m68k-harris - os=cxux - ;; - nh[45]000) - basic_machine=m88k-harris - os=cxux - ;; - nindy960) - basic_machine=i960-intel - os=nindy - ;; - mon960) - basic_machine=i960-intel - os=mon960 - ;; - nonstopux) - basic_machine=mips-compaq - os=nonstopux - ;; - os400) - basic_machine=powerpc-ibm - os=os400 - ;; - OSE68000 | ose68000) - basic_machine=m68000-ericsson - os=ose - ;; - os68k) - basic_machine=m68k-none - os=os68k - ;; - paragon) - basic_machine=i860-intel - os=osf - ;; - parisc) - basic_machine=hppa-unknown - os=linux - ;; - pw32) - basic_machine=i586-unknown - os=pw32 - ;; - rdos | rdos64) - basic_machine=x86_64-pc - os=rdos - ;; - rdos32) - basic_machine=i386-pc - os=rdos - ;; - rom68k) - basic_machine=m68k-rom68k - os=coff - ;; - sa29200) - basic_machine=a29k-amd - os=udi - ;; - sei) - basic_machine=mips-sei - os=seiux - ;; - sequent) - basic_machine=i386-sequent - os= - ;; - sps7) - basic_machine=m68k-bull - os=sysv2 - ;; - st2000) - basic_machine=m68k-tandem - os= - ;; - stratus) - basic_machine=i860-stratus - os=sysv4 - ;; - sun2) - basic_machine=m68000-sun - os= - ;; - sun2os3) - basic_machine=m68000-sun - os=sunos3 - ;; - sun2os4) - basic_machine=m68000-sun - os=sunos4 - ;; - sun3) - basic_machine=m68k-sun - os= - ;; - sun3os3) - basic_machine=m68k-sun - os=sunos3 - ;; - sun3os4) - basic_machine=m68k-sun - os=sunos4 - ;; - sun4) - basic_machine=sparc-sun - os= - ;; - sun4os3) - basic_machine=sparc-sun - os=sunos3 - ;; - sun4os4) - basic_machine=sparc-sun - os=sunos4 - ;; - sun4sol2) - basic_machine=sparc-sun - os=solaris2 - ;; - sun386 | sun386i | roadrunner) - basic_machine=i386-sun - os= - ;; - sv1) - basic_machine=sv1-cray - os=unicos - ;; - symmetry) - basic_machine=i386-sequent - os=dynix - ;; - t3e) - basic_machine=alphaev5-cray - os=unicos - ;; - t90) - basic_machine=t90-cray - os=unicos - ;; - toad1) - basic_machine=pdp10-xkl - os=tops20 - ;; - tpf) - basic_machine=s390x-ibm - os=tpf - ;; - udi29k) - basic_machine=a29k-amd - os=udi - ;; - ultra3) - basic_machine=a29k-nyu - os=sym1 - ;; - v810 | necv810) - basic_machine=v810-nec - os=none - ;; - vaxv) - basic_machine=vax-dec - os=sysv - ;; - vms) - basic_machine=vax-dec - os=vms - ;; - vxworks960) - basic_machine=i960-wrs - os=vxworks - ;; - vxworks68) - basic_machine=m68k-wrs - os=vxworks - ;; - vxworks29k) - basic_machine=a29k-wrs - os=vxworks - ;; - xbox) - basic_machine=i686-pc - os=mingw32 - ;; - ymp) - basic_machine=ymp-cray - os=unicos - ;; - *) - basic_machine=$1 - os= - ;; - esac - ;; -esac - -# Decode 1-component or ad-hoc basic machines -case $basic_machine in - # Here we handle the default manufacturer of certain CPU types. It is in - # some cases the only manufacturer, in others, it is the most popular. - w89k) - cpu=hppa1.1 - vendor=winbond - ;; - op50n) - cpu=hppa1.1 - vendor=oki - ;; - op60c) - cpu=hppa1.1 - vendor=oki - ;; - ibm*) - cpu=i370 - vendor=ibm - ;; - orion105) - cpu=clipper - vendor=highlevel - ;; - mac | mpw | mac-mpw) - cpu=m68k - vendor=apple - ;; - pmac | pmac-mpw) - cpu=powerpc - vendor=apple - ;; - - # Recognize the various machine names and aliases which stand - # for a CPU type and a company and sometimes even an OS. - 3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc) - cpu=m68000 - vendor=att - ;; - 3b*) - cpu=we32k - vendor=att - ;; - bluegene*) - cpu=powerpc - vendor=ibm - os=cnk - ;; - decsystem10* | dec10*) - cpu=pdp10 - vendor=dec - os=tops10 - ;; - decsystem20* | dec20*) - cpu=pdp10 - vendor=dec - os=tops20 - ;; - delta | 3300 | motorola-3300 | motorola-delta \ - | 3300-motorola | delta-motorola) - cpu=m68k - vendor=motorola - ;; - dpx2*) - cpu=m68k - vendor=bull - os=sysv3 - ;; - encore | umax | mmax) - cpu=ns32k - vendor=encore - ;; - elxsi) - cpu=elxsi - vendor=elxsi - os=${os:-bsd} - ;; - fx2800) - cpu=i860 - vendor=alliant - ;; - genix) - cpu=ns32k - vendor=ns - ;; - h3050r* | hiux*) - cpu=hppa1.1 - vendor=hitachi - os=hiuxwe2 - ;; - hp3k9[0-9][0-9] | hp9[0-9][0-9]) - cpu=hppa1.0 - vendor=hp - ;; - hp9k2[0-9][0-9] | hp9k31[0-9]) - cpu=m68000 - vendor=hp - ;; - hp9k3[2-9][0-9]) - cpu=m68k - vendor=hp - ;; - hp9k6[0-9][0-9] | hp6[0-9][0-9]) - cpu=hppa1.0 - vendor=hp - ;; - hp9k7[0-79][0-9] | hp7[0-79][0-9]) - cpu=hppa1.1 - vendor=hp - ;; - hp9k78[0-9] | hp78[0-9]) - # FIXME: really hppa2.0-hp - cpu=hppa1.1 - vendor=hp - ;; - hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893) - # FIXME: really hppa2.0-hp - cpu=hppa1.1 - vendor=hp - ;; - hp9k8[0-9][13679] | hp8[0-9][13679]) - cpu=hppa1.1 - vendor=hp - ;; - hp9k8[0-9][0-9] | hp8[0-9][0-9]) - cpu=hppa1.0 - vendor=hp - ;; - i*86v32) - cpu=`echo "$1" | sed -e 's/86.*/86/'` - vendor=pc - os=sysv32 - ;; - i*86v4*) - cpu=`echo "$1" | sed -e 's/86.*/86/'` - vendor=pc - os=sysv4 - ;; - i*86v) - cpu=`echo "$1" | sed -e 's/86.*/86/'` - vendor=pc - os=sysv - ;; - i*86sol2) - cpu=`echo "$1" | sed -e 's/86.*/86/'` - vendor=pc - os=solaris2 - ;; - j90 | j90-cray) - cpu=j90 - vendor=cray - os=${os:-unicos} - ;; - iris | iris4d) - cpu=mips - vendor=sgi - case $os in - irix*) - ;; - *) - os=irix4 - ;; - esac - ;; - miniframe) - cpu=m68000 - vendor=convergent - ;; - *mint | mint[0-9]* | *MiNT | *MiNT[0-9]*) - cpu=m68k - vendor=atari - os=mint - ;; - news-3600 | risc-news) - cpu=mips - vendor=sony - os=newsos - ;; - next | m*-next) - cpu=m68k - vendor=next - case $os in - openstep*) - ;; - nextstep*) - ;; - ns2*) - os=nextstep2 - ;; - *) - os=nextstep3 - ;; - esac - ;; - np1) - cpu=np1 - vendor=gould - ;; - op50n-* | op60c-*) - cpu=hppa1.1 - vendor=oki - os=proelf - ;; - pa-hitachi) - cpu=hppa1.1 - vendor=hitachi - os=hiuxwe2 - ;; - pbd) - cpu=sparc - vendor=tti - ;; - pbb) - cpu=m68k - vendor=tti - ;; - pc532) - cpu=ns32k - vendor=pc532 - ;; - pn) - cpu=pn - vendor=gould - ;; - power) - cpu=power - vendor=ibm - ;; - ps2) - cpu=i386 - vendor=ibm - ;; - rm[46]00) - cpu=mips - vendor=siemens - ;; - rtpc | rtpc-*) - cpu=romp - vendor=ibm - ;; - sde) - cpu=mipsisa32 - vendor=sde - os=${os:-elf} - ;; - simso-wrs) - cpu=sparclite - vendor=wrs - os=vxworks - ;; - tower | tower-32) - cpu=m68k - vendor=ncr - ;; - vpp*|vx|vx-*) - cpu=f301 - vendor=fujitsu - ;; - w65) - cpu=w65 - vendor=wdc - ;; - w89k-*) - cpu=hppa1.1 - vendor=winbond - os=proelf - ;; - none) - cpu=none - vendor=none - ;; - leon|leon[3-9]) - cpu=sparc - vendor=$basic_machine - ;; - leon-*|leon[3-9]-*) - cpu=sparc - vendor=`echo "$basic_machine" | sed 's/-.*//'` - ;; - - *-*) - # shellcheck disable=SC2162 - IFS="-" read cpu vendor <&2 - exit 1 - ;; - esac - ;; -esac - -# Here we canonicalize certain aliases for manufacturers. -case $vendor in - digital*) - vendor=dec - ;; - commodore*) - vendor=cbm - ;; - *) - ;; -esac - -# Decode manufacturer-specific aliases for certain operating systems. - -if [ x$os != x ] -then -case $os in - # First match some system type aliases that might get confused - # with valid system types. - # solaris* is a basic system type, with this one exception. - auroraux) - os=auroraux - ;; - bluegene*) - os=cnk - ;; - solaris1 | solaris1.*) - os=`echo $os | sed -e 's|solaris1|sunos4|'` - ;; - solaris) - os=solaris2 - ;; - unixware*) - os=sysv4.2uw - ;; - gnu/linux*) - os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'` - ;; - # es1800 is here to avoid being matched by es* (a different OS) - es1800*) - os=ose - ;; - # Some version numbers need modification - chorusos*) - os=chorusos - ;; - isc) - os=isc2.2 - ;; - sco6) - os=sco5v6 - ;; - sco5) - os=sco3.2v5 - ;; - sco4) - os=sco3.2v4 - ;; - sco3.2.[4-9]*) - os=`echo $os | sed -e 's/sco3.2./sco3.2v/'` - ;; - sco3.2v[4-9]* | sco5v6*) - # Don't forget version if it is 3.2v4 or newer. - ;; - scout) - # Don't match below - ;; - sco*) - os=sco3.2v2 - ;; - psos*) - os=psos - ;; - # Now accept the basic system types. - # The portable systems comes first. - # Each alternative MUST end in a * to match a version number. - # sysv* is not here because it comes later, after sysvr4. - gnu* | bsd* | mach* | minix* | genix* | ultrix* | irix* \ - | *vms* | esix* | aix* | cnk* | sunos | sunos[34]*\ - | hpux* | unos* | osf* | luna* | dgux* | auroraux* | solaris* \ - | sym* | kopensolaris* | plan9* \ - | amigaos* | amigados* | msdos* | newsos* | unicos* | aof* \ - | aos* | aros* | cloudabi* | sortix* \ - | nindy* | vxsim* | vxworks* | ebmon* | hms* | mvs* \ - | clix* | riscos* | uniplus* | iris* | isc* | rtu* | xenix* \ - | knetbsd* | mirbsd* | netbsd* \ - | bitrig* | openbsd* | solidbsd* | libertybsd* \ - | ekkobsd* | kfreebsd* | freebsd* | riscix* | lynxos* \ - | bosx* | nextstep* | cxux* | aout* | elf* | oabi* \ - | ptx* | coff* | ecoff* | winnt* | domain* | vsta* \ - | udi* | eabi* | lites* | ieee* | go32* | aux* | hcos* \ - | chorusrdb* | cegcc* | glidix* \ - | cygwin* | msys* | pe* | moss* | proelf* | rtems* \ - | midipix* | mingw32* | mingw64* | linux-gnu* | linux-android* \ - | linux-newlib* | linux-musl* | linux-uclibc* \ - | uxpv* | beos* | mpeix* | udk* | moxiebox* \ - | interix* | uwin* | mks* | rhapsody* | darwin* \ - | openstep* | oskit* | conix* | pw32* | nonstopux* \ - | storm-chaos* | tops10* | tenex* | tops20* | its* \ - | os2* | vos* | palmos* | uclinux* | nucleus* \ - | morphos* | superux* | rtmk* | windiss* \ - | powermax* | dnix* | nx6 | nx7 | sei* | dragonfly* \ - | skyos* | haiku* | rdos* | toppers* | drops* | es* \ - | onefs* | tirtos* | phoenix* | fuchsia* | redox* | bme* \ - | midnightbsd* | amdhsa* | unleashed* | emscripten* | wasi*) - # Remember, each alternative MUST END IN *, to match a version number. - ;; - qnx*) - case $cpu in - x86 | i*86) - ;; - *) - os=nto-$os - ;; - esac - ;; - hiux*) - os=hiuxwe2 - ;; - nto-qnx*) - ;; - nto*) - os=`echo $os | sed -e 's|nto|nto-qnx|'` - ;; - sim | xray | os68k* | v88r* \ - | windows* | osx | abug | netware* | os9* \ - | macos* | mpw* | magic* | mmixware* | mon960* | lnews*) - ;; - linux-dietlibc) - os=linux-dietlibc - ;; - linux*) - os=`echo $os | sed -e 's|linux|linux-gnu|'` - ;; - lynx*178) - os=lynxos178 - ;; - lynx*5) - os=lynxos5 - ;; - lynx*) - os=lynxos - ;; - mac*) - os=`echo "$os" | sed -e 's|mac|macos|'` - ;; - opened*) - os=openedition - ;; - os400*) - os=os400 - ;; - sunos5*) - os=`echo "$os" | sed -e 's|sunos5|solaris2|'` - ;; - sunos6*) - os=`echo "$os" | sed -e 's|sunos6|solaris3|'` - ;; - wince*) - os=wince - ;; - utek*) - os=bsd - ;; - dynix*) - os=bsd - ;; - acis*) - os=aos - ;; - atheos*) - os=atheos - ;; - syllable*) - os=syllable - ;; - 386bsd) - os=bsd - ;; - ctix* | uts*) - os=sysv - ;; - nova*) - os=rtmk-nova - ;; - ns2) - os=nextstep2 - ;; - nsk*) - os=nsk - ;; - # Preserve the version number of sinix5. - sinix5.*) - os=`echo $os | sed -e 's|sinix|sysv|'` - ;; - sinix*) - os=sysv4 - ;; - tpf*) - os=tpf - ;; - triton*) - os=sysv3 - ;; - oss*) - os=sysv3 - ;; - svr4*) - os=sysv4 - ;; - svr3) - os=sysv3 - ;; - sysvr4) - os=sysv4 - ;; - # This must come after sysvr4. - sysv*) - ;; - ose*) - os=ose - ;; - *mint | mint[0-9]* | *MiNT | MiNT[0-9]*) - os=mint - ;; - zvmoe) - os=zvmoe - ;; - dicos*) - os=dicos - ;; - pikeos*) - # Until real need of OS specific support for - # particular features comes up, bare metal - # configurations are quite functional. - case $cpu in - arm*) - os=eabi - ;; - *) - os=elf - ;; - esac - ;; - nacl*) - ;; - ios) - ;; - none) - ;; - *-eabi) - ;; - *) - echo Invalid configuration \`"$1"\': system \`"$os"\' not recognized 1>&2 - exit 1 - ;; -esac -else - -# Here we handle the default operating systems that come with various machines. -# The value should be what the vendor currently ships out the door with their -# machine or put another way, the most popular os provided with the machine. - -# Note that if you're going to try to match "-MANUFACTURER" here (say, -# "-sun"), then you have to tell the case statement up towards the top -# that MANUFACTURER isn't an operating system. Otherwise, code above -# will signal an error saying that MANUFACTURER isn't an operating -# system, and we'll never get to this point. - -case $cpu-$vendor in - score-*) - os=elf - ;; - spu-*) - os=elf - ;; - *-acorn) - os=riscix1.2 - ;; - arm*-rebel) - os=linux - ;; - arm*-semi) - os=aout - ;; - c4x-* | tic4x-*) - os=coff - ;; - c8051-*) - os=elf - ;; - clipper-intergraph) - os=clix - ;; - hexagon-*) - os=elf - ;; - tic54x-*) - os=coff - ;; - tic55x-*) - os=coff - ;; - tic6x-*) - os=coff - ;; - # This must come before the *-dec entry. - pdp10-*) - os=tops20 - ;; - pdp11-*) - os=none - ;; - *-dec | vax-*) - os=ultrix4.2 - ;; - m68*-apollo) - os=domain - ;; - i386-sun) - os=sunos4.0.2 - ;; - m68000-sun) - os=sunos3 - ;; - m68*-cisco) - os=aout - ;; - mep-*) - os=elf - ;; - mips*-cisco) - os=elf - ;; - mips*-*) - os=elf - ;; - or32-*) - os=coff - ;; - *-tti) # must be before sparc entry or we get the wrong os. - os=sysv3 - ;; - sparc-* | *-sun) - os=sunos4.1.1 - ;; - pru-*) - os=elf - ;; - *-be) - os=beos - ;; - *-ibm) - os=aix - ;; - *-knuth) - os=mmixware - ;; - *-wec) - os=proelf - ;; - *-winbond) - os=proelf - ;; - *-oki) - os=proelf - ;; - *-hp) - os=hpux - ;; - *-hitachi) - os=hiux - ;; - i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent) - os=sysv - ;; - *-cbm) - os=amigaos - ;; - *-dg) - os=dgux - ;; - *-dolphin) - os=sysv3 - ;; - m68k-ccur) - os=rtu - ;; - m88k-omron*) - os=luna - ;; - *-next) - os=nextstep - ;; - *-sequent) - os=ptx - ;; - *-crds) - os=unos - ;; - *-ns) - os=genix - ;; - i370-*) - os=mvs - ;; - *-gould) - os=sysv - ;; - *-highlevel) - os=bsd - ;; - *-encore) - os=bsd - ;; - *-sgi) - os=irix - ;; - *-siemens) - os=sysv4 - ;; - *-masscomp) - os=rtu - ;; - f30[01]-fujitsu | f700-fujitsu) - os=uxpv - ;; - *-rom68k) - os=coff - ;; - *-*bug) - os=coff - ;; - *-apple) - os=macos - ;; - *-atari*) - os=mint - ;; - *-wrs) - os=vxworks - ;; - *) - os=none - ;; -esac -fi - -# Here we handle the case where we know the os, and the CPU type, but not the -# manufacturer. We pick the logical manufacturer. -case $vendor in - unknown) - case $os in - riscix*) - vendor=acorn - ;; - sunos*) - vendor=sun - ;; - cnk*|-aix*) - vendor=ibm - ;; - beos*) - vendor=be - ;; - hpux*) - vendor=hp - ;; - mpeix*) - vendor=hp - ;; - hiux*) - vendor=hitachi - ;; - unos*) - vendor=crds - ;; - dgux*) - vendor=dg - ;; - luna*) - vendor=omron - ;; - genix*) - vendor=ns - ;; - clix*) - vendor=intergraph - ;; - mvs* | opened*) - vendor=ibm - ;; - os400*) - vendor=ibm - ;; - ptx*) - vendor=sequent - ;; - tpf*) - vendor=ibm - ;; - vxsim* | vxworks* | windiss*) - vendor=wrs - ;; - aux*) - vendor=apple - ;; - hms*) - vendor=hitachi - ;; - mpw* | macos*) - vendor=apple - ;; - *mint | mint[0-9]* | *MiNT | MiNT[0-9]*) - vendor=atari - ;; - vos*) - vendor=stratus - ;; - esac - ;; -esac - -echo "$cpu-$vendor-$os" -exit - -# Local variables: -# eval: (add-hook 'before-save-hook 'time-stamp) -# time-stamp-start: "timestamp='" -# time-stamp-format: "%:y-%02m-%02d" -# time-stamp-end: "'" -# End: \ No newline at end of file diff --git a/src/native/unix/support/install.sh b/src/native/unix/support/install.sh deleted file mode 100755 index bd238202..00000000 --- a/src/native/unix/support/install.sh +++ /dev/null @@ -1,128 +0,0 @@ -#!/bin/sh -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to 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. -# -## -## install.sh -- install a program, script or datafile -## -## Based on `install-sh' from the X Consortium's X11R5 distribution -## as of 89/12/18 which is freely available. -## Cleaned up for Apache's Autoconf-style Interface (APACI) -## by Ralf S. Engelschall -## -# -# This script falls under the Apache License. -# See http://www.apache.org/docs/LICENSE - - -# -# put in absolute paths if you don't have them in your path; -# or use env. vars. -# -mvprog="${MVPROG-mv}" -cpprog="${CPPROG-cp}" -chmodprog="${CHMODPROG-chmod}" -chownprog="${CHOWNPROG-chown}" -chgrpprog="${CHGRPPROG-chgrp}" -stripprog="${STRIPPROG-strip}" -rmprog="${RMPROG-rm}" - -# -# parse argument line -# -instcmd="$mvprog" -chmodcmd="" -chowncmd="" -chgrpcmd="" -stripcmd="" -rmcmd="$rmprog -f" -mvcmd="$mvprog" -ext="" -src="" -dst="" -while [ "x$1" != "x" ]; do - case $1 in - -c) instcmd="$cpprog" - shift; continue - ;; - -m) chmodcmd="$chmodprog $2" - shift; shift; continue - ;; - -o) chowncmd="$chownprog $2" - shift; shift; continue - ;; - -g) chgrpcmd="$chgrpprog $2" - shift; shift; continue - ;; - -s) stripcmd="$stripprog" - shift; continue - ;; - -S) stripcmd="$stripprog $2" - shift; shift; continue - ;; - -e) ext="$2" - shift; shift; continue - ;; - *) if [ "x$src" = "x" ]; then - src=$1 - else - dst=$1 - fi - shift; continue - ;; - esac -done -if [ "x$src" = "x" ]; then - echo "install.sh: no input file specified" - exit 1 -fi -if [ "x$dst" = "x" ]; then - echo "install.sh: no destination specified" - exit 1 -fi - -# -# If destination is a directory, append the input filename; if -# your system does not like double slashes in filenames, you may -# need to add some logic -# -if [ -d $dst ]; then - dst="$dst/`basename $src`" -fi - -# Add a possible extension (such as ".exe") to src and dst -src="$src$ext" -dst="$dst$ext" - -# Make a temp file name in the proper directory. -dstdir=`dirname $dst` -dsttmp=$dstdir/#inst.$$# - -# Move or copy the file name to the temp name -$instcmd $src $dsttmp - -# And set any options; do chmod last to preserve setuid bits -if [ "x$chowncmd" != "x" ]; then $chowncmd $dsttmp; fi -if [ "x$chgrpcmd" != "x" ]; then $chgrpcmd $dsttmp; fi -if [ "x$stripcmd" != "x" ]; then $stripcmd $dsttmp; fi -if [ "x$chmodcmd" != "x" ]; then $chmodcmd $dsttmp; fi - -# Now rename the file to the real destination. -$rmcmd $dst -$mvcmd $dsttmp $dst - -exit 0 - From 4f17a5dd73d9acabdd7d4ace07daba8c3d7a563b Mon Sep 17 00:00:00 2001 From: Gary Gregory Date: Fri, 12 Jul 2024 11:34:44 -0400 Subject: [PATCH 228/298] Javadoc --- .../org/apache/commons/daemon/support/DaemonLoader.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/main/java/org/apache/commons/daemon/support/DaemonLoader.java b/src/main/java/org/apache/commons/daemon/support/DaemonLoader.java index e3507c79..a3234303 100644 --- a/src/main/java/org/apache/commons/daemon/support/DaemonLoader.java +++ b/src/main/java/org/apache/commons/daemon/support/DaemonLoader.java @@ -60,6 +60,12 @@ public static void version() System.getProperty("commons.daemon.process.parent") + ")"); } + /** + * Checks whether the given class name can be instantiated with a zero-argument constructor. + * + * @param className The class name. + * @return true if the given class name can be instantiated, false otherwise. + */ public static boolean check(final String className) { try { From aeb0ed2f03247882848f5cae730983d7ad26b7de Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 12 Jul 2024 12:43:10 -0400 Subject: [PATCH 229/298] Bump github/codeql-action from 3.25.11 to 3.25.12 (#186) Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.25.11 to 3.25.12. - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/b611370bb5703a7efb587f9d136a52ea24c5c38c...4fa2a7953630fd2f3fb380f21be14ede0169dd4f) --- updated-dependencies: - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/codeql-analysis-cpp.yml | 4 ++-- .github/workflows/codeql-analysis-java.yml | 6 +++--- .github/workflows/scorecards-analysis.yml | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/codeql-analysis-cpp.yml b/.github/workflows/codeql-analysis-cpp.yml index 466a2178..84a7f20d 100644 --- a/.github/workflows/codeql-analysis-cpp.yml +++ b/.github/workflows/codeql-analysis-cpp.yml @@ -57,7 +57,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@b611370bb5703a7efb587f9d136a52ea24c5c38c # 3.25.11 + uses: github/codeql-action/init@4fa2a7953630fd2f3fb380f21be14ede0169dd4f # 3.25.12 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -86,4 +86,4 @@ jobs: make - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@b611370bb5703a7efb587f9d136a52ea24c5c38c # 3.25.11 + uses: github/codeql-action/analyze@4fa2a7953630fd2f3fb380f21be14ede0169dd4f # 3.25.12 diff --git a/.github/workflows/codeql-analysis-java.yml b/.github/workflows/codeql-analysis-java.yml index 16f1858c..a8e39091 100644 --- a/.github/workflows/codeql-analysis-java.yml +++ b/.github/workflows/codeql-analysis-java.yml @@ -57,7 +57,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@b611370bb5703a7efb587f9d136a52ea24c5c38c # 3.25.11 + uses: github/codeql-action/init@4fa2a7953630fd2f3fb380f21be14ede0169dd4f # 3.25.12 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -68,7 +68,7 @@ jobs: # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). # If this step fails, then you should remove it and run the build manually (see below) - name: Autobuild - uses: github/codeql-action/autobuild@b611370bb5703a7efb587f9d136a52ea24c5c38c # 3.25.11 + uses: github/codeql-action/autobuild@4fa2a7953630fd2f3fb380f21be14ede0169dd4f # 3.25.12 # ℹī¸ Command-line programs to run using the OS shell. # 📚 https://git.io/JvXDl @@ -82,4 +82,4 @@ jobs: # make release - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@b611370bb5703a7efb587f9d136a52ea24c5c38c # 3.25.11 + uses: github/codeql-action/analyze@4fa2a7953630fd2f3fb380f21be14ede0169dd4f # 3.25.12 diff --git a/.github/workflows/scorecards-analysis.yml b/.github/workflows/scorecards-analysis.yml index 9c3dcf97..381f78a9 100644 --- a/.github/workflows/scorecards-analysis.yml +++ b/.github/workflows/scorecards-analysis.yml @@ -64,6 +64,6 @@ jobs: retention-days: 5 - name: "Upload to code-scanning" - uses: github/codeql-action/upload-sarif@b611370bb5703a7efb587f9d136a52ea24c5c38c # 3.25.11 + uses: github/codeql-action/upload-sarif@4fa2a7953630fd2f3fb380f21be14ede0169dd4f # 3.25.12 with: sarif_file: results.sarif From 57d07092535f7b8ceed7da27d537e08fc7a555e1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 19 Jul 2024 14:01:10 -0400 Subject: [PATCH 230/298] Bump github/codeql-action from 3.25.12 to 3.25.13 (#187) Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.25.12 to 3.25.13. - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/4fa2a7953630fd2f3fb380f21be14ede0169dd4f...2d790406f505036ef40ecba973cc774a50395aac) --- updated-dependencies: - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/codeql-analysis-cpp.yml | 4 ++-- .github/workflows/codeql-analysis-java.yml | 6 +++--- .github/workflows/scorecards-analysis.yml | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/codeql-analysis-cpp.yml b/.github/workflows/codeql-analysis-cpp.yml index 84a7f20d..56ff8a32 100644 --- a/.github/workflows/codeql-analysis-cpp.yml +++ b/.github/workflows/codeql-analysis-cpp.yml @@ -57,7 +57,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@4fa2a7953630fd2f3fb380f21be14ede0169dd4f # 3.25.12 + uses: github/codeql-action/init@2d790406f505036ef40ecba973cc774a50395aac # 3.25.13 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -86,4 +86,4 @@ jobs: make - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@4fa2a7953630fd2f3fb380f21be14ede0169dd4f # 3.25.12 + uses: github/codeql-action/analyze@2d790406f505036ef40ecba973cc774a50395aac # 3.25.13 diff --git a/.github/workflows/codeql-analysis-java.yml b/.github/workflows/codeql-analysis-java.yml index a8e39091..824e498d 100644 --- a/.github/workflows/codeql-analysis-java.yml +++ b/.github/workflows/codeql-analysis-java.yml @@ -57,7 +57,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@4fa2a7953630fd2f3fb380f21be14ede0169dd4f # 3.25.12 + uses: github/codeql-action/init@2d790406f505036ef40ecba973cc774a50395aac # 3.25.13 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -68,7 +68,7 @@ jobs: # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). # If this step fails, then you should remove it and run the build manually (see below) - name: Autobuild - uses: github/codeql-action/autobuild@4fa2a7953630fd2f3fb380f21be14ede0169dd4f # 3.25.12 + uses: github/codeql-action/autobuild@2d790406f505036ef40ecba973cc774a50395aac # 3.25.13 # ℹī¸ Command-line programs to run using the OS shell. # 📚 https://git.io/JvXDl @@ -82,4 +82,4 @@ jobs: # make release - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@4fa2a7953630fd2f3fb380f21be14ede0169dd4f # 3.25.12 + uses: github/codeql-action/analyze@2d790406f505036ef40ecba973cc774a50395aac # 3.25.13 diff --git a/.github/workflows/scorecards-analysis.yml b/.github/workflows/scorecards-analysis.yml index 381f78a9..5954d572 100644 --- a/.github/workflows/scorecards-analysis.yml +++ b/.github/workflows/scorecards-analysis.yml @@ -64,6 +64,6 @@ jobs: retention-days: 5 - name: "Upload to code-scanning" - uses: github/codeql-action/upload-sarif@4fa2a7953630fd2f3fb380f21be14ede0169dd4f # 3.25.12 + uses: github/codeql-action/upload-sarif@2d790406f505036ef40ecba973cc774a50395aac # 3.25.13 with: sarif_file: results.sarif From 58915139a87616f3ae40d7f826142cb472c06859 Mon Sep 17 00:00:00 2001 From: Gary Gregory Date: Sun, 21 Jul 2024 11:28:35 -0400 Subject: [PATCH 231/298] Javadoc Use HTML 'em' tag instead of 'i' tag --- src/main/java/org/apache/commons/daemon/Daemon.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/apache/commons/daemon/Daemon.java b/src/main/java/org/apache/commons/daemon/Daemon.java index a2ff8cc8..fd2cb0c8 100644 --- a/src/main/java/org/apache/commons/daemon/Daemon.java +++ b/src/main/java/org/apache/commons/daemon/Daemon.java @@ -42,12 +42,12 @@ public interface Daemon *

      * Under certain operating systems (typically UNIX based operating * systems) and if the native invocation framework is configured to do - * so, this method might be called with super-user privileges. + * so, this method might be called with super-user privileges. *

      *

      * For example, it might be wise to create {@code ServerSocket} * instances within the scope of this method, and perform all operations - * requiring super-user privileges in the underlying operating + * requiring super-user privileges in the underlying operating * system. *

      *

      From ee2a2b51ef7441f199bdd08580b035571cd500e3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 26 Jul 2024 14:05:48 -0400 Subject: [PATCH 232/298] Bump github/codeql-action from 3.25.13 to 3.25.15 (#188) Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.25.13 to 3.25.15. - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/2d790406f505036ef40ecba973cc774a50395aac...afb54ba388a7dca6ecae48f608c4ff05ff4cc77a) --- updated-dependencies: - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/codeql-analysis-cpp.yml | 4 ++-- .github/workflows/codeql-analysis-java.yml | 6 +++--- .github/workflows/scorecards-analysis.yml | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/codeql-analysis-cpp.yml b/.github/workflows/codeql-analysis-cpp.yml index 56ff8a32..b5f599fa 100644 --- a/.github/workflows/codeql-analysis-cpp.yml +++ b/.github/workflows/codeql-analysis-cpp.yml @@ -57,7 +57,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@2d790406f505036ef40ecba973cc774a50395aac # 3.25.13 + uses: github/codeql-action/init@afb54ba388a7dca6ecae48f608c4ff05ff4cc77a # 3.25.15 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -86,4 +86,4 @@ jobs: make - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@2d790406f505036ef40ecba973cc774a50395aac # 3.25.13 + uses: github/codeql-action/analyze@afb54ba388a7dca6ecae48f608c4ff05ff4cc77a # 3.25.15 diff --git a/.github/workflows/codeql-analysis-java.yml b/.github/workflows/codeql-analysis-java.yml index 824e498d..8bba14c6 100644 --- a/.github/workflows/codeql-analysis-java.yml +++ b/.github/workflows/codeql-analysis-java.yml @@ -57,7 +57,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@2d790406f505036ef40ecba973cc774a50395aac # 3.25.13 + uses: github/codeql-action/init@afb54ba388a7dca6ecae48f608c4ff05ff4cc77a # 3.25.15 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -68,7 +68,7 @@ jobs: # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). # If this step fails, then you should remove it and run the build manually (see below) - name: Autobuild - uses: github/codeql-action/autobuild@2d790406f505036ef40ecba973cc774a50395aac # 3.25.13 + uses: github/codeql-action/autobuild@afb54ba388a7dca6ecae48f608c4ff05ff4cc77a # 3.25.15 # ℹī¸ Command-line programs to run using the OS shell. # 📚 https://git.io/JvXDl @@ -82,4 +82,4 @@ jobs: # make release - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@2d790406f505036ef40ecba973cc774a50395aac # 3.25.13 + uses: github/codeql-action/analyze@afb54ba388a7dca6ecae48f608c4ff05ff4cc77a # 3.25.15 diff --git a/.github/workflows/scorecards-analysis.yml b/.github/workflows/scorecards-analysis.yml index 5954d572..52798abf 100644 --- a/.github/workflows/scorecards-analysis.yml +++ b/.github/workflows/scorecards-analysis.yml @@ -64,6 +64,6 @@ jobs: retention-days: 5 - name: "Upload to code-scanning" - uses: github/codeql-action/upload-sarif@2d790406f505036ef40ecba973cc774a50395aac # 3.25.13 + uses: github/codeql-action/upload-sarif@afb54ba388a7dca6ecae48f608c4ff05ff4cc77a # 3.25.15 with: sarif_file: results.sarif From f7b94e779db8c6090e19770333ba26a10a931f27 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 26 Jul 2024 20:54:53 -0400 Subject: [PATCH 233/298] Bump org.apache.commons:commons-parent from 71 to 72 (#189) Bumps [org.apache.commons:commons-parent](https://github.com/apache/commons-parent) from 71 to 72. - [Changelog](https://github.com/apache/commons-parent/blob/master/RELEASE-NOTES.txt) - [Commits](https://github.com/apache/commons-parent/commits) --- updated-dependencies: - dependency-name: org.apache.commons:commons-parent dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c744e2b9..30bfca6c 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ org.apache.commons commons-parent - 71 + 72 4.0.0 commons-daemon From e5a9888206d19cdb66fd27d4817d0883d320e402 Mon Sep 17 00:00:00 2001 From: Gary Gregory Date: Fri, 26 Jul 2024 20:56:01 -0400 Subject: [PATCH 234/298] Bump org.apache.commons:commons-parent from 71 to 72 #189 --- src/changes/changes.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/changes/changes.xml b/src/changes/changes.xml index da16b564..2b3e95f1 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -47,6 +47,9 @@ Remove autogenerated files and rely on autoreconf only. + + Bump org.apache.commons:commons-parent from 71 to 72 #189. + From a9781f9b7d79e74bbfda0cd816059dfc5ee57c5a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 2 Aug 2024 13:12:36 -0400 Subject: [PATCH 235/298] Bump ossf/scorecard-action from 2.3.3 to 2.4.0 (#190) Bumps [ossf/scorecard-action](https://github.com/ossf/scorecard-action) from 2.3.3 to 2.4.0. - [Release notes](https://github.com/ossf/scorecard-action/releases) - [Changelog](https://github.com/ossf/scorecard-action/blob/main/RELEASE.md) - [Commits](https://github.com/ossf/scorecard-action/compare/dc50aa9510b46c811795eb24b2f1ba02a914e534...62b2cac7ed8198b15735ed49ab1e5cf35480ba46) --- updated-dependencies: - dependency-name: ossf/scorecard-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/scorecards-analysis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/scorecards-analysis.yml b/.github/workflows/scorecards-analysis.yml index 52798abf..b7e50232 100644 --- a/.github/workflows/scorecards-analysis.yml +++ b/.github/workflows/scorecards-analysis.yml @@ -45,7 +45,7 @@ jobs: persist-credentials: false - name: "Run analysis" - uses: ossf/scorecard-action@dc50aa9510b46c811795eb24b2f1ba02a914e534 # 2.3.3 + uses: ossf/scorecard-action@62b2cac7ed8198b15735ed49ab1e5cf35480ba46 # 2.4.0 with: results_file: results.sarif results_format: sarif From 19c57fc3850055b12de672e41c32dbce1430c4f3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 2 Aug 2024 13:12:48 -0400 Subject: [PATCH 236/298] Bump actions/upload-artifact from 4.3.4 to 4.3.5 (#191) Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 4.3.4 to 4.3.5. - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](https://github.com/actions/upload-artifact/compare/0b2256b8c012f0828dc542b3febcab082c67f72b...89ef406dd8d7e03cfd12d9e0a4a378f454709029) --- updated-dependencies: - dependency-name: actions/upload-artifact dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/scorecards-analysis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/scorecards-analysis.yml b/.github/workflows/scorecards-analysis.yml index b7e50232..7455adde 100644 --- a/.github/workflows/scorecards-analysis.yml +++ b/.github/workflows/scorecards-analysis.yml @@ -57,7 +57,7 @@ jobs: publish_results: true - name: "Upload artifact" - uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # 4.3.4 + uses: actions/upload-artifact@89ef406dd8d7e03cfd12d9e0a4a378f454709029 # 4.3.5 with: name: SARIF file path: results.sarif From 6f27754c60694e44bba479251b09d3452ce2b404 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 9 Aug 2024 12:55:24 -0400 Subject: [PATCH 237/298] Bump actions/setup-java from 4.2.1 to 4.2.2 (#192) Bumps [actions/setup-java](https://github.com/actions/setup-java) from 4.2.1 to 4.2.2. - [Release notes](https://github.com/actions/setup-java/releases) - [Commits](https://github.com/actions/setup-java/compare/99b8673ff64fbf99d8d325f52d9a5bdedb8483e9...6a0805fcefea3d4657a47ac4c165951e33482018) --- updated-dependencies: - dependency-name: actions/setup-java dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/maven.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 66b3b54c..c12bd189 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -45,7 +45,7 @@ jobs: restore-keys: | ${{ runner.os }}-maven- - name: Set up JDK ${{ matrix.java }} - uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1 + uses: actions/setup-java@6a0805fcefea3d4657a47ac4c165951e33482018 # v4.2.2 with: distribution: 'temurin' java-version: ${{ matrix.java }} From f89879bcb64df1ed1604153451321d366dec9432 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 9 Aug 2024 12:55:35 -0400 Subject: [PATCH 238/298] Bump actions/upload-artifact from 4.3.5 to 4.3.6 (#194) Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 4.3.5 to 4.3.6. - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](https://github.com/actions/upload-artifact/compare/89ef406dd8d7e03cfd12d9e0a4a378f454709029...834a144ee995460fba8ed112a2fc961b36a5ec5a) --- updated-dependencies: - dependency-name: actions/upload-artifact dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/scorecards-analysis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/scorecards-analysis.yml b/.github/workflows/scorecards-analysis.yml index 7455adde..71dd669a 100644 --- a/.github/workflows/scorecards-analysis.yml +++ b/.github/workflows/scorecards-analysis.yml @@ -57,7 +57,7 @@ jobs: publish_results: true - name: "Upload artifact" - uses: actions/upload-artifact@89ef406dd8d7e03cfd12d9e0a4a378f454709029 # 4.3.5 + uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a # 4.3.6 with: name: SARIF file path: results.sarif From 9d782c5303bd28d70a7c3ff3b11b04dba70d7b94 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 9 Aug 2024 12:55:46 -0400 Subject: [PATCH 239/298] Bump github/codeql-action from 3.25.15 to 3.26.0 (#193) Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.25.15 to 3.26.0. - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/afb54ba388a7dca6ecae48f608c4ff05ff4cc77a...eb055d739abdc2e8de2e5f4ba1a8b246daa779aa) --- updated-dependencies: - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/codeql-analysis-cpp.yml | 4 ++-- .github/workflows/codeql-analysis-java.yml | 6 +++--- .github/workflows/scorecards-analysis.yml | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/codeql-analysis-cpp.yml b/.github/workflows/codeql-analysis-cpp.yml index b5f599fa..147c0f06 100644 --- a/.github/workflows/codeql-analysis-cpp.yml +++ b/.github/workflows/codeql-analysis-cpp.yml @@ -57,7 +57,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@afb54ba388a7dca6ecae48f608c4ff05ff4cc77a # 3.25.15 + uses: github/codeql-action/init@eb055d739abdc2e8de2e5f4ba1a8b246daa779aa # 3.26.0 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -86,4 +86,4 @@ jobs: make - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@afb54ba388a7dca6ecae48f608c4ff05ff4cc77a # 3.25.15 + uses: github/codeql-action/analyze@eb055d739abdc2e8de2e5f4ba1a8b246daa779aa # 3.26.0 diff --git a/.github/workflows/codeql-analysis-java.yml b/.github/workflows/codeql-analysis-java.yml index 8bba14c6..3d5ecd07 100644 --- a/.github/workflows/codeql-analysis-java.yml +++ b/.github/workflows/codeql-analysis-java.yml @@ -57,7 +57,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@afb54ba388a7dca6ecae48f608c4ff05ff4cc77a # 3.25.15 + uses: github/codeql-action/init@eb055d739abdc2e8de2e5f4ba1a8b246daa779aa # 3.26.0 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -68,7 +68,7 @@ jobs: # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). # If this step fails, then you should remove it and run the build manually (see below) - name: Autobuild - uses: github/codeql-action/autobuild@afb54ba388a7dca6ecae48f608c4ff05ff4cc77a # 3.25.15 + uses: github/codeql-action/autobuild@eb055d739abdc2e8de2e5f4ba1a8b246daa779aa # 3.26.0 # ℹī¸ Command-line programs to run using the OS shell. # 📚 https://git.io/JvXDl @@ -82,4 +82,4 @@ jobs: # make release - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@afb54ba388a7dca6ecae48f608c4ff05ff4cc77a # 3.25.15 + uses: github/codeql-action/analyze@eb055d739abdc2e8de2e5f4ba1a8b246daa779aa # 3.26.0 diff --git a/.github/workflows/scorecards-analysis.yml b/.github/workflows/scorecards-analysis.yml index 71dd669a..bb13f9c0 100644 --- a/.github/workflows/scorecards-analysis.yml +++ b/.github/workflows/scorecards-analysis.yml @@ -64,6 +64,6 @@ jobs: retention-days: 5 - name: "Upload to code-scanning" - uses: github/codeql-action/upload-sarif@afb54ba388a7dca6ecae48f608c4ff05ff4cc77a # 3.25.15 + uses: github/codeql-action/upload-sarif@eb055d739abdc2e8de2e5f4ba1a8b246daa779aa # 3.26.0 with: sarif_file: results.sarif From 8c4d07c4791aca62c052beb81b145e2c2faa1e44 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 16 Aug 2024 15:44:14 -0400 Subject: [PATCH 240/298] Bump github/codeql-action from 3.26.0 to 3.26.2 (#195) Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.26.0 to 3.26.2. - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/eb055d739abdc2e8de2e5f4ba1a8b246daa779aa...429e1977040da7a23b6822b13c129cd1ba93dbb2) --- updated-dependencies: - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/codeql-analysis-cpp.yml | 4 ++-- .github/workflows/codeql-analysis-java.yml | 6 +++--- .github/workflows/scorecards-analysis.yml | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/codeql-analysis-cpp.yml b/.github/workflows/codeql-analysis-cpp.yml index 147c0f06..4912d835 100644 --- a/.github/workflows/codeql-analysis-cpp.yml +++ b/.github/workflows/codeql-analysis-cpp.yml @@ -57,7 +57,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@eb055d739abdc2e8de2e5f4ba1a8b246daa779aa # 3.26.0 + uses: github/codeql-action/init@429e1977040da7a23b6822b13c129cd1ba93dbb2 # 3.26.2 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -86,4 +86,4 @@ jobs: make - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@eb055d739abdc2e8de2e5f4ba1a8b246daa779aa # 3.26.0 + uses: github/codeql-action/analyze@429e1977040da7a23b6822b13c129cd1ba93dbb2 # 3.26.2 diff --git a/.github/workflows/codeql-analysis-java.yml b/.github/workflows/codeql-analysis-java.yml index 3d5ecd07..670d5bde 100644 --- a/.github/workflows/codeql-analysis-java.yml +++ b/.github/workflows/codeql-analysis-java.yml @@ -57,7 +57,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@eb055d739abdc2e8de2e5f4ba1a8b246daa779aa # 3.26.0 + uses: github/codeql-action/init@429e1977040da7a23b6822b13c129cd1ba93dbb2 # 3.26.2 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -68,7 +68,7 @@ jobs: # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). # If this step fails, then you should remove it and run the build manually (see below) - name: Autobuild - uses: github/codeql-action/autobuild@eb055d739abdc2e8de2e5f4ba1a8b246daa779aa # 3.26.0 + uses: github/codeql-action/autobuild@429e1977040da7a23b6822b13c129cd1ba93dbb2 # 3.26.2 # ℹī¸ Command-line programs to run using the OS shell. # 📚 https://git.io/JvXDl @@ -82,4 +82,4 @@ jobs: # make release - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@eb055d739abdc2e8de2e5f4ba1a8b246daa779aa # 3.26.0 + uses: github/codeql-action/analyze@429e1977040da7a23b6822b13c129cd1ba93dbb2 # 3.26.2 diff --git a/.github/workflows/scorecards-analysis.yml b/.github/workflows/scorecards-analysis.yml index bb13f9c0..5ddf1e85 100644 --- a/.github/workflows/scorecards-analysis.yml +++ b/.github/workflows/scorecards-analysis.yml @@ -64,6 +64,6 @@ jobs: retention-days: 5 - name: "Upload to code-scanning" - uses: github/codeql-action/upload-sarif@eb055d739abdc2e8de2e5f4ba1a8b246daa779aa # 3.26.0 + uses: github/codeql-action/upload-sarif@429e1977040da7a23b6822b13c129cd1ba93dbb2 # 3.26.2 with: sarif_file: results.sarif From 8fe3e3c264b10809dfd8d9ce21386dd280d89382 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 18 Aug 2024 10:52:39 -0400 Subject: [PATCH 241/298] Bump org.apache.commons:commons-parent from 72 to 73 (#196) Bumps [org.apache.commons:commons-parent](https://github.com/apache/commons-parent) from 72 to 73. - [Changelog](https://github.com/apache/commons-parent/blob/master/RELEASE-NOTES.txt) - [Commits](https://github.com/apache/commons-parent/commits) --- updated-dependencies: - dependency-name: org.apache.commons:commons-parent dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 30bfca6c..9e099c91 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ org.apache.commons commons-parent - 72 + 73 4.0.0 commons-daemon From 20d369184eb9db290047ea693f398471c731953f Mon Sep 17 00:00:00 2001 From: Gary Gregory Date: Sun, 18 Aug 2024 10:53:08 -0400 Subject: [PATCH 242/298] Bump org.apache.commons:commons-parent from 72 to 73 #196 --- src/changes/changes.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/changes/changes.xml b/src/changes/changes.xml index 2b3e95f1..06909f55 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -48,7 +48,7 @@ Remove autogenerated files and rely on autoreconf only. - Bump org.apache.commons:commons-parent from 71 to 72 #189. + Bump org.apache.commons:commons-parent from 71 to 73 #189, #196. From 83001cbe26aebdd4cb003566ebffae9ceb0605c6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 23 Aug 2024 12:24:13 -0400 Subject: [PATCH 243/298] Bump github/codeql-action from 3.26.2 to 3.26.4 (#197) Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.26.2 to 3.26.4. - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/429e1977040da7a23b6822b13c129cd1ba93dbb2...f0f3afee809481da311ca3a6ff1ff51d81dbeb24) --- updated-dependencies: - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/codeql-analysis-cpp.yml | 4 ++-- .github/workflows/codeql-analysis-java.yml | 6 +++--- .github/workflows/scorecards-analysis.yml | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/codeql-analysis-cpp.yml b/.github/workflows/codeql-analysis-cpp.yml index 4912d835..a818effd 100644 --- a/.github/workflows/codeql-analysis-cpp.yml +++ b/.github/workflows/codeql-analysis-cpp.yml @@ -57,7 +57,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@429e1977040da7a23b6822b13c129cd1ba93dbb2 # 3.26.2 + uses: github/codeql-action/init@f0f3afee809481da311ca3a6ff1ff51d81dbeb24 # 3.26.4 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -86,4 +86,4 @@ jobs: make - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@429e1977040da7a23b6822b13c129cd1ba93dbb2 # 3.26.2 + uses: github/codeql-action/analyze@f0f3afee809481da311ca3a6ff1ff51d81dbeb24 # 3.26.4 diff --git a/.github/workflows/codeql-analysis-java.yml b/.github/workflows/codeql-analysis-java.yml index 670d5bde..8bc78e42 100644 --- a/.github/workflows/codeql-analysis-java.yml +++ b/.github/workflows/codeql-analysis-java.yml @@ -57,7 +57,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@429e1977040da7a23b6822b13c129cd1ba93dbb2 # 3.26.2 + uses: github/codeql-action/init@f0f3afee809481da311ca3a6ff1ff51d81dbeb24 # 3.26.4 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -68,7 +68,7 @@ jobs: # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). # If this step fails, then you should remove it and run the build manually (see below) - name: Autobuild - uses: github/codeql-action/autobuild@429e1977040da7a23b6822b13c129cd1ba93dbb2 # 3.26.2 + uses: github/codeql-action/autobuild@f0f3afee809481da311ca3a6ff1ff51d81dbeb24 # 3.26.4 # ℹī¸ Command-line programs to run using the OS shell. # 📚 https://git.io/JvXDl @@ -82,4 +82,4 @@ jobs: # make release - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@429e1977040da7a23b6822b13c129cd1ba93dbb2 # 3.26.2 + uses: github/codeql-action/analyze@f0f3afee809481da311ca3a6ff1ff51d81dbeb24 # 3.26.4 diff --git a/.github/workflows/scorecards-analysis.yml b/.github/workflows/scorecards-analysis.yml index 5ddf1e85..83eee00d 100644 --- a/.github/workflows/scorecards-analysis.yml +++ b/.github/workflows/scorecards-analysis.yml @@ -64,6 +64,6 @@ jobs: retention-days: 5 - name: "Upload to code-scanning" - uses: github/codeql-action/upload-sarif@429e1977040da7a23b6822b13c129cd1ba93dbb2 # 3.26.2 + uses: github/codeql-action/upload-sarif@f0f3afee809481da311ca3a6ff1ff51d81dbeb24 # 3.26.4 with: sarif_file: results.sarif From 5c4bf89b298ace500c57fc3bd7a0847594e3c389 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 29 Aug 2024 08:14:24 -0400 Subject: [PATCH 244/298] Bump org.apache.commons:commons-parent from 73 to 74 (#198) Bumps [org.apache.commons:commons-parent](https://github.com/apache/commons-parent) from 73 to 74. - [Changelog](https://github.com/apache/commons-parent/blob/master/RELEASE-NOTES.txt) - [Commits](https://github.com/apache/commons-parent/commits) --- updated-dependencies: - dependency-name: org.apache.commons:commons-parent dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9e099c91..571e24ef 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ org.apache.commons commons-parent - 73 + 74 4.0.0 commons-daemon From cbb5561b8a004e0b1e47708d7e95ff1b5a59c405 Mon Sep 17 00:00:00 2001 From: Gary Gregory Date: Thu, 29 Aug 2024 08:14:50 -0400 Subject: [PATCH 245/298] Bump org.apache.commons:commons-parent from 73 to 74 #198 --- src/changes/changes.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/changes/changes.xml b/src/changes/changes.xml index 06909f55..94862b7e 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -48,7 +48,7 @@ Remove autogenerated files and rely on autoreconf only. - Bump org.apache.commons:commons-parent from 71 to 73 #189, #196. + Bump org.apache.commons:commons-parent from 71 to 74 #189, #196, #198. From bb6dbc121f4910331cbc514ff1999c33196644e4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 30 Aug 2024 12:32:54 -0400 Subject: [PATCH 246/298] Bump github/codeql-action from 3.26.4 to 3.26.6 (#199) Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.26.4 to 3.26.6. - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/f0f3afee809481da311ca3a6ff1ff51d81dbeb24...4dd16135b69a43b6c8efb853346f8437d92d3c93) --- updated-dependencies: - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/codeql-analysis-cpp.yml | 4 ++-- .github/workflows/codeql-analysis-java.yml | 6 +++--- .github/workflows/scorecards-analysis.yml | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/codeql-analysis-cpp.yml b/.github/workflows/codeql-analysis-cpp.yml index a818effd..30e51f84 100644 --- a/.github/workflows/codeql-analysis-cpp.yml +++ b/.github/workflows/codeql-analysis-cpp.yml @@ -57,7 +57,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@f0f3afee809481da311ca3a6ff1ff51d81dbeb24 # 3.26.4 + uses: github/codeql-action/init@4dd16135b69a43b6c8efb853346f8437d92d3c93 # 3.26.6 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -86,4 +86,4 @@ jobs: make - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@f0f3afee809481da311ca3a6ff1ff51d81dbeb24 # 3.26.4 + uses: github/codeql-action/analyze@4dd16135b69a43b6c8efb853346f8437d92d3c93 # 3.26.6 diff --git a/.github/workflows/codeql-analysis-java.yml b/.github/workflows/codeql-analysis-java.yml index 8bc78e42..9158e663 100644 --- a/.github/workflows/codeql-analysis-java.yml +++ b/.github/workflows/codeql-analysis-java.yml @@ -57,7 +57,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@f0f3afee809481da311ca3a6ff1ff51d81dbeb24 # 3.26.4 + uses: github/codeql-action/init@4dd16135b69a43b6c8efb853346f8437d92d3c93 # 3.26.6 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -68,7 +68,7 @@ jobs: # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). # If this step fails, then you should remove it and run the build manually (see below) - name: Autobuild - uses: github/codeql-action/autobuild@f0f3afee809481da311ca3a6ff1ff51d81dbeb24 # 3.26.4 + uses: github/codeql-action/autobuild@4dd16135b69a43b6c8efb853346f8437d92d3c93 # 3.26.6 # ℹī¸ Command-line programs to run using the OS shell. # 📚 https://git.io/JvXDl @@ -82,4 +82,4 @@ jobs: # make release - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@f0f3afee809481da311ca3a6ff1ff51d81dbeb24 # 3.26.4 + uses: github/codeql-action/analyze@4dd16135b69a43b6c8efb853346f8437d92d3c93 # 3.26.6 diff --git a/.github/workflows/scorecards-analysis.yml b/.github/workflows/scorecards-analysis.yml index 83eee00d..da2deb78 100644 --- a/.github/workflows/scorecards-analysis.yml +++ b/.github/workflows/scorecards-analysis.yml @@ -64,6 +64,6 @@ jobs: retention-days: 5 - name: "Upload to code-scanning" - uses: github/codeql-action/upload-sarif@f0f3afee809481da311ca3a6ff1ff51d81dbeb24 # 3.26.4 + uses: github/codeql-action/upload-sarif@4dd16135b69a43b6c8efb853346f8437d92d3c93 # 3.26.6 with: sarif_file: results.sarif From 89c3221e2a46b700002633234710377ad86939bf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 6 Sep 2024 09:10:08 -0700 Subject: [PATCH 247/298] Bump actions/upload-artifact from 4.3.6 to 4.4.0 (#200) Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 4.3.6 to 4.4.0. - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](https://github.com/actions/upload-artifact/compare/834a144ee995460fba8ed112a2fc961b36a5ec5a...50769540e7f4bd5e21e526ee35c689e35e0d6874) --- updated-dependencies: - dependency-name: actions/upload-artifact dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/scorecards-analysis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/scorecards-analysis.yml b/.github/workflows/scorecards-analysis.yml index da2deb78..c18f0c3f 100644 --- a/.github/workflows/scorecards-analysis.yml +++ b/.github/workflows/scorecards-analysis.yml @@ -57,7 +57,7 @@ jobs: publish_results: true - name: "Upload artifact" - uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a # 4.3.6 + uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # 4.4.0 with: name: SARIF file path: results.sarif From d175494936e38f419ed7d04509ce6ce952779bd7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 13 Sep 2024 13:12:16 -0400 Subject: [PATCH 248/298] Bump github/codeql-action from 3.26.6 to 3.26.7 (#201) Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.26.6 to 3.26.7. - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/4dd16135b69a43b6c8efb853346f8437d92d3c93...8214744c546c1e5c8f03dde8fab3a7353211988d) --- updated-dependencies: - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/codeql-analysis-cpp.yml | 4 ++-- .github/workflows/codeql-analysis-java.yml | 6 +++--- .github/workflows/scorecards-analysis.yml | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/codeql-analysis-cpp.yml b/.github/workflows/codeql-analysis-cpp.yml index 30e51f84..e72e6213 100644 --- a/.github/workflows/codeql-analysis-cpp.yml +++ b/.github/workflows/codeql-analysis-cpp.yml @@ -57,7 +57,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@4dd16135b69a43b6c8efb853346f8437d92d3c93 # 3.26.6 + uses: github/codeql-action/init@8214744c546c1e5c8f03dde8fab3a7353211988d # 3.26.7 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -86,4 +86,4 @@ jobs: make - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@4dd16135b69a43b6c8efb853346f8437d92d3c93 # 3.26.6 + uses: github/codeql-action/analyze@8214744c546c1e5c8f03dde8fab3a7353211988d # 3.26.7 diff --git a/.github/workflows/codeql-analysis-java.yml b/.github/workflows/codeql-analysis-java.yml index 9158e663..51210e04 100644 --- a/.github/workflows/codeql-analysis-java.yml +++ b/.github/workflows/codeql-analysis-java.yml @@ -57,7 +57,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@4dd16135b69a43b6c8efb853346f8437d92d3c93 # 3.26.6 + uses: github/codeql-action/init@8214744c546c1e5c8f03dde8fab3a7353211988d # 3.26.7 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -68,7 +68,7 @@ jobs: # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). # If this step fails, then you should remove it and run the build manually (see below) - name: Autobuild - uses: github/codeql-action/autobuild@4dd16135b69a43b6c8efb853346f8437d92d3c93 # 3.26.6 + uses: github/codeql-action/autobuild@8214744c546c1e5c8f03dde8fab3a7353211988d # 3.26.7 # ℹī¸ Command-line programs to run using the OS shell. # 📚 https://git.io/JvXDl @@ -82,4 +82,4 @@ jobs: # make release - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@4dd16135b69a43b6c8efb853346f8437d92d3c93 # 3.26.6 + uses: github/codeql-action/analyze@8214744c546c1e5c8f03dde8fab3a7353211988d # 3.26.7 diff --git a/.github/workflows/scorecards-analysis.yml b/.github/workflows/scorecards-analysis.yml index c18f0c3f..3f44c429 100644 --- a/.github/workflows/scorecards-analysis.yml +++ b/.github/workflows/scorecards-analysis.yml @@ -64,6 +64,6 @@ jobs: retention-days: 5 - name: "Upload to code-scanning" - uses: github/codeql-action/upload-sarif@4dd16135b69a43b6c8efb853346f8437d92d3c93 # 3.26.6 + uses: github/codeql-action/upload-sarif@8214744c546c1e5c8f03dde8fab3a7353211988d # 3.26.7 with: sarif_file: results.sarif From a142b809281b133a691f2257daf9a6fbc26582e2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 13 Sep 2024 13:12:26 -0400 Subject: [PATCH 249/298] Bump actions/setup-java from 4.2.2 to 4.3.0 (#202) Bumps [actions/setup-java](https://github.com/actions/setup-java) from 4.2.2 to 4.3.0. - [Release notes](https://github.com/actions/setup-java/releases) - [Commits](https://github.com/actions/setup-java/compare/6a0805fcefea3d4657a47ac4c165951e33482018...2dfa2011c5b2a0f1489bf9e433881c92c1631f88) --- updated-dependencies: - dependency-name: actions/setup-java dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/maven.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index c12bd189..5f160a3c 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -45,7 +45,7 @@ jobs: restore-keys: | ${{ runner.os }}-maven- - name: Set up JDK ${{ matrix.java }} - uses: actions/setup-java@6a0805fcefea3d4657a47ac4c165951e33482018 # v4.2.2 + uses: actions/setup-java@2dfa2011c5b2a0f1489bf9e433881c92c1631f88 # v4.3.0 with: distribution: 'temurin' java-version: ${{ matrix.java }} From f26dbd86fc5c9865513f111597e5701438554519 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 20 Sep 2024 13:03:02 -0400 Subject: [PATCH 250/298] Bump github/codeql-action from 3.26.7 to 3.26.8 (#203) Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.26.7 to 3.26.8. - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/8214744c546c1e5c8f03dde8fab3a7353211988d...294a9d92911152fe08befb9ec03e240add280cb3) --- updated-dependencies: - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/codeql-analysis-cpp.yml | 4 ++-- .github/workflows/codeql-analysis-java.yml | 6 +++--- .github/workflows/scorecards-analysis.yml | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/codeql-analysis-cpp.yml b/.github/workflows/codeql-analysis-cpp.yml index e72e6213..56b2eed2 100644 --- a/.github/workflows/codeql-analysis-cpp.yml +++ b/.github/workflows/codeql-analysis-cpp.yml @@ -57,7 +57,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@8214744c546c1e5c8f03dde8fab3a7353211988d # 3.26.7 + uses: github/codeql-action/init@294a9d92911152fe08befb9ec03e240add280cb3 # 3.26.8 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -86,4 +86,4 @@ jobs: make - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@8214744c546c1e5c8f03dde8fab3a7353211988d # 3.26.7 + uses: github/codeql-action/analyze@294a9d92911152fe08befb9ec03e240add280cb3 # 3.26.8 diff --git a/.github/workflows/codeql-analysis-java.yml b/.github/workflows/codeql-analysis-java.yml index 51210e04..e23d4f5e 100644 --- a/.github/workflows/codeql-analysis-java.yml +++ b/.github/workflows/codeql-analysis-java.yml @@ -57,7 +57,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@8214744c546c1e5c8f03dde8fab3a7353211988d # 3.26.7 + uses: github/codeql-action/init@294a9d92911152fe08befb9ec03e240add280cb3 # 3.26.8 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -68,7 +68,7 @@ jobs: # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). # If this step fails, then you should remove it and run the build manually (see below) - name: Autobuild - uses: github/codeql-action/autobuild@8214744c546c1e5c8f03dde8fab3a7353211988d # 3.26.7 + uses: github/codeql-action/autobuild@294a9d92911152fe08befb9ec03e240add280cb3 # 3.26.8 # ℹī¸ Command-line programs to run using the OS shell. # 📚 https://git.io/JvXDl @@ -82,4 +82,4 @@ jobs: # make release - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@8214744c546c1e5c8f03dde8fab3a7353211988d # 3.26.7 + uses: github/codeql-action/analyze@294a9d92911152fe08befb9ec03e240add280cb3 # 3.26.8 diff --git a/.github/workflows/scorecards-analysis.yml b/.github/workflows/scorecards-analysis.yml index 3f44c429..f80c265c 100644 --- a/.github/workflows/scorecards-analysis.yml +++ b/.github/workflows/scorecards-analysis.yml @@ -64,6 +64,6 @@ jobs: retention-days: 5 - name: "Upload to code-scanning" - uses: github/codeql-action/upload-sarif@8214744c546c1e5c8f03dde8fab3a7353211988d # 3.26.7 + uses: github/codeql-action/upload-sarif@294a9d92911152fe08befb9ec03e240add280cb3 # 3.26.8 with: sarif_file: results.sarif From ad1d5ddf74e8ce73def1cd84b8a40f338524f515 Mon Sep 17 00:00:00 2001 From: Gary Gregory Date: Fri, 20 Sep 2024 19:58:39 -0400 Subject: [PATCH 251/298] Add dependency-review.yml to GitHub CI --- .github/workflows/dependency-review.yml | 31 +++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 .github/workflows/dependency-review.yml diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml new file mode 100644 index 00000000..0748cf09 --- /dev/null +++ b/.github/workflows/dependency-review.yml @@ -0,0 +1,31 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to 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. + +name: 'Dependency Review' +on: [pull_request] + +permissions: + contents: read + +jobs: + dependency-review: + runs-on: ubuntu-latest + steps: + - name: 'Checkout Repository' + uses: actions/checkout@v4 + - name: 'Dependency Review' + uses: actions/dependency-review-action@v4 From 5d3ad4a75e7f899312670881a624f188c2c4ef71 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 20 Sep 2024 21:16:38 -0400 Subject: [PATCH 252/298] Bump org.apache.commons:commons-parent from 74 to 75 (#204) Bumps [org.apache.commons:commons-parent](https://github.com/apache/commons-parent) from 74 to 75. - [Changelog](https://github.com/apache/commons-parent/blob/master/RELEASE-NOTES.txt) - [Commits](https://github.com/apache/commons-parent/commits) --- updated-dependencies: - dependency-name: org.apache.commons:commons-parent dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 571e24ef..ff412d13 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ org.apache.commons commons-parent - 74 + 75 4.0.0 commons-daemon From dbca611116f9a1e5d3c2e265c3e41045234b6725 Mon Sep 17 00:00:00 2001 From: Gary Gregory Date: Fri, 20 Sep 2024 21:17:17 -0400 Subject: [PATCH 253/298] Bump org.apache.commons:commons-parent from 74 to 75 #204 --- src/changes/changes.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/changes/changes.xml b/src/changes/changes.xml index 94862b7e..aa4bfa53 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -48,7 +48,7 @@ Remove autogenerated files and rely on autoreconf only. - Bump org.apache.commons:commons-parent from 71 to 74 #189, #196, #198. + Bump org.apache.commons:commons-parent from 71 to 75 #189, #196, #198, #204. From b1837af46df1e0ccd3e6ad872eb459cf278c3ba2 Mon Sep 17 00:00:00 2001 From: Gary Gregory Date: Mon, 23 Sep 2024 09:28:20 -0400 Subject: [PATCH 254/298] Also run DR on push --- .github/workflows/dependency-review.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml index 0748cf09..ae11bd03 100644 --- a/.github/workflows/dependency-review.yml +++ b/.github/workflows/dependency-review.yml @@ -16,7 +16,7 @@ # under the License. name: 'Dependency Review' -on: [pull_request] +on: [push, pull_request] permissions: contents: read @@ -27,5 +27,8 @@ jobs: steps: - name: 'Checkout Repository' uses: actions/checkout@v4 - - name: 'Dependency Review' - uses: actions/dependency-review-action@v4 + - name: 'Dependency Review PR' + uses: actions/dependency-review-action@v4.3.4 + with: + base-ref: ${{ github.event.before }} + head-ref: ${{ github.sha }} From 206aa859e0f1c8aa1a9b8cca14590a33dd33e47e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 27 Sep 2024 14:32:13 -0400 Subject: [PATCH 255/298] Bump actions/setup-java from 4.3.0 to 4.4.0 (#205) Bumps [actions/setup-java](https://github.com/actions/setup-java) from 4.3.0 to 4.4.0. - [Release notes](https://github.com/actions/setup-java/releases) - [Commits](https://github.com/actions/setup-java/compare/2dfa2011c5b2a0f1489bf9e433881c92c1631f88...b36c23c0d998641eff861008f374ee103c25ac73) --- updated-dependencies: - dependency-name: actions/setup-java dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/maven.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 5f160a3c..afb5ff14 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -45,7 +45,7 @@ jobs: restore-keys: | ${{ runner.os }}-maven- - name: Set up JDK ${{ matrix.java }} - uses: actions/setup-java@2dfa2011c5b2a0f1489bf9e433881c92c1631f88 # v4.3.0 + uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # v4.4.0 with: distribution: 'temurin' java-version: ${{ matrix.java }} From 05316c3c3f379cbf6da0a150f4ba48046465131a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 27 Sep 2024 14:32:25 -0400 Subject: [PATCH 256/298] Bump github/codeql-action from 3.26.8 to 3.26.9 (#206) Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.26.8 to 3.26.9. - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/294a9d92911152fe08befb9ec03e240add280cb3...461ef6c76dfe95d5c364de2f431ddbd31a417628) --- updated-dependencies: - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/codeql-analysis-cpp.yml | 4 ++-- .github/workflows/codeql-analysis-java.yml | 6 +++--- .github/workflows/scorecards-analysis.yml | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/codeql-analysis-cpp.yml b/.github/workflows/codeql-analysis-cpp.yml index 56b2eed2..789684d9 100644 --- a/.github/workflows/codeql-analysis-cpp.yml +++ b/.github/workflows/codeql-analysis-cpp.yml @@ -57,7 +57,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@294a9d92911152fe08befb9ec03e240add280cb3 # 3.26.8 + uses: github/codeql-action/init@461ef6c76dfe95d5c364de2f431ddbd31a417628 # 3.26.9 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -86,4 +86,4 @@ jobs: make - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@294a9d92911152fe08befb9ec03e240add280cb3 # 3.26.8 + uses: github/codeql-action/analyze@461ef6c76dfe95d5c364de2f431ddbd31a417628 # 3.26.9 diff --git a/.github/workflows/codeql-analysis-java.yml b/.github/workflows/codeql-analysis-java.yml index e23d4f5e..8e018f65 100644 --- a/.github/workflows/codeql-analysis-java.yml +++ b/.github/workflows/codeql-analysis-java.yml @@ -57,7 +57,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@294a9d92911152fe08befb9ec03e240add280cb3 # 3.26.8 + uses: github/codeql-action/init@461ef6c76dfe95d5c364de2f431ddbd31a417628 # 3.26.9 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -68,7 +68,7 @@ jobs: # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). # If this step fails, then you should remove it and run the build manually (see below) - name: Autobuild - uses: github/codeql-action/autobuild@294a9d92911152fe08befb9ec03e240add280cb3 # 3.26.8 + uses: github/codeql-action/autobuild@461ef6c76dfe95d5c364de2f431ddbd31a417628 # 3.26.9 # ℹī¸ Command-line programs to run using the OS shell. # 📚 https://git.io/JvXDl @@ -82,4 +82,4 @@ jobs: # make release - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@294a9d92911152fe08befb9ec03e240add280cb3 # 3.26.8 + uses: github/codeql-action/analyze@461ef6c76dfe95d5c364de2f431ddbd31a417628 # 3.26.9 diff --git a/.github/workflows/scorecards-analysis.yml b/.github/workflows/scorecards-analysis.yml index f80c265c..dcf5cbae 100644 --- a/.github/workflows/scorecards-analysis.yml +++ b/.github/workflows/scorecards-analysis.yml @@ -64,6 +64,6 @@ jobs: retention-days: 5 - name: "Upload to code-scanning" - uses: github/codeql-action/upload-sarif@294a9d92911152fe08befb9ec03e240add280cb3 # 3.26.8 + uses: github/codeql-action/upload-sarif@461ef6c76dfe95d5c364de2f431ddbd31a417628 # 3.26.9 with: sarif_file: results.sarif From d00d7255a3f090fe017fbab3b434385296023f76 Mon Sep 17 00:00:00 2001 From: Gary Gregory Date: Sat, 28 Sep 2024 16:20:07 -0400 Subject: [PATCH 257/298] Pin GitHub action versions --- .github/workflows/dependency-review.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml index ae11bd03..173a3f1a 100644 --- a/.github/workflows/dependency-review.yml +++ b/.github/workflows/dependency-review.yml @@ -26,9 +26,9 @@ jobs: runs-on: ubuntu-latest steps: - name: 'Checkout Repository' - uses: actions/checkout@v4 + uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - name: 'Dependency Review PR' - uses: actions/dependency-review-action@v4.3.4 + uses: actions/dependency-review-action@5a2ce3f5b92ee19cbb1541a4984c76d921601d7c # v4.3.4 with: base-ref: ${{ github.event.before }} head-ref: ${{ github.sha }} From 88321bd2d88f8b868367e92e1d097a0f191b47e3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 28 Sep 2024 20:19:46 -0400 Subject: [PATCH 258/298] Bump org.apache.commons:commons-parent from 75 to 76 (#207) Bumps [org.apache.commons:commons-parent](https://github.com/apache/commons-parent) from 75 to 76. - [Changelog](https://github.com/apache/commons-parent/blob/master/RELEASE-NOTES.txt) - [Commits](https://github.com/apache/commons-parent/commits) --- updated-dependencies: - dependency-name: org.apache.commons:commons-parent dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ff412d13..d79d3591 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ org.apache.commons commons-parent - 75 + 76 4.0.0 commons-daemon From 327e5093d3a4445b36129901c2e2c793b7649ed5 Mon Sep 17 00:00:00 2001 From: Gary Gregory Date: Sat, 28 Sep 2024 20:20:24 -0400 Subject: [PATCH 259/298] Bump org.apache.commons:commons-parent from 75 to 76 #207 --- src/changes/changes.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/changes/changes.xml b/src/changes/changes.xml index aa4bfa53..e1f2afd1 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -48,7 +48,7 @@ Remove autogenerated files and rely on autoreconf only. - Bump org.apache.commons:commons-parent from 71 to 75 #189, #196, #198, #204. + Bump org.apache.commons:commons-parent from 71 to 76 #189, #196, #198, #204, #207. From d6a2058290ce8ea44e065c57cfce739d52f061ae Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 4 Oct 2024 12:36:34 -0400 Subject: [PATCH 260/298] Bump actions/checkout from 4.1.7 to 4.2.0 (#208) Bumps [actions/checkout](https://github.com/actions/checkout) from 4.1.7 to 4.2.0. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/692973e3d937129bcbf40652eb9f2f61becf3332...d632683dd7b4114ad314bca15554477dd762a938) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/codeql-analysis-cpp.yml | 2 +- .github/workflows/codeql-analysis-java.yml | 2 +- .github/workflows/dependency-review.yml | 2 +- .github/workflows/maven.yml | 2 +- .github/workflows/scorecards-analysis.yml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/codeql-analysis-cpp.yml b/.github/workflows/codeql-analysis-cpp.yml index 789684d9..a08a2c57 100644 --- a/.github/workflows/codeql-analysis-cpp.yml +++ b/.github/workflows/codeql-analysis-cpp.yml @@ -45,7 +45,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 + uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0 with: persist-credentials: false - uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2 diff --git a/.github/workflows/codeql-analysis-java.yml b/.github/workflows/codeql-analysis-java.yml index 8e018f65..335ae3c7 100644 --- a/.github/workflows/codeql-analysis-java.yml +++ b/.github/workflows/codeql-analysis-java.yml @@ -45,7 +45,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 + uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0 with: persist-credentials: false - uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2 diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml index 173a3f1a..13f691e2 100644 --- a/.github/workflows/dependency-review.yml +++ b/.github/workflows/dependency-review.yml @@ -26,7 +26,7 @@ jobs: runs-on: ubuntu-latest steps: - name: 'Checkout Repository' - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 + uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0 - name: 'Dependency Review PR' uses: actions/dependency-review-action@5a2ce3f5b92ee19cbb1541a4984c76d921601d7c # v4.3.4 with: diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index afb5ff14..f81addc0 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -35,7 +35,7 @@ jobs: # experimental: true steps: - - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 + - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0 with: persist-credentials: false - uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2 diff --git a/.github/workflows/scorecards-analysis.yml b/.github/workflows/scorecards-analysis.yml index dcf5cbae..d837145b 100644 --- a/.github/workflows/scorecards-analysis.yml +++ b/.github/workflows/scorecards-analysis.yml @@ -40,7 +40,7 @@ jobs: steps: - name: "Checkout code" - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 + uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0 with: persist-credentials: false From a2c803269f2f81de5aad9cf5ab9b5622992b0877 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 4 Oct 2024 12:36:43 -0400 Subject: [PATCH 261/298] Bump github/codeql-action from 3.26.9 to 3.26.11 (#209) Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.26.9 to 3.26.11. - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/461ef6c76dfe95d5c364de2f431ddbd31a417628...6db8d6351fd0be61f9ed8ebd12ccd35dcec51fea) --- updated-dependencies: - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/codeql-analysis-cpp.yml | 4 ++-- .github/workflows/codeql-analysis-java.yml | 6 +++--- .github/workflows/scorecards-analysis.yml | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/codeql-analysis-cpp.yml b/.github/workflows/codeql-analysis-cpp.yml index a08a2c57..660fe27f 100644 --- a/.github/workflows/codeql-analysis-cpp.yml +++ b/.github/workflows/codeql-analysis-cpp.yml @@ -57,7 +57,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@461ef6c76dfe95d5c364de2f431ddbd31a417628 # 3.26.9 + uses: github/codeql-action/init@6db8d6351fd0be61f9ed8ebd12ccd35dcec51fea # 3.26.11 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -86,4 +86,4 @@ jobs: make - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@461ef6c76dfe95d5c364de2f431ddbd31a417628 # 3.26.9 + uses: github/codeql-action/analyze@6db8d6351fd0be61f9ed8ebd12ccd35dcec51fea # 3.26.11 diff --git a/.github/workflows/codeql-analysis-java.yml b/.github/workflows/codeql-analysis-java.yml index 335ae3c7..e06d71d8 100644 --- a/.github/workflows/codeql-analysis-java.yml +++ b/.github/workflows/codeql-analysis-java.yml @@ -57,7 +57,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@461ef6c76dfe95d5c364de2f431ddbd31a417628 # 3.26.9 + uses: github/codeql-action/init@6db8d6351fd0be61f9ed8ebd12ccd35dcec51fea # 3.26.11 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -68,7 +68,7 @@ jobs: # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). # If this step fails, then you should remove it and run the build manually (see below) - name: Autobuild - uses: github/codeql-action/autobuild@461ef6c76dfe95d5c364de2f431ddbd31a417628 # 3.26.9 + uses: github/codeql-action/autobuild@6db8d6351fd0be61f9ed8ebd12ccd35dcec51fea # 3.26.11 # ℹī¸ Command-line programs to run using the OS shell. # 📚 https://git.io/JvXDl @@ -82,4 +82,4 @@ jobs: # make release - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@461ef6c76dfe95d5c364de2f431ddbd31a417628 # 3.26.9 + uses: github/codeql-action/analyze@6db8d6351fd0be61f9ed8ebd12ccd35dcec51fea # 3.26.11 diff --git a/.github/workflows/scorecards-analysis.yml b/.github/workflows/scorecards-analysis.yml index d837145b..7a4b0a53 100644 --- a/.github/workflows/scorecards-analysis.yml +++ b/.github/workflows/scorecards-analysis.yml @@ -64,6 +64,6 @@ jobs: retention-days: 5 - name: "Upload to code-scanning" - uses: github/codeql-action/upload-sarif@461ef6c76dfe95d5c364de2f431ddbd31a417628 # 3.26.9 + uses: github/codeql-action/upload-sarif@6db8d6351fd0be61f9ed8ebd12ccd35dcec51fea # 3.26.11 with: sarif_file: results.sarif From c8b66d465c539ef005b01611efca4f4bc6c1bf0c Mon Sep 17 00:00:00 2001 From: Gary Gregory Date: Sun, 6 Oct 2024 08:33:18 -0400 Subject: [PATCH 262/298] Add Java 21, 23 and 24-ea builds --- .github/workflows/maven.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index f81addc0..4734b46f 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -28,11 +28,11 @@ jobs: strategy: matrix: os: [ubuntu-latest, windows-latest, macos-13] - java: [ 8, 11, 17 ] + java: [ 8, 11, 17, 21, 23 ] experimental: [false] -# include: -# - java: 22-ea -# experimental: true + include: + - java: 24-ea + experimental: true steps: - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0 From 78fbcd8b2bacfb21357c5a3262062749e2137f78 Mon Sep 17 00:00:00 2001 From: Gary Gregory Date: Sun, 6 Oct 2024 08:35:17 -0400 Subject: [PATCH 263/298] Remove Java 23, can't run with OS combo? --- .github/workflows/maven.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 4734b46f..f7bb06f2 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -28,7 +28,7 @@ jobs: strategy: matrix: os: [ubuntu-latest, windows-latest, macos-13] - java: [ 8, 11, 17, 21, 23 ] + java: [ 8, 11, 17, 21 ] experimental: [false] include: - java: 24-ea From fb7f047ddc63d5ef2988b2397c896b5fa573ea97 Mon Sep 17 00:00:00 2001 From: Gary Gregory Date: Sun, 6 Oct 2024 08:39:05 -0400 Subject: [PATCH 264/298] Run Java 21, 23 and 24-ea builds --- .github/workflows/maven.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index f7bb06f2..4517b132 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -28,9 +28,13 @@ jobs: strategy: matrix: os: [ubuntu-latest, windows-latest, macos-13] - java: [ 8, 11, 17, 21 ] + java: [ 8, 11, 17 ] experimental: [false] include: + - os: ubuntu-latest + java: 21 + - os: ubuntu-latest + java: 23 - java: 24-ea experimental: true From 93dc0d3390006ff841eba855df9df406d62e2c4d Mon Sep 17 00:00:00 2001 From: Gary Gregory Date: Sun, 6 Oct 2024 08:40:03 -0400 Subject: [PATCH 265/298] Run Java 21, 23 and 24-ea builds (experimental) --- .github/workflows/maven.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 4517b132..e70089b9 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -33,10 +33,12 @@ jobs: include: - os: ubuntu-latest java: 21 + experimental: true - os: ubuntu-latest java: 23 + experimental: true - java: 24-ea - experimental: true + experimental: true steps: - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0 From 6331a48a9d257c054b030153e9c2f47f7c999ea1 Mon Sep 17 00:00:00 2001 From: Gary Gregory Date: Sun, 6 Oct 2024 08:41:14 -0400 Subject: [PATCH 266/298] Comment out builds on Java 21, 23, and 24-ea Can't find GH spell --- .github/workflows/maven.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index e70089b9..8ef222dc 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -30,15 +30,15 @@ jobs: os: [ubuntu-latest, windows-latest, macos-13] java: [ 8, 11, 17 ] experimental: [false] - include: - - os: ubuntu-latest - java: 21 - experimental: true - - os: ubuntu-latest - java: 23 - experimental: true - - java: 24-ea - experimental: true +# include: +# - os: ubuntu-latest +# java: 21 +# experimental: true +# - os: ubuntu-latest +# java: 23 +# experimental: true +# - java: 24-ea +# experimental: true steps: - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0 From bb4d0fb90db820a6964dfc1bdf77c3b7cbe4261e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 9 Oct 2024 15:08:44 -0400 Subject: [PATCH 267/298] Bump org.apache.commons:commons-parent from 76 to 77 (#210) Bumps [org.apache.commons:commons-parent](https://github.com/apache/commons-parent) from 76 to 77. - [Changelog](https://github.com/apache/commons-parent/blob/master/RELEASE-NOTES.txt) - [Commits](https://github.com/apache/commons-parent/commits) --- updated-dependencies: - dependency-name: org.apache.commons:commons-parent dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d79d3591..f97cb14f 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ org.apache.commons commons-parent - 76 + 77 4.0.0 commons-daemon From ffd7eb5e8e9e5a825ba1d8f6403aed60adb7e897 Mon Sep 17 00:00:00 2001 From: Gary Gregory Date: Wed, 9 Oct 2024 15:09:13 -0400 Subject: [PATCH 268/298] Bump org.apache.commons:commons-parent from 76 to 77 #210 --- src/changes/changes.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/changes/changes.xml b/src/changes/changes.xml index e1f2afd1..8ab08a0c 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -48,7 +48,7 @@ Remove autogenerated files and rely on autoreconf only. - Bump org.apache.commons:commons-parent from 71 to 76 #189, #196, #198, #204, #207. + Bump org.apache.commons:commons-parent from 71 to 77 #189, #196, #198, #204, #207, #210. From e5d3b12a444b22909680199cb4121fdfd2a18222 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 11 Oct 2024 13:15:12 -0400 Subject: [PATCH 269/298] Bump actions/checkout from 4.2.0 to 4.2.1 (#211) Bumps [actions/checkout](https://github.com/actions/checkout) from 4.2.0 to 4.2.1. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/d632683dd7b4114ad314bca15554477dd762a938...eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/codeql-analysis-cpp.yml | 2 +- .github/workflows/codeql-analysis-java.yml | 2 +- .github/workflows/dependency-review.yml | 2 +- .github/workflows/maven.yml | 2 +- .github/workflows/scorecards-analysis.yml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/codeql-analysis-cpp.yml b/.github/workflows/codeql-analysis-cpp.yml index 660fe27f..18266958 100644 --- a/.github/workflows/codeql-analysis-cpp.yml +++ b/.github/workflows/codeql-analysis-cpp.yml @@ -45,7 +45,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0 + uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1 with: persist-credentials: false - uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2 diff --git a/.github/workflows/codeql-analysis-java.yml b/.github/workflows/codeql-analysis-java.yml index e06d71d8..2c714b3d 100644 --- a/.github/workflows/codeql-analysis-java.yml +++ b/.github/workflows/codeql-analysis-java.yml @@ -45,7 +45,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0 + uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1 with: persist-credentials: false - uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2 diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml index 13f691e2..21e60b1a 100644 --- a/.github/workflows/dependency-review.yml +++ b/.github/workflows/dependency-review.yml @@ -26,7 +26,7 @@ jobs: runs-on: ubuntu-latest steps: - name: 'Checkout Repository' - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0 + uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1 - name: 'Dependency Review PR' uses: actions/dependency-review-action@5a2ce3f5b92ee19cbb1541a4984c76d921601d7c # v4.3.4 with: diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 8ef222dc..e2706592 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -41,7 +41,7 @@ jobs: # experimental: true steps: - - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0 + - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1 with: persist-credentials: false - uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2 diff --git a/.github/workflows/scorecards-analysis.yml b/.github/workflows/scorecards-analysis.yml index 7a4b0a53..0ad1db05 100644 --- a/.github/workflows/scorecards-analysis.yml +++ b/.github/workflows/scorecards-analysis.yml @@ -40,7 +40,7 @@ jobs: steps: - name: "Checkout code" - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0 + uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1 with: persist-credentials: false From 8aa6f29c2c1c68f73db26c4aff254ed2e402dea9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 11 Oct 2024 13:15:22 -0400 Subject: [PATCH 270/298] Bump actions/upload-artifact from 4.4.0 to 4.4.3 (#214) Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 4.4.0 to 4.4.3. - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](https://github.com/actions/upload-artifact/compare/50769540e7f4bd5e21e526ee35c689e35e0d6874...b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882) --- updated-dependencies: - dependency-name: actions/upload-artifact dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/scorecards-analysis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/scorecards-analysis.yml b/.github/workflows/scorecards-analysis.yml index 0ad1db05..de9401d8 100644 --- a/.github/workflows/scorecards-analysis.yml +++ b/.github/workflows/scorecards-analysis.yml @@ -57,7 +57,7 @@ jobs: publish_results: true - name: "Upload artifact" - uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # 4.4.0 + uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # 4.4.3 with: name: SARIF file path: results.sarif From 1379e6b26d6102ba442931fc91651ace166ecdcf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 11 Oct 2024 13:15:32 -0400 Subject: [PATCH 271/298] Bump github/codeql-action from 3.26.11 to 3.26.12 (#213) Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.26.11 to 3.26.12. - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/6db8d6351fd0be61f9ed8ebd12ccd35dcec51fea...c36620d31ac7c881962c3d9dd939c40ec9434f2b) --- updated-dependencies: - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/codeql-analysis-cpp.yml | 4 ++-- .github/workflows/codeql-analysis-java.yml | 6 +++--- .github/workflows/scorecards-analysis.yml | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/codeql-analysis-cpp.yml b/.github/workflows/codeql-analysis-cpp.yml index 18266958..aab0d284 100644 --- a/.github/workflows/codeql-analysis-cpp.yml +++ b/.github/workflows/codeql-analysis-cpp.yml @@ -57,7 +57,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@6db8d6351fd0be61f9ed8ebd12ccd35dcec51fea # 3.26.11 + uses: github/codeql-action/init@c36620d31ac7c881962c3d9dd939c40ec9434f2b # 3.26.12 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -86,4 +86,4 @@ jobs: make - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@6db8d6351fd0be61f9ed8ebd12ccd35dcec51fea # 3.26.11 + uses: github/codeql-action/analyze@c36620d31ac7c881962c3d9dd939c40ec9434f2b # 3.26.12 diff --git a/.github/workflows/codeql-analysis-java.yml b/.github/workflows/codeql-analysis-java.yml index 2c714b3d..9b487ed2 100644 --- a/.github/workflows/codeql-analysis-java.yml +++ b/.github/workflows/codeql-analysis-java.yml @@ -57,7 +57,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@6db8d6351fd0be61f9ed8ebd12ccd35dcec51fea # 3.26.11 + uses: github/codeql-action/init@c36620d31ac7c881962c3d9dd939c40ec9434f2b # 3.26.12 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -68,7 +68,7 @@ jobs: # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). # If this step fails, then you should remove it and run the build manually (see below) - name: Autobuild - uses: github/codeql-action/autobuild@6db8d6351fd0be61f9ed8ebd12ccd35dcec51fea # 3.26.11 + uses: github/codeql-action/autobuild@c36620d31ac7c881962c3d9dd939c40ec9434f2b # 3.26.12 # ℹī¸ Command-line programs to run using the OS shell. # 📚 https://git.io/JvXDl @@ -82,4 +82,4 @@ jobs: # make release - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@6db8d6351fd0be61f9ed8ebd12ccd35dcec51fea # 3.26.11 + uses: github/codeql-action/analyze@c36620d31ac7c881962c3d9dd939c40ec9434f2b # 3.26.12 diff --git a/.github/workflows/scorecards-analysis.yml b/.github/workflows/scorecards-analysis.yml index de9401d8..621296f8 100644 --- a/.github/workflows/scorecards-analysis.yml +++ b/.github/workflows/scorecards-analysis.yml @@ -64,6 +64,6 @@ jobs: retention-days: 5 - name: "Upload to code-scanning" - uses: github/codeql-action/upload-sarif@6db8d6351fd0be61f9ed8ebd12ccd35dcec51fea # 3.26.11 + uses: github/codeql-action/upload-sarif@c36620d31ac7c881962c3d9dd939c40ec9434f2b # 3.26.12 with: sarif_file: results.sarif From ebbaf5af000907d2aaa2388c2bd1d724bf22b1d8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 11 Oct 2024 13:15:47 -0400 Subject: [PATCH 272/298] Bump actions/cache from 4.0.2 to 4.1.1 (#212) Bumps [actions/cache](https://github.com/actions/cache) from 4.0.2 to 4.1.1. - [Release notes](https://github.com/actions/cache/releases) - [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md) - [Commits](https://github.com/actions/cache/compare/0c45773b623bea8c8e75f6c82b208c3cf94ea4f9...3624ceb22c1c5a301c8db4169662070a689d9ea8) --- updated-dependencies: - dependency-name: actions/cache dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/codeql-analysis-cpp.yml | 2 +- .github/workflows/codeql-analysis-java.yml | 2 +- .github/workflows/maven.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/codeql-analysis-cpp.yml b/.github/workflows/codeql-analysis-cpp.yml index aab0d284..ca7808a0 100644 --- a/.github/workflows/codeql-analysis-cpp.yml +++ b/.github/workflows/codeql-analysis-cpp.yml @@ -48,7 +48,7 @@ jobs: uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1 with: persist-credentials: false - - uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2 + - uses: actions/cache@3624ceb22c1c5a301c8db4169662070a689d9ea8 # v4.1.1 with: path: ~/.m2/repository key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} diff --git a/.github/workflows/codeql-analysis-java.yml b/.github/workflows/codeql-analysis-java.yml index 9b487ed2..3bf0649a 100644 --- a/.github/workflows/codeql-analysis-java.yml +++ b/.github/workflows/codeql-analysis-java.yml @@ -48,7 +48,7 @@ jobs: uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1 with: persist-credentials: false - - uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2 + - uses: actions/cache@3624ceb22c1c5a301c8db4169662070a689d9ea8 # v4.1.1 with: path: ~/.m2/repository key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index e2706592..1c12bc05 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -44,7 +44,7 @@ jobs: - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1 with: persist-credentials: false - - uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2 + - uses: actions/cache@3624ceb22c1c5a301c8db4169662070a689d9ea8 # v4.1.1 with: path: ~/.m2/repository key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} From 7b65ed2d90dd365c697fe9456e1b23e267c8c5df Mon Sep 17 00:00:00 2001 From: Gary Gregory Date: Mon, 14 Oct 2024 07:09:38 -0400 Subject: [PATCH 273/298] Fix GH badge --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index cc1223a7..06370f57 100644 --- a/README.md +++ b/README.md @@ -44,7 +44,7 @@ Apache Commons Daemon =================== [![Java CI](https://github.com/apache/commons-daemon/actions/workflows/maven.yml/badge.svg)](https://github.com/apache/commons-daemon/actions/workflows/maven.yml) -[![Maven Central](https://maven-badges.herokuapp.com/maven-central/commons-daemon/commons-daemon/badge.svg?gav=true)](https://maven-badges.herokuapp.com/maven-central/commons-daemon/commons-daemon/?gav=true) +[![Maven Central](https://img.shields.io/maven-central/v/commons-daemon/commons-daemon?label=Maven%20Central)](https://search.maven.org/artifact/commons-daemon/commons-daemon) [![Javadocs](https://javadoc.io/badge/commons-daemon/commons-daemon/1.4.0.svg)](https://javadoc.io/doc/commons-daemon/commons-daemon/1.4.0) [![CodeQL](https://github.com/apache/commons-daemon/actions/workflows/codeql-analysis.yml/badge.svg)](https://github.com/apache/commons-daemon/actions/workflows/codeql-analysis.yml) [![OpenSSF Scorecard](https://api.securityscorecards.dev/projects/github.com/apache/commons-daemon/badge)](https://api.securityscorecards.dev/projects/github.com/apache/commons-daemon) From 7aa3434de1150e8260161137b544cd41aa489564 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 18 Oct 2024 12:28:16 -0400 Subject: [PATCH 274/298] Bump github/codeql-action from 3.26.12 to 3.26.13 (#215) Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.26.12 to 3.26.13. - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/c36620d31ac7c881962c3d9dd939c40ec9434f2b...f779452ac5af1c261dce0346a8f964149f49322b) --- updated-dependencies: - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/codeql-analysis-cpp.yml | 4 ++-- .github/workflows/codeql-analysis-java.yml | 6 +++--- .github/workflows/scorecards-analysis.yml | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/codeql-analysis-cpp.yml b/.github/workflows/codeql-analysis-cpp.yml index ca7808a0..fcf9fe74 100644 --- a/.github/workflows/codeql-analysis-cpp.yml +++ b/.github/workflows/codeql-analysis-cpp.yml @@ -57,7 +57,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@c36620d31ac7c881962c3d9dd939c40ec9434f2b # 3.26.12 + uses: github/codeql-action/init@f779452ac5af1c261dce0346a8f964149f49322b # 3.26.13 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -86,4 +86,4 @@ jobs: make - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@c36620d31ac7c881962c3d9dd939c40ec9434f2b # 3.26.12 + uses: github/codeql-action/analyze@f779452ac5af1c261dce0346a8f964149f49322b # 3.26.13 diff --git a/.github/workflows/codeql-analysis-java.yml b/.github/workflows/codeql-analysis-java.yml index 3bf0649a..836fa518 100644 --- a/.github/workflows/codeql-analysis-java.yml +++ b/.github/workflows/codeql-analysis-java.yml @@ -57,7 +57,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@c36620d31ac7c881962c3d9dd939c40ec9434f2b # 3.26.12 + uses: github/codeql-action/init@f779452ac5af1c261dce0346a8f964149f49322b # 3.26.13 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -68,7 +68,7 @@ jobs: # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). # If this step fails, then you should remove it and run the build manually (see below) - name: Autobuild - uses: github/codeql-action/autobuild@c36620d31ac7c881962c3d9dd939c40ec9434f2b # 3.26.12 + uses: github/codeql-action/autobuild@f779452ac5af1c261dce0346a8f964149f49322b # 3.26.13 # ℹī¸ Command-line programs to run using the OS shell. # 📚 https://git.io/JvXDl @@ -82,4 +82,4 @@ jobs: # make release - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@c36620d31ac7c881962c3d9dd939c40ec9434f2b # 3.26.12 + uses: github/codeql-action/analyze@f779452ac5af1c261dce0346a8f964149f49322b # 3.26.13 diff --git a/.github/workflows/scorecards-analysis.yml b/.github/workflows/scorecards-analysis.yml index 621296f8..86f966c4 100644 --- a/.github/workflows/scorecards-analysis.yml +++ b/.github/workflows/scorecards-analysis.yml @@ -64,6 +64,6 @@ jobs: retention-days: 5 - name: "Upload to code-scanning" - uses: github/codeql-action/upload-sarif@c36620d31ac7c881962c3d9dd939c40ec9434f2b # 3.26.12 + uses: github/codeql-action/upload-sarif@f779452ac5af1c261dce0346a8f964149f49322b # 3.26.13 with: sarif_file: results.sarif From 30d64f6af10c590cc0e8008b54cab735f9c83d74 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 22 Oct 2024 10:30:51 -0400 Subject: [PATCH 275/298] Bump org.apache.commons:commons-parent from 77 to 78 (#216) Bumps [org.apache.commons:commons-parent](https://github.com/apache/commons-parent) from 77 to 78. - [Changelog](https://github.com/apache/commons-parent/blob/master/RELEASE-NOTES.txt) - [Commits](https://github.com/apache/commons-parent/commits) --- updated-dependencies: - dependency-name: org.apache.commons:commons-parent dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f97cb14f..14b07768 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ org.apache.commons commons-parent - 77 + 78 4.0.0 commons-daemon From 7ed724e15c133719de0c770848a1a6d4fa06cdf5 Mon Sep 17 00:00:00 2001 From: Gary Gregory Date: Tue, 22 Oct 2024 10:31:33 -0400 Subject: [PATCH 276/298] Bump org.apache.commons:commons-parent from 77 to 78 #216 --- src/changes/changes.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/changes/changes.xml b/src/changes/changes.xml index 8ab08a0c..100f95c2 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -48,7 +48,7 @@ Remove autogenerated files and rely on autoreconf only. - Bump org.apache.commons:commons-parent from 71 to 77 #189, #196, #198, #204, #207, #210. + Bump org.apache.commons:commons-parent from 71 to 78 #189, #196, #198, #204, #207, #210, #216. From 56eba5df5819da488b7f7628c06df7b2a986b41b Mon Sep 17 00:00:00 2001 From: Gary Gregory Date: Tue, 22 Oct 2024 10:32:10 -0400 Subject: [PATCH 277/298] Order and comment --- src/changes/changes.xml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/changes/changes.xml b/src/changes/changes.xml index 100f95c2..110ebaaf 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -41,15 +41,17 @@ + Fix several issues around Java OS and header files location detection. - - Remove autogenerated files and rely on autoreconf only. - + Bump org.apache.commons:commons-parent from 71 to 78 #189, #196, #198, #204, #207, #210, #216. + + Remove autogenerated files and rely on autoreconf only. + From 000ef3d013a09593e496c587b65a32ebed891b49 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 25 Oct 2024 14:54:19 -0400 Subject: [PATCH 278/298] Bump actions/setup-java from 4.4.0 to 4.5.0 (#220) Bumps [actions/setup-java](https://github.com/actions/setup-java) from 4.4.0 to 4.5.0. - [Release notes](https://github.com/actions/setup-java/releases) - [Commits](https://github.com/actions/setup-java/compare/b36c23c0d998641eff861008f374ee103c25ac73...8df1039502a15bceb9433410b1a100fbe190c53b) --- updated-dependencies: - dependency-name: actions/setup-java dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/maven.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 1c12bc05..e0fa205f 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -51,7 +51,7 @@ jobs: restore-keys: | ${{ runner.os }}-maven- - name: Set up JDK ${{ matrix.java }} - uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # v4.4.0 + uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b # v4.5.0 with: distribution: 'temurin' java-version: ${{ matrix.java }} From 3e043e09e028016858077dc91445a660930889b3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 25 Oct 2024 14:54:30 -0400 Subject: [PATCH 279/298] Bump actions/dependency-review-action from 4.3.4 to 4.3.5 (#221) Bumps [actions/dependency-review-action](https://github.com/actions/dependency-review-action) from 4.3.4 to 4.3.5. - [Release notes](https://github.com/actions/dependency-review-action/releases) - [Commits](https://github.com/actions/dependency-review-action/compare/5a2ce3f5b92ee19cbb1541a4984c76d921601d7c...a6993e2c61fd5dc440b409aa1d6904921c5e1894) --- updated-dependencies: - dependency-name: actions/dependency-review-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/dependency-review.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml index 21e60b1a..c13bd3f9 100644 --- a/.github/workflows/dependency-review.yml +++ b/.github/workflows/dependency-review.yml @@ -28,7 +28,7 @@ jobs: - name: 'Checkout Repository' uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1 - name: 'Dependency Review PR' - uses: actions/dependency-review-action@5a2ce3f5b92ee19cbb1541a4984c76d921601d7c # v4.3.4 + uses: actions/dependency-review-action@a6993e2c61fd5dc440b409aa1d6904921c5e1894 # v4.3.5 with: base-ref: ${{ github.event.before }} head-ref: ${{ github.sha }} From eb1dee652db31e05fba9d2fc5d3522945f61de9e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 25 Oct 2024 14:54:44 -0400 Subject: [PATCH 280/298] Bump github/codeql-action from 3.26.13 to 3.27.0 (#219) Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.26.13 to 3.27.0. - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/f779452ac5af1c261dce0346a8f964149f49322b...662472033e021d55d94146f66f6058822b0b39fd) --- updated-dependencies: - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/codeql-analysis-cpp.yml | 4 ++-- .github/workflows/codeql-analysis-java.yml | 6 +++--- .github/workflows/scorecards-analysis.yml | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/codeql-analysis-cpp.yml b/.github/workflows/codeql-analysis-cpp.yml index fcf9fe74..a62255b1 100644 --- a/.github/workflows/codeql-analysis-cpp.yml +++ b/.github/workflows/codeql-analysis-cpp.yml @@ -57,7 +57,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@f779452ac5af1c261dce0346a8f964149f49322b # 3.26.13 + uses: github/codeql-action/init@662472033e021d55d94146f66f6058822b0b39fd # 3.27.0 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -86,4 +86,4 @@ jobs: make - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@f779452ac5af1c261dce0346a8f964149f49322b # 3.26.13 + uses: github/codeql-action/analyze@662472033e021d55d94146f66f6058822b0b39fd # 3.27.0 diff --git a/.github/workflows/codeql-analysis-java.yml b/.github/workflows/codeql-analysis-java.yml index 836fa518..67235c26 100644 --- a/.github/workflows/codeql-analysis-java.yml +++ b/.github/workflows/codeql-analysis-java.yml @@ -57,7 +57,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@f779452ac5af1c261dce0346a8f964149f49322b # 3.26.13 + uses: github/codeql-action/init@662472033e021d55d94146f66f6058822b0b39fd # 3.27.0 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -68,7 +68,7 @@ jobs: # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). # If this step fails, then you should remove it and run the build manually (see below) - name: Autobuild - uses: github/codeql-action/autobuild@f779452ac5af1c261dce0346a8f964149f49322b # 3.26.13 + uses: github/codeql-action/autobuild@662472033e021d55d94146f66f6058822b0b39fd # 3.27.0 # ℹī¸ Command-line programs to run using the OS shell. # 📚 https://git.io/JvXDl @@ -82,4 +82,4 @@ jobs: # make release - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@f779452ac5af1c261dce0346a8f964149f49322b # 3.26.13 + uses: github/codeql-action/analyze@662472033e021d55d94146f66f6058822b0b39fd # 3.27.0 diff --git a/.github/workflows/scorecards-analysis.yml b/.github/workflows/scorecards-analysis.yml index 86f966c4..cccd14dc 100644 --- a/.github/workflows/scorecards-analysis.yml +++ b/.github/workflows/scorecards-analysis.yml @@ -64,6 +64,6 @@ jobs: retention-days: 5 - name: "Upload to code-scanning" - uses: github/codeql-action/upload-sarif@f779452ac5af1c261dce0346a8f964149f49322b # 3.26.13 + uses: github/codeql-action/upload-sarif@662472033e021d55d94146f66f6058822b0b39fd # 3.27.0 with: sarif_file: results.sarif From aa44fc2812dca1503ec9c17cbc41dae238dd6a07 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 25 Oct 2024 14:54:54 -0400 Subject: [PATCH 281/298] Bump actions/cache from 4.1.1 to 4.1.2 (#218) Bumps [actions/cache](https://github.com/actions/cache) from 4.1.1 to 4.1.2. - [Release notes](https://github.com/actions/cache/releases) - [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md) - [Commits](https://github.com/actions/cache/compare/3624ceb22c1c5a301c8db4169662070a689d9ea8...6849a6489940f00c2f30c0fb92c6274307ccb58a) --- updated-dependencies: - dependency-name: actions/cache dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/codeql-analysis-cpp.yml | 2 +- .github/workflows/codeql-analysis-java.yml | 2 +- .github/workflows/maven.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/codeql-analysis-cpp.yml b/.github/workflows/codeql-analysis-cpp.yml index a62255b1..cdba39f9 100644 --- a/.github/workflows/codeql-analysis-cpp.yml +++ b/.github/workflows/codeql-analysis-cpp.yml @@ -48,7 +48,7 @@ jobs: uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1 with: persist-credentials: false - - uses: actions/cache@3624ceb22c1c5a301c8db4169662070a689d9ea8 # v4.1.1 + - uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a # v4.1.2 with: path: ~/.m2/repository key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} diff --git a/.github/workflows/codeql-analysis-java.yml b/.github/workflows/codeql-analysis-java.yml index 67235c26..b5ffa89d 100644 --- a/.github/workflows/codeql-analysis-java.yml +++ b/.github/workflows/codeql-analysis-java.yml @@ -48,7 +48,7 @@ jobs: uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1 with: persist-credentials: false - - uses: actions/cache@3624ceb22c1c5a301c8db4169662070a689d9ea8 # v4.1.1 + - uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a # v4.1.2 with: path: ~/.m2/repository key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index e0fa205f..b4cacdee 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -44,7 +44,7 @@ jobs: - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1 with: persist-credentials: false - - uses: actions/cache@3624ceb22c1c5a301c8db4169662070a689d9ea8 # v4.1.1 + - uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a # v4.1.2 with: path: ~/.m2/repository key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} From e45b0779432b8928ee19a4a7c484f748da836626 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 25 Oct 2024 14:58:01 -0400 Subject: [PATCH 282/298] Bump actions/checkout from 4.2.1 to 4.2.2 (#217) Bumps [actions/checkout](https://github.com/actions/checkout) from 4.2.1 to 4.2.2. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871...11bd71901bbe5b1630ceea73d27597364c9af683) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/codeql-analysis-cpp.yml | 2 +- .github/workflows/codeql-analysis-java.yml | 2 +- .github/workflows/dependency-review.yml | 2 +- .github/workflows/maven.yml | 2 +- .github/workflows/scorecards-analysis.yml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/codeql-analysis-cpp.yml b/.github/workflows/codeql-analysis-cpp.yml index cdba39f9..401ed154 100644 --- a/.github/workflows/codeql-analysis-cpp.yml +++ b/.github/workflows/codeql-analysis-cpp.yml @@ -45,7 +45,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1 + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: persist-credentials: false - uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a # v4.1.2 diff --git a/.github/workflows/codeql-analysis-java.yml b/.github/workflows/codeql-analysis-java.yml index b5ffa89d..73213a97 100644 --- a/.github/workflows/codeql-analysis-java.yml +++ b/.github/workflows/codeql-analysis-java.yml @@ -45,7 +45,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1 + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: persist-credentials: false - uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a # v4.1.2 diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml index c13bd3f9..a932f55d 100644 --- a/.github/workflows/dependency-review.yml +++ b/.github/workflows/dependency-review.yml @@ -26,7 +26,7 @@ jobs: runs-on: ubuntu-latest steps: - name: 'Checkout Repository' - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1 + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - name: 'Dependency Review PR' uses: actions/dependency-review-action@a6993e2c61fd5dc440b409aa1d6904921c5e1894 # v4.3.5 with: diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index b4cacdee..5e251295 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -41,7 +41,7 @@ jobs: # experimental: true steps: - - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: persist-credentials: false - uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a # v4.1.2 diff --git a/.github/workflows/scorecards-analysis.yml b/.github/workflows/scorecards-analysis.yml index cccd14dc..ac3fdad8 100644 --- a/.github/workflows/scorecards-analysis.yml +++ b/.github/workflows/scorecards-analysis.yml @@ -40,7 +40,7 @@ jobs: steps: - name: "Checkout code" - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1 + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: persist-credentials: false From 45aca22e3b23cd17e846ffed2dff4e9355882fcd Mon Sep 17 00:00:00 2001 From: Gary Gregory Date: Fri, 1 Nov 2024 07:31:34 -0400 Subject: [PATCH 283/298] Only run actions/dependency-review-action on pull_request --- .github/workflows/dependency-review.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml index a932f55d..47e7d042 100644 --- a/.github/workflows/dependency-review.yml +++ b/.github/workflows/dependency-review.yml @@ -16,7 +16,7 @@ # under the License. name: 'Dependency Review' -on: [push, pull_request] +on: [pull_request] permissions: contents: read From b99d55fa2a2ac132374d68af93f6805b21dd322a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 2 Nov 2024 09:07:15 -0400 Subject: [PATCH 284/298] Bump actions/dependency-review-action from 4.3.5 to 4.4.0 (#222) Bumps [actions/dependency-review-action](https://github.com/actions/dependency-review-action) from 4.3.5 to 4.4.0. - [Release notes](https://github.com/actions/dependency-review-action/releases) - [Commits](https://github.com/actions/dependency-review-action/compare/a6993e2c61fd5dc440b409aa1d6904921c5e1894...4081bf99e2866ebe428fc0477b69eb4fcda7220a) --- updated-dependencies: - dependency-name: actions/dependency-review-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/dependency-review.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml index 47e7d042..154ab430 100644 --- a/.github/workflows/dependency-review.yml +++ b/.github/workflows/dependency-review.yml @@ -28,7 +28,7 @@ jobs: - name: 'Checkout Repository' uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - name: 'Dependency Review PR' - uses: actions/dependency-review-action@a6993e2c61fd5dc440b409aa1d6904921c5e1894 # v4.3.5 + uses: actions/dependency-review-action@4081bf99e2866ebe428fc0477b69eb4fcda7220a # v4.4.0 with: base-ref: ${{ github.event.before }} head-ref: ${{ github.sha }} From 067adece537947127d8c75c5133e07b04e6fd86b Mon Sep 17 00:00:00 2001 From: Gary Gregory Date: Tue, 5 Nov 2024 05:56:41 -0500 Subject: [PATCH 285/298] Use preferred spelling for "cannot" --- src/main/java/org/apache/commons/daemon/Daemon.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/apache/commons/daemon/Daemon.java b/src/main/java/org/apache/commons/daemon/Daemon.java index fd2cb0c8..88848cee 100644 --- a/src/main/java/org/apache/commons/daemon/Daemon.java +++ b/src/main/java/org/apache/commons/daemon/Daemon.java @@ -100,7 +100,7 @@ void stop() * Frees any resources allocated by this daemon such as file * descriptors or sockets. This method gets called by the container * after stop() has been called, before the JVM exits. The Daemon - * can not be restarted after this method has been called without a + * cannot be restarted after this method has been called without a * new call to the init() method. */ void destroy(); From 1a5540fe3d2ccb74904614566fa225643d5d237b Mon Sep 17 00:00:00 2001 From: Gary Gregory Date: Fri, 8 Nov 2024 07:19:38 -0500 Subject: [PATCH 286/298] Fix dependency-review.yml for PR only --- .github/workflows/dependency-review.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml index 154ab430..6da427d5 100644 --- a/.github/workflows/dependency-review.yml +++ b/.github/workflows/dependency-review.yml @@ -29,6 +29,3 @@ jobs: uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - name: 'Dependency Review PR' uses: actions/dependency-review-action@4081bf99e2866ebe428fc0477b69eb4fcda7220a # v4.4.0 - with: - base-ref: ${{ github.event.before }} - head-ref: ${{ github.sha }} From 7fb9e66ec3a461aec86b5399ffae1990c6cc7ad2 Mon Sep 17 00:00:00 2001 From: Gary Gregory Date: Fri, 15 Nov 2024 11:12:21 -0500 Subject: [PATCH 287/298] Javadoc: Use semantic tag instead of style tag --- .../java/org/apache/commons/daemon/DaemonPermission.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/apache/commons/daemon/DaemonPermission.java b/src/main/java/org/apache/commons/daemon/DaemonPermission.java index a49b48ae..0774ca79 100644 --- a/src/main/java/org/apache/commons/daemon/DaemonPermission.java +++ b/src/main/java/org/apache/commons/daemon/DaemonPermission.java @@ -175,7 +175,7 @@ public final class DaemonPermission extends Permission * permission name. *

      * This constructor will create a new {@code DaemonPermission} - * instance that will not grant any permission to the caller. + * instance that will not grant any permission to the caller. * * @param target The target name of this permission. * @throws IllegalArgumentException If the specified target name is not @@ -259,7 +259,7 @@ public int hashCode() /** * Checks if a specified object equals {@code DaemonPermission}. * - * @return true or false whether the specified object equals + * @return true or false whether the specified object equals * this {@code DaemonPermission} instance or not. */ @Override @@ -285,7 +285,7 @@ public boolean equals(final Object object) * Checks if this {@code DaemonPermission} implies another * {@code Permission}. * - * @return true or false whether the specified permission + * @return true or false whether the specified permission * is implied by this {@code DaemonPermission} instance or * not. */ From e12e05abf3d4dcc2115fedcf718c2486cfdc86e3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 15 Nov 2024 11:45:57 -0500 Subject: [PATCH 288/298] Bump github/codeql-action from 3.27.0 to 3.27.4 (#223) Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.27.0 to 3.27.4. - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/662472033e021d55d94146f66f6058822b0b39fd...ea9e4e37992a54ee68a9622e985e60c8e8f12d9f) --- updated-dependencies: - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/codeql-analysis-cpp.yml | 4 ++-- .github/workflows/codeql-analysis-java.yml | 6 +++--- .github/workflows/scorecards-analysis.yml | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/codeql-analysis-cpp.yml b/.github/workflows/codeql-analysis-cpp.yml index 401ed154..19607c2c 100644 --- a/.github/workflows/codeql-analysis-cpp.yml +++ b/.github/workflows/codeql-analysis-cpp.yml @@ -57,7 +57,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@662472033e021d55d94146f66f6058822b0b39fd # 3.27.0 + uses: github/codeql-action/init@ea9e4e37992a54ee68a9622e985e60c8e8f12d9f # 3.27.4 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -86,4 +86,4 @@ jobs: make - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@662472033e021d55d94146f66f6058822b0b39fd # 3.27.0 + uses: github/codeql-action/analyze@ea9e4e37992a54ee68a9622e985e60c8e8f12d9f # 3.27.4 diff --git a/.github/workflows/codeql-analysis-java.yml b/.github/workflows/codeql-analysis-java.yml index 73213a97..90aac6be 100644 --- a/.github/workflows/codeql-analysis-java.yml +++ b/.github/workflows/codeql-analysis-java.yml @@ -57,7 +57,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@662472033e021d55d94146f66f6058822b0b39fd # 3.27.0 + uses: github/codeql-action/init@ea9e4e37992a54ee68a9622e985e60c8e8f12d9f # 3.27.4 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -68,7 +68,7 @@ jobs: # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). # If this step fails, then you should remove it and run the build manually (see below) - name: Autobuild - uses: github/codeql-action/autobuild@662472033e021d55d94146f66f6058822b0b39fd # 3.27.0 + uses: github/codeql-action/autobuild@ea9e4e37992a54ee68a9622e985e60c8e8f12d9f # 3.27.4 # ℹī¸ Command-line programs to run using the OS shell. # 📚 https://git.io/JvXDl @@ -82,4 +82,4 @@ jobs: # make release - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@662472033e021d55d94146f66f6058822b0b39fd # 3.27.0 + uses: github/codeql-action/analyze@ea9e4e37992a54ee68a9622e985e60c8e8f12d9f # 3.27.4 diff --git a/.github/workflows/scorecards-analysis.yml b/.github/workflows/scorecards-analysis.yml index ac3fdad8..3aaf39bc 100644 --- a/.github/workflows/scorecards-analysis.yml +++ b/.github/workflows/scorecards-analysis.yml @@ -64,6 +64,6 @@ jobs: retention-days: 5 - name: "Upload to code-scanning" - uses: github/codeql-action/upload-sarif@662472033e021d55d94146f66f6058822b0b39fd # 3.27.0 + uses: github/codeql-action/upload-sarif@ea9e4e37992a54ee68a9622e985e60c8e8f12d9f # 3.27.4 with: sarif_file: results.sarif From c6b04d9ac085c98fdecaa2baa649b874f6e881fa Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 22 Nov 2024 12:20:35 -0500 Subject: [PATCH 289/298] Bump github/codeql-action from 3.27.4 to 3.27.5 (#224) Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.27.4 to 3.27.5. - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/ea9e4e37992a54ee68a9622e985e60c8e8f12d9f...f09c1c0a94de965c15400f5634aa42fac8fb8f88) --- updated-dependencies: - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/codeql-analysis-cpp.yml | 4 ++-- .github/workflows/codeql-analysis-java.yml | 6 +++--- .github/workflows/scorecards-analysis.yml | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/codeql-analysis-cpp.yml b/.github/workflows/codeql-analysis-cpp.yml index 19607c2c..8179d7f3 100644 --- a/.github/workflows/codeql-analysis-cpp.yml +++ b/.github/workflows/codeql-analysis-cpp.yml @@ -57,7 +57,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@ea9e4e37992a54ee68a9622e985e60c8e8f12d9f # 3.27.4 + uses: github/codeql-action/init@f09c1c0a94de965c15400f5634aa42fac8fb8f88 # 3.27.5 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -86,4 +86,4 @@ jobs: make - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@ea9e4e37992a54ee68a9622e985e60c8e8f12d9f # 3.27.4 + uses: github/codeql-action/analyze@f09c1c0a94de965c15400f5634aa42fac8fb8f88 # 3.27.5 diff --git a/.github/workflows/codeql-analysis-java.yml b/.github/workflows/codeql-analysis-java.yml index 90aac6be..cc918667 100644 --- a/.github/workflows/codeql-analysis-java.yml +++ b/.github/workflows/codeql-analysis-java.yml @@ -57,7 +57,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@ea9e4e37992a54ee68a9622e985e60c8e8f12d9f # 3.27.4 + uses: github/codeql-action/init@f09c1c0a94de965c15400f5634aa42fac8fb8f88 # 3.27.5 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -68,7 +68,7 @@ jobs: # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). # If this step fails, then you should remove it and run the build manually (see below) - name: Autobuild - uses: github/codeql-action/autobuild@ea9e4e37992a54ee68a9622e985e60c8e8f12d9f # 3.27.4 + uses: github/codeql-action/autobuild@f09c1c0a94de965c15400f5634aa42fac8fb8f88 # 3.27.5 # ℹī¸ Command-line programs to run using the OS shell. # 📚 https://git.io/JvXDl @@ -82,4 +82,4 @@ jobs: # make release - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@ea9e4e37992a54ee68a9622e985e60c8e8f12d9f # 3.27.4 + uses: github/codeql-action/analyze@f09c1c0a94de965c15400f5634aa42fac8fb8f88 # 3.27.5 diff --git a/.github/workflows/scorecards-analysis.yml b/.github/workflows/scorecards-analysis.yml index 3aaf39bc..94d1bedb 100644 --- a/.github/workflows/scorecards-analysis.yml +++ b/.github/workflows/scorecards-analysis.yml @@ -64,6 +64,6 @@ jobs: retention-days: 5 - name: "Upload to code-scanning" - uses: github/codeql-action/upload-sarif@ea9e4e37992a54ee68a9622e985e60c8e8f12d9f # 3.27.4 + uses: github/codeql-action/upload-sarif@f09c1c0a94de965c15400f5634aa42fac8fb8f88 # 3.27.5 with: sarif_file: results.sarif From baa08561382e3f7d454e5d29efb29cf37d2a1c81 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 22 Nov 2024 12:20:50 -0500 Subject: [PATCH 290/298] Bump actions/dependency-review-action from 4.4.0 to 4.5.0 (#225) Bumps [actions/dependency-review-action](https://github.com/actions/dependency-review-action) from 4.4.0 to 4.5.0. - [Release notes](https://github.com/actions/dependency-review-action/releases) - [Commits](https://github.com/actions/dependency-review-action/compare/4081bf99e2866ebe428fc0477b69eb4fcda7220a...3b139cfc5fae8b618d3eae3675e383bb1769c019) --- updated-dependencies: - dependency-name: actions/dependency-review-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/dependency-review.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml index 6da427d5..c6ece650 100644 --- a/.github/workflows/dependency-review.yml +++ b/.github/workflows/dependency-review.yml @@ -28,4 +28,4 @@ jobs: - name: 'Checkout Repository' uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - name: 'Dependency Review PR' - uses: actions/dependency-review-action@4081bf99e2866ebe428fc0477b69eb4fcda7220a # v4.4.0 + uses: actions/dependency-review-action@3b139cfc5fae8b618d3eae3675e383bb1769c019 # v4.5.0 From 2f35f084b2c6c724cf0885e87e0546c09631c357 Mon Sep 17 00:00:00 2001 From: Gary Gregory Date: Thu, 28 Nov 2024 12:30:48 -0500 Subject: [PATCH 291/298] No need for blank Javadoc lines between Javadoc @ tags --- src/main/java/org/apache/commons/daemon/DaemonController.java | 3 --- .../apache/commons/daemon/support/DaemonConfiguration.java | 4 ---- src/samples/AloneService.java | 1 - src/samples/SimpleApplication.java | 1 - 4 files changed, 9 deletions(-) diff --git a/src/main/java/org/apache/commons/daemon/DaemonController.java b/src/main/java/org/apache/commons/daemon/DaemonController.java index bde14bfa..cae127e4 100644 --- a/src/main/java/org/apache/commons/daemon/DaemonController.java +++ b/src/main/java/org/apache/commons/daemon/DaemonController.java @@ -54,7 +54,6 @@ void fail() * Shuts down daemon and logs failed message. * * @param message The message to log - * * @throws IllegalStateException If the daemon is not in a valid state to be * shutdown */ @@ -65,7 +64,6 @@ void fail(String message) * Shuts down daemon and logs failed message. * * @param exception The exception to log - * * @throws IllegalStateException If the daemon is not in a valid state to be * shutdown */ @@ -77,7 +75,6 @@ void fail(Exception exception) * * @param message The message to log * @param exception The exception to log - * * @throws IllegalStateException If the daemon is not in a valid state to be * shutdown */ diff --git a/src/main/java/org/apache/commons/daemon/support/DaemonConfiguration.java b/src/main/java/org/apache/commons/daemon/support/DaemonConfiguration.java index de01ea27..3dd68254 100644 --- a/src/main/java/org/apache/commons/daemon/support/DaemonConfiguration.java +++ b/src/main/java/org/apache/commons/daemon/support/DaemonConfiguration.java @@ -147,9 +147,7 @@ private String expandProperty(final String propValue) * Gets the configuration property. * * @param name The name of the property to get. - * * @throws ParseException if the property is wrongly formatted. - * * @return Configuration property including any expansion/replacement */ public String getProperty(final String name) @@ -173,9 +171,7 @@ public String getProperty(final String name) * daemon.arg[2] = argument 3 * * @param name The name of the property array to get. - * * @throws ParseException if the property is wrongly formatted. - * * @return Configuration property array including any expansion/replacement */ public String[] getPropertyArray(final String name) diff --git a/src/samples/AloneService.java b/src/samples/AloneService.java index 5a670273..bf248a23 100644 --- a/src/samples/AloneService.java +++ b/src/samples/AloneService.java @@ -41,7 +41,6 @@ protected void finalize() { * init and destroy were added in jakarta-tomcat-daemon. * * @param arguments Unused - * * @throws Exception If the daemon cannot be initialized */ public void init(String[] arguments) throws Exception { diff --git a/src/samples/SimpleApplication.java b/src/samples/SimpleApplication.java index fb796efa..cad8a4ac 100644 --- a/src/samples/SimpleApplication.java +++ b/src/samples/SimpleApplication.java @@ -58,7 +58,6 @@ protected void finalize() { * Main method * * @param args Optional port and directory configuration - * * @throws Exception If the daemon cannot be set up */ public static void main(String[] args) throws Exception { From 12b8f855fa1d1658208160deedc5eb41609caec6 Mon Sep 17 00:00:00 2001 From: Gary Gregory Date: Fri, 29 Nov 2024 08:07:15 -0500 Subject: [PATCH 292/298] Add pull request template --- .github/pull_request_template.md | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 .github/pull_request_template.md diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md new file mode 100644 index 00000000..d126a970 --- /dev/null +++ b/.github/pull_request_template.md @@ -0,0 +1,28 @@ + + +Thanks for your contribution to [Apache Commons](https://commons.apache.org/)! Your help is appreciated! + +Before you push a pull request, review this list: + +- [ ] Read the [contribution guidelines](CONTRIBUTING.md) for this project. +- [ ] Run a successful build using the default [Maven](https://maven.apache.org/) goal with `mvn`; that's `mvn` on the command line by itself. +- [ ] 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 is a best-practice. +- [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. +- [ ] Each commit in the pull request should have a meaningful subject line and body. Note that commits might be squashed by a maintainer on merge. From 885f4371b886838b5ca26275c8fa3a7c5a2b1a36 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 6 Dec 2024 11:23:47 -0500 Subject: [PATCH 293/298] Bump actions/cache from 4.1.2 to 4.2.0 (#226) Bumps [actions/cache](https://github.com/actions/cache) from 4.1.2 to 4.2.0. - [Release notes](https://github.com/actions/cache/releases) - [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md) - [Commits](https://github.com/actions/cache/compare/6849a6489940f00c2f30c0fb92c6274307ccb58a...1bd1e32a3bdc45362d1e726936510720a7c30a57) --- updated-dependencies: - dependency-name: actions/cache dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/codeql-analysis-cpp.yml | 2 +- .github/workflows/codeql-analysis-java.yml | 2 +- .github/workflows/maven.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/codeql-analysis-cpp.yml b/.github/workflows/codeql-analysis-cpp.yml index 8179d7f3..bdcb80c5 100644 --- a/.github/workflows/codeql-analysis-cpp.yml +++ b/.github/workflows/codeql-analysis-cpp.yml @@ -48,7 +48,7 @@ jobs: uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: persist-credentials: false - - uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a # v4.1.2 + - uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0 with: path: ~/.m2/repository key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} diff --git a/.github/workflows/codeql-analysis-java.yml b/.github/workflows/codeql-analysis-java.yml index cc918667..21dbbc5d 100644 --- a/.github/workflows/codeql-analysis-java.yml +++ b/.github/workflows/codeql-analysis-java.yml @@ -48,7 +48,7 @@ jobs: uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: persist-credentials: false - - uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a # v4.1.2 + - uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0 with: path: ~/.m2/repository key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 5e251295..a43b0796 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -44,7 +44,7 @@ jobs: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: persist-credentials: false - - uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a # v4.1.2 + - uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0 with: path: ~/.m2/repository key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} From 0fdc0cfd977130926b40e08b27fa009aff20737d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 6 Dec 2024 11:23:57 -0500 Subject: [PATCH 294/298] Bump github/codeql-action from 3.27.5 to 3.27.6 (#227) Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.27.5 to 3.27.6. - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/f09c1c0a94de965c15400f5634aa42fac8fb8f88...aa578102511db1f4524ed59b8cc2bae4f6e88195) --- updated-dependencies: - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/codeql-analysis-cpp.yml | 4 ++-- .github/workflows/codeql-analysis-java.yml | 6 +++--- .github/workflows/scorecards-analysis.yml | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/codeql-analysis-cpp.yml b/.github/workflows/codeql-analysis-cpp.yml index bdcb80c5..1593b3cb 100644 --- a/.github/workflows/codeql-analysis-cpp.yml +++ b/.github/workflows/codeql-analysis-cpp.yml @@ -57,7 +57,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@f09c1c0a94de965c15400f5634aa42fac8fb8f88 # 3.27.5 + uses: github/codeql-action/init@aa578102511db1f4524ed59b8cc2bae4f6e88195 # 3.27.6 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -86,4 +86,4 @@ jobs: make - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@f09c1c0a94de965c15400f5634aa42fac8fb8f88 # 3.27.5 + uses: github/codeql-action/analyze@aa578102511db1f4524ed59b8cc2bae4f6e88195 # 3.27.6 diff --git a/.github/workflows/codeql-analysis-java.yml b/.github/workflows/codeql-analysis-java.yml index 21dbbc5d..df570af0 100644 --- a/.github/workflows/codeql-analysis-java.yml +++ b/.github/workflows/codeql-analysis-java.yml @@ -57,7 +57,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@f09c1c0a94de965c15400f5634aa42fac8fb8f88 # 3.27.5 + uses: github/codeql-action/init@aa578102511db1f4524ed59b8cc2bae4f6e88195 # 3.27.6 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -68,7 +68,7 @@ jobs: # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). # If this step fails, then you should remove it and run the build manually (see below) - name: Autobuild - uses: github/codeql-action/autobuild@f09c1c0a94de965c15400f5634aa42fac8fb8f88 # 3.27.5 + uses: github/codeql-action/autobuild@aa578102511db1f4524ed59b8cc2bae4f6e88195 # 3.27.6 # ℹī¸ Command-line programs to run using the OS shell. # 📚 https://git.io/JvXDl @@ -82,4 +82,4 @@ jobs: # make release - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@f09c1c0a94de965c15400f5634aa42fac8fb8f88 # 3.27.5 + uses: github/codeql-action/analyze@aa578102511db1f4524ed59b8cc2bae4f6e88195 # 3.27.6 diff --git a/.github/workflows/scorecards-analysis.yml b/.github/workflows/scorecards-analysis.yml index 94d1bedb..6e21bc8b 100644 --- a/.github/workflows/scorecards-analysis.yml +++ b/.github/workflows/scorecards-analysis.yml @@ -64,6 +64,6 @@ jobs: retention-days: 5 - name: "Upload to code-scanning" - uses: github/codeql-action/upload-sarif@f09c1c0a94de965c15400f5634aa42fac8fb8f88 # 3.27.5 + uses: github/codeql-action/upload-sarif@aa578102511db1f4524ed59b8cc2bae4f6e88195 # 3.27.6 with: sarif_file: results.sarif From 559b6c24bd6701e397f231e429851743759bf997 Mon Sep 17 00:00:00 2001 From: Gary Gregory Date: Fri, 6 Dec 2024 17:46:51 -0500 Subject: [PATCH 295/298] Normalize spelling Note that "UNIX" is a trademark, "Unix" is not --- src/main/java/org/apache/commons/daemon/Daemon.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/apache/commons/daemon/Daemon.java b/src/main/java/org/apache/commons/daemon/Daemon.java index 88848cee..83572989 100644 --- a/src/main/java/org/apache/commons/daemon/Daemon.java +++ b/src/main/java/org/apache/commons/daemon/Daemon.java @@ -40,7 +40,7 @@ public interface Daemon * constructor. *

      *

      - * Under certain operating systems (typically UNIX based operating + * Under certain operating systems (typically Unix based operating * systems) and if the native invocation framework is configured to do * so, this method might be called with super-user privileges. *

      From 285ac9c258917ef5265eb240583d0984cc5e4ed9 Mon Sep 17 00:00:00 2001 From: Mark Thomas Date: Tue, 10 Dec 2024 10:10:21 +0000 Subject: [PATCH 296/298] Fix DAEMON-460. Protect against high CPU usage in JVM mode if start returns before stop is called. --- src/changes/changes.xml | 6 ++++++ src/native/windows/apps/prunsrv/prunsrv.c | 10 +++++++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/src/changes/changes.xml b/src/changes/changes.xml index 110ebaaf..c145e5fd 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -45,6 +45,12 @@ Fix several issues around Java OS and header files location detection. + + + Add protection to avoid high CPU usage for applications running in JVM + mode that do not wait for the stop method to be called before the start + method returns. + Bump org.apache.commons:commons-parent from 71 to 78 #189, #196, #198, #204, #207, #210, #216. diff --git a/src/native/windows/apps/prunsrv/prunsrv.c b/src/native/windows/apps/prunsrv/prunsrv.c index a30417c4..42c030d5 100644 --- a/src/native/windows/apps/prunsrv/prunsrv.c +++ b/src/native/windows/apps/prunsrv/prunsrv.c @@ -1839,9 +1839,17 @@ void WINAPI serviceMain(DWORD argc, LPTSTR *argv) if (SO_STOPTIMEOUT) { /* we have a stop timeout */ + BOOL bLoopWarningIssued = FALSE; do { /* wait 2 seconds */ - apxHandleWait(gWorker, 2000, FALSE); + DWORD rv = apxHandleWait(gWorker, 2000, FALSE); + if (rv == WAIT_OBJECT_0 && !_exe_shutdown) { + if (!bLoopWarningIssued) { + apxLogWrite(APXLOG_MARK_WARN "Start method returned before stop method was called. This should not happen. Using loop with a fixed sleep of 2 seconds waiting for stop method to be called."); + bLoopWarningIssued = TRUE; + } + Sleep(2000); + } } while (!_exe_shutdown); apxLogWrite(APXLOG_MARK_DEBUG "waiting %d sec... shutdown: %d", SO_STOPTIMEOUT, _exe_shutdown); apxHandleWait(gWorker, SO_STOPTIMEOUT*1000, FALSE); From cee15add7ddbe95fde4ac8d956a0d2ce53209dbe Mon Sep 17 00:00:00 2001 From: Mark Thomas Date: Tue, 10 Dec 2024 11:51:32 +0000 Subject: [PATCH 297/298] Fix truncated log messages --- src/changes/changes.xml | 4 ++++ src/native/windows/src/registry.c | 6 +++--- src/native/windows/src/service.c | 4 ++-- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/changes/changes.xml b/src/changes/changes.xml index c145e5fd..fb3454f1 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -45,6 +45,10 @@ Fix several issues around Java OS and header files location detection. + + Correct several log messages where an incorrect placeholder led to + truncation of the inserted values. + Add protection to avoid high CPU usage for applications running in JVM diff --git a/src/native/windows/src/registry.c b/src/native/windows/src/registry.c index 89ff5549..d0955e01 100644 --- a/src/native/windows/src/registry.c +++ b/src/native/windows/src/registry.c @@ -858,7 +858,7 @@ BOOL apxGetServiceDescriptionW(LPCWSTR szServiceName, LPWSTR szDescription, DWORD t = REG_SZ; int iServiceNameLen = lstrlenW(szServiceName); if (iServiceNameLen > SIZ_RESMAX) { - apxLogWrite(APXLOG_MARK_WARN "Can't read service description because registry key '%s' length %d > %d", szServiceName, iServiceNameLen, SIZ_RESMAX); + apxLogWrite(APXLOG_MARK_WARN "Can't read service description because registry key '%S' length %d > %d", szServiceName, iServiceNameLen, SIZ_RESMAX); return FALSE; } lstrcpyW(wcName, REGSERVICE_ROOT); @@ -866,7 +866,7 @@ BOOL apxGetServiceDescriptionW(LPCWSTR szServiceName, LPWSTR szDescription, rc = RegOpenKeyExW(HKEY_LOCAL_MACHINE, wcName, 0, KEY_READ, &hKey); if (rc != ERROR_SUCCESS) { - apxLogWrite(APXLOG_MARK_WARN "Can't read service description because registry key '%s' cannot be opened (rc = %d)", wcName, rc); + apxLogWrite(APXLOG_MARK_WARN "Can't read service description because registry key '%S' cannot be opened (rc = %d)", wcName, rc); return FALSE; } rc = RegQueryValueExW(hKey, REGDESCRIPTION, NULL, &t, (BYTE *)szDescription, @@ -875,7 +875,7 @@ BOOL apxGetServiceDescriptionW(LPCWSTR szServiceName, LPWSTR szDescription, if (rc == ERROR_SUCCESS && t == REG_SZ) return TRUE; else { - apxLogWrite(APXLOG_MARK_WARN "Can't read service description because registry key '%s' cannot query value at '%s' (rc = %d)", wcName, REGDESCRIPTION, rc); + apxLogWrite(APXLOG_MARK_WARN "Can't read service description because registry key '%S' cannot query value at '%S' (rc = %d)", wcName, REGDESCRIPTION, rc); return FALSE; } } diff --git a/src/native/windows/src/service.c b/src/native/windows/src/service.c index 582d1119..82146346 100644 --- a/src/native/windows/src/service.c +++ b/src/native/windows/src/service.c @@ -156,13 +156,13 @@ apxServiceOpen(APXHANDLE hService, LPCWSTR szServiceName, DWORD dwOptions) if (!apxGetServiceDescriptionW(szServiceName, lpService->stServiceEntry.szServiceDescription, SIZ_DESLEN)) { - apxLogWrite(APXLOG_MARK_WARN "Failed to obtain service description for '%s'", szServiceName); + apxLogWrite(APXLOG_MARK_WARN "Failed to obtain service description for '%S'", szServiceName); lpService->stServiceEntry.szServiceDescription[0] = L'\0'; } if (!apxGetServiceUserW(szServiceName, lpService->stServiceEntry.szObjectName, SIZ_RESLEN)) { - apxLogWrite(APXLOG_MARK_WARN "Failed to obtain service user name for '%s'", szServiceName); + apxLogWrite(APXLOG_MARK_WARN "Failed to obtain service user name for '%S'", szServiceName); lpService->stServiceEntry.szObjectName[0] = L'\0'; } if (!QueryServiceConfigW(lpService->hService, NULL, 0, &dwNeeded)) { From 3e750f06f06c1e3c0f3de44510031bdb2c586191 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 13 Dec 2024 12:22:19 -0500 Subject: [PATCH 298/298] Bump github/codeql-action from 3.27.6 to 3.27.9 (#228) Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.27.6 to 3.27.9. - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/aa578102511db1f4524ed59b8cc2bae4f6e88195...df409f7d9260372bd5f19e5b04e83cb3c43714ae) --- updated-dependencies: - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/codeql-analysis-cpp.yml | 4 ++-- .github/workflows/codeql-analysis-java.yml | 6 +++--- .github/workflows/scorecards-analysis.yml | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/codeql-analysis-cpp.yml b/.github/workflows/codeql-analysis-cpp.yml index 1593b3cb..ce0fc49b 100644 --- a/.github/workflows/codeql-analysis-cpp.yml +++ b/.github/workflows/codeql-analysis-cpp.yml @@ -57,7 +57,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@aa578102511db1f4524ed59b8cc2bae4f6e88195 # 3.27.6 + uses: github/codeql-action/init@df409f7d9260372bd5f19e5b04e83cb3c43714ae # 3.27.9 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -86,4 +86,4 @@ jobs: make - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@aa578102511db1f4524ed59b8cc2bae4f6e88195 # 3.27.6 + uses: github/codeql-action/analyze@df409f7d9260372bd5f19e5b04e83cb3c43714ae # 3.27.9 diff --git a/.github/workflows/codeql-analysis-java.yml b/.github/workflows/codeql-analysis-java.yml index df570af0..4dddfd37 100644 --- a/.github/workflows/codeql-analysis-java.yml +++ b/.github/workflows/codeql-analysis-java.yml @@ -57,7 +57,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@aa578102511db1f4524ed59b8cc2bae4f6e88195 # 3.27.6 + uses: github/codeql-action/init@df409f7d9260372bd5f19e5b04e83cb3c43714ae # 3.27.9 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -68,7 +68,7 @@ jobs: # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). # If this step fails, then you should remove it and run the build manually (see below) - name: Autobuild - uses: github/codeql-action/autobuild@aa578102511db1f4524ed59b8cc2bae4f6e88195 # 3.27.6 + uses: github/codeql-action/autobuild@df409f7d9260372bd5f19e5b04e83cb3c43714ae # 3.27.9 # ℹī¸ Command-line programs to run using the OS shell. # 📚 https://git.io/JvXDl @@ -82,4 +82,4 @@ jobs: # make release - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@aa578102511db1f4524ed59b8cc2bae4f6e88195 # 3.27.6 + uses: github/codeql-action/analyze@df409f7d9260372bd5f19e5b04e83cb3c43714ae # 3.27.9 diff --git a/.github/workflows/scorecards-analysis.yml b/.github/workflows/scorecards-analysis.yml index 6e21bc8b..35812f16 100644 --- a/.github/workflows/scorecards-analysis.yml +++ b/.github/workflows/scorecards-analysis.yml @@ -64,6 +64,6 @@ jobs: retention-days: 5 - name: "Upload to code-scanning" - uses: github/codeql-action/upload-sarif@aa578102511db1f4524ed59b8cc2bae4f6e88195 # 3.27.6 + uses: github/codeql-action/upload-sarif@df409f7d9260372bd5f19e5b04e83cb3c43714ae # 3.27.9 with: sarif_file: results.sarif