Merge branch 'mercedes-benz:develop' into feature-345-summary-in-reports

mercedes-benz · Sep 8, 2023 · e22c483 · e22c483
2 parents a445501 + 639f6ab
commit e22c483
Show file tree

Hide file tree

Showing 79 changed files with 3,039 additions and 1,972 deletions.
diff --git a/MAINTAINERS.md b/MAINTAINERS.md
@@ -10,6 +10,7 @@
 | Jeremias Eppler  | <jeremias.eppler@mercedes-benz.com>     | [jeeppler](https://github.com/jeeppler) | Mercedes-Benz Tech Innovation GmbH, [imprint](https://github.com/mercedes-benz/foss/blob/master/PROVIDER_INFORMATION.md) | 2021-01-01 |
 | Jan Winz         | <jan.winz@mercedes-benz.com>     | [winzj](https://github.com/winzj) | Mercedes-Benz Tech Innovation GmbH, [imprint](https://github.com/mercedes-benz/foss/blob/master/PROVIDER_INFORMATION.md) | 2021-07-01 |
 | Rouven Härtel         | <rouven.haertel@mercedes-benz.com>     | [haerter-tss](https://github.com/haerter-tss) | Mercedes-Benz Tech Innovation GmbH, [imprint](https://github.com/mercedes-benz/foss/blob/master/PROVIDER_INFORMATION.md) | 2022-02-01 |
+| Laura Bottner         | <laura.bottner@mercedes-benz.com>     | [lorriborri](hhttps://github.com/lorriborri) | Mercedes-Benz Tech Innovation GmbH, [imprint](https://github.com/mercedes-benz/foss/blob/master/PROVIDER_INFORMATION.md) | 2023-09-06 |
 
 
 ## Emeritus Maintainers

diff --git a/gradle/libraries.gradle b/gradle/libraries.gradle
@@ -68,7 +68,7 @@ ext {
       restDocsApiSpec:                         "0.16.4",  // newest version compatible with Spring Boot 2.x
 
       /* Owasp Zap wrapper */
-      owaspzap_client_api:                     "1.11.0",
+      owaspzap_client_api:                     "1.12.0",
       jcommander:                              "1.82",
 
       thymeleaf_extras_springsecurity5:        "3.1.1.RELEASE",

diff --git a/...ns-model/src/main/java/com/mercedesbenz/sechub/commons/model/HTTPHeaderConfiguration.java b/...ns-model/src/main/java/com/mercedesbenz/sechub/commons/model/HTTPHeaderConfiguration.java
@@ -4,6 +4,9 @@
 import java.util.List;
 import java.util.Optional;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class HTTPHeaderConfiguration {
     public static final String PROPERTY_NAME = "name";
     public static final String PROPERTY_VALUE = "value";

diff --git a/...p-zap/src/main/java/com/mercedesbenz/sechub/owaspzapwrapper/cli/OwaspZapScanExecutor.java b/...p-zap/src/main/java/com/mercedesbenz/sechub/owaspzapwrapper/cli/OwaspZapScanExecutor.java
diff --git a/...p-zap/src/main/java/com/mercedesbenz/sechub/owaspzapwrapper/cli/OwaspZapScanResolver.java b/...p-zap/src/main/java/com/mercedesbenz/sechub/owaspzapwrapper/cli/OwaspZapScanResolver.java
diff --git a/...rc/main/java/com/mercedesbenz/sechub/owaspzapwrapper/config/OwaspZapClientApiFactory.java b/...rc/main/java/com/mercedesbenz/sechub/owaspzapwrapper/config/OwaspZapClientApiFactory.java