diff --git a/gradle.properties b/gradle.properties index 591ba61dda..e8e26d24ac 100644 --- a/gradle.properties +++ b/gradle.properties @@ -44,7 +44,7 @@ buildFromSource=true # The default version for LabKey artifacts that are built or that we depend on. # override in an individual module's gradle.properties file as necessary -labkeyVersion=25.7.9 +labkeyVersion=25.7.10 labkeyClientApiVersion=6.3.0 # Version numbers for the various binary artifacts that are included when @@ -99,7 +99,7 @@ apacheDirectoryVersion=2.1.7 apacheMinaVersion=2.2.4 # Usually matches the version specified as a Spring Boot dependency (see springBootVersion below) -apacheTomcatVersion=10.1.44 +apacheTomcatVersion=10.1.46 # (mothership) -> json-path -> json-smart -> accessor-smart # (core) -> graalvm @@ -287,9 +287,9 @@ slf4jLog4jApiVersion=2.0.17 snappyJavaVersion=1.1.10.7 # Also, update apacheTomcatVersion above to match Spring Boot's Tomcat dependency version -springBootVersion=3.5.3 +springBootVersion=3.5.6 # This usually matches the Spring Framework version dictated by springBootVersion -springVersion=6.2.10 +springVersion=6.2.11 sqliteJdbcVersion=3.50.3.0 diff --git a/server/embedded/src/org/labkey/embedded/LabKeyServer.java b/server/embedded/src/org/labkey/embedded/LabKeyServer.java index e716072caf..b6e9b38acf 100644 --- a/server/embedded/src/org/labkey/embedded/LabKeyServer.java +++ b/server/embedded/src/org/labkey/embedded/LabKeyServer.java @@ -75,7 +75,7 @@ public static void main(String[] args) style-src 'self' 'unsafe-inline' ${STYLE.SOURCES} ; img-src 'self' data: ${IMAGE.SOURCES} ; font-src 'self' data: ${FONT.SOURCES} ; - script-src 'unsafe-eval' 'strict-dynamic' 'nonce-${REQUEST.SCRIPT.NONCE}' ; + script-src 'unsafe-eval' 'strict-dynamic' 'nonce-${REQUEST.SCRIPT.NONCE}' ${SCRIPT.SOURCES} ; base-uri 'self' ; frame-src 'self' ${FRAME.SOURCES} ; """;