Skip to content
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

Adopt the latest Spring Boot and Tomcat releases #598

Closed
wants to merge 1 commit into from
Closed

Adopt the latest Spring Boot and Tomcat releases #598

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ apacheDirectoryVersion=2.1.3
apacheMinaVersion=2.2.1

# Keep in sync with springBootTomcatVersion below
apacheTomcatVersion=9.0.80
apacheTomcatVersion=9.0.82

# (mothership) -> json-path -> json-smart -> accessor-smart
# (core) -> graalvm
Expand Down Expand Up @@ -276,10 +276,10 @@ slf4jLog4jApiVersion=2.0.7
# This is a dependency for HTSJDK. Force to avoid a deserialization problem. Remove once HTSJDK bumps its preferred version
snappyJavaVersion=1.1.10.4

springBootVersion=2.7.16
springBootVersion=2.7.17
# This MUST match the Tomcat version dictated by springBootVersion
# Also, keep this in sync with apacheTomcatVersion above
springBootTomcatVersion=9.0.80
springBootTomcatVersion=9.0.82

springVersion=5.3.28

Expand Down
4 changes: 2 additions & 2 deletions server/configs/mssql.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ smtpHost=localhost
smtpUser=Anonymous
smtpPort=25

databaseDefault=labkey
databaseDefault=labkey237
databaseBootstrap=labkey2
databaseMaster=master
databaseDefaultHost=localhost
Expand All @@ -14,7 +14,7 @@ databaseDefaultPort=1433
jdbcDriverClassName=com.microsoft.sqlserver.jdbc.SQLServerDriver
jdbcURL=jdbc:sqlserver://${jdbcHost}:${jdbcPort};databaseName=${jdbcDatabase};trustServerCertificate=true;applicationName=LabKey Server;${jdbcURLParameters}
jdbcUser=sa
jdbcPassword=sa
jdbcPassword=Strong!Passw0rd

# key for the encrypted property store and other potentially sensitive content
encryptionKey=defaultKey
6 changes: 3 additions & 3 deletions server/configs/pg.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,16 @@ smtpHost=localhost
smtpUser=Anonymous
smtpPort=25

databaseDefault=labkey
databaseDefault=labkey237
databaseBootstrap=labkey2
databaseMaster=template1
databaseDefaultHost=localhost
databaseDefaultPort=5432

jdbcDriverClassName=org.postgresql.Driver
jdbcURL=jdbc:postgresql://${jdbcHost}:${jdbcPort}/${jdbcDatabase}${jdbcURLParameters}
jdbcUser=postgres
jdbcPassword=sasa
jdbcUser=labkey
jdbcPassword=labkey

# key for the encrypted property store and other potentially sensitive content
encryptionKey=defaultKey