From b8a6df63b9c434806ade13c50c9d578484eb5ff3 Mon Sep 17 00:00:00 2001
From: alfresco-build <build@alfresco.com>
Date: Thu, 30 Nov 2017 15:22:09 +0000
Subject: [PATCH] updating develop poms to master versions to avoid merge
 conflicts

---
 activiti-bpmn-converter/pom.xml     | 2 +-
 activiti-bpmn-layout/pom.xml        | 2 +-
 activiti-bpmn-model/pom.xml         | 2 +-
 activiti-engine/pom.xml             | 2 +-
 activiti-image-generator/pom.xml    | 2 +-
 activiti-json-converter/pom.xml     | 2 +-
 activiti-process-validation/pom.xml | 2 +-
 activiti-spring/pom.xml             | 2 +-
 pom.xml                             | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/activiti-bpmn-converter/pom.xml b/activiti-bpmn-converter/pom.xml
index d83c180bb8a..aa5fd50c024 100644
--- a/activiti-bpmn-converter/pom.xml
+++ b/activiti-bpmn-converter/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>org.activiti</groupId>
     <artifactId>activiti-root</artifactId>
-    <version>7-201712-EA-SNAPSHOT</version>
+    <version>7-201711-EA</version>
   </parent>
 
   <properties>
diff --git a/activiti-bpmn-layout/pom.xml b/activiti-bpmn-layout/pom.xml
index 66a2469550a..3e4225237b8 100644
--- a/activiti-bpmn-layout/pom.xml
+++ b/activiti-bpmn-layout/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>org.activiti</groupId>
     <artifactId>activiti-root</artifactId>
-    <version>7-201712-EA-SNAPSHOT</version>
+    <version>7-201711-EA</version>
   </parent>
 
   <properties>
diff --git a/activiti-bpmn-model/pom.xml b/activiti-bpmn-model/pom.xml
index 488b9675d08..016e42021d8 100644
--- a/activiti-bpmn-model/pom.xml
+++ b/activiti-bpmn-model/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>org.activiti</groupId>
     <artifactId>activiti-root</artifactId>
-    <version>7-201712-EA-SNAPSHOT</version>
+    <version>7-201711-EA</version>
   </parent>
 
   <properties>
diff --git a/activiti-engine/pom.xml b/activiti-engine/pom.xml
index 50da0735530..866200a7b08 100644
--- a/activiti-engine/pom.xml
+++ b/activiti-engine/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>org.activiti</groupId>
     <artifactId>activiti-root</artifactId>
-    <version>7-201712-EA-SNAPSHOT</version>
+    <version>7-201711-EA</version>
   </parent>
 
   <dependencies>
diff --git a/activiti-image-generator/pom.xml b/activiti-image-generator/pom.xml
index b27d88a5657..d0290761ebf 100644
--- a/activiti-image-generator/pom.xml
+++ b/activiti-image-generator/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>org.activiti</groupId>
     <artifactId>activiti-root</artifactId>
-    <version>7-201712-EA-SNAPSHOT</version>
+    <version>7-201711-EA</version>
   </parent>
 
   <dependencies>
diff --git a/activiti-json-converter/pom.xml b/activiti-json-converter/pom.xml
index d236e67d3d0..27d7b48f4c3 100644
--- a/activiti-json-converter/pom.xml
+++ b/activiti-json-converter/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>org.activiti</groupId>
     <artifactId>activiti-root</artifactId>
-    <version>7-201712-EA-SNAPSHOT</version>
+    <version>7-201711-EA</version>
   </parent>
 
   <properties>
diff --git a/activiti-process-validation/pom.xml b/activiti-process-validation/pom.xml
index 9fab6a2d13e..b5c929b64f4 100644
--- a/activiti-process-validation/pom.xml
+++ b/activiti-process-validation/pom.xml
@@ -9,7 +9,7 @@
   <parent>
     <groupId>org.activiti</groupId>
     <artifactId>activiti-root</artifactId>
-    <version>7-201712-EA-SNAPSHOT</version>
+    <version>7-201711-EA</version>
   </parent>
 
   <properties>
diff --git a/activiti-spring/pom.xml b/activiti-spring/pom.xml
index 0961dae0464..4c11738ff9c 100644
--- a/activiti-spring/pom.xml
+++ b/activiti-spring/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.activiti</groupId>
     <artifactId>activiti-root</artifactId>
-    <version>7-201712-EA-SNAPSHOT</version>
+    <version>7-201711-EA</version>
   </parent>
 
   <properties>
diff --git a/pom.xml b/pom.xml
index fb09cf4134f..0102f7092ca 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 
   <description>BPM and workflow engine</description>
   <artifactId>activiti-root</artifactId>
-  <version>7-201712-EA-SNAPSHOT</version>
+  <version>7-201711-EA</version>
   <packaging>pom</packaging>
 
   <properties>