From 76b051e6128a28af0c6a92d59763af08961b46fb Mon Sep 17 00:00:00 2001 From: ChrisJoosse Date: Thu, 17 Apr 2025 14:43:29 -0700 Subject: [PATCH 1/7] support for contextPath --- gradle.properties | 2 +- .../webapps/embedded/config/application.properties | 2 +- settings.gradle | 14 ++++++++++++++ 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index c58065d9aa..c86c0b24c5 100644 --- a/gradle.properties +++ b/gradle.properties @@ -59,7 +59,7 @@ windowsProteomicsBinariesVersion=1.0 # The current version numbers for the gradle plugins. artifactoryPluginVersion=5.2.5 gradleNodePluginVersion=7.1.0 -gradlePluginsVersion=6.1.0 +gradlePluginsVersion=6.2.0_fb_serverContext owaspDependencyCheckPluginVersion=12.1.0 versioningPluginVersion=1.1.2 diff --git a/server/configs/webapps/embedded/config/application.properties b/server/configs/webapps/embedded/config/application.properties index 62d1459fa3..b139b29053 100644 --- a/server/configs/webapps/embedded/config/application.properties +++ b/server/configs/webapps/embedded/config/application.properties @@ -67,7 +67,7 @@ server.error.include-message=always ## We do not recommend deploying to a non-root context path (e.g. http://localhost:8080/labkey) ## If you do set this property, do not set a legacyContextPath. -#context.contextPath=/labkey +#context.contextPath=/@@contextPath@@ #################################################################################### ## SMTP configuration diff --git a/settings.gradle b/settings.gradle index 6faf7d1af7..2d1ea03083 100644 --- a/settings.gradle +++ b/settings.gradle @@ -31,6 +31,20 @@ pluginManagement { } } } + if (gradlePluginsVersion.contains("_fb_serverContext") || versioningPluginVersion.contains("_fb_serverContext")) + { + mavenLocal() + maven { + url = "${artifactory_contextUrl}/plugins-snapshot-local" + mavenContent { + snapshotsOnly() + } + content { + includeGroup "org.labkey.build" + includeGroup "org.labkey.versioning" + } + } + } } resolutionStrategy { eachPlugin { From 34761a5eed21b1e49ab7feaf06dae5c7439e0c53 Mon Sep 17 00:00:00 2001 From: ChrisJoosse Date: Fri, 18 Apr 2025 17:36:03 -0700 Subject: [PATCH 2/7] support for contextPath testing --- gradle.properties | 2 +- .../webapps/embedded/config/application.properties | 2 +- settings.gradle | 14 -------------- 3 files changed, 2 insertions(+), 16 deletions(-) diff --git a/gradle.properties b/gradle.properties index c86c0b24c5..e40965bf4b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -59,7 +59,7 @@ windowsProteomicsBinariesVersion=1.0 # The current version numbers for the gradle plugins. artifactoryPluginVersion=5.2.5 gradleNodePluginVersion=7.1.0 -gradlePluginsVersion=6.2.0_fb_serverContext +gradlePluginsVersion=6.2.0_fb_serverContext_SNAPSHOT owaspDependencyCheckPluginVersion=12.1.0 versioningPluginVersion=1.1.2 diff --git a/server/configs/webapps/embedded/config/application.properties b/server/configs/webapps/embedded/config/application.properties index b139b29053..5cca527351 100644 --- a/server/configs/webapps/embedded/config/application.properties +++ b/server/configs/webapps/embedded/config/application.properties @@ -67,7 +67,7 @@ server.error.include-message=always ## We do not recommend deploying to a non-root context path (e.g. http://localhost:8080/labkey) ## If you do set this property, do not set a legacyContextPath. -#context.contextPath=/@@contextPath@@ +#context.contextPath=@@contextPath@@ #################################################################################### ## SMTP configuration diff --git a/settings.gradle b/settings.gradle index 2d1ea03083..6faf7d1af7 100644 --- a/settings.gradle +++ b/settings.gradle @@ -31,20 +31,6 @@ pluginManagement { } } } - if (gradlePluginsVersion.contains("_fb_serverContext") || versioningPluginVersion.contains("_fb_serverContext")) - { - mavenLocal() - maven { - url = "${artifactory_contextUrl}/plugins-snapshot-local" - mavenContent { - snapshotsOnly() - } - content { - includeGroup "org.labkey.build" - includeGroup "org.labkey.versioning" - } - } - } } resolutionStrategy { eachPlugin { From 0d254554b53486b57c710378814eaca5b2276973 Mon Sep 17 00:00:00 2001 From: ChrisJoosse Date: Mon, 21 Apr 2025 10:13:54 -0700 Subject: [PATCH 3/7] hopefully a version name matching the right pattern --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index e40965bf4b..890fd36c34 100644 --- a/gradle.properties +++ b/gradle.properties @@ -59,7 +59,7 @@ windowsProteomicsBinariesVersion=1.0 # The current version numbers for the gradle plugins. artifactoryPluginVersion=5.2.5 gradleNodePluginVersion=7.1.0 -gradlePluginsVersion=6.2.0_fb_serverContext_SNAPSHOT +gradlePluginsVersion=6.2.0_fb_serverContext-SNAPSHOT owaspDependencyCheckPluginVersion=12.1.0 versioningPluginVersion=1.1.2 From e85cd6fccaf33b52ed068e3037f2de2f3e0c10e4 Mon Sep 17 00:00:00 2001 From: ChrisJoosse Date: Tue, 22 Apr 2025 15:37:37 -0700 Subject: [PATCH 4/7] update the other application.properties too --- server/configs/application.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/configs/application.properties b/server/configs/application.properties index 2cdc072243..a616f0c450 100644 --- a/server/configs/application.properties +++ b/server/configs/application.properties @@ -46,7 +46,7 @@ context.encryptionKey=@@encryptionKey@@ ## By default, we serve LabKey at the root context path (e.g. http://localhost:8080) ## You may customize the context path if you wish (e.g. http://localhost:8080/labkey) -#context.contextPath=/labkey +#context.contextPath=@@contextPath@@ ## Using a legacy context path provides backwards compatibility with old deployments. A typical use case would be to ## deploy to the root context (the default) and configure /labkey as the legacy path. GETs will be redirected. From 9497cfd3ab54d42592f2ff8169e1492b1f3713a9 Mon Sep 17 00:00:00 2001 From: ChrisJoosse Date: Tue, 22 Apr 2025 17:00:07 -0700 Subject: [PATCH 5/7] undo unintended dependency downgrades --- gradle.properties | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/gradle.properties b/gradle.properties index 7be91b7ff9..f46a3b9c6b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -129,17 +129,17 @@ commonsCompressVersion=1.27.1 commonsDbcpVersion=1.4 commonsDigesterVersion=1.8.1 commonsDiscoveryVersion=0.2 -commonsIoVersion=2.18.0 +commonsIoVersion=2.19.0 commonsLang3Version=3.17.0 commonsLangVersion=2.6 commonsLoggingVersion=1.3.5 commonsMath3Version=3.6.1 commonsPoolVersion=1.6 -commonsTextVersion=1.13.0 +commonsTextVersion=1.13.1 commonsValidatorVersion=1.9.0 commonsVfs2Version=2.10.0 -datadogVersion=1.47.3 +datadogVersion=1.48.1 dom4jVersion=2.1.4 @@ -155,7 +155,7 @@ fopVersion=2.10 # Force latest for consistency googleAutoValueAnnotationsVersion=1.10.4 -googleErrorProneAnnotationsVersion=2.37.0 +googleErrorProneAnnotationsVersion=2.38.0 googleHttpClientVersion=1.46.3 googleOauthClientVersion=1.39.0 googleProtocolBufVersion=3.25.5 @@ -166,9 +166,9 @@ googleProtocolBufVersion=3.25.5 # "java.lang.NoSuchMethodError: 'void com.google.gson.internal.ConstructorConstructor.(java.util.Map)'" errors gsonVersion=2.8.9 -grpcVersion=1.71.0 +grpcVersion=1.72.0 -guavaVersion=33.4.6-jre +guavaVersion=33.4.8-jre # Note: You won't find usages in the product sources; this property is used by the gradle plugin. gwtVersion=2.11.0 @@ -240,16 +240,14 @@ kaptchaVersion=2.3 log4j2Version=2.24.3 -lombokVersion=1.18.36 +lombokVersion=1.18.38 luceneVersion=9.12.1 mssqlJdbcVersion=12.10.0.jre11 -mysqlDriverVersion=9.2.0 - # force for docker -nettyVersion=4.1.119.Final +nettyVersion=4.2.0.Final objenesisVersion=1.0 From 5430d0577fc0044b565ccd9d979b282fa56e84bd Mon Sep 17 00:00:00 2001 From: ChrisJoosse Date: Wed, 23 Apr 2025 09:54:01 -0700 Subject: [PATCH 6/7] update plugin version to 6.2.0 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index f46a3b9c6b..e6a64affd8 100644 --- a/gradle.properties +++ b/gradle.properties @@ -59,7 +59,7 @@ windowsProteomicsBinariesVersion=1.0 # The current version numbers for the gradle plugins. artifactoryPluginVersion=5.2.5 gradleNodePluginVersion=7.1.0 -gradlePluginsVersion=6.2.0_fb_serverContext-SNAPSHOT +gradlePluginsVersion=6.2.0 owaspDependencyCheckPluginVersion=12.1.1 versioningPluginVersion=1.1.2 From 140e8afdce52deca212cdcce108fc9f084242510 Mon Sep 17 00:00:00 2001 From: ChrisJoosse Date: Wed, 23 Apr 2025 11:16:27 -0700 Subject: [PATCH 7/7] see if server/configs/webapps config change can be reverted --- server/configs/webapps/embedded/config/application.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/configs/webapps/embedded/config/application.properties b/server/configs/webapps/embedded/config/application.properties index 5cca527351..62d1459fa3 100644 --- a/server/configs/webapps/embedded/config/application.properties +++ b/server/configs/webapps/embedded/config/application.properties @@ -67,7 +67,7 @@ server.error.include-message=always ## We do not recommend deploying to a non-root context path (e.g. http://localhost:8080/labkey) ## If you do set this property, do not set a legacyContextPath. -#context.contextPath=@@contextPath@@ +#context.contextPath=/labkey #################################################################################### ## SMTP configuration