Skip to content

support testing with serverContext on teamCity #1050

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
labkey-chrisj merged 8 commits into from
Apr 23, 2025
Merged

support testing with serverContext on teamCity #1050

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
76b051e
support for contextPath
labkey-chrisj Apr 17, 2025
34761a5
support for contextPath testing
labkey-chrisj Apr 19, 2025
0d25455
hopefully a version name matching the right pattern
labkey-chrisj Apr 21, 2025
2c5ac71
Merge branch 'refs/heads/develop' into fb_serverContext
labkey-chrisj Apr 22, 2025
e85cd6f
update the other application.properties too
labkey-chrisj Apr 22, 2025
9497cfd
undo unintended dependency downgrades
labkey-chrisj Apr 23, 2025
5430d05
update plugin version to 6.2.0
labkey-chrisj Apr 23, 2025
140e8af
see if server/configs/webapps config change can be reverted
labkey-chrisj Apr 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 11 additions & 9 deletions gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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-SNAPSHOT
owaspDependencyCheckPluginVersion=12.1.1
versioningPluginVersion=1.1.2

Expand Down Expand Up @@ -129,17 +129,17 @@ commonsCompressVersion=1.27.1
commonsDbcpVersion=1.4
commonsDigesterVersion=1.8.1
commonsDiscoveryVersion=0.2
commonsIoVersion=2.19.0
commonsIoVersion=2.18.0
commonsLang3Version=3.17.0
commonsLangVersion=2.6
commonsLoggingVersion=1.3.5
commonsMath3Version=3.6.1
commonsPoolVersion=1.6
commonsTextVersion=1.13.1
commonsTextVersion=1.13.0
commonsValidatorVersion=1.9.0
commonsVfs2Version=2.10.0

datadogVersion=1.48.1
datadogVersion=1.47.3

dom4jVersion=2.1.4

Expand All @@ -155,7 +155,7 @@ fopVersion=2.10

# Force latest for consistency
googleAutoValueAnnotationsVersion=1.10.4
googleErrorProneAnnotationsVersion=2.38.0
googleErrorProneAnnotationsVersion=2.37.0
googleHttpClientVersion=1.46.3
googleOauthClientVersion=1.39.0
googleProtocolBufVersion=3.25.5
Expand All @@ -166,9 +166,9 @@ googleProtocolBufVersion=3.25.5
# "java.lang.NoSuchMethodError: 'void com.google.gson.internal.ConstructorConstructor.<init>(java.util.Map)'" errors
gsonVersion=2.8.9

grpcVersion=1.72.0
grpcVersion=1.71.0

guavaVersion=33.4.8-jre
guavaVersion=33.4.6-jre

# Note: You won't find usages in the product sources; this property is used by the gradle plugin.
gwtVersion=2.11.0
Expand Down Expand Up @@ -240,14 +240,16 @@ kaptchaVersion=2.3

log4j2Version=2.24.3

lombokVersion=1.18.38
lombokVersion=1.18.36

luceneVersion=9.12.1

mssqlJdbcVersion=12.10.0.jre11

mysqlDriverVersion=9.2.0

# force for docker
nettyVersion=4.2.0.Final
nettyVersion=4.1.119.Final

objenesisVersion=1.0

Expand Down
2 changes: 1 addition & 1 deletion server/configs/application.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion server/configs/webapps/embedded/config/application.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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@@
Copy link
Member

@labkey-tchad labkey-tchad Apr 23, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This file (server/configs/webapps/embedded/config/application.properties) is the one we bundle with distributions. TeamCity doesn't care about it. Changing this probably won't cause any trouble but folks might have scripts that depend on the current text. Let's leave it as is; not worth the risk IMO.

Copy link
Contributor Author

@labkey-chrisj labkey-chrisj Apr 23, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If that change isn't there, I worry the plugin won't uncomment that line. It does this check:
(DoThenSetup.groovy line 110)
if (configProperties.containsKey("contextPath") && line.contains("=@@contextPath")) { line = line.replace("#context.", "context.") }

If I undo this change, I think I'll have to check differently or else we don't effectively configure the server for the run.
...as I review my changes and the results, it's the one at server/configs/application.properties that seems to have resolved the problem of that line not being uncommented. I'll try reverting that change in the one at server/configs/webapps/embedded/config/ to see if it still works

(edit: it does work.)


####################################################################################
## SMTP configuration
Expand Down