From 74f5156870dec697df97ead8ff92d3b01ec3bb08 Mon Sep 17 00:00:00 2001 From: Jeremy Long Date: Sun, 22 Oct 2023 06:31:44 -0400 Subject: [PATCH 1/4] fix: dependabot config --- .github/dependabot.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 65449fc67fa..7070f6c2403 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -11,7 +11,7 @@ updates: - package-ecosystem: "docker" directory: "/" schedule: - interval: "daily" + interval: "daily" ignore: # stay .net 3.1 - dependency-name: "mcr.microsoft.com/dotnet/runtime" From dbdb84d8bf143f5970f8294f1277f1d66b1f599a Mon Sep 17 00:00:00 2001 From: Jeremy Long Date: Sun, 22 Oct 2023 06:34:43 -0400 Subject: [PATCH 2/4] docs: release 8.4.2 --- .github/workflows/release.yml | 8 ++------ CHANGELOG.md | 6 ++++++ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 7d517e444f8..c574e2aabed 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -186,13 +186,9 @@ jobs: draft: false body: | - - fix: upgrade to JCS3 (#5114) - - fix: Support ~= version specifier in requirements.txt and pipfile (#5902) - - fix: Version of dependency no longer ignored when CPE product has a 'java' suffix in a product name (#5901) - - fix: Do not filter out evidences added by hints (#5900) - - fix: fixes FP #5925 (#5927) + - fix: correct log configuration in cli (#6002) - See the full listing of [changes](https://github.com/jeremylong/DependencyCheck/milestone/67?closed=1). + See the full listing of [changes](https://github.com/jeremylong/DependencyCheck/milestone/69?closed=1). - name: Upload CLI id: upload-release-cli diff --git a/CHANGELOG.md b/CHANGELOG.md index 130721aea78..51b14c6490b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # Change Log +## [Version 8.4.2](https://github.com/jeremylong/DependencyCheck/releases/tag/v8.4.2) (2023-10-22) + +- fix: correct log configuration in cli (#6002) + +See the full listing of [changes](https://github.com/jeremylong/DependencyCheck/milestone/69?closed=1). + ## [Version 8.4.1](https://github.com/jeremylong/DependencyCheck/releases/tag/v8.4.1) (2023-10-21) ### Fixed From c15b3b9677e2c64bd69b104809a294b8caf159ac Mon Sep 17 00:00:00 2001 From: Jeremy Long Date: Sun, 22 Oct 2023 06:35:44 -0400 Subject: [PATCH 3/4] build: prepare release v8.4.2 --- ant/pom.xml | 4 ++-- archetype/pom.xml | 6 +++--- cli/pom.xml | 4 ++-- core/pom.xml | 4 ++-- maven/pom.xml | 4 ++-- pom.xml | 6 +++--- utils/pom.xml | 4 ++-- 7 files changed, 16 insertions(+), 16 deletions(-) diff --git a/ant/pom.xml b/ant/pom.xml index 7a56bb57b3f..d4e34e31c69 100644 --- a/ant/pom.xml +++ b/ant/pom.xml @@ -20,7 +20,7 @@ Copyright (c) 2013 - Jeremy Long. All Rights Reserved. org.owasp dependency-check-parent - 8.4.2-SNAPSHOT + 8.4.2 dependency-check-ant @@ -32,7 +32,7 @@ Copyright (c) 2013 - Jeremy Long. All Rights Reserved. scm:git:https://github.com/jeremylong/DependencyCheck.git https://github.com/jeremylong/DependencyCheck/tree/main/ant scm:git:git@github.com:jeremylong/DependencyCheck.git - v6.4.1 + v8.4.2 diff --git a/archetype/pom.xml b/archetype/pom.xml index f5a6bd5cf73..5592ecd4a2b 100644 --- a/archetype/pom.xml +++ b/archetype/pom.xml @@ -20,20 +20,20 @@ Copyright (c) 2017 Jeremy Long. All Rights Reserved. org.owasp dependency-check-parent - 8.4.2-SNAPSHOT + 8.4.2 dependency-check-plugin Dependency-Check Plugin Archetype jar - 2023-10-21T13:37:51Z + 2023-10-22T10:34:59Z scm:git:https://github.com/jeremylong/DependencyCheck.git https://github.com/jeremylong/DependencyCheck/tree/main/archetype scm:git:git@github.com:jeremylong/DependencyCheck.git - HEAD + v8.4.2 diff --git a/cli/pom.xml b/cli/pom.xml index 380a1efd399..a7f50fe30b4 100644 --- a/cli/pom.xml +++ b/cli/pom.xml @@ -20,7 +20,7 @@ Copyright (c) 2012 - Jeremy Long. All Rights Reserved. org.owasp dependency-check-parent - 8.4.2-SNAPSHOT + 8.4.2 dependency-check-cli @@ -32,7 +32,7 @@ Copyright (c) 2012 - Jeremy Long. All Rights Reserved. scm:git:https://github.com/jeremylong/DependencyCheck.git https://github.com/jeremylong/DependencyCheck/tree/main/cli scm:git:git@github.com:jeremylong/DependencyCheck.git - v6.4.1 + v8.4.2 dependency-check-${project.version} diff --git a/core/pom.xml b/core/pom.xml index 5d3d96f2cfd..849e53fb08c 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -20,7 +20,7 @@ Copyright (c) 2012 Jeremy Long. All Rights Reserved. org.owasp dependency-check-parent - 8.4.2-SNAPSHOT + 8.4.2 dependency-check-core @@ -32,7 +32,7 @@ Copyright (c) 2012 Jeremy Long. All Rights Reserved. scm:git:https://github.com/jeremylong/DependencyCheck.git https://github.com/jeremylong/DependencyCheck/tree/main/core scm:git:git@github.com:jeremylong/DependencyCheck.git - v6.4.1 + v8.4.2 diff --git a/maven/pom.xml b/maven/pom.xml index fa7a742b053..86d19891c1e 100644 --- a/maven/pom.xml +++ b/maven/pom.xml @@ -20,7 +20,7 @@ Copyright (c) 2013 Jeremy Long. All Rights Reserved. org.owasp dependency-check-parent - 8.4.2-SNAPSHOT + 8.4.2 dependency-check-maven maven-plugin @@ -35,7 +35,7 @@ Copyright (c) 2013 Jeremy Long. All Rights Reserved. scm:git:https://github.com/jeremylong/DependencyCheck.git https://github.com/jeremylong/DependencyCheck/tree/master/maven scm:git:git@github.com:jeremylong/DependencyCheck.git - v6.4.1 + v8.4.2 3.1.0 diff --git a/pom.xml b/pom.xml index 0ce026b2190..4433c635363 100644 --- a/pom.xml +++ b/pom.xml @@ -20,7 +20,7 @@ Copyright (c) 2012 - Jeremy Long org.owasp dependency-check-parent - 8.4.2-SNAPSHOT + 8.4.2 pom @@ -94,7 +94,7 @@ Copyright (c) 2012 - Jeremy Long scm:git:https://github.com/jeremylong/DependencyCheck.git https://github.com/jeremylong/DependencyCheck scm:git:https://github.com/jeremylong/DependencyCheck.git - v6.4.1 + v8.4.2 github @@ -112,7 +112,7 @@ Copyright (c) 2012 - Jeremy Long - 2023-10-21T13:37:51Z + 2023-10-22T10:34:59Z UTF-8 UTF-8 github diff --git a/utils/pom.xml b/utils/pom.xml index b176c53a678..8d11bf59901 100644 --- a/utils/pom.xml +++ b/utils/pom.xml @@ -20,7 +20,7 @@ Copyright (c) 2014 - Jeremy Long. All Rights Reserved. org.owasp dependency-check-parent - 8.4.2-SNAPSHOT + 8.4.2 dependency-check-utils @@ -30,7 +30,7 @@ Copyright (c) 2014 - Jeremy Long. All Rights Reserved. scm:git:https://github.com/jeremylong/DependencyCheck.git https://github.com/jeremylong/DependencyCheck/tree/main/utils scm:git:git@github.com:jeremylong/DependencyCheck.git - v6.4.1 + v8.4.2 org.owasp.dependencycheck.utils.* From 6522f4712ff90a03b0636ba5a8b3ed2fa1f8b27c Mon Sep 17 00:00:00 2001 From: Jeremy Long Date: Sun, 22 Oct 2023 06:35:45 -0400 Subject: [PATCH 4/4] build: prepare for next development iteration --- ant/pom.xml | 4 ++-- archetype/pom.xml | 6 +++--- cli/pom.xml | 4 ++-- core/pom.xml | 4 ++-- maven/pom.xml | 4 ++-- pom.xml | 6 +++--- utils/pom.xml | 4 ++-- 7 files changed, 16 insertions(+), 16 deletions(-) diff --git a/ant/pom.xml b/ant/pom.xml index d4e34e31c69..ab7e45f21d5 100644 --- a/ant/pom.xml +++ b/ant/pom.xml @@ -20,7 +20,7 @@ Copyright (c) 2013 - Jeremy Long. All Rights Reserved. org.owasp dependency-check-parent - 8.4.2 + 8.4.3-SNAPSHOT dependency-check-ant @@ -32,7 +32,7 @@ Copyright (c) 2013 - Jeremy Long. All Rights Reserved. scm:git:https://github.com/jeremylong/DependencyCheck.git https://github.com/jeremylong/DependencyCheck/tree/main/ant scm:git:git@github.com:jeremylong/DependencyCheck.git - v8.4.2 + v6.4.1 diff --git a/archetype/pom.xml b/archetype/pom.xml index 5592ecd4a2b..59adf5da06c 100644 --- a/archetype/pom.xml +++ b/archetype/pom.xml @@ -20,20 +20,20 @@ Copyright (c) 2017 Jeremy Long. All Rights Reserved. org.owasp dependency-check-parent - 8.4.2 + 8.4.3-SNAPSHOT dependency-check-plugin Dependency-Check Plugin Archetype jar - 2023-10-22T10:34:59Z + 2023-10-22T10:35:45Z scm:git:https://github.com/jeremylong/DependencyCheck.git https://github.com/jeremylong/DependencyCheck/tree/main/archetype scm:git:git@github.com:jeremylong/DependencyCheck.git - v8.4.2 + HEAD diff --git a/cli/pom.xml b/cli/pom.xml index a7f50fe30b4..90307e5d943 100644 --- a/cli/pom.xml +++ b/cli/pom.xml @@ -20,7 +20,7 @@ Copyright (c) 2012 - Jeremy Long. All Rights Reserved. org.owasp dependency-check-parent - 8.4.2 + 8.4.3-SNAPSHOT dependency-check-cli @@ -32,7 +32,7 @@ Copyright (c) 2012 - Jeremy Long. All Rights Reserved. scm:git:https://github.com/jeremylong/DependencyCheck.git https://github.com/jeremylong/DependencyCheck/tree/main/cli scm:git:git@github.com:jeremylong/DependencyCheck.git - v8.4.2 + v6.4.1 dependency-check-${project.version} diff --git a/core/pom.xml b/core/pom.xml index 849e53fb08c..6abbdf22765 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -20,7 +20,7 @@ Copyright (c) 2012 Jeremy Long. All Rights Reserved. org.owasp dependency-check-parent - 8.4.2 + 8.4.3-SNAPSHOT dependency-check-core @@ -32,7 +32,7 @@ Copyright (c) 2012 Jeremy Long. All Rights Reserved. scm:git:https://github.com/jeremylong/DependencyCheck.git https://github.com/jeremylong/DependencyCheck/tree/main/core scm:git:git@github.com:jeremylong/DependencyCheck.git - v8.4.2 + v6.4.1 diff --git a/maven/pom.xml b/maven/pom.xml index 86d19891c1e..b216183c664 100644 --- a/maven/pom.xml +++ b/maven/pom.xml @@ -20,7 +20,7 @@ Copyright (c) 2013 Jeremy Long. All Rights Reserved. org.owasp dependency-check-parent - 8.4.2 + 8.4.3-SNAPSHOT dependency-check-maven maven-plugin @@ -35,7 +35,7 @@ Copyright (c) 2013 Jeremy Long. All Rights Reserved. scm:git:https://github.com/jeremylong/DependencyCheck.git https://github.com/jeremylong/DependencyCheck/tree/master/maven scm:git:git@github.com:jeremylong/DependencyCheck.git - v8.4.2 + v6.4.1 3.1.0 diff --git a/pom.xml b/pom.xml index 4433c635363..ed22f44bccf 100644 --- a/pom.xml +++ b/pom.xml @@ -20,7 +20,7 @@ Copyright (c) 2012 - Jeremy Long org.owasp dependency-check-parent - 8.4.2 + 8.4.3-SNAPSHOT pom @@ -94,7 +94,7 @@ Copyright (c) 2012 - Jeremy Long scm:git:https://github.com/jeremylong/DependencyCheck.git https://github.com/jeremylong/DependencyCheck scm:git:https://github.com/jeremylong/DependencyCheck.git - v8.4.2 + v6.4.1 github @@ -112,7 +112,7 @@ Copyright (c) 2012 - Jeremy Long - 2023-10-22T10:34:59Z + 2023-10-22T10:35:45Z UTF-8 UTF-8 github diff --git a/utils/pom.xml b/utils/pom.xml index 8d11bf59901..d5f6d63c34f 100644 --- a/utils/pom.xml +++ b/utils/pom.xml @@ -20,7 +20,7 @@ Copyright (c) 2014 - Jeremy Long. All Rights Reserved. org.owasp dependency-check-parent - 8.4.2 + 8.4.3-SNAPSHOT dependency-check-utils @@ -30,7 +30,7 @@ Copyright (c) 2014 - Jeremy Long. All Rights Reserved. scm:git:https://github.com/jeremylong/DependencyCheck.git https://github.com/jeremylong/DependencyCheck/tree/main/utils scm:git:git@github.com:jeremylong/DependencyCheck.git - v8.4.2 + v6.4.1 org.owasp.dependencycheck.utils.*