Merge branch 'develop' of 10.10.31.70:/ervu-eks into develop

config-data-executor/src/main/java/org/micord/service/RequestService.java

@@ -137,7 +137,7 @@ public class RequestService {
     }
   }
 
-  @Transactional(timeout = 300000)
+  @Transactional
   public void processSqlAndAqlRequests(Requests config, List<String> ids) {
     logger.debug("Starting transactional processing of requests");
     if (config.getSqlRequests() != null) {

config-data-executor/src/main/resources/application.yml

@@ -1,4 +1,8 @@
 configDirectory: C:\work\ervu-eks\config\cde-xml
+spring:
+  mvc:
+    servlet:
+      load-on-startup: 1
 logging:
   level:
     root: info

config-data-executor/src/main/resources/transactions.properties

@@ -1 +1,2 @@
 com.atomikos.icatch.max_timeout = 300000
+com.atomikos.icatch.default_jta_timeout=300000