[syncope] 01/03: [SYNCOPE-1406] Flowable local directory was changed by SYNCOPE-1369

2018-12-03 Thread ilgrosso 
This is an automated email from the ASF dual-hosted git repository.

ilgrosso pushed a commit to branch 2_1_X
in repository https://gitbox.apache.org/repos/asf/syncope.git

commit 09e9ec99cd1dba9917927cbd39f8a5f5ded8dbe8
Author: Francesco Chicchiriccò 
AuthorDate: Mon Dec 3 12:59:03 2018 +0100

[SYNCOPE-1406] Flowable local directory was changed by SYNCOPE-1369
---
 deb/core/pom.xml | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/deb/core/pom.xml b/deb/core/pom.xml
index 9c0f0af..45f8f71 100644
--- a/deb/core/pom.xml
+++ b/deb/core/pom.xml
@@ -160,19 +160,19 @@ under the License.
 true
   
   
-
${basedir}/../../core/workflow-flowable/src/main/resources
+
${basedir}/../../core/provisioning-java/src/main/resources
 
-  workflow.properties
-  userWorkflow.bpmn20.xml
+  mail.properties
+  connid.properties
 
 ${project.build.directory}/etc
 true
   
   
-
${basedir}/../../core/provisioning-java/src/main/resources
+
${basedir}/../../ext/flowable/flowable-bpmn/src/main/resources
 
-  mail.properties
-  connid.properties
+  workflow.properties
+  userWorkflow.bpmn20.xml
 
 ${project.build.directory}/etc
 true

[syncope] 01/03: [SYNCOPE-1406] Flowable local directory was changed by SYNCOPE-1369

2018-12-03 Thread ilgrosso 
This is an automated email from the ASF dual-hosted git repository.

ilgrosso pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/syncope.git

commit 34de818e2d7b55c3a50150283cbe320df307d526
Author: Francesco Chicchiriccò 
AuthorDate: Mon Dec 3 12:59:03 2018 +0100

[SYNCOPE-1406] Flowable local directory was changed by SYNCOPE-1369
---
 deb/core/pom.xml | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/deb/core/pom.xml b/deb/core/pom.xml
index 910cc30..b815ce0 100644
--- a/deb/core/pom.xml
+++ b/deb/core/pom.xml
@@ -160,19 +160,19 @@ under the License.
 true
   
   
-
${basedir}/../../core/workflow-flowable/src/main/resources
+
${basedir}/../../core/provisioning-java/src/main/resources
 
-  workflow.properties
-  userWorkflow.bpmn20.xml
+  mail.properties
+  connid.properties
 
 ${project.build.directory}/etc
 true
   
   
-
${basedir}/../../core/provisioning-java/src/main/resources
+
${basedir}/../../ext/flowable/flowable-bpmn/src/main/resources
 
-  mail.properties
-  connid.properties
+  workflow.properties
+  userWorkflow.bpmn20.xml
 
 ${project.build.directory}/etc
 true