From 1cac45591311bdf2910136c565e6cb05e245e7c7 Mon Sep 17 00:00:00 2001
From: Marty Pradere <martyp@labkey.com>
Date: Wed, 2 Apr 2025 04:22:07 -0700
Subject: [PATCH 1/2] Update commons VFS (#1025)

---
 build.gradle      | 1 +
 gradle.properties | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 4a5258118a..2e2d45a83a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -195,6 +195,7 @@ allprojects {
                     force "org.apache.logging.log4j:log4j-core:${log4j2Version}"
                     force "org.apache.logging.log4j:log4j-api:${log4j2Version}"
                     force "org.apache.logging.log4j:log4j-1.2-api:${log4j2Version}"
+                    force "org.apache.commons:commons-vfs2:${commonsVfs2Version}"
                     // force version for consistency with saml, query, LDK, and pipeline
                     force "commons-lang:commons-lang:${commonsLangVersion}"
                     // force version for consistency with workflow, api, SequenceAnalysis
diff --git a/gradle.properties b/gradle.properties
index 867cecfccd..cba52e55d3 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -136,7 +136,7 @@ commonsMath3Version=3.6.1
 commonsPoolVersion=1.6
 commonsTextVersion=1.12.0
 commonsValidatorVersion=1.9.0
-commonsVfs2Version=2.7.0
+commonsVfs2Version=2.10.0
 
 datadogVersion=1.41.1
 

From 879a68ec96d67f47724e8d290e6115a25b25a698 Mon Sep 17 00:00:00 2001
From: Ian Sigmon <labkey-ians@users.noreply.github.com>
Date: Thu, 3 Apr 2025 09:32:46 -0700
Subject: [PATCH 2/2] fix exception when loading log4j2 (#1034)

---
 server/embedded/src/main/resources/log4j2.xml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/server/embedded/src/main/resources/log4j2.xml b/server/embedded/src/main/resources/log4j2.xml
index 74fb920ae6..8be958e0e4 100644
--- a/server/embedded/src/main/resources/log4j2.xml
+++ b/server/embedded/src/main/resources/log4j2.xml
@@ -239,9 +239,7 @@ account managers so that we can coordinate edits with other customized copies of
 
         <Logger name="org.labkey.api.dataiterator" />
 
-        <Logger name="org.labkey.docker" >
-            <level value="info"/>
-        </Logger>
+        <Logger name="org.labkey.docker" level="info"/>
 
         <Logger name="org.labkey.rstudio" level="info"/>