diff --git a/gradle.properties b/gradle.properties index ab28ace1ba..6abdba0d73 100644 --- a/gradle.properties +++ b/gradle.properties @@ -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 @@ -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 diff --git a/server/configs/mssql.properties b/server/configs/mssql.properties index cbd7951026..cd50b49057 100644 --- a/server/configs/mssql.properties +++ b/server/configs/mssql.properties @@ -5,7 +5,7 @@ smtpHost=localhost smtpUser=Anonymous smtpPort=25 -databaseDefault=labkey +databaseDefault=labkey237 databaseBootstrap=labkey2 databaseMaster=master databaseDefaultHost=localhost @@ -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 diff --git a/server/configs/pg.properties b/server/configs/pg.properties index 721eac42ae..391fa78c86 100644 --- a/server/configs/pg.properties +++ b/server/configs/pg.properties @@ -5,7 +5,7 @@ smtpHost=localhost smtpUser=Anonymous smtpPort=25 -databaseDefault=labkey +databaseDefault=labkey237 databaseBootstrap=labkey2 databaseMaster=template1 databaseDefaultHost=localhost @@ -13,8 +13,8 @@ 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