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.

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

Update to latest Spring versions #686

Merged
merged 1 commit into from
Jan 24, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -283,12 +283,12 @@ slf4jLog4jApiVersion=2.0.9
# This is a dependency for HTSJDK. Force version for CVE-2023-43642
snappyJavaVersion=1.1.10.5

springBootVersion=3.1.7
springBootVersion=3.2.2
# This usually matches the Tomcat version dictated by springBootVersion
# Also, keep this in sync with apacheTomcatVersion above
springBootTomcatVersion=10.1.18

springVersion=6.0.16
springVersion=6.1.3

# Do not upgrade until BaseDaoImpl stops calling getGeneratedKeys()
sqliteJdbcVersion=3.42.0.1
Expand Down
8 changes: 6 additions & 2 deletions server/embedded/src/org/labkey/embedded/LabKeyServer.java
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
import org.apache.catalina.loader.WebappLoader;
import org.apache.catalina.startup.Tomcat;
import org.apache.catalina.valves.JsonAccessLogValve;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.tomcat.util.descriptor.web.ContextResource;
import org.apache.tomcat.util.descriptor.web.FilterDef;
import org.apache.tomcat.util.descriptor.web.FilterMap;
Expand Down Expand Up @@ -37,6 +39,8 @@
@SpringBootApplication
public class LabKeyServer
{
private static final Log LOG = LogFactory.getLog(LabKeyServer.class);

private static final int BUFFER_SIZE = 4096;
private static final String TERMINATE_ON_STARTUP_FAILURE = "terminateOnStartupFailure";
private static final String SERVER_GUID = "serverGUID";
Expand Down Expand Up @@ -315,12 +319,12 @@ private String getPropValue(Map<Integer, String> propValues, Integer resourceKey
{
if (propValues == null)
{
logger.debug(String.format("%1$s property was not provided, using default", propName));
LOG.debug(String.format("%1$s property was not provided, using default", propName));
return defaultValue;
}

if (!propValues.containsKey(resourceKey))
logger.debug(String.format("%1$s property was not provided for resource [%2$s], using default [%3$s]", propName, resourceKey, defaultValue));
LOG.debug(String.format("%1$s property was not provided for resource [%2$s], using default [%3$s]", propName, resourceKey, defaultValue));

String val = propValues.getOrDefault(resourceKey, defaultValue);
return val != null && !val.isBlank() ? val.trim() : defaultValue;
Expand Down