Merge remote-tracking branch 'origin/develop' into fb_filesystemlike

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=24.10-SNAPSHOT
+labkeyVersion=24.11-SNAPSHOT
 labkeyClientApiVersion=6.2.0
 
 # Version numbers for the various binary artifacts that are included when
@@ -59,7 +59,7 @@ windowsProteomicsBinariesVersion=1.0
 # The current version numbers for the gradle plugins.
 artifactoryPluginVersion=4.31.9
 gradleNodePluginVersion=3.5.1
-gradlePluginsVersion=4.0.0
+gradlePluginsVersion=4.1.0
 owaspDependencyCheckPluginVersion=10.0.3
 versioningPluginVersion=1.1.2
 
@@ -128,17 +128,17 @@ commonsCompressVersion=1.26.2
 commonsDbcpVersion=1.4
 commonsDiscoveryVersion=0.2
 commonsDigesterVersion=1.8.1
-commonsIoVersion=2.16.1
+commonsIoVersion=2.17.0
 commonsLangVersion=2.6
-commonsLang3Version=3.15.0
-commonsLoggingVersion=1.3.3
+commonsLang3Version=3.17.0
+commonsLoggingVersion=1.3.4
 commonsMath3Version=3.6.1
 commonsPoolVersion=1.6
 commonsTextVersion=1.12.0
 commonsValidatorVersion=1.9.0
 commonsVfs2Version=2.7.0
 
-datadogVersion=1.37.1
+datadogVersion=1.39.1
 
 dom4jVersion=2.1.4
 
@@ -154,22 +154,22 @@ fopVersion=2.9
 
 # Force latest for consistency
 googleAutoValueAnnotationsVersion=1.10.4
-googleErrorProneAnnotationsVersion=2.29.2
-googleHttpClientVersion=1.44.2
+googleErrorProneAnnotationsVersion=2.32.0
+googleHttpClientVersion=1.45.0
 googleOauthClientVersion=1.36.0
 googleProtocolBufVersion=3.25.3
 
-graalVersion=24.0.2
+graalVersion=24.1.0
 
 # Cloud and SequenceAnalysis bring gson in as a transitive dependency.
 # We resolve to the later version here to keep things consistent
 # Note: Current jclouds seems to require 2.8.9; attempting to upgrade to 2.9.0 cratered the S3 test suite with many
 # "java.lang.NoSuchMethodError: 'void com.google.gson.internal.ConstructorConstructor.<init>(java.util.Map)'" errors
 gsonVersion=2.8.9
 
-grpcVersion=1.65.1
+grpcVersion=1.67.1
 
-guavaVersion=33.2.1-jre
+guavaVersion=33.3.1-jre
 
 # Note: You won't find usages in the product sources; this property is used by the gradle plugin.
 gwtVersion=2.11.0
@@ -188,10 +188,10 @@ httpclientVersion=4.5.14
 httpcoreVersion=4.4.16
 
 # Jackson dependencies are usually released in tandem, but occasionally one gets a patch release out-of-sync with the others
-jacksonVersion=2.17.2
-jacksonAnnotationsVersion=2.17.2
-jacksonDatabindVersion=2.17.2
-jacksonJaxrsBaseVersion=2.17.2
+jacksonVersion=2.18.0
+jacksonAnnotationsVersion=2.18.0
+jacksonDatabindVersion=2.18.0
+jacksonJaxrsBaseVersion=2.18.0
 
 jamaVersion=1.0.3
 
@@ -217,7 +217,7 @@ jfreechartVersion=1.0.19
 
 jmockVersion=2.6.0
 
-jodaTimeVersion=2.12.7
+jodaTimeVersion=2.13.0
 
 # brought in transitively from guava and other google packages. Need to resolve consistently
 jsr305Version=3.0.2
@@ -232,18 +232,18 @@ jxlVersion=2.6.3
 
 kaptchaVersion=2.3
 
-log4j2Version=2.23.1
+log4j2Version=2.24.0
 
 lombokVersion=1.18.34
 
-luceneVersion=9.11.1
+luceneVersion=9.12.0
 
-mssqlJdbcVersion=12.6.3.jre11
+mssqlJdbcVersion=12.8.1.jre11
 
 mysqlDriverVersion=9.0.0
 
 # forced compatibility between docker and UserReg-WS
-nettyVersion=4.1.112.Final
+nettyVersion=4.1.113.Final
 
 objenesisVersion=1.0
 
@@ -252,7 +252,7 @@ opencsvVersion=2.3
 
 openTracingVersion=0.33.0
 
-oracleJdbcVersion=23.4.0.24.05
+oracleJdbcVersion=23.5.0.24.07
 
 # sync with version Tika ships
 pdfboxVersion=2.0.32
@@ -262,7 +262,7 @@ poiVersion=5.2.5
 
 pollingWatchVersion=0.2.0
 
-postgresqlDriverVersion=42.7.3
+postgresqlDriverVersion=42.7.4
 
 quartzVersion=2.3.2
 
@@ -282,7 +282,7 @@ slf4jLog4j12Version=2.0.13
 slf4jLog4jApiVersion=2.0.13
 
 # This is a dependency for HTSJDK. Force version for CVE-2023-43642
-snappyJavaVersion=1.1.10.5
+snappyJavaVersion=1.1.10.7
 
 springBootVersion=3.3.4
 # This usually matches the Tomcat version dictated by springBootVersion
@@ -291,7 +291,7 @@ springBootTomcatVersion=10.1.30
 # This usually matches the Spring Framework version dictated by springBootVersion
 springVersion=6.1.13
 
-sqliteJdbcVersion=3.46.0.0
+sqliteJdbcVersion=3.46.1.3
 
 # NLP and SAML bring stax2-api in as a transitive dependency but with very different versions. We force the later version.
 stax2ApiVersion=4.2.1

server/configs/mssql.properties

@@ -7,7 +7,6 @@ smtpPort=25
 
 databaseDefault=labkey
 databaseBootstrap=labkey2
-databaseMaster=master
 databaseDefaultHost=localhost
 databaseDefaultPort=1433
 

server/configs/pg.properties

@@ -7,7 +7,6 @@ smtpPort=25
 
 databaseDefault=labkey
 databaseBootstrap=labkey2
-databaseMaster=template1
 databaseDefaultHost=localhost
 databaseDefaultPort=5432