From f622e11256a81d3ace0b376a8428b1eae46da486 Mon Sep 17 00:00:00 2001
From: Jeremy Long <jeremy.long@gmail.com>
Date: Sun, 18 Sep 2022 10:14:54 -0400
Subject: [PATCH 1/3] update release notes

---
 RELEASE_NOTES.md | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 0037afc5b8a..17eddb37c34 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -1,5 +1,15 @@
 # Release Notes
 
+## [Version 7.2.0](https://github.com/jeremylong/DependencyCheck/releases/tag/v7.2.0) (2022-09-14)
+
+**Changes**
+
+- Add support for Bazel's pinned `maven_install.json` (#4772).
+- Fixed bug preventing the use of custom report templates (#4800).
+- Updated several dependencies including upgrades for dependencies with CVEs.
+- Several bug fixes made and suppression rules were added.
+- See the full listing of [changes](https://github.com/jeremylong/DependencyCheck/milestone/48?closed=1).
+
 ## [Version 7.1.2](https://github.com/jeremylong/DependencyCheck/releases/tag/v7.1.2) (2022-08-20)
 
 **Changes**

From cc993caaf3cbd6b667f8d8001568f331f4ba6d16 Mon Sep 17 00:00:00 2001
From: Jeremy Long <jeremy.long@gmail.com>
Date: Sun, 18 Sep 2022 10:15:11 -0400
Subject: [PATCH 2/3] revert logging updates

---
 cli/src/main/java/org/owasp/dependencycheck/App.java | 4 +---
 pom.xml                                              | 5 ++++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/cli/src/main/java/org/owasp/dependencycheck/App.java b/cli/src/main/java/org/owasp/dependencycheck/App.java
index 9cb11c3f56a..a4dbfc814f1 100644
--- a/cli/src/main/java/org/owasp/dependencycheck/App.java
+++ b/cli/src/main/java/org/owasp/dependencycheck/App.java
@@ -39,7 +39,6 @@
 import org.owasp.dependencycheck.utils.Settings;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.slf4j.impl.StaticLoggerBinder;
 
 import ch.qos.logback.core.FileAppender;
 import ch.qos.logback.classic.encoder.PatternLayoutEncoder;
@@ -658,8 +657,7 @@ private String getDefaultCveUrlModified(CliParser cli) {
      * @param verboseLog the path to the verbose log file
      */
     private void prepareLogger(String verboseLog) {
-        final StaticLoggerBinder loggerBinder = StaticLoggerBinder.getSingleton();
-        final LoggerContext context = (LoggerContext) loggerBinder.getLoggerFactory();
+        LoggerContext context = (LoggerContext) LoggerFactory.getILoggerFactory();
 
         final PatternLayoutEncoder encoder = new PatternLayoutEncoder();
         encoder.setPattern("%d %C:%L%n%-5level - %msg%n");
diff --git a/pom.xml b/pom.xml
index 60a15eab96d..9922d858f91 100644
--- a/pom.xml
+++ b/pom.xml
@@ -119,8 +119,11 @@ Copyright (c) 2012 - Jeremy Long
         
         <apache.lucene.version>8.11.2</apache.lucene.version>
         <apache.ant.version>1.10.12</apache.ant.version>
-        <slf4j.version>2.0.0</slf4j.version>
+        
+        <!-- upgrading slf4j and logback can cause issues ;) https://github.com/jeremylong/DependencyCheck/issues/4846 -->
+        <slf4j.version>1.7.36</slf4j.version>
         <logback.version>1.2.11</logback.version>
+        
         <!-- Note that Maven will use classes from the distro, ignoring declared dependencies for Maven core... -->
         <maven.api.version>3.1.0</maven.api.version>
         <reporting.checkstyle-plugin.version>3.2.0</reporting.checkstyle-plugin.version>

From 9167d2d4a90d612fe206de1d5bcba998b86effbe Mon Sep 17 00:00:00 2001
From: Jeremy Long <jeremy.long@gmail.com>
Date: Sun, 18 Sep 2022 10:17:26 -0400
Subject: [PATCH 3/3] checkstyle

---
 cli/src/main/java/org/owasp/dependencycheck/App.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/cli/src/main/java/org/owasp/dependencycheck/App.java b/cli/src/main/java/org/owasp/dependencycheck/App.java
index a4dbfc814f1..4120315b13d 100644
--- a/cli/src/main/java/org/owasp/dependencycheck/App.java
+++ b/cli/src/main/java/org/owasp/dependencycheck/App.java
@@ -657,8 +657,7 @@ private String getDefaultCveUrlModified(CliParser cli) {
      * @param verboseLog the path to the verbose log file
      */
     private void prepareLogger(String verboseLog) {
-        LoggerContext context = (LoggerContext) LoggerFactory.getILoggerFactory();
-
+        final LoggerContext context = (LoggerContext) LoggerFactory.getILoggerFactory();
         final PatternLayoutEncoder encoder = new PatternLayoutEncoder();
         encoder.setPattern("%d %C:%L%n%-5level - %msg%n");
         encoder.setContext(context);