From 62d45cbb03a8e04159e8d757b32fe8f20cbd3a23 Mon Sep 17 00:00:00 2001
From: Benjamin Reed <ranger@opennms.org>
Date: Fri, 10 Dec 2021 09:22:47 -0500
Subject: [PATCH 1/2] run dependabot daily, not weekly

---
 .github/dependabot.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 7215c0cec862..53b2bbdf0842 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -13,7 +13,7 @@ updates:
       prefix: "build"
       include: "scope"
     schedule:
-      interval: "weekly"
+      interval: "daily"
     ignore:
       - dependency-name: "d3"
       - dependency-name: "ionicons"
@@ -29,4 +29,4 @@ updates:
       prefix: "build"
       include: "scope"
     schedule:
-      interval: "weekly"
+      interval: "daily"

From 3b97522b248a5144b444cd6a5671b0dbc55c0686 Mon Sep 17 00:00:00 2001
From: Benjamin Reed <ranger@opennms.org>
Date: Fri, 10 Dec 2021 09:55:48 -0500
Subject: [PATCH 2/2] NMS-13850: try bumping log4j to 2.15.0

---
 .../poller/remote/support/Log4j2StringAppender.java   | 11 ++++++++---
 pom.xml                                               |  2 +-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/features/poller/remote/src/main/java/org/opennms/netmgt/poller/remote/support/Log4j2StringAppender.java b/features/poller/remote/src/main/java/org/opennms/netmgt/poller/remote/support/Log4j2StringAppender.java
index bb25704ffaeb..f9300f2a2fbe 100644
--- a/features/poller/remote/src/main/java/org/opennms/netmgt/poller/remote/support/Log4j2StringAppender.java
+++ b/features/poller/remote/src/main/java/org/opennms/netmgt/poller/remote/support/Log4j2StringAppender.java
@@ -29,6 +29,7 @@
 package org.opennms.netmgt.poller.remote.support;
 
 import java.io.ByteArrayOutputStream;
+import java.io.IOException;
 import java.io.Serializable;
 import java.util.concurrent.atomic.AtomicInteger;
 
@@ -106,8 +107,12 @@ public void removeFromLogger(String loggerName) {
 	}
 
 	public String getOutput() {
-		getManager().flush();
-		return new String(getManager().getByteArrayOutputStream().toByteArray());
+		try {
+			getManager().flush();
+			return new String(getManager().getByteArrayOutputStream().toByteArray());
+		} catch (IOException e) {
+			return new String();
+		}
 	}
 
 	public static class ByteArrayOutputStreamManager extends OutputStreamManager {
@@ -115,7 +120,7 @@ protected ByteArrayOutputStreamManager(Layout<?> layout) {
 			super(new ByteArrayOutputStream(), ByteArrayOutputStreamManager.class.getName(), layout, true);
 		}
 
-		public ByteArrayOutputStream getByteArrayOutputStream() {
+		public ByteArrayOutputStream getByteArrayOutputStream() throws IOException {
 			return (ByteArrayOutputStream)getOutputStream();
 		}
 	}
diff --git a/pom.xml b/pom.xml
index e8cd18961faa..78e7e79bc49a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1414,7 +1414,7 @@
     <liquibaseVersion>2.0.5-ONMS20160524b</liquibaseVersion>
     <lmaxDisruptorVersion>3.3.2</lmaxDisruptorVersion>
     <log4jVersion>99.99.99-use-log4j2</log4jVersion>
-    <log4j2Version>2.5</log4j2Version>
+    <log4j2Version>2.15.0</log4j2Version>
     <minaVersion>2.0.16</minaVersion>
     <mapstructVersion>1.2.0.CR1</mapstructVersion>
     <minionKarafVersion>4.0.5</minionKarafVersion>