diff --git a/build.gradle b/build.gradle index 712a040bee..d060da9d7d 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 c702f8e163..c859d8bdf8 100644 --- a/gradle.properties +++ b/gradle.properties @@ -44,7 +44,7 @@ buildFromSource=true # The default version for LabKey artifacts that are built or that we depend on. # override in an individual module's gradle.properties file as necessary -labkeyVersion=25.3.2 +labkeyVersion=25.3.3 labkeyClientApiVersion=6.2.0 # Version numbers for the various binary artifacts that are included when @@ -137,7 +137,7 @@ commonsMath3Version=3.6.1 commonsPoolVersion=1.6 commonsTextVersion=1.13.0 commonsValidatorVersion=1.9.0 -commonsVfs2Version=2.7.0 +commonsVfs2Version=2.10.0 datadogVersion=1.45.1 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 - - - +