From 1feb8bad0d5b2ff91128a4c159cc3a5d72080471 Mon Sep 17 00:00:00 2001 From: Simon Bennetts Date: Thu, 17 Jul 2025 12:41:06 +0100 Subject: [PATCH 1/2] Itests: update for new (passing) pscan rule Signed-off-by: Simon Bennetts --- docker/integration_tests/results/baseline1-1.out | 2 +- docker/integration_tests/results/baseline1-2.out | 2 +- docker/integration_tests/results/baseline2-1.out | 2 +- docker/integration_tests/results/baseline3-1.out | 2 +- docker/integration_tests/results/baseline4-1.out | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docker/integration_tests/results/baseline1-1.out b/docker/integration_tests/results/baseline1-1.out index 2b703214ca2..72421d15fb2 100644 --- a/docker/integration_tests/results/baseline1-1.out +++ b/docker/integration_tests/results/baseline1-1.out @@ -10,4 +10,4 @@ WARN-NEW: CSP: Failure to Define Directive with No Fallback [10055] x X WARN-NEW: Permissions Policy Header Not Set [10063] x X WARN-NEW: Cross-Domain Misconfiguration [10098] x X WARN-NEW: Insufficient Site Isolation Against Spectre Vulnerability [90004] x X -FAIL-NEW: 0 FAIL-INPROG: 0 WARN-NEW: 11 WARN-INPROG: 0 INFO: 0 IGNORE: 0 PASS: 55 +FAIL-NEW: 0 FAIL-INPROG: 0 WARN-NEW: 11 WARN-INPROG: 0 INFO: 0 IGNORE: 0 PASS: 56 diff --git a/docker/integration_tests/results/baseline1-2.out b/docker/integration_tests/results/baseline1-2.out index 0fe3ebc61f3..d2245abe71b 100644 --- a/docker/integration_tests/results/baseline1-2.out +++ b/docker/integration_tests/results/baseline1-2.out @@ -9,4 +9,4 @@ WARN-NEW: CSP: Failure to Define Directive with No Fallback [10055] x X WARN-NEW: Permissions Policy Header Not Set [10063] x X WARN-NEW: Cross-Domain Misconfiguration [10098] x X WARN-NEW: Insufficient Site Isolation Against Spectre Vulnerability [90004] x X -FAIL-NEW: 0 FAIL-INPROG: 0 WARN-NEW: 10 WARN-INPROG: 0 INFO: 0 IGNORE: 0 PASS: 56 +FAIL-NEW: 0 FAIL-INPROG: 0 WARN-NEW: 10 WARN-INPROG: 0 INFO: 0 IGNORE: 0 PASS: 57 diff --git a/docker/integration_tests/results/baseline2-1.out b/docker/integration_tests/results/baseline2-1.out index 46ca99a3195..64842a2cd92 100644 --- a/docker/integration_tests/results/baseline2-1.out +++ b/docker/integration_tests/results/baseline2-1.out @@ -10,4 +10,4 @@ WARN-NEW: Permissions Policy Header Not Set [10063] x X WARN-NEW: Cross-Domain Misconfiguration [10098] x X WARN-NEW: Insufficient Site Isolation Against Spectre Vulnerability [90004] x X FAIL-NEW: X-Content-Type-Options Header Missing [10021] x X -FAIL-NEW: 1 FAIL-INPROG: 0 WARN-NEW: 8 WARN-INPROG: 0 INFO: 1 IGNORE: 1 PASS: 55 +FAIL-NEW: 1 FAIL-INPROG: 0 WARN-NEW: 8 WARN-INPROG: 0 INFO: 1 IGNORE: 1 PASS: 56 diff --git a/docker/integration_tests/results/baseline3-1.out b/docker/integration_tests/results/baseline3-1.out index b1f0b1d8e6a..f2568ab49b0 100644 --- a/docker/integration_tests/results/baseline3-1.out +++ b/docker/integration_tests/results/baseline3-1.out @@ -9,4 +9,4 @@ WARN-NEW: Permissions Policy Header Not Set [10063] x X WARN-NEW: Cross-Domain Misconfiguration [10098] x X WARN-NEW: Insufficient Site Isolation Against Spectre Vulnerability [90004] x X FAIL-NEW: X-Content-Type-Options Header Missing [10021] x X -FAIL-NEW: 1 FAIL-INPROG: 0 WARN-NEW: 7 WARN-INPROG: 0 INFO: 1 IGNORE: 1 PASS: 56 +FAIL-NEW: 1 FAIL-INPROG: 0 WARN-NEW: 7 WARN-INPROG: 0 INFO: 1 IGNORE: 1 PASS: 57 diff --git a/docker/integration_tests/results/baseline4-1.out b/docker/integration_tests/results/baseline4-1.out index b1f0b1d8e6a..f2568ab49b0 100644 --- a/docker/integration_tests/results/baseline4-1.out +++ b/docker/integration_tests/results/baseline4-1.out @@ -9,4 +9,4 @@ WARN-NEW: Permissions Policy Header Not Set [10063] x X WARN-NEW: Cross-Domain Misconfiguration [10098] x X WARN-NEW: Insufficient Site Isolation Against Spectre Vulnerability [90004] x X FAIL-NEW: X-Content-Type-Options Header Missing [10021] x X -FAIL-NEW: 1 FAIL-INPROG: 0 WARN-NEW: 7 WARN-INPROG: 0 INFO: 1 IGNORE: 1 PASS: 56 +FAIL-NEW: 1 FAIL-INPROG: 0 WARN-NEW: 7 WARN-INPROG: 0 INFO: 1 IGNORE: 1 PASS: 57 From ceebe04c81b4b113916cbbebb00563e2912b7848 Mon Sep 17 00:00:00 2001 From: thc202 Date: Thu, 17 Jul 2025 16:01:52 +0100 Subject: [PATCH 2/2] Update FlatLaf Update FlatLaf to 3.6.1. Signed-off-by: thc202 --- LEGALNOTICE.md | 4 ++-- zap/zap.gradle.kts | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/LEGALNOTICE.md b/LEGALNOTICE.md index 5f824caa152..52d6f57373d 100644 --- a/LEGALNOTICE.md +++ b/LEGALNOTICE.md @@ -43,8 +43,8 @@ and subject to their respective licenses. | commons-logging-1.3.5.jar | Apache 2.0 | | commons-text-1.13.0.jar | Apache 2.0 | | ezmorph-1.0.6.jar | Apache 2.0 | -| flatlaf-3.6.jar | Apache 2.0 | -| flatlaf-swingx-3.6.jar | Apache 2.0 | +| flatlaf-3.6.1.jar | Apache 2.0 | +| flatlaf-swingx-3.6.1.jar | Apache 2.0 | | harlib-1.1.3.jar | Apache 2.0 | | hsqldb-2.7.4.jar | BSD | | jackson-core-asl-1.9.13.jar | Apache 2.0 | diff --git a/zap/zap.gradle.kts b/zap/zap.gradle.kts index 905e287aeca..25f2b4ddd1f 100644 --- a/zap/zap.gradle.kts +++ b/zap/zap.gradle.kts @@ -113,8 +113,8 @@ dependencies { api("org.jgrapht:jgrapht-core:0.9.0") api("org.swinglabs.swingx:swingx-all:1.6.5-1") - implementation("com.formdev:flatlaf:3.6") - implementation("com.formdev:flatlaf-swingx:3.6") + implementation("com.formdev:flatlaf:3.6.1") + implementation("com.formdev:flatlaf-swingx:3.6.1") runtimeOnly("commons-logging:commons-logging:1.3.5") runtimeOnly("xom:xom:1.3.9") {