From 663860e4828800e99fdf5aa5a7e54a28b0c55354 Mon Sep 17 00:00:00 2001
From: labkey-jeckels <jeckels@labkey.com>
Date: Tue, 7 May 2024 10:35:58 -0400
Subject: [PATCH 1/3] Help spread the word on edits to log4j2.xml

---
 server/embedded/src/main/resources/log4j2.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/server/embedded/src/main/resources/log4j2.xml b/server/embedded/src/main/resources/log4j2.xml
index 4f1039c906..271db26389 100644
--- a/server/embedded/src/main/resources/log4j2.xml
+++ b/server/embedded/src/main/resources/log4j2.xml
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 
+<!--
+When making edits to this file, please communicate with systems engineering and
+account managers so that we can coordinate edits with other customized copies of the file
+-->
+
 <Configuration packages="org.labkey.api.util,org.labkey.embedded">
 
     <Appenders>

From 73880013387b954e2b6c65e12f0cf1c10af22ff9 Mon Sep 17 00:00:00 2001
From: labkey-jeckels <jeckels@labkey.com>
Date: Tue, 7 May 2024 15:14:32 -0400
Subject: [PATCH 2/3] Don't import jakarta variant of Nullable or NotNull

---
 .idea/codeInsightSettings.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.idea/codeInsightSettings.xml b/.idea/codeInsightSettings.xml
index 74f9226485..238a812ab3 100644
--- a/.idea/codeInsightSettings.xml
+++ b/.idea/codeInsightSettings.xml
@@ -7,6 +7,8 @@
       <name>com.mchange.lang.StringUtils</name>
       <name>com.mchange.v2.lang.StringUtils</name>
       <name>common.Logger</name>
+      <name>jakarta.annotation.Nullable</name>
+      <name>jakarta.validation.constraints.NotNull</name>
       <name>java.lang.System.Logger</name>
       <name>java.util.logging.Logger</name>
       <name>javax.annotation.Nullable</name>

From e51771b62ca5bf678a4c63208e9224884fa9da6c Mon Sep 17 00:00:00 2001
From: Josh Eckels <jeckels@labkey.com>
Date: Wed, 8 May 2024 11:00:17 -0400
Subject: [PATCH 3/3] Update server/embedded/src/main/resources/log4j2.xml

---
 server/embedded/src/main/resources/log4j2.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/server/embedded/src/main/resources/log4j2.xml b/server/embedded/src/main/resources/log4j2.xml
index 271db26389..64f01bca1f 100644
--- a/server/embedded/src/main/resources/log4j2.xml
+++ b/server/embedded/src/main/resources/log4j2.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 
 <!--
-When making edits to this file, please communicate with systems engineering and
+When making edits to this file, please be sure to make corresponding updates to the copy in gradlePlugins.
+Additionally, please communicate with systems engineering and
 account managers so that we can coordinate edits with other customized copies of the file
 -->