Merge branch 'master' into rc3.1

# Conflicts:
#	.gitlab-ci.yml

process/target/classes/META-INF/processes.xml

+<?xml version="1.0" encoding="UTF-8" ?>
+
+<process-application
+        xmlns="http://www.camunda.org/schema/1.0/ProcessApplication"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+
+    <process-archive name="melodic">
+        <process-engine>default</process-engine>
+        <properties>
+            <property name="isDeleteUponUndeploy">false</property>
+            <property name="isScanForProcessDefinitions">true</property>
+        </properties>
+    </process-archive>
+
+</process-application>

process/target/classes/application.properties

+camunda.bpm.filter.create=All tasks
+

process/target/classes/eu.melodic.integration.bpm.properties

+# was not distributed with this file, You can obtain one at
+# http://mozilla.org/MPL/2.0/.
+#
+
+#### Communication with ESB ####
+esb.url=http://localhost:8088/api/process
+
+#### REST interface port ####
+server.port = 8095
+
+#time that must pass before executing deployment process for the same application again (counted from the finish time of last process), in seconds
+deployment.delay = 60
+
+dataManagement.enabled = false
+eventManagement.enabled = false
+
+discovery.retries=40
+discovery.delay=15
+

process/target/classes/logback-spring.xml

+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  ~ Copyright (C) 2017 7bulls.com
+  ~
+  ~ This Source Code Form is subject to the terms of the
+  ~ Mozilla Public License, v. 2.0. If a copy of the MPL
+  ~ was not distributed with this file, You can obtain one at
+  ~ http://mozilla.org/MPL/2.0/.
+  -->
+
+<configuration>
+  <include resource="org/springframework/boot/logging/logback/base.xml"/>
+  <logger name="eu.melodic.integration.process" level="DEBUG"/>
+  <logger name="org.springframework.web.filter.CommonsRequestLoggingFilter" level="DEBUG"/>
+</configuration>

process/target/docker/Dockerfile

+FROM java:8-alpine
+
+RUN /bin/sh -c "apk add --no-cache bash"
+VOLUME /tmp
+ADD process.jar process.jar
+
+COPY ./run.sh .
+RUN bash -c 'chmod +rx run.sh'
+ENTRYPOINT ["./run.sh"]
+

process/target/docker/run.sh

+#!/bin/sh
+
+#keytool -noprompt -storepass changeit -import -alias mule -keystore /usr/lib/jvm/java-1.8-openjdk/jre/lib/security/cacerts -file /config/mule-server.crt
+java  -Djavax.net.ssl.trustStore=/config/common/melodic-truststore.p12 -Djavax.net.ssl.trustStorePassword=melodic -Djavax.net.ssl.trustStoreType=pkcs12 -Duser.timezone=Europe/Warsaw -Djava.security.egd=file:/dev/./urandom -jar process.jar

process/target/maven-archiver/pom.properties

+#Generated by Maven
+#Tue Dec 24 07:52:17 UTC 2019
+version=2.5.1-SNAPSHOT
+groupId=eu.melodic.bpm
+artifactId=process

process/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst

+eu/melodic/bpm/services/EventModelDelegate.class
+eu/melodic/bpm/ApplicationContext.class
+eu/melodic/bpm/services/ApplySolutionDelegate.class
+eu/melodic/bpm/services/DataModelDelegate.class
+eu/melodic/bpm/services/ConstraintProblemEnhancementDelegate.class
+eu/melodic/bpm/services/ConstraintProblemDelegate.class
+eu/melodic/bpm/services/SolutionUpdateDelegate.class
+eu/melodic/bpm/services/SolutionEvaluationDelegate.class
+eu/melodic/bpm/DeploymentProcess.class
+eu/melodic/bpm/services/ConstraintProblemSolutionDelegate.class
+eu/melodic/bpm/services/DiscoveryStatusDelegate.class
+eu/melodic/bpm/services/ApplicationDeploymentExecutor.class
+eu/melodic/bpm/services/StartProcessVerifierDelegate.class
+eu/melodic/bpm/exception/JwtExpiredException.class
+eu/melodic/bpm/CamundaApplication.class
+eu/melodic/bpm/services/ApplicationDeploymentDelegate.class

process/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

+/usr/src/mymaven/process/src/main/java/eu/melodic/bpm/services/ApplicationDeploymentDelegate.java
+/usr/src/mymaven/process/src/main/java/eu/melodic/bpm/ApplicationContext.java
+/usr/src/mymaven/process/src/main/java/eu/melodic/bpm/services/SolutionUpdateDelegate.java
+/usr/src/mymaven/process/src/main/java/eu/melodic/bpm/CamundaApplication.java
+/usr/src/mymaven/process/src/main/java/eu/melodic/bpm/services/SolutionEvaluationDelegate.java
+/usr/src/mymaven/process/src/main/java/eu/melodic/bpm/services/ConstraintProblemEnhancementDelegate.java
+/usr/src/mymaven/process/src/main/java/eu/melodic/bpm/exception/JwtExpiredException.java
+/usr/src/mymaven/process/src/main/java/eu/melodic/bpm/services/ApplicationDeploymentExecutor.java
+/usr/src/mymaven/process/src/main/java/eu/melodic/bpm/DeploymentProcess.java
+/usr/src/mymaven/process/src/main/java/eu/melodic/bpm/services/DiscoveryStatusDelegate.java
+/usr/src/mymaven/process/src/main/java/eu/melodic/bpm/services/ConstraintProblemSolutionDelegate.java
+/usr/src/mymaven/process/src/main/java/eu/melodic/bpm/services/EventModelDelegate.java
+/usr/src/mymaven/process/src/main/java/eu/melodic/bpm/services/ApplySolutionDelegate.java
+/usr/src/mymaven/process/src/main/java/eu/melodic/bpm/services/ConstraintProblemDelegate.java
+/usr/src/mymaven/process/src/main/java/eu/melodic/bpm/services/StartProcessVerifierDelegate.java
+/usr/src/mymaven/process/src/main/java/eu/melodic/bpm/services/DataModelDelegate.java

process/target/test-classes/image_info.json

+{"commit":"a36e60d1fec69661c95e0e0e520e5316dfa98fb2","image":"127.0.0.1:5000/melodic-rc3.0/process","repo":"git@gitlab.ow2.org:melodic/melodic-integration.git"}
\ No newline at end of file