diff --git a/.travis.yml b/.travis.yml
index 7792b772..5719cbcb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,9 +11,6 @@ cache:
install: true
script:
- set -e
- - echo -en "travis_fold:start:Test\r"
- - mvn install -Pdependency-check -B
- - echo -en "travis_fold:end:Test\r"
- export REPO=securecodebox/engine
- export TAG=$(echo $TRAVIS_BRANCH | sed 's/\//-/g')
- echo -en "travis_fold:start:Docker_Build\r"
diff --git a/pom.xml b/pom.xml
index 28803c4b..bad9dca7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -56,11 +56,11 @@
IMPORTANT: camunda.version and camunda.spring.boot.starter.version must be compatible
please see org.camunda.bpm.springboot.project:camunda-bpm-spring-boot-starter-root
-->
- 7.10.0
- 3.2.8
+ 7.12.0
+ 3.4.2
- 2.2.2.RELEASE
+ 2.2.6.RELEASE
2.9.2
UTF-8
@@ -101,6 +101,7 @@
org.springframework.boot
spring-boot-properties-migrator
+ ${spring-boot.version}
runtime
@@ -144,7 +145,7 @@
org.camunda.bpm.extension.mockito
camunda-bpm-mockito
test
- 3.2.1
+ 4.12.0
org.camunda.bpm.extension
@@ -155,7 +156,7 @@
org.camunda.bpm.extension
camunda-bpm-assert-scenario
- 0.2
+ 1.0.0
test
@@ -203,7 +204,7 @@
maven-compiler-plugin
- 2.3.1
+ 3.8.1
1.8
1.8
@@ -217,12 +218,12 @@
jcenter-snapshots
jcenter
- http://oss.jfrog.org/artifactory/oss-snapshot-local/
+ https://oss.jfrog.org/artifactory/oss-snapshot-local/
jcenter-releases
jcenter
- http://jcenter.bintray.com
+ https://jcenter.bintray.com
false
@@ -256,7 +257,7 @@
org.owasp
dependency-check-maven
- 5.2.4
+ 5.3.2
ALL
dependency-check-suppression.xml
@@ -315,7 +316,7 @@
org.apache.maven.plugins
maven-source-plugin
- 3.0.1
+ 3.2.1
generate-sources
@@ -328,7 +329,7 @@
org.apache.maven.plugins
maven-javadoc-plugin
- 2.10.4
+ 3.2.0
generate-javadocs
diff --git a/scb-engine/pom.xml b/scb-engine/pom.xml
index 7352b952..d7aacfea 100644
--- a/scb-engine/pom.xml
+++ b/scb-engine/pom.xml
@@ -32,13 +32,12 @@
org.springframework.boot
spring-boot-properties-migrator
runtime
- 2.2.2.RELEASE
org.springframework.security
spring-security-core
- 5.2.2.RELEASE
+ 5.3.1.RELEASE
@@ -90,22 +89,6 @@
tomcat-jdbc
-
- org.apache.tomcat.embed
- tomcat-embed-core
- 9.0.31
-
-
- org.apache.tomcat.embed
- tomcat-embed-el
- 9.0.31
-
-
- org.apache.tomcat.embed
- tomcat-embed-websocket
- 9.0.31
-
-
io.securecodebox.persistenceproviders
empty-persistenceprovider
diff --git a/scb-persistenceproviders/defectdojo-persistenceprovider/src/main/java/io/securecodebox/persistence/DefectDojoService.java b/scb-persistenceproviders/defectdojo-persistenceprovider/src/main/java/io/securecodebox/persistence/DefectDojoService.java
index 37e381d3..8069681e 100644
--- a/scb-persistenceproviders/defectdojo-persistenceprovider/src/main/java/io/securecodebox/persistence/DefectDojoService.java
+++ b/scb-persistenceproviders/defectdojo-persistenceprovider/src/main/java/io/securecodebox/persistence/DefectDojoService.java
@@ -26,7 +26,12 @@
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.core.ParameterizedTypeReference;
import org.springframework.core.io.ByteArrayResource;
-import org.springframework.http.*;
+
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
import org.springframework.http.converter.FormHttpMessageConverter;
import org.springframework.http.converter.ResourceHttpMessageConverter;
import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
@@ -206,7 +211,7 @@ public EngagementResponse createEngagement(EngagementPayload engagementPayload)
public ImportScanResponse createFindings(String rawResult, long engagementId, long lead, String currentDate, String defectDojoScanName) {
return createFindings(rawResult, engagementId, lead, currentDate,defectDojoScanName, "", new LinkedMultiValueMap<>());
}
- /**
+ /*
* Before version 1.5.4. testName (in DefectDojo _test_type_) must be defectDojoScanName, afterwards, you can have somethings else
*/
public ImportScanResponse createFindings(String rawResult, long engagementId, long lead, String currentDate,String defectDojoScanName, String testName, MultiValueMap options) {
@@ -254,7 +259,7 @@ public String getFilename() {
throw new DefectDojoPersistenceException("Failed to attach findings to engagement.");
}
}
- /**
+ /*
* When DefectDojo >= 1.5.4 is used, testType can be given. Add testName in case DefectDojo >= 1.5.4 is used
* Using testName for each branch leads to multiple issues in DefectDojo, so it is not recommended
*/
@@ -363,7 +368,7 @@ private long getTestIdOrCreate(long engagementId, TestPayload testPayload, Strin
return testId.longValue();
}
- /**
+ /*
* @deprecated
*/
public ImportScanResponse createFindingsReImport(String rawResult, String productName, String engagementName, long lead, String currentDate, String defectDojoScanName, EngagementPayload engagementPayload, TestPayload testPayload, MultiValueMap options) {
@@ -480,7 +485,7 @@ private Optional getEngagementIdByEngagementName(String engagementName, lo
LOG.warn("Engagement with name '{}' not found.", engagementName);
return Optional.empty();
}
- /**
+ /*
* @deprecated
*/
public ProductResponse createProduct(String productName) {
@@ -508,7 +513,9 @@ public void deleteUnusedBranches(List existingBranches, String producNam
/**
* Deletes engagements based on branch tag
- * Be aware that the branch tag MUST be set, otherwise all engagments will be deleted
+ * Be aware that the branch tag MUST be set, otherwise all engagements will be deleted
+ * @param existingBranches The list of existing branches
+ * @param productId The productId to find engagements for
*/
public void deleteUnusedBranches(List existingBranches, long productId) {
if(existingBranches == null) {
diff --git a/scb-scanprocesses/amass-process/pom.xml b/scb-scanprocesses/amass-process/pom.xml
index bc3e2899..d6ff6cec 100644
--- a/scb-scanprocesses/amass-process/pom.xml
+++ b/scb-scanprocesses/amass-process/pom.xml
@@ -1,23 +1,3 @@
-
-
-
4.0.0
diff --git a/scb-scanprocesses/amass-process/src/main/resources/forms/default/approve-results.html b/scb-scanprocesses/amass-process/src/main/resources/forms/default/approve-results.html
index 256b7f0d..55b9377e 100644
--- a/scb-scanprocesses/amass-process/src/main/resources/forms/default/approve-results.html
+++ b/scb-scanprocesses/amass-process/src/main/resources/forms/default/approve-results.html
@@ -17,7 +17,7 @@
~ */
-->
-