From a50b0b983eb2406fd5873e3973d88ec968673ce6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 22 Mar 2024 06:28:40 -0400 Subject: [PATCH 01/35] Bump actions/cache from 4.0.1 to 4.0.2 (#235) 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.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index f8cd94b..9333b28 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -48,7 +48,7 @@ jobs: uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # 4.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 b63fc7a07e0526bfd88180ae1c21270dd488a689 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 22 Mar 2024 06:28:53 -0400 Subject: [PATCH 02/35] Bump github/codeql-action from 3.24.7 to 3.24.8 (#236) Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.24.7 to 3.24.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/3ab4101902695724f9365a384f86c1074d94e18c...05963f47d870e2cb19a537396c1f668a348c7d8f) --- 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.yml | 6 +++--- .github/workflows/scorecards-analysis.yml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 9333b28..62b5f69 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.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@05963f47d870e2cb19a537396c1f668a348c7d8f # 3.24.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@3ab4101902695724f9365a384f86c1074d94e18c # 3.24.7 + uses: github/codeql-action/autobuild@05963f47d870e2cb19a537396c1f668a348c7d8f # 3.24.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@3ab4101902695724f9365a384f86c1074d94e18c # 3.24.7 + uses: github/codeql-action/analyze@05963f47d870e2cb19a537396c1f668a348c7d8f # 3.24.8 diff --git a/.github/workflows/scorecards-analysis.yml b/.github/workflows/scorecards-analysis.yml index 1fbbd73..3974865 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@05963f47d870e2cb19a537396c1f668a348c7d8f # 3.24.8 with: sarif_file: results.sarif From 0adb67eb208ab539727c339d810ed8db2f3621f2 Mon Sep 17 00:00:00 2001 From: Gary Gregory Date: Fri, 22 Mar 2024 09:48:14 -0400 Subject: [PATCH 03/35] Use Java 5's String#contains(CharSequence) --- src/test/java/org/apache/commons/logging/LoadTestCase.java | 3 +-- .../apache/commons/logging/tccl/log/TcclDisabledTestCase.java | 3 +-- .../commons/logging/tccl/logfactory/TcclDisabledTestCase.java | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/test/java/org/apache/commons/logging/LoadTestCase.java b/src/test/java/org/apache/commons/logging/LoadTestCase.java index 0005202..a2eda91 100644 --- a/src/test/java/org/apache/commons/logging/LoadTestCase.java +++ b/src/test/java/org/apache/commons/logging/LoadTestCase.java @@ -78,11 +78,10 @@ public class LoadTestCase extends TestCase { // but it will delegate to JUnit class loader first @Override public Class loadClass(final String name) throws ClassNotFoundException { - // isolates all logging classes, application in the same class loader too. // filters exceptions to simplify handling in test for (final String element : LOG_PCKG) { - if (name.startsWith(element) && name.indexOf("Exception") == -1) { + if (name.startsWith(element) && !name.contains("Exception")) { return def(name); } } diff --git a/src/test/java/org/apache/commons/logging/tccl/log/TcclDisabledTestCase.java b/src/test/java/org/apache/commons/logging/tccl/log/TcclDisabledTestCase.java index 9a52c3b..8a787fe 100644 --- a/src/test/java/org/apache/commons/logging/tccl/log/TcclDisabledTestCase.java +++ b/src/test/java/org/apache/commons/logging/tccl/log/TcclDisabledTestCase.java @@ -149,8 +149,7 @@ public class TcclDisabledTestCase extends TestCase { assertNotNull(log); // silence compiler warning about unused var } catch (final LogConfigurationException ex) { // ok, expected - final int index = ex.getMessage().indexOf(MY_LOG_IMPL); - assertTrue("MyLog not found", index >= 0); + assertTrue("MyLog not found", ex.getMessage().contains(MY_LOG_IMPL)); } } } diff --git a/src/test/java/org/apache/commons/logging/tccl/logfactory/TcclDisabledTestCase.java b/src/test/java/org/apache/commons/logging/tccl/logfactory/TcclDisabledTestCase.java index df9634e..e8f2e88 100644 --- a/src/test/java/org/apache/commons/logging/tccl/logfactory/TcclDisabledTestCase.java +++ b/src/test/java/org/apache/commons/logging/tccl/logfactory/TcclDisabledTestCase.java @@ -144,8 +144,7 @@ public class TcclDisabledTestCase extends TestCase { } catch (final org.apache.commons.logging.LogConfigurationException ex) { // ok, custom MyLogFactoryImpl as specified in props_disable_tccl // could not be found. - final int index = ex.getMessage().indexOf(MY_LOG_FACTORY_IMPL); - assertTrue("MylogFactoryImpl not found", index >= 0); + assertTrue("MylogFactoryImpl not found", ex.getMessage().contains(MY_LOG_FACTORY_IMPL)); } } } From 0bbefd98c12ab34c863aa49315a5eb165b31998b Mon Sep 17 00:00:00 2001 From: Gary Gregory Date: Sun, 24 Mar 2024 11:35:33 -0400 Subject: [PATCH 04/35] Add section for the next release --- src/changes/changes.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/changes/changes.xml b/src/changes/changes.xml index 246c115..f245951 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -43,6 +43,8 @@ The type attribute can be add,update,fix,remove. Release Notes + + Add Maven property project.build.outputTimestamp for build reproducibility. From 149d376588c77b0c16bde1c4fba13baab2c690c9 Mon Sep 17 00:00:00 2001 From: Gary Gregory Date: Sun, 24 Mar 2024 14:07:54 -0400 Subject: [PATCH 05/35] Fix site generation --- pom.xml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index 0619ac4..f707ce3 100644 --- a/pom.xml +++ b/pom.xml @@ -605,11 +605,6 @@ under the License. false - - org.codehaus.mojo - jdepend-maven-plugin - 2.0 - com.github.spotbugs spotbugs-maven-plugin @@ -640,7 +635,8 @@ under the License. apache.website - ${commons.deployment.protocol}://people.apache.org/www/commons.apache.org/logging/ + Apache Commons Site + scm:svn:https://svn.apache.org/repos/infra/websites/production/commons/content/proper/commons-logging/ From 3a86c5f7051df85318871414edf6c600ca05e0ba Mon Sep 17 00:00:00 2001 From: Hannes Wellmann Date: Mon, 25 Mar 2024 13:31:31 +0100 Subject: [PATCH 06/35] [LOGGING-190] Add OSGi metadata to enable Service Loader Mediator (#234) --- pom.xml | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/pom.xml b/pom.xml index f707ce3..9d0fc24 100644 --- a/pom.xml +++ b/pom.xml @@ -510,6 +510,26 @@ under the License. + + + + + + org.apache.felix + maven-bundle-plugin + + + =1.0.0)(!(version>=2.0.0)))";resolution:=optional, + osgi.serviceloader;filter:="(osgi.serviceloader=org.apache.commons.logging.LogFactory)";osgi.serviceloader="org.apache.commons.logging.LogFactory";resolution:=optional;cardinality:=multiple + ]]> + + + + + + + From 96a4b8976ea1b97725ca9560255c7e23d68be2ee Mon Sep 17 00:00:00 2001 From: Gary Gregory Date: Mon, 25 Mar 2024 08:34:37 -0400 Subject: [PATCH 07/35] [LOGGING-190] Add OSGi metadata to enable Service Loader Mediator #234 --- src/changes/changes.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/changes/changes.xml b/src/changes/changes.xml index f245951..d724b70 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -43,7 +43,8 @@ The type attribute can be add,update,fix,remove. Release Notes - + + Add OSGi metadata to enable Service Loader Mediator #234. From 85117d0492826ed65145024d9874d5818f173e57 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 29 Mar 2024 07:13:28 -0400 Subject: [PATCH 08/35] Bump github/codeql-action from 3.24.8 to 3.24.9 (#237) Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.24.8 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/05963f47d870e2cb19a537396c1f668a348c7d8f...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.yml | 6 +++--- .github/workflows/scorecards-analysis.yml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 62b5f69..8c08d11 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -57,7 +57,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@05963f47d870e2cb19a537396c1f668a348c7d8f # 3.24.8 + 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@05963f47d870e2cb19a537396c1f668a348c7d8f # 3.24.8 + 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@05963f47d870e2cb19a537396c1f668a348c7d8f # 3.24.8 + uses: github/codeql-action/analyze@1b1aada464948af03b950897e5eb522f92603cc2 # 3.24.9 diff --git a/.github/workflows/scorecards-analysis.yml b/.github/workflows/scorecards-analysis.yml index 3974865..67f591e 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@05963f47d870e2cb19a537396c1f668a348c7d8f # 3.24.8 + uses: github/codeql-action/upload-sarif@1b1aada464948af03b950897e5eb522f92603cc2 # 3.24.9 with: sarif_file: results.sarif From 3bc4ad505b9947b43464b6114ac9a3da9776cf49 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 29 Mar 2024 07:13:39 -0400 Subject: [PATCH 09/35] Bump codecov/codecov-action from 4.1.0 to 4.1.1 (#238) 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 00ddd57..0bd8a3d 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -42,6 +42,6 @@ jobs: run: mvn --show-version --batch-mode --no-transfer-progress verify jacoco:report - name: Upload coverage to Codecov - uses: codecov/codecov-action@54bcd8715eee62d40e33596ef5e8f0f48dbbccab # v3 + uses: codecov/codecov-action@c16abc29c95fcf9174b58eb7e1abf4c866893bc8 # v3 with: files: ./target/site/jacoco/jacoco.xml From 1711e8f718bb159d0e08e82cafcc138a2e823bde Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 1 Apr 2024 14:02:35 -0400 Subject: [PATCH 10/35] Bump org.apache.commons:commons-parent from 67 to 69 (#240) 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 9d0fc24..3ba4ef7 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ under the License. org.apache.commons commons-parent - 67 + 69 4.0.0 commons-logging From c121c81fda95aee2ec6dc91d1e86b72bee50e3d1 Mon Sep 17 00:00:00 2001 From: Gary Gregory Date: Mon, 1 Apr 2024 14:03:29 -0400 Subject: [PATCH 11/35] Bump org.apache.commons:commons-parent from 67 to 69 #240 --- src/changes/changes.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/changes/changes.xml b/src/changes/changes.xml index d724b70..e94e9bf 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -45,6 +45,8 @@ The type attribute can be add,update,fix,remove. Add OSGi metadata to enable Service Loader Mediator #234. + + Bump org.apache.commons:commons-parent from 67 to 69 #240. From 247324c0f14fb29cd3ef7f41b1e2b8d2aaab7552 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 5 Apr 2024 06:27:18 -0400 Subject: [PATCH 12/35] Bump codecov/codecov-action from 4.1.1 to 4.2.0 (#241) 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 0bd8a3d..f7b3183 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -42,6 +42,6 @@ jobs: run: mvn --show-version --batch-mode --no-transfer-progress verify jacoco:report - name: Upload coverage to Codecov - uses: codecov/codecov-action@c16abc29c95fcf9174b58eb7e1abf4c866893bc8 # v3 + uses: codecov/codecov-action@7afa10ed9b269c561c2336fd862446844e0cbf71 # v3 with: files: ./target/site/jacoco/jacoco.xml From c0aeea57595613af0092ae8993d395b63586b081 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 12 Apr 2024 08:00:51 -0400 Subject: [PATCH 13/35] Bump github/codeql-action from 3.24.9 to 3.24.10 (#242) 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.yml | 6 +++--- .github/workflows/scorecards-analysis.yml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 8c08d11..cc0fe44 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.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 67f591e..372f190 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 40e4e6de7c23d90b2ce646e245acc9c0c65c35e1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 12 Apr 2024 08:01:07 -0400 Subject: [PATCH 14/35] Bump codecov/codecov-action from 4.2.0 to 4.3.0 (#243) 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 f7b3183..691f550 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -42,6 +42,6 @@ jobs: run: mvn --show-version --batch-mode --no-transfer-progress verify jacoco:report - name: Upload coverage to Codecov - uses: codecov/codecov-action@7afa10ed9b269c561c2336fd862446844e0cbf71 # v3 + uses: codecov/codecov-action@84508663e988701840491b86de86b666e8a86bed # v3 with: files: ./target/site/jacoco/jacoco.xml From b12bfdabdbfbfce45358cf33966b7149e9f311b1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 19 Apr 2024 09:33:12 -0400 Subject: [PATCH 15/35] Bump github/codeql-action from 3.24.10 to 3.25.1 (#245) 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.yml | 6 +++--- .github/workflows/scorecards-analysis.yml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index cc0fe44..aa00787 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.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 372f190..e4b89de 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 c662976db9d97b2b7ac8f8b84c987f0160322b0e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 19 Apr 2024 09:33:25 -0400 Subject: [PATCH 16/35] Bump actions/upload-artifact from 4.3.1 to 4.3.2 (#246) 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 e4b89de..bd978da 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 c1c8dce8772c0c0b1657448f24cb4c683311ccfd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 19 Apr 2024 09:54:40 -0400 Subject: [PATCH 17/35] Bump org.slf4j:slf4j-api from 2.0.12 to 2.0.13 (#248) Bumps org.slf4j:slf4j-api from 2.0.12 to 2.0.13. --- updated-dependencies: - dependency-name: org.slf4j:slf4j-api 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> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3ba4ef7..51170f7 100644 --- a/pom.xml +++ b/pom.xml @@ -682,7 +682,7 @@ under the License. filesystem 2.23.1 1.3.14 - 2.0.12 + 2.0.13 1.13.0 javax.servlet;version="[2.1.0, 5.0.0)";resolution:=optional, From 9cd3ea84aef77f9d95f63f441471fe9a7de1ca51 Mon Sep 17 00:00:00 2001 From: Gary Gregory Date: Fri, 19 Apr 2024 09:55:38 -0400 Subject: [PATCH 18/35] Bump org.slf4j:slf4j-api from 2.0.12 to 2.0.13 #248 --- src/changes/changes.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/src/changes/changes.xml b/src/changes/changes.xml index e94e9bf..c1326d5 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -47,6 +47,7 @@ The type attribute can be add,update,fix,remove. Add OSGi metadata to enable Service Loader Mediator #234. Bump org.apache.commons:commons-parent from 67 to 69 #240. + Bump org.slf4j:slf4j-api from 2.0.12 to 2.0.13 #248. From 1bae51e4fef657cd82a20cc824d2f55ecfa869b7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 26 Apr 2024 06:56:47 -0400 Subject: [PATCH 19/35] Bump github/codeql-action from 3.25.1 to 3.25.3 (#251) 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.yml | 6 +++--- .github/workflows/scorecards-analysis.yml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index aa00787..faa540d 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.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 bd978da..9ed7f39 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 0755e2a33980b880425664345ae6381902041667 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 26 Apr 2024 06:56:58 -0400 Subject: [PATCH 20/35] Bump actions/checkout from 4.1.2 to 4.1.4 (#250) Bumps [actions/checkout](https://github.com/actions/checkout) from 4.1.2 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/9bb56186c3b09b4f86b1c65136769dd318469633...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.yml | 2 +- .github/workflows/coverage.yml | 2 +- .github/workflows/maven.yml | 2 +- .github/workflows/scorecards-analysis.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index faa540d..0418376 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -45,7 +45,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # 4.1.2 + uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # 4.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 691f550..9932f30 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@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 with: persist-credentials: false - name: Set up JDK ${{ matrix.java }} diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 166ce30..a1c2b12 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -36,7 +36,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2 + uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 - name: Set up JDK ${{ matrix.java }} uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1 diff --git a/.github/workflows/scorecards-analysis.yml b/.github/workflows/scorecards-analysis.yml index 9ed7f39..9cdd3ed 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 # 4.1.2 + uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # 4.1.4 with: persist-credentials: false From c12d7f3acf6cf7ab29789cd2659980766a10fd10 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 26 Apr 2024 06:57:09 -0400 Subject: [PATCH 21/35] Bump actions/upload-artifact from 4.3.2 to 4.3.3 (#249) 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 9cdd3ed..db116e2 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 33efdc2e2f351f1b7d7f6a4c2ec90bb454919a2e Mon Sep 17 00:00:00 2001 From: Gary Gregory Date: Fri, 26 Apr 2024 07:07:11 -0400 Subject: [PATCH 22/35] [LOGGING-191] Apache commons logging shows 1.4 as latest release instead of 1.3.1 --- src/changes/changes.xml | 1 + src/site/xdoc/index.xml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/changes/changes.xml b/src/changes/changes.xml index c1326d5..f485bee 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -45,6 +45,7 @@ The type attribute can be add,update,fix,remove. Add OSGi metadata to enable Service Loader Mediator #234. + Apache commons logging shows 1.4 as latest release instead of 1.3.1. Bump org.apache.commons:commons-parent from 67 to 69 #240. Bump org.slf4j:slf4j-api from 2.0.12 to 2.0.13 #248. diff --git a/src/site/xdoc/index.xml b/src/site/xdoc/index.xml index 409b595..ab10ec5 100644 --- a/src/site/xdoc/index.xml +++ b/src/site/xdoc/index.xml @@ -81,7 +81,7 @@ This gives short introductions to topics such as advanced class loading. Binary and source distributions are available here.

- +

Please refer to the change-report.

From 176bcdf7406aa680a1b5982aabd3f8d2fc83e3ae Mon Sep 17 00:00:00 2001 From: Gary Gregory Date: Fri, 26 Apr 2024 07:12:19 -0400 Subject: [PATCH 23/35] Javadoc --- .../java/org/apache/commons/logging/impl/WeakHashtable.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/apache/commons/logging/impl/WeakHashtable.java b/src/main/java/org/apache/commons/logging/impl/WeakHashtable.java index 00a4753..ca0cdcc 100644 --- a/src/main/java/org/apache/commons/logging/impl/WeakHashtable.java +++ b/src/main/java/org/apache/commons/logging/impl/WeakHashtable.java @@ -106,7 +106,7 @@ import java.util.Set; * for most or all users. * * @since 1.1 - * @deprecated No longer used. + * @deprecated No longer used, will be removed in 2.0. */ @Deprecated public final class WeakHashtable extends Hashtable { From 2fa63c758f105eb2a47789ca8f89cc587e3c1d58 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 3 May 2024 08:25:24 -0400 Subject: [PATCH 24/35] Bump codecov/codecov-action from 4.3.0 to 4.3.1 (#252) 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 9932f30..8c8da64 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -42,6 +42,6 @@ jobs: run: mvn --show-version --batch-mode --no-transfer-progress verify jacoco:report - name: Upload coverage to Codecov - uses: codecov/codecov-action@84508663e988701840491b86de86b666e8a86bed # v3 + uses: codecov/codecov-action@5ecb98a3c6b747ed38dc09f787459979aebb39be # v3 with: files: ./target/site/jacoco/jacoco.xml From 144ae1f6578a913f1b8407611961e975e69919c7 Mon Sep 17 00:00:00 2001 From: Gary Gregory Date: Fri, 3 May 2024 10:13:06 -0400 Subject: [PATCH 25/35] Normalize exception message --- src/main/java/org/apache/commons/logging/impl/AvalonLogger.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/apache/commons/logging/impl/AvalonLogger.java b/src/main/java/org/apache/commons/logging/impl/AvalonLogger.java index 987d6ac..2102cf2 100644 --- a/src/main/java/org/apache/commons/logging/impl/AvalonLogger.java +++ b/src/main/java/org/apache/commons/logging/impl/AvalonLogger.java @@ -87,7 +87,7 @@ public class AvalonLogger implements Log { * @param name the name of the avalon logger implementation to delegate to */ public AvalonLogger(final String name) { - Objects.requireNonNull(defaultLogger, "default logger has to be specified if this constructor is used!"); + Objects.requireNonNull(defaultLogger, "defaultLogger"); this.logger = defaultLogger.getChildLogger(name); } From 3d59890e6ff38454177695e84dfef0f5ce59ce32 Mon Sep 17 00:00:00 2001 From: Gary Gregory Date: Wed, 8 May 2024 16:05:18 -0400 Subject: [PATCH 26/35] Set a baseline for JaCoCo checks --- pom.xml | 9 ++++++++- src/site/resources/profile.jacoco | 0 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 src/site/resources/profile.jacoco diff --git a/pom.xml b/pom.xml index 51170f7..0b38b74 100644 --- a/pom.xml +++ b/pom.xml @@ -694,8 +694,15 @@ under the License. org.slf4j.spi;version="[1.7, 3)";resolution:=optional 2024-03-24T15:00:55Z + + true + 0.86 + 0.53 + 0.69 + 0.51 + 0.58 + 0.51 - baliuka diff --git a/src/site/resources/profile.jacoco b/src/site/resources/profile.jacoco new file mode 100644 index 0000000..e69de29 From 2097ca8c9f320907b6c53de1fcaee3b9dd4c882c Mon Sep 17 00:00:00 2001 From: Gary Gregory Date: Wed, 8 May 2024 17:51:22 -0400 Subject: [PATCH 27/35] Set a baseline for JaCoCo checks --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 0b38b74..81d5da4 100644 --- a/pom.xml +++ b/pom.xml @@ -699,9 +699,9 @@ under the License. 0.86 0.53 0.69 - 0.51 - 0.58 - 0.51 + 0.50 + 0.57 + 0.50 From 6cddcb4450454735b8b06a07027e32d825f6e39f Mon Sep 17 00:00:00 2001 From: Gary Gregory Date: Wed, 8 May 2024 19:51:53 -0400 Subject: [PATCH 28/35] Set a baseline for JaCoCo checks Java 21 baseline as LCD --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 81d5da4..39bb4de 100644 --- a/pom.xml +++ b/pom.xml @@ -697,10 +697,10 @@ under the License. true 0.86 - 0.53 + 0.52 0.69 - 0.50 - 0.57 + 0.49 + 0.56 0.50 From f553f77be68b44fbb4e5e6e6ea85dee7461a5fee Mon Sep 17 00:00:00 2001 From: Gary Gregory Date: Wed, 8 May 2024 19:52:23 -0400 Subject: [PATCH 29/35] Add Java 22 to GH CI builds --- .github/workflows/maven.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index a1c2b12..3868be6 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -28,10 +28,10 @@ jobs: strategy: fail-fast: false matrix: - java: [ 8, 11, 17, 21 ] + java: [ 8, 11, 17, 21, 22 ] experimental: [false] # include: -# - java: 22-ea +# - java: 23-ea # experimental: true steps: From f852efcb6fcdaeb6cdb959c0c1429a75967bc08b Mon Sep 17 00:00:00 2001 From: Gary Gregory Date: Wed, 8 May 2024 22:55:28 -0400 Subject: [PATCH 30/35] Java 22 build doesn't work --- .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 3868be6..99b3135 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -28,7 +28,7 @@ jobs: strategy: fail-fast: false matrix: - java: [ 8, 11, 17, 21, 22 ] + java: [ 8, 11, 17, 21 ] experimental: [false] # include: # - java: 23-ea From 2efb10c0d998a7b0cf4fd70dd6956f4bb4337701 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 10 May 2024 07:38:49 -0400 Subject: [PATCH 31/35] Bump github/codeql-action from 3.25.3 to 3.25.4 (#253) 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.yml | 6 +++--- .github/workflows/scorecards-analysis.yml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 0418376..02d156e 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.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 db116e2..01a9a04 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 21d043040213052671a8dbb1b50d2d66bc5bced1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 10 May 2024 07:39:00 -0400 Subject: [PATCH 32/35] Bump ossf/scorecard-action from 2.3.1 to 2.3.3 (#255) 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 01a9a04..f6304ee 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 541b25f3650636d334b34ce51d912843157b315a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 10 May 2024 07:39:12 -0400 Subject: [PATCH 33/35] Bump actions/checkout from 4.1.4 to 4.1.5 (#254) 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.yml | 2 +- .github/workflows/coverage.yml | 2 +- .github/workflows/maven.yml | 2 +- .github/workflows/scorecards-analysis.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 02d156e..4cfca52 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -45,7 +45,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # 4.1.4 + uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # 4.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 8c8da64..070ac49 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 - name: Set up JDK ${{ matrix.java }} diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 99b3135..cee3d81 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -36,7 +36,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 + uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5 - name: Set up JDK ${{ matrix.java }} uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1 diff --git a/.github/workflows/scorecards-analysis.yml b/.github/workflows/scorecards-analysis.yml index f6304ee..9f22301 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 # 4.1.4 + uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # 4.1.5 with: persist-credentials: false From ebe6c93ce24f49f4741dc33b7f88dec5b843bfae Mon Sep 17 00:00:00 2001 From: Gary Gregory Date: Sat, 11 May 2024 10:41:57 -0400 Subject: [PATCH 34/35] Move properties towards the top Whitespace and normalize comments --- pom.xml | 195 ++++++++++++++++++++++++-------------------------------- 1 file changed, 84 insertions(+), 111 deletions(-) diff --git a/pom.xml b/pom.xml index 39bb4de..85fc93a 100644 --- a/pom.xml +++ b/pom.xml @@ -18,10 +18,10 @@ under the License. --> org.apache.commons @@ -36,31 +36,69 @@ under the License. Apache Commons Logging is a thin adapter allowing configurable bridging to other, well-known logging systems. https://commons.apache.org/proper/commons-logging/ - + + java18 + 1.8 + ${commons.logging.javaversion} + ${commons.logging.javaversion} + logging + org.apache.commons.logging + 1.3.1 + 1.3.2 + 1.3.0 + true + LOGGING + 12310484 + + RC2 + true + + 3.2.1 + + filesystem + 2.23.1 + 1.3.14 + 2.0.13 + 1.13.0 + + javax.servlet;version="[2.1.0, 5.0.0)";resolution:=optional, + org.apache.avalon.framework.logger;version="[4.1.3, 4.1.5]";resolution:=optional, + org.apache.log;version="[1.0.1, 1.0.1]";resolution:=optional, + org.apache.log4j;version="[1.2.15, 2.0.0)";resolution:=optional, + org.apache.logging.log4j;version="[2.0, 4.0)";resolution:=optional, + org.slf4j;version="[1.7, 3)";resolution:=optional, + org.slf4j.spi;version="[1.7, 3)";resolution:=optional + + 2024-03-24T15:00:55Z + + true + 0.86 + 0.52 + 0.69 + 0.49 + 0.56 + 0.50 + JIRA https://issues.apache.org/jira/browse/LOGGING - 2001 - scm:git:https://gitbox.apache.org/repos/asf/commons-logging scm:git:https://gitbox.apache.org/repos/asf/commons-logging https://gitbox.apache.org/repos/asf/commons-logging - clean verify apache-rat:check japicmp:cmp javadoc:javadoc checkstyle:check pmd:check - org.apache.maven.plugins @@ -68,8 +106,8 @@ under the License. create-test-jar package @@ -77,7 +115,6 @@ under the License. test-jar - create-api-jar package @@ -101,7 +138,6 @@ under the License. - create-adapters-jar package @@ -130,7 +166,6 @@ under the License. - org.apache.maven.plugins maven-antrun-plugin @@ -153,15 +188,14 @@ under the License. - org.apache.maven.plugins maven-surefire-plugin @@ -169,15 +203,14 @@ under the License. true - org.codehaus.mojo cobertura-maven-plugin @@ -186,7 +219,6 @@ under the License. true - org.moditect moditect-maven-plugin @@ -206,15 +238,14 @@ under the License. - org.apache.maven.plugins maven-failsafe-plugin @@ -260,8 +291,8 @@ under the License. serviceLoader-test @@ -278,7 +309,7 @@ under the License. log4j-test @@ -298,16 +329,16 @@ under the License. + --> org.apache.logging.log4j.core.impl.ReusableLogEventFactory log4j12-test @@ -337,8 +368,8 @@ under the License. org.apache.logging.log4j.core.impl.ReusableLogEventFactory @@ -354,7 +385,7 @@ under the License. slf4j-test @@ -379,7 +410,7 @@ under the License. log4j-to-slf4j-test @@ -412,7 +443,6 @@ under the License. - org.apache.maven.plugins maven-assembly-plugin @@ -436,7 +466,6 @@ under the License. - org.apache.maven.plugins maven-scm-publish-plugin @@ -447,7 +476,6 @@ under the License. - org.apache.maven.plugins maven-checkstyle-plugin @@ -457,7 +485,6 @@ under the License. false - org.apache.maven.plugins maven-pmd-plugin @@ -482,9 +509,8 @@ under the License. - org.apache.maven.plugins @@ -508,12 +534,9 @@ under the License. - - - org.apache.felix maven-bundle-plugin @@ -526,12 +549,9 @@ under the License. - - - org.junit.vintage @@ -614,7 +634,6 @@ under the License. test - @@ -651,7 +670,6 @@ under the License. - apache.website @@ -659,50 +677,6 @@ under the License. scm:svn:https://svn.apache.org/repos/infra/websites/production/commons/content/proper/commons-logging/ - - - java18 - 1.8 - ${commons.logging.javaversion} - ${commons.logging.javaversion} - logging - org.apache.commons.logging - 1.3.1 - 1.3.2 - 1.3.0 - true - LOGGING - 12310484 - - RC2 - true - - 3.2.1 - - filesystem - 2.23.1 - 1.3.14 - 2.0.13 - 1.13.0 - - javax.servlet;version="[2.1.0, 5.0.0)";resolution:=optional, - org.apache.avalon.framework.logger;version="[4.1.3, 4.1.5]";resolution:=optional, - org.apache.log;version="[1.0.1, 1.0.1]";resolution:=optional, - org.apache.log4j;version="[1.2.15, 2.0.0)";resolution:=optional, - org.apache.logging.log4j;version="[2.0, 4.0)";resolution:=optional, - org.slf4j;version="[1.7, 3)";resolution:=optional, - org.slf4j.spi;version="[1.7, 3)";resolution:=optional - - 2024-03-24T15:00:55Z - - true - 0.86 - 0.52 - 0.69 - 0.49 - 0.56 - 0.50 - baliuka @@ -846,5 +820,4 @@ under the License. arturobernalg@yahoo.com - From 1724a5b6c5e836d8804b9e407789f06347c29179 Mon Sep 17 00:00:00 2001 From: Gary Gregory Date: Sat, 11 May 2024 14:44:05 +0000 Subject: [PATCH 35/35] Prepare for the next release candidate --- README.md | 4 +-- RELEASE-NOTES.txt | 50 ++++++++++++++++++++++++++++++ pom.xml | 6 ++-- src/changes/changes.xml | 2 +- src/site/xdoc/download_logging.xml | 26 ++++++++-------- 5 files changed, 69 insertions(+), 19 deletions(-) diff --git a/README.md b/README.md index 0730ab8..752406f 100644 --- a/README.md +++ b/README.md @@ -46,7 +46,7 @@ Apache Commons Logging [![Java CI](https://github.com/apache/commons-logging/actions/workflows/maven.yml/badge.svg)](https://github.com/apache/commons-logging/actions/workflows/maven.yml) [![Coverage Status](https://codecov.io/gh/apache/commons-logging/branch/master/graph/badge.svg)](https://app.codecov.io/gh/apache/commons-logging) [![Maven Central](https://maven-badges.herokuapp.com/maven-central/commons-logging/commons-logging/badge.svg?gav=true)](https://maven-badges.herokuapp.com/maven-central/commons-logging/commons-logging/?gav=true) -[![Javadocs](https://javadoc.io/badge/commons-logging/commons-logging/1.3.1.svg)](https://javadoc.io/doc/commons-logging/commons-logging/1.3.1) +[![Javadocs](https://javadoc.io/badge/commons-logging/commons-logging/1.3.2.svg)](https://javadoc.io/doc/commons-logging/commons-logging/1.3.2) [![CodeQL](https://github.com/apache/commons-logging/actions/workflows/codeql-analysis.yml/badge.svg)](https://github.com/apache/commons-logging/actions/workflows/codeql-analysis.yml) [![OpenSSF Scorecard](https://api.securityscorecards.dev/projects/github.com/apache/commons-logging/badge)](https://api.securityscorecards.dev/projects/github.com/apache/commons-logging) @@ -70,7 +70,7 @@ Alternatively, you can pull it from the central Maven repositories: commons-logging commons-logging - 1.3.1 + 1.3.2 ``` diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt index 4028541..d1144da 100644 --- a/RELEASE-NOTES.txt +++ b/RELEASE-NOTES.txt @@ -38,6 +38,56 @@ Changes * Bump logkit from 1.0.1 to 2.0 #32. Thanks to Dependabot. +Historical list of changes: https://commons.apache.org/proper/commons-logging/changes-report.html + +Download it from https://commons.apache.org/proper/commons-logging/download_logging.cgi + +For complete information on Apache Commons Logging, including instructions on how to submit bug reports, +patches, or suggestions for improvement, see the Apache Commons Logging website: + +https://commons.apache.org/proper/commons-logging/ + +----------------------------------------------------------------------------- +Apache Commons Logging +Version 1.3.1 +RELEASE NOTES + +The Apache Commons Logging team is pleased to announce the release of Apache Commons Logging 1.3.1 + +Apache Commons Logging is a thin adapter allowing configurable bridging to other, +well-known logging systems. + +This is a feature and maintenance release. Java 8 or later is required. + +Changes in this version +----------------------- + +New features +------------ + +* Add Maven property project.build.outputTimestamp for build reproducibility. Thanks to Gary Gregory. + +Fixed Bugs +---------- + +* Remove references to very old JDK and Commons Logging versions #201. Thanks to Elliotte Rusty Harold. +* Update from Logj 1 to the Log4j 2 API compatibility layer #231. Thanks to Gary Gregory, Piotr P. Karwasz. +* Allow Servlet 4 in OSGi environment #191. Thanks to Vclav Haisman. +* Fix generics warnings #213. Thanks to Elliotte Rusty Harold. +* LOGGING-189: Fix Import-Package entry for org.slf4j #188. Thanks to Vclav Haisman, Sebb, Hannes Wellmann, Gary Gregory, Piotr P. Karwasz. + +Changes +------- + +* Bump org.apache.commons:commons-parent from 65 to 67. Thanks to Dependabot. +* Bump log4j2.version from 2.21.1 to 2.23.1 #187, #230. Thanks to Dependabot, Piotr P. Karwasz. +* Bump org.slf4j:slf4j-api from 2.0.9 to 2.0.12 #207. Thanks to Dependabot. +* Bump ch.qos.logback:logback-classic from 1.3.11 to 1.3.14 #212. Thanks to Dependabot, Gary Gregory. +* Bump ch.qos.logback:logback-core from 1.3.11 to 1.3.14 #211. Thanks to Dependabot, Gary Gregory. +* Bump com.h3xstream.findsecbugs:findsecbugs-plugin from 1.12.0 to 1.13.0. Thanks to Dependabot. +* Bump logkit from 1.0.1 to 2.0 #32. Thanks to Dependabot. + + Historical list of changes: https://commons.apache.org/proper/commons-logging/changes-report.html Download it from https://commons.apache.org/proper/commons-logging/download_logging.cgi diff --git a/pom.xml b/pom.xml index 85fc93a..a68ec2e 100644 --- a/pom.xml +++ b/pom.xml @@ -43,9 +43,9 @@ under the License. ${commons.logging.javaversion} logging org.apache.commons.logging - 1.3.1 - 1.3.2 - 1.3.0 + 1.3.2 + 1.3.3 + 1.3.1 true LOGGING 12310484 diff --git a/src/changes/changes.xml b/src/changes/changes.xml index f485bee..14fbec0 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -43,7 +43,7 @@ The type attribute can be add,update,fix,remove. Release Notes - + Add OSGi metadata to enable Service Loader Mediator #234. Apache commons logging shows 1.4 as latest release instead of 1.3.1. diff --git a/src/site/xdoc/download_logging.xml b/src/site/xdoc/download_logging.xml index 7cebced..a35c002 100644 --- a/src/site/xdoc/download_logging.xml +++ b/src/site/xdoc/download_logging.xml @@ -113,32 +113,32 @@ limitations under the License.

-
+
- - - + + + - - - + + +
commons-logging-1.3.1-bin.tar.gzsha512pgpcommons-logging-1.3.2-bin.tar.gzsha512pgp
commons-logging-1.3.1-bin.zipsha512pgpcommons-logging-1.3.2-bin.zipsha512pgp
- - - + + + - - - + + +
commons-logging-1.3.1-src.tar.gzsha512pgpcommons-logging-1.3.2-src.tar.gzsha512pgp
commons-logging-1.3.1-src.zipsha512pgpcommons-logging-1.3.2-src.zipsha512pgp