From 5197069ec4c056f681a67642000ace7c6cad9619 Mon Sep 17 00:00:00 2001 From: Marty Pradere Date: Mon, 30 Sep 2024 12:30:46 -0700 Subject: [PATCH 1/4] Monthly dependency update (#893) Dependency versions --- gradle.properties | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/gradle.properties b/gradle.properties index 59010327f7..759588570e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -128,16 +128,16 @@ 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 -datadogVersion=1.37.1 +datadogVersion=1.39.1 dom4jVersion=2.1.4 @@ -153,12 +153,12 @@ 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 @@ -166,9 +166,9 @@ graalVersion=24.0.2 # "java.lang.NoSuchMethodError: 'void com.google.gson.internal.ConstructorConstructor.(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 @@ -216,7 +216,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 @@ -231,18 +231,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 @@ -251,7 +251,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 @@ -261,7 +261,7 @@ poiVersion=5.2.5 pollingWatchVersion=0.2.0 -postgresqlDriverVersion=42.7.3 +postgresqlDriverVersion=42.7.4 quartzVersion=2.3.2 @@ -281,7 +281,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 @@ -290,7 +290,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 From e769c3bcbc616d54fcff5633b1c5cdef1cc1fb25 Mon Sep 17 00:00:00 2001 From: Marty Pradere Date: Tue, 1 Oct 2024 08:20:57 -0700 Subject: [PATCH 2/4] Update gradle.properties (#895) Update jackson versions --- gradle.properties | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gradle.properties b/gradle.properties index 759588570e..9cb0586dac 100644 --- a/gradle.properties +++ b/gradle.properties @@ -187,10 +187,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 From 80b12036c5d8f0f15ede9d8162d39fcdbe28a74b Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 1 Oct 2024 09:51:52 -0700 Subject: [PATCH 3/4] Update labkeyVersion to 24.11-SNAPSHOT (#897) Co-authored-by: github-actions Co-authored-by: Chris Joosse --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 9cb0586dac..90f94acf0e 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=24.10-SNAPSHOT +labkeyVersion=24.11-SNAPSHOT labkeyClientApiVersion=6.2.0 # Version numbers for the various binary artifacts that are included when From 31c47f0e4a3977c100cdc9e59fe731ed3f5b1fae Mon Sep 17 00:00:00 2001 From: Adam Rauch Date: Tue, 1 Oct 2024 11:52:36 -0700 Subject: [PATCH 4/4] Adopt new distribution naming conventions (#886) --- gradle.properties | 2 +- server/configs/mssql.properties | 1 - server/configs/pg.properties | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/gradle.properties b/gradle.properties index 90f94acf0e..ee2875f6cd 100644 --- a/gradle.properties +++ b/gradle.properties @@ -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 diff --git a/server/configs/mssql.properties b/server/configs/mssql.properties index cbd7951026..a5f4ec9548 100644 --- a/server/configs/mssql.properties +++ b/server/configs/mssql.properties @@ -7,7 +7,6 @@ smtpPort=25 databaseDefault=labkey databaseBootstrap=labkey2 -databaseMaster=master databaseDefaultHost=localhost databaseDefaultPort=1433 diff --git a/server/configs/pg.properties b/server/configs/pg.properties index 721eac42ae..a97050471e 100644 --- a/server/configs/pg.properties +++ b/server/configs/pg.properties @@ -7,7 +7,6 @@ smtpPort=25 databaseDefault=labkey databaseBootstrap=labkey2 -databaseMaster=template1 databaseDefaultHost=localhost databaseDefaultPort=5432