Merge pull request #41 from secureCodeBox/upgrade-to-camunda-7.9

Upgrade to camunda 7.10 and spring.boot.starter 3.2.0

Author: MartinLang1

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
          -->
-        <camunda.version>7.8.0</camunda.version>
-        <camunda.spring.boot.starter.version>2.3.0</camunda.spring.boot.starter.version>
+        <camunda.version>7.10.0</camunda.version>
+        <camunda.spring.boot.starter.version>3.2.0</camunda.spring.boot.starter.version>
         <!-- END IMPORTANT -->
 
-        <spring-boot.version>1.5.13.RELEASE</spring-boot.version>
+        <spring-boot.version>2.1.1.RELEASE</spring-boot.version>
         <swagger-version>2.9.0</swagger-version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
@@ -98,6 +98,12 @@
                 <type>pom</type>
             </dependency>
 
+            <dependency>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-properties-migrator</artifactId>
+                <scope>runtime</scope>
+            </dependency>
+
             <!-- Add camunda spring boot starter classes -->
             <dependency>
                 <groupId>org.camunda.bpm.springboot</groupId>
@@ -138,7 +144,13 @@
                 <groupId>org.camunda.bpm.extension.mockito</groupId>
                 <artifactId>camunda-bpm-mockito</artifactId>
                 <scope>test</scope>
-                <version>3.1.0</version>
+                <version>3.2.1</version>
+            </dependency>
+            <dependency>
+                <groupId>org.camunda.bpm.extension</groupId>
+                <artifactId>camunda-bpm-assert</artifactId>
+                <version>1.2</version> <!-- Use 2.0-alpha2 for the CMMN assertions preview! -->
+                <scope>test</scope>
             </dependency>
             <dependency>
                 <groupId>org.camunda.bpm.extension</groupId>

scb-engine/pom.xml

@@ -28,6 +28,12 @@
             <groupId>org.camunda.bpm.springboot</groupId>
             <artifactId>camunda-bpm-spring-boot-starter-webapp</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-properties-migrator</artifactId>
+            <scope>runtime</scope>
+            <version>2.0.2.RELEASE</version>
+        </dependency>
 
         <dependency>
             <groupId>io.springfox</groupId>
@@ -72,6 +78,11 @@
             <scope>runtime</scope>
         </dependency>
 
+        <dependency>
+            <groupId>org.apache.tomcat</groupId>
+            <artifactId>tomcat-jdbc</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>io.securecodebox.persistenceproviders</groupId>
             <artifactId>empty-persistenceprovider</artifactId>
@@ -203,7 +214,7 @@
                     <dependency>
                         <groupId>org.elasticsearch</groupId>
                         <artifactId>elasticsearch</artifactId>
-                        <version>6.2.4</version>
+                        <version>6.4.3</version>
                     </dependency>
                 </dependencies>
             </dependencyManagement>

scb-engine/src/main/java/io/securecodebox/engine/helper/DefaultGroupConfiguration.java

@@ -46,7 +46,7 @@ public class DefaultGroupConfiguration extends AbstractCamundaConfiguration {
 
     public static final String GROUP_SCANNER = "scanner";
     public static final String GROUP_APPROVER = "approver";
-    public static final String GROUP_CI = "continuous-integration";
+    public static final String GROUP_CI = "continuousIntegration";
 
     private static final Logger LOG = LoggerFactory.getLogger(DefaultGroupConfiguration.class);
 

scb-engine/src/main/java/io/securecodebox/engine/rest/ScanJobResource.java

@@ -169,7 +169,7 @@ public ResponseEntity completeJob(
     ) {
         try{
             authService.checkAuthorizedFor(id.toString(), ResourceType.SECURITY_TEST, PermissionType.UPDATE);
-        }catch (InsufficientAuthenticationException e){
+        } catch (InsufficientAuthenticationException e){
             return ResponseEntity.status(HttpStatus.FORBIDDEN).build();
         }