From 11e3734390f75b3dcdfd0e9572d7147a7463b20d Mon Sep 17 00:00:00 2001 From: Adam Rauch Date: Fri, 20 Jun 2025 13:41:21 -0700 Subject: [PATCH 1/3] Test PostgreSQL JDBC SNAPSHOT driver --- build.gradle | 3 +++ gradle.properties | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index b8366f5c16..0e534ccde0 100644 --- a/build.gradle +++ b/build.gradle @@ -162,6 +162,9 @@ allprojects { // maven { // url "https://repository.apache.org/content/repositories/orgapachetomcat-1322/" // } + maven { + url "https://oss.sonatype.org/content/repositories/snapshots/" + } maven { // Mondrian dependencies are available via this repository. It's a direct dependency of the Query // module but is declared here as many modules depend on Query and therefore need it as well. diff --git a/gradle.properties b/gradle.properties index e8888610fd..5987439f36 100644 --- a/gradle.properties +++ b/gradle.properties @@ -264,7 +264,7 @@ poiVersion=5.4.0 pollingWatchVersion=0.2.0 # Newer versions of the driver have a perf degradation that's important for us. https://github.com/pgjdbc/pgjdbc/issues/3505 -postgresqlDriverVersion=42.7.4 +postgresqlDriverVersion=42.7.7-SNAPSHOT quartzVersion=2.5.0 From 67c87ca643a147a0ebad5571d0c6ccfe8220950b Mon Sep 17 00:00:00 2001 From: Adam Rauch Date: Mon, 23 Jun 2025 13:02:08 -0700 Subject: [PATCH 2/3] Back to 42.7.4 and add instructions for testing SNAPSHOT versions --- build.gradle | 20 +++++++++++++------ gradle.properties | 2 +- .../src/org/labkey/embedded/LabKeyServer.java | 1 - 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/build.gradle b/build.gradle index 0e534ccde0..96e77619b4 100644 --- a/build.gradle +++ b/build.gradle @@ -156,15 +156,23 @@ allprojects { } } -// Temporarily uncomment the block below and update the four-digit number to allow building with Tomcat versions that -// haven't been released yet. The "VOTE" emails sent to the Tomcat dev email list include a staging repo URL. In -// addition to updating the url to match, you'll also need to update apacheTomcatVersion in gradle.properties. +// To build and test Tomcat versions that haven't been released yet, temporarily uncomment the block below and update +// the four-digit number. The "VOTE" emails sent to the Tomcat dev email list include a staging repo URL. In addition +// to updating the url to match, you'll also need to update apacheTomcatVersion in gradle.properties. // maven { // url "https://repository.apache.org/content/repositories/orgapachetomcat-1322/" // } - maven { - url "https://oss.sonatype.org/content/repositories/snapshots/" - } + +// To test SNAPSHOT PostgreSQL JDBC drivers locally, temporarily uncomment the block below and update the +// postgresqlDriverVersion property in gradle.properties to a SNAPSHOT version (e.g., 42.7.7-SNAPSHOT). Note that +// the writeDependenciesList task does not support SNAPSHOT versions, so you'll need to build with something like: +// +// ./gradlew deployApp -x writeDependenciesList +// +// maven { +// url "https://oss.sonatype.org/content/repositories/snapshots/" +// } + maven { // Mondrian dependencies are available via this repository. It's a direct dependency of the Query // module but is declared here as many modules depend on Query and therefore need it as well. diff --git a/gradle.properties b/gradle.properties index 5987439f36..e8888610fd 100644 --- a/gradle.properties +++ b/gradle.properties @@ -264,7 +264,7 @@ poiVersion=5.4.0 pollingWatchVersion=0.2.0 # Newer versions of the driver have a perf degradation that's important for us. https://github.com/pgjdbc/pgjdbc/issues/3505 -postgresqlDriverVersion=42.7.7-SNAPSHOT +postgresqlDriverVersion=42.7.4 quartzVersion=2.5.0 diff --git a/server/embedded/src/org/labkey/embedded/LabKeyServer.java b/server/embedded/src/org/labkey/embedded/LabKeyServer.java index 0173e43876..bb7370e99f 100644 --- a/server/embedded/src/org/labkey/embedded/LabKeyServer.java +++ b/server/embedded/src/org/labkey/embedded/LabKeyServer.java @@ -7,7 +7,6 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.context.ApplicationPidFileWriter; import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.boot.web.embedded.tomcat.TomcatConnectorCustomizer; import org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory; import org.springframework.boot.web.server.WebServerFactoryCustomizer; import org.springframework.context.annotation.Bean; From 195dfa7c2ec4dbbbd542de5de835d045913eb5f3 Mon Sep 17 00:00:00 2001 From: Adam Rauch Date: Mon, 23 Jun 2025 13:25:23 -0700 Subject: [PATCH 3/3] Redundant --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 96e77619b4..650b07e96f 100644 --- a/build.gradle +++ b/build.gradle @@ -158,7 +158,7 @@ allprojects { // To build and test Tomcat versions that haven't been released yet, temporarily uncomment the block below and update // the four-digit number. The "VOTE" emails sent to the Tomcat dev email list include a staging repo URL. In addition -// to updating the url to match, you'll also need to update apacheTomcatVersion in gradle.properties. +// to updating the url to match, you'll need to update apacheTomcatVersion in gradle.properties. // maven { // url "https://repository.apache.org/content/repositories/orgapachetomcat-1322/" // }