updating develop poms to master versions to avoid merge conflicts

vanlin · Nov 30, 2017 · b8a6df6 · b8a6df6
1 parent 5e1780e
commit b8a6df6
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 9 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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>