From e15869403b5abf8e34bc522dad99fe5910ea0f73 Mon Sep 17 00:00:00 2001 From: Trey Chadick Date: Wed, 3 Jun 2026 10:29:46 -0700 Subject: [PATCH 1/2] Remove Java version from service files templates (#1396) --- server/configs/webapps/embedded/install_service.bat | 2 +- server/configs/webapps/embedded/labkey_server.service | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/server/configs/webapps/embedded/install_service.bat b/server/configs/webapps/embedded/install_service.bat index b511344fe7..d51b7b2261 100644 --- a/server/configs/webapps/embedded/install_service.bat +++ b/server/configs/webapps/embedded/install_service.bat @@ -1,6 +1,6 @@ set LABKEY_HOME=C:\labkey\labkey set LABKEY_APPS=C:\labkey\apps -set JAVA_HOME=%LABKEY_APPS%\java\jdk-17.0.9+9 +set JAVA_HOME=%LABKEY_APPS%\java\jdk-version prunsrv.exe //IS//labkeyServer ^ --DisplayName "LabKey Server - labkeyServer" ^ diff --git a/server/configs/webapps/embedded/labkey_server.service b/server/configs/webapps/embedded/labkey_server.service index 99ac0b226c..18d9fd30a6 100644 --- a/server/configs/webapps/embedded/labkey_server.service +++ b/server/configs/webapps/embedded/labkey_server.service @@ -1,5 +1,5 @@ # Systemd unit file for labkey_server. -# This default will require customization. Confirm or edit the LABKEY_HOME path. +# This default will require customization. Update LABKEY_HOME and JAVA_HOME to match the deployment. # You must always edit the ExecStart line to start with the full path to java. # is shown for clarity, but will not be substituted. # Learn more here: https://www.labkey.org/Documentation/wiki-page.view?name=serviceFile @@ -10,7 +10,7 @@ After=syslog.target network.target [Service] Type=simple -Environment="JAVA_HOME=/usr/lib/jvm/jdk-17.0.10+7" +Environment="JAVA_HOME=/usr/lib/jvm/jdk-version" Environment="LABKEY_HOME=/labkey/labkey" Environment="JAVA_FLAGS_JAR_OPS=-Dorg.apache.catalina.startup.EXIT_ON_INIT_FAILURE=true -DterminateOnStartupFailure=true" Environment="JAVA_REFLECTION_JAR_OPS=--add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.io=ALL-UNNAMED --add-opens=java.base/java.nio=ALL-UNNAMED --add-opens=java.base/java.util=ALL-UNNAMED --add-opens=java.base/java.util.concurrent=ALL-UNNAMED --add-opens=java.rmi/sun.rmi.transport=ALL-UNNAMED" From f9f1a7291b19baba5ff9835910a2ca0d6d7edf67 Mon Sep 17 00:00:00 2001 From: Adam Rauch Date: Wed, 3 Jun 2026 17:50:41 -0700 Subject: [PATCH 2/2] Update Datadog trace API (#1407) --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 5843e0436f..1d04cf94c9 100644 --- a/gradle.properties +++ b/gradle.properties @@ -140,7 +140,7 @@ commonsTextVersion=1.15.0 commonsValidatorVersion=1.10.1 commonsVfs2Version=2.10.0 -datadogVersion=1.58.2 +datadogVersion=1.60.3 dom4jVersion=2.2.0