diff --git a/dependencyCheckSuppression.xml b/dependencyCheckSuppression.xml
index 2bdde92a52..8de7fea3d7 100644
--- a/dependencyCheckSuppression.xml
+++ b/dependencyCheckSuppression.xml
@@ -250,4 +250,37 @@
cpe:/a:vmware:server
cpe:/a:vmware:vmware_server
+
+
+
+
+ ^pkg:maven/org\.apache\.pdfbox/pdfbox@.*$
+ CVE-2026-23907
+
+
+
+ ^pkg:maven/org\.apache\.pdfbox/pdfbox-debugger@.*$
+ CVE-2026-23907
+
+
+
+ ^pkg:maven/org\.apache\.pdfbox/pdfbox-io@.*$
+ CVE-2026-23907
+
+
+
+ ^pkg:maven/org\.apache\.pdfbox/pdfbox-tools@.*$
+ CVE-2026-23907
+
diff --git a/server/embedded/src/org/labkey/embedded/LabKeyServer.java b/server/embedded/src/org/labkey/embedded/LabKeyServer.java
index 03a4b72d60..0c1135baf1 100644
--- a/server/embedded/src/org/labkey/embedded/LabKeyServer.java
+++ b/server/embedded/src/org/labkey/embedded/LabKeyServer.java
@@ -79,16 +79,17 @@ public static void main(String[] args)
script-src 'unsafe-eval' 'strict-dynamic' 'nonce-${REQUEST.SCRIPT.NONCE}' ${SCRIPT.SOURCES} ;
base-uri 'self' ;
frame-src 'self' ${FRAME.SOURCES} ;
+ report-uri ${context.contextPath:}/admin-contentSecurityPolicyReport.api ;
""";
// Add upgrade_insecure_requests substitution, frame-ancestors, and enforce version
String enforceCsp = baseCsp + """
${UPGRADE.INSECURE.REQUESTS}
frame-ancestors 'self' ;
- report-uri ${context.contextPath:}/admin-contentSecurityPolicyReport.api?cspVersion=e14 ;
+ /* cspVersion=e15 */
""";
// Leave out upgrade_insecure_requests and frame-ancestors directives, since they produce warnings on some browsers
String reportCsp = baseCsp + """
- report-uri ${context.contextPath:}/admin-contentSecurityPolicyReport.api?cspVersion=r14 ;
+ /* cspVersion=r15 */
""";
application.setDefaultProperties(new HashMap<>()