From e2649a6bbee0621794b3f549ed5919f1f3650290 Mon Sep 17 00:00:00 2001
From: Jeremy Long <jeremy.long@gmail.com>
Date: Sat, 21 Oct 2023 09:36:38 -0400
Subject: [PATCH 1/3] docs: prepare release

---
 .github/workflows/release.yml | 19 +++++++------------
 CHANGELOG.md                  | 12 ++++++++++++
 2 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 19553e579be..7d517e444f8 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -185,19 +185,14 @@ jobs:
           prerelease: false
           draft: false
           body: |
-            ### Added
 
-            - feat: Add support for Nexus v3 to NexusAnalyzer (#5849)
-
-            ### Fixed
-
-            - fix: Hint Analyzer should run before VersionFilter Analyzer (#5818)
-            - chore: switch to sha1-pinning as suggested by Semgrep
-            - fix: OSS Index Analyzer SocketTimeoutException exception handling based on warn only parameter (#5845)
-            - fix: use curl with -L to follow github redirect (#5808)
-            - fix: use curl with -L to follow github redirect
-            - fix: #5671 out of memory error (#5789)
-            - fix: #5671 Exit method as soon as we detect a loop to prevent an infinite loop leading to an OutOfMemoryError
+            - 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)
+            
+            See the full listing of [changes](https://github.com/jeremylong/DependencyCheck/milestone/67?closed=1).
 
       - name: Upload CLI
         id: upload-release-cli
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f280e31f733..130721aea78 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,17 @@
 # Change Log
 
+## [Version 8.4.1](https://github.com/jeremylong/DependencyCheck/releases/tag/v8.4.1) (2023-10-21)
+
+### Fixed
+
+- 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)
+
+See the full listing of [changes](https://github.com/jeremylong/DependencyCheck/milestone/67?closed=1).
+
 ## [Version 8.4.0](https://github.com/jeremylong/DependencyCheck/releases/tag/v8.4.0) (2023-08-19)
 
 ### Added

From 61377ad8f1b097025cfb7047abbfb0a2dca01a7b Mon Sep 17 00:00:00 2001
From: Jeremy Long <jeremy.long@gmail.com>
Date: Sat, 21 Oct 2023 09:37:51 -0400
Subject: [PATCH 2/3] build: prepare release v8.4.1

---
 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 2a82b494893..d1ea7c812d7 100644
--- a/ant/pom.xml
+++ b/ant/pom.xml
@@ -20,7 +20,7 @@ Copyright (c) 2013 - Jeremy Long. All Rights Reserved.
     <parent>
         <groupId>org.owasp</groupId>
         <artifactId>dependency-check-parent</artifactId>
-        <version>8.4.1-SNAPSHOT</version>
+        <version>8.4.1</version>
     </parent>
 
     <artifactId>dependency-check-ant</artifactId>
@@ -32,7 +32,7 @@ Copyright (c) 2013 - Jeremy Long. All Rights Reserved.
         <connection>scm:git:https://github.com/jeremylong/DependencyCheck.git</connection>
         <url>https://github.com/jeremylong/DependencyCheck/tree/main/ant</url>
         <developerConnection>scm:git:git@github.com:jeremylong/DependencyCheck.git</developerConnection>
-        <tag>v6.4.1</tag>
+        <tag>v8.4.1</tag>
     </scm>
     <build>
         <resources>
diff --git a/archetype/pom.xml b/archetype/pom.xml
index 329bfd645bc..a00fa368279 100644
--- a/archetype/pom.xml
+++ b/archetype/pom.xml
@@ -20,20 +20,20 @@ Copyright (c) 2017 Jeremy Long. All Rights Reserved.
     <parent>
         <groupId>org.owasp</groupId>
         <artifactId>dependency-check-parent</artifactId>
-        <version>8.4.1-SNAPSHOT</version>
+        <version>8.4.1</version>
     </parent>
     <artifactId>dependency-check-plugin</artifactId>
     <name>Dependency-Check Plugin Archetype</name>
     <packaging>jar</packaging>
     <properties>
         <!--reproducible build-->
-        <project.build.outputTimestamp>2023-08-19T12:57:43Z</project.build.outputTimestamp>
+        <project.build.outputTimestamp>2023-10-21T13:37:02Z</project.build.outputTimestamp>
     </properties>
     <scm>
         <connection>scm:git:https://github.com/jeremylong/DependencyCheck.git</connection>
         <url>https://github.com/jeremylong/DependencyCheck/tree/main/archetype</url>
         <developerConnection>scm:git:git@github.com:jeremylong/DependencyCheck.git</developerConnection>
-      <tag>HEAD</tag>
+      <tag>v8.4.1</tag>
   </scm>
     <build>
         <plugins>
diff --git a/cli/pom.xml b/cli/pom.xml
index 7130074a552..6e65a1c20f9 100644
--- a/cli/pom.xml
+++ b/cli/pom.xml
@@ -20,7 +20,7 @@ Copyright (c) 2012 - Jeremy Long. All Rights Reserved.
     <parent>
         <groupId>org.owasp</groupId>
         <artifactId>dependency-check-parent</artifactId>
-        <version>8.4.1-SNAPSHOT</version>
+        <version>8.4.1</version>
     </parent>
 
     <artifactId>dependency-check-cli</artifactId>
@@ -32,7 +32,7 @@ Copyright (c) 2012 - Jeremy Long. All Rights Reserved.
         <connection>scm:git:https://github.com/jeremylong/DependencyCheck.git</connection>
         <url>https://github.com/jeremylong/DependencyCheck/tree/main/cli</url>
         <developerConnection>scm:git:git@github.com:jeremylong/DependencyCheck.git</developerConnection>
-        <tag>v6.4.1</tag>
+        <tag>v8.4.1</tag>
     </scm>
     <build>
         <finalName>dependency-check-${project.version}</finalName>
diff --git a/core/pom.xml b/core/pom.xml
index 7f6216c33af..cda55e36cfb 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -20,7 +20,7 @@ Copyright (c) 2012 Jeremy Long. All Rights Reserved.
     <parent>
         <groupId>org.owasp</groupId>
         <artifactId>dependency-check-parent</artifactId>
-        <version>8.4.1-SNAPSHOT</version>
+        <version>8.4.1</version>
     </parent>
 
     <artifactId>dependency-check-core</artifactId>
@@ -32,7 +32,7 @@ Copyright (c) 2012 Jeremy Long. All Rights Reserved.
         <connection>scm:git:https://github.com/jeremylong/DependencyCheck.git</connection>
         <url>https://github.com/jeremylong/DependencyCheck/tree/main/core</url>
         <developerConnection>scm:git:git@github.com:jeremylong/DependencyCheck.git</developerConnection>
-        <tag>v6.4.1</tag>
+        <tag>v8.4.1</tag>
     </scm>
     <build>
         <resources>
diff --git a/maven/pom.xml b/maven/pom.xml
index d927cbcb6c7..f0d62fba7ab 100644
--- a/maven/pom.xml
+++ b/maven/pom.xml
@@ -20,7 +20,7 @@ Copyright (c) 2013 Jeremy Long. All Rights Reserved.
     <parent>
         <groupId>org.owasp</groupId>
         <artifactId>dependency-check-parent</artifactId>
-        <version>8.4.1-SNAPSHOT</version>
+        <version>8.4.1</version>
     </parent>
     <artifactId>dependency-check-maven</artifactId>
     <packaging>maven-plugin</packaging>
@@ -35,7 +35,7 @@ Copyright (c) 2013 Jeremy Long. All Rights Reserved.
         <connection>scm:git:https://github.com/jeremylong/DependencyCheck.git</connection>
         <url>https://github.com/jeremylong/DependencyCheck/tree/master/maven</url>
         <developerConnection>scm:git:git@github.com:jeremylong/DependencyCheck.git</developerConnection>
-        <tag>v6.4.1</tag>
+        <tag>v8.4.1</tag>
     </scm>
     <prerequisites>
         <maven>3.1.0</maven>
diff --git a/pom.xml b/pom.xml
index ba6f0612479..830402e76a6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,7 @@ Copyright (c) 2012 - Jeremy Long
 
     <groupId>org.owasp</groupId>
     <artifactId>dependency-check-parent</artifactId>
-    <version>8.4.1-SNAPSHOT</version>
+    <version>8.4.1</version>
     <packaging>pom</packaging>
 
     <modules>
@@ -94,7 +94,7 @@ Copyright (c) 2012 - Jeremy Long
         <connection>scm:git:https://github.com/jeremylong/DependencyCheck.git</connection>
         <url>https://github.com/jeremylong/DependencyCheck</url>
         <developerConnection>scm:git:https://github.com/jeremylong/DependencyCheck.git</developerConnection>
-        <tag>v6.4.1</tag>
+        <tag>v8.4.1</tag>
     </scm>
     <issueManagement>
         <system>github</system>
@@ -112,7 +112,7 @@ Copyright (c) 2012 - Jeremy Long
     </licenses>
     <properties>
         <!--reproducible build-->
-        <project.build.outputTimestamp>2023-08-19T12:57:43Z</project.build.outputTimestamp>
+        <project.build.outputTimestamp>2023-10-21T13:37:02Z</project.build.outputTimestamp>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <github.global.server>github</github.global.server>
diff --git a/utils/pom.xml b/utils/pom.xml
index b912b89336e..8074e278fff 100644
--- a/utils/pom.xml
+++ b/utils/pom.xml
@@ -20,7 +20,7 @@ Copyright (c) 2014 - Jeremy Long. All Rights Reserved.
     <parent>
         <groupId>org.owasp</groupId>
         <artifactId>dependency-check-parent</artifactId>
-        <version>8.4.1-SNAPSHOT</version>
+        <version>8.4.1</version>
     </parent>
 
     <artifactId>dependency-check-utils</artifactId>
@@ -30,7 +30,7 @@ Copyright (c) 2014 - Jeremy Long. All Rights Reserved.
         <connection>scm:git:https://github.com/jeremylong/DependencyCheck.git</connection>
         <url>https://github.com/jeremylong/DependencyCheck/tree/main/utils</url>
         <developerConnection>scm:git:git@github.com:jeremylong/DependencyCheck.git</developerConnection>
-        <tag>v6.4.1</tag>
+        <tag>v8.4.1</tag>
     </scm>
     <properties>
         <findbugs.onlyAnalyze>org.owasp.dependencycheck.utils.*</findbugs.onlyAnalyze>

From 5cc8df0f8f04247763d571aeb362af1c4bdfbd62 Mon Sep 17 00:00:00 2001
From: Jeremy Long <jeremy.long@gmail.com>
Date: Sat, 21 Oct 2023 09:37:52 -0400
Subject: [PATCH 3/3] 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 d1ea7c812d7..7a56bb57b3f 100644
--- a/ant/pom.xml
+++ b/ant/pom.xml
@@ -20,7 +20,7 @@ Copyright (c) 2013 - Jeremy Long. All Rights Reserved.
     <parent>
         <groupId>org.owasp</groupId>
         <artifactId>dependency-check-parent</artifactId>
-        <version>8.4.1</version>
+        <version>8.4.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>dependency-check-ant</artifactId>
@@ -32,7 +32,7 @@ Copyright (c) 2013 - Jeremy Long. All Rights Reserved.
         <connection>scm:git:https://github.com/jeremylong/DependencyCheck.git</connection>
         <url>https://github.com/jeremylong/DependencyCheck/tree/main/ant</url>
         <developerConnection>scm:git:git@github.com:jeremylong/DependencyCheck.git</developerConnection>
-        <tag>v8.4.1</tag>
+        <tag>v6.4.1</tag>
     </scm>
     <build>
         <resources>
diff --git a/archetype/pom.xml b/archetype/pom.xml
index a00fa368279..f5a6bd5cf73 100644
--- a/archetype/pom.xml
+++ b/archetype/pom.xml
@@ -20,20 +20,20 @@ Copyright (c) 2017 Jeremy Long. All Rights Reserved.
     <parent>
         <groupId>org.owasp</groupId>
         <artifactId>dependency-check-parent</artifactId>
-        <version>8.4.1</version>
+        <version>8.4.2-SNAPSHOT</version>
     </parent>
     <artifactId>dependency-check-plugin</artifactId>
     <name>Dependency-Check Plugin Archetype</name>
     <packaging>jar</packaging>
     <properties>
         <!--reproducible build-->
-        <project.build.outputTimestamp>2023-10-21T13:37:02Z</project.build.outputTimestamp>
+        <project.build.outputTimestamp>2023-10-21T13:37:51Z</project.build.outputTimestamp>
     </properties>
     <scm>
         <connection>scm:git:https://github.com/jeremylong/DependencyCheck.git</connection>
         <url>https://github.com/jeremylong/DependencyCheck/tree/main/archetype</url>
         <developerConnection>scm:git:git@github.com:jeremylong/DependencyCheck.git</developerConnection>
-      <tag>v8.4.1</tag>
+      <tag>HEAD</tag>
   </scm>
     <build>
         <plugins>
diff --git a/cli/pom.xml b/cli/pom.xml
index 6e65a1c20f9..380a1efd399 100644
--- a/cli/pom.xml
+++ b/cli/pom.xml
@@ -20,7 +20,7 @@ Copyright (c) 2012 - Jeremy Long. All Rights Reserved.
     <parent>
         <groupId>org.owasp</groupId>
         <artifactId>dependency-check-parent</artifactId>
-        <version>8.4.1</version>
+        <version>8.4.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>dependency-check-cli</artifactId>
@@ -32,7 +32,7 @@ Copyright (c) 2012 - Jeremy Long. All Rights Reserved.
         <connection>scm:git:https://github.com/jeremylong/DependencyCheck.git</connection>
         <url>https://github.com/jeremylong/DependencyCheck/tree/main/cli</url>
         <developerConnection>scm:git:git@github.com:jeremylong/DependencyCheck.git</developerConnection>
-        <tag>v8.4.1</tag>
+        <tag>v6.4.1</tag>
     </scm>
     <build>
         <finalName>dependency-check-${project.version}</finalName>
diff --git a/core/pom.xml b/core/pom.xml
index cda55e36cfb..5d3d96f2cfd 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -20,7 +20,7 @@ Copyright (c) 2012 Jeremy Long. All Rights Reserved.
     <parent>
         <groupId>org.owasp</groupId>
         <artifactId>dependency-check-parent</artifactId>
-        <version>8.4.1</version>
+        <version>8.4.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>dependency-check-core</artifactId>
@@ -32,7 +32,7 @@ Copyright (c) 2012 Jeremy Long. All Rights Reserved.
         <connection>scm:git:https://github.com/jeremylong/DependencyCheck.git</connection>
         <url>https://github.com/jeremylong/DependencyCheck/tree/main/core</url>
         <developerConnection>scm:git:git@github.com:jeremylong/DependencyCheck.git</developerConnection>
-        <tag>v8.4.1</tag>
+        <tag>v6.4.1</tag>
     </scm>
     <build>
         <resources>
diff --git a/maven/pom.xml b/maven/pom.xml
index f0d62fba7ab..fa7a742b053 100644
--- a/maven/pom.xml
+++ b/maven/pom.xml
@@ -20,7 +20,7 @@ Copyright (c) 2013 Jeremy Long. All Rights Reserved.
     <parent>
         <groupId>org.owasp</groupId>
         <artifactId>dependency-check-parent</artifactId>
-        <version>8.4.1</version>
+        <version>8.4.2-SNAPSHOT</version>
     </parent>
     <artifactId>dependency-check-maven</artifactId>
     <packaging>maven-plugin</packaging>
@@ -35,7 +35,7 @@ Copyright (c) 2013 Jeremy Long. All Rights Reserved.
         <connection>scm:git:https://github.com/jeremylong/DependencyCheck.git</connection>
         <url>https://github.com/jeremylong/DependencyCheck/tree/master/maven</url>
         <developerConnection>scm:git:git@github.com:jeremylong/DependencyCheck.git</developerConnection>
-        <tag>v8.4.1</tag>
+        <tag>v6.4.1</tag>
     </scm>
     <prerequisites>
         <maven>3.1.0</maven>
diff --git a/pom.xml b/pom.xml
index 830402e76a6..0ce026b2190 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,7 @@ Copyright (c) 2012 - Jeremy Long
 
     <groupId>org.owasp</groupId>
     <artifactId>dependency-check-parent</artifactId>
-    <version>8.4.1</version>
+    <version>8.4.2-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <modules>
@@ -94,7 +94,7 @@ Copyright (c) 2012 - Jeremy Long
         <connection>scm:git:https://github.com/jeremylong/DependencyCheck.git</connection>
         <url>https://github.com/jeremylong/DependencyCheck</url>
         <developerConnection>scm:git:https://github.com/jeremylong/DependencyCheck.git</developerConnection>
-        <tag>v8.4.1</tag>
+        <tag>v6.4.1</tag>
     </scm>
     <issueManagement>
         <system>github</system>
@@ -112,7 +112,7 @@ Copyright (c) 2012 - Jeremy Long
     </licenses>
     <properties>
         <!--reproducible build-->
-        <project.build.outputTimestamp>2023-10-21T13:37:02Z</project.build.outputTimestamp>
+        <project.build.outputTimestamp>2023-10-21T13:37:51Z</project.build.outputTimestamp>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <github.global.server>github</github.global.server>
diff --git a/utils/pom.xml b/utils/pom.xml
index 8074e278fff..b176c53a678 100644
--- a/utils/pom.xml
+++ b/utils/pom.xml
@@ -20,7 +20,7 @@ Copyright (c) 2014 - Jeremy Long. All Rights Reserved.
     <parent>
         <groupId>org.owasp</groupId>
         <artifactId>dependency-check-parent</artifactId>
-        <version>8.4.1</version>
+        <version>8.4.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>dependency-check-utils</artifactId>
@@ -30,7 +30,7 @@ Copyright (c) 2014 - Jeremy Long. All Rights Reserved.
         <connection>scm:git:https://github.com/jeremylong/DependencyCheck.git</connection>
         <url>https://github.com/jeremylong/DependencyCheck/tree/main/utils</url>
         <developerConnection>scm:git:git@github.com:jeremylong/DependencyCheck.git</developerConnection>
-        <tag>v8.4.1</tag>
+        <tag>v6.4.1</tag>
     </scm>
     <properties>
         <findbugs.onlyAnalyze>org.owasp.dependencycheck.utils.*</findbugs.onlyAnalyze>