[Git][ultreia.io/ird-observe][master] Deleted 4 commits: [jgitflow-maven-plugin]Updating develop poms back to pre merge state

12 Mar 2017

Tony CHEMIT pushed to branch master at ultreia.io / ird-observe


WARNING: The push did not contain any new commits, but force pushed to delete the commits and changes below.


Deleted commits:
ebf49628 by Tony CHEMIT at 2017-03-11T12:56:06+01:00
[jgitflow-maven-plugin]Updating develop poms back to pre merge state
- - - - -
9eb36475 by Tony CHEMIT at 2017-03-11T12:59:33+01:00
Update changelog for staging version 6.0-RC-1

- - - - -
2f75e9a1 by Tony CHEMIT at 2017-03-11T13:02:24+01:00
update changelog

- - - - -
06ff52a8 by Tony CHEMIT at 2017-03-12T12:08:23+01:00
update changelog

- - - - -


26 changed files:

- CHANGELOG.md
- application-swing-configuration/pom.xml
- application-swing-decoration/pom.xml
- application-swing-validation/pom.xml
- application-swing-validators/pom.xml
- application-swing/pom.xml
- application-web-configuration/pom.xml
- application-web/pom.xml
- common/pom.xml
- observe/pom.xml
- persistence/pom.xml
- pom.xml
- services-binder/pom.xml
- services-configuration-rest/pom.xml
- services-configuration-topia/pom.xml
- services-configuration/pom.xml
- services-rest/pom.xml
- services-runner/pom.xml
- services-topia/pom.xml
- services-validation/pom.xml
- services-validators/pom.xml
- services/pom.xml
- test/pom.xml
- toolbox-maven-plugin/pom.xml
- topia-extension/pom.xml
- topia-templates-extension/pom.xml


Changes:

=====================================
CHANGELOG.md
=====================================
The diff for this file was not included because it is too large.

=====================================
application-swing-configuration/pom.xml
=====================================

--- a/application-swing-configuration/pom.xml
+++ b/application-swing-configuration/pom.xml
@@ -26,7 +26,7 @@
   <parent>
     <groupId>fr.ird.observe</groupId>
     <artifactId>pom</artifactId>
-    <version>6.0-RC-1</version>
+    <version>6.0-RC-2-SNAPSHOT</version>
   </parent>
 
   <artifactId>application-swing-configuration</artifactId>


=====================================
application-swing-decoration/pom.xml
=====================================
--- a/application-swing-decoration/pom.xml
+++ b/application-swing-decoration/pom.xml
@@ -26,7 +26,7 @@
   <parent>
     <groupId>fr.ird.observe</groupId>
     <artifactId>pom</artifactId>
-    <version>6.0-RC-1</version>
+    <version>6.0-RC-2-SNAPSHOT</version>
   </parent>
 
   <artifactId>application-swing-decoration</artifactId>


=====================================
application-swing-validation/pom.xml
=====================================
--- a/application-swing-validation/pom.xml
+++ b/application-swing-validation/pom.xml
@@ -26,7 +26,7 @@
   <parent>
     <groupId>fr.ird.observe</groupId>
     <artifactId>pom</artifactId>
-    <version>6.0-RC-1</version>
+    <version>6.0-RC-2-SNAPSHOT</version>
   </parent>
 
   <artifactId>application-swing-validation</artifactId>


=====================================
application-swing-validators/pom.xml
=====================================
--- a/application-swing-validators/pom.xml
+++ b/application-swing-validators/pom.xml
@@ -26,7 +26,7 @@
   <parent>
     <groupId>fr.ird.observe</groupId>
     <artifactId>pom</artifactId>
-    <version>6.0-RC-1</version>
+    <version>6.0-RC-2-SNAPSHOT</version>
   </parent>
 
   <artifactId>application-swing-validators</artifactId>


=====================================
application-swing/pom.xml
=====================================
--- a/application-swing/pom.xml
+++ b/application-swing/pom.xml
@@ -26,7 +26,7 @@
   <parent>
     <groupId>fr.ird.observe</groupId>
     <artifactId>pom</artifactId>
-    <version>6.0-RC-1</version>
+    <version>6.0-RC-2-SNAPSHOT</version>
   </parent>
 
   <artifactId>application-swing</artifactId>


=====================================
application-web-configuration/pom.xml
=====================================
--- a/application-web-configuration/pom.xml
+++ b/application-web-configuration/pom.xml
@@ -26,7 +26,7 @@
   <parent>
     <groupId>fr.ird.observe</groupId>
     <artifactId>pom</artifactId>
-    <version>6.0-RC-1</version>
+    <version>6.0-RC-2-SNAPSHOT</version>
   </parent>
 
   <artifactId>application-web-configuration</artifactId>


=====================================
application-web/pom.xml
=====================================
--- a/application-web/pom.xml
+++ b/application-web/pom.xml
@@ -27,7 +27,7 @@
   <parent>
     <groupId>fr.ird.observe</groupId>
     <artifactId>pom</artifactId>
-    <version>6.0-RC-1</version>
+    <version>6.0-RC-2-SNAPSHOT</version>
   </parent>
 
   <artifactId>application-web</artifactId>


=====================================
common/pom.xml
=====================================
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -27,7 +27,7 @@
   <parent>
     <groupId>fr.ird.observe</groupId>
     <artifactId>pom</artifactId>
-    <version>6.0-RC-1</version>
+    <version>6.0-RC-2-SNAPSHOT</version>
   </parent>
 
   <artifactId>common</artifactId>


=====================================
observe/pom.xml
=====================================
--- a/observe/pom.xml
+++ b/observe/pom.xml
@@ -26,7 +26,7 @@
   <parent>
     <groupId>fr.ird.observe</groupId>
     <artifactId>pom</artifactId>
-    <version>6.0-RC-1</version>
+    <version>6.0-RC-2-SNAPSHOT</version>
   </parent>
 
   <artifactId>observe</artifactId>


=====================================
persistence/pom.xml
=====================================
--- a/persistence/pom.xml
+++ b/persistence/pom.xml
@@ -26,7 +26,7 @@
   <parent>
     <groupId>fr.ird.observe</groupId>
     <artifactId>pom</artifactId>
-    <version>6.0-RC-1</version>
+    <version>6.0-RC-2-SNAPSHOT</version>
   </parent>
 
   <artifactId>persistence</artifactId>


=====================================
pom.xml
=====================================
--- a/pom.xml
+++ b/pom.xml
@@ -31,7 +31,7 @@
 
   <groupId>fr.ird.observe</groupId>
   <artifactId>pom</artifactId>
-  <version>6.0-RC-1</version>
+  <version>6.0-RC-2-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>ObServe</name>


=====================================
services-binder/pom.xml
=====================================
--- a/services-binder/pom.xml
+++ b/services-binder/pom.xml
@@ -27,7 +27,7 @@
   <parent>
     <groupId>fr.ird.observe</groupId>
     <artifactId>pom</artifactId>
-    <version>6.0-RC-1</version>
+    <version>6.0-RC-2-SNAPSHOT</version>
   </parent>
 
   <artifactId>services-binder</artifactId>


=====================================
services-configuration-rest/pom.xml
=====================================
--- a/services-configuration-rest/pom.xml
+++ b/services-configuration-rest/pom.xml
@@ -27,7 +27,7 @@
   <parent>
     <groupId>fr.ird.observe</groupId>
     <artifactId>pom</artifactId>
-    <version>6.0-RC-1</version>
+    <version>6.0-RC-2-SNAPSHOT</version>
   </parent>
 
   <artifactId>services-configuration-rest</artifactId>


=====================================
services-configuration-topia/pom.xml
=====================================
--- a/services-configuration-topia/pom.xml
+++ b/services-configuration-topia/pom.xml
@@ -27,7 +27,7 @@
   <parent>
     <groupId>fr.ird.observe</groupId>
     <artifactId>pom</artifactId>
-    <version>6.0-RC-1</version>
+    <version>6.0-RC-2-SNAPSHOT</version>
   </parent>
 
   <artifactId>services-configuration-topia</artifactId>


=====================================
services-configuration/pom.xml
=====================================
--- a/services-configuration/pom.xml
+++ b/services-configuration/pom.xml
@@ -27,7 +27,7 @@
   <parent>
     <groupId>fr.ird.observe</groupId>
     <artifactId>pom</artifactId>
-    <version>6.0-RC-1</version>
+    <version>6.0-RC-2-SNAPSHOT</version>
   </parent>
 
   <artifactId>services-configuration</artifactId>


=====================================
services-rest/pom.xml
=====================================
--- a/services-rest/pom.xml
+++ b/services-rest/pom.xml
@@ -27,7 +27,7 @@
   <parent>
     <groupId>fr.ird.observe</groupId>
     <artifactId>pom</artifactId>
-    <version>6.0-RC-1</version>
+    <version>6.0-RC-2-SNAPSHOT</version>
   </parent>
 
   <artifactId>services-rest</artifactId>


=====================================
services-runner/pom.xml
=====================================
--- a/services-runner/pom.xml
+++ b/services-runner/pom.xml
@@ -27,7 +27,7 @@
   <parent>
     <groupId>fr.ird.observe</groupId>
     <artifactId>pom</artifactId>
-    <version>6.0-RC-1</version>
+    <version>6.0-RC-2-SNAPSHOT</version>
   </parent>
 
   <artifactId>services-runner</artifactId>


=====================================
services-topia/pom.xml
=====================================
--- a/services-topia/pom.xml
+++ b/services-topia/pom.xml
@@ -27,7 +27,7 @@
   <parent>
     <groupId>fr.ird.observe</groupId>
     <artifactId>pom</artifactId>
-    <version>6.0-RC-1</version>
+    <version>6.0-RC-2-SNAPSHOT</version>
   </parent>
 
   <artifactId>services-topia</artifactId>


=====================================
services-validation/pom.xml
=====================================
--- a/services-validation/pom.xml
+++ b/services-validation/pom.xml
@@ -26,7 +26,7 @@
   <parent>
     <groupId>fr.ird.observe</groupId>
     <artifactId>pom</artifactId>
-    <version>6.0-RC-1</version>
+    <version>6.0-RC-2-SNAPSHOT</version>
   </parent>
 
   <artifactId>services-validation</artifactId>


=====================================
services-validators/pom.xml
=====================================
--- a/services-validators/pom.xml
+++ b/services-validators/pom.xml
@@ -26,7 +26,7 @@
   <parent>
     <groupId>fr.ird.observe</groupId>
     <artifactId>pom</artifactId>
-    <version>6.0-RC-1</version>
+    <version>6.0-RC-2-SNAPSHOT</version>
   </parent>
 
   <artifactId>services-validators</artifactId>


=====================================
services/pom.xml
=====================================
--- a/services/pom.xml
+++ b/services/pom.xml
@@ -27,7 +27,7 @@
   <parent>
     <groupId>fr.ird.observe</groupId>
     <artifactId>pom</artifactId>
-    <version>6.0-RC-1</version>
+    <version>6.0-RC-2-SNAPSHOT</version>
   </parent>
 
   <artifactId>services</artifactId>


=====================================
test/pom.xml
=====================================
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -26,7 +26,7 @@
   <parent>
     <groupId>fr.ird.observe</groupId>
     <artifactId>pom</artifactId>
-    <version>6.0-RC-1</version>
+    <version>6.0-RC-2-SNAPSHOT</version>
   </parent>
 
   <artifactId>test</artifactId>


=====================================
toolbox-maven-plugin/pom.xml
=====================================
--- a/toolbox-maven-plugin/pom.xml
+++ b/toolbox-maven-plugin/pom.xml
@@ -26,7 +26,7 @@
   <parent>
     <groupId>fr.ird.observe</groupId>
     <artifactId>pom</artifactId>
-    <version>6.0-RC-1</version>
+    <version>6.0-RC-2-SNAPSHOT</version>
   </parent>
 
   <artifactId>toolbox-maven-plugin</artifactId>


=====================================
topia-extension/pom.xml
=====================================
--- a/topia-extension/pom.xml
+++ b/topia-extension/pom.xml
@@ -26,7 +26,7 @@
   <parent>
     <groupId>fr.ird.observe</groupId>
     <artifactId>pom</artifactId>
-    <version>6.0-RC-1</version>
+    <version>6.0-RC-2-SNAPSHOT</version>
   </parent>
 
   <artifactId>topia-extension</artifactId>


=====================================
topia-templates-extension/pom.xml
=====================================
--- a/topia-templates-extension/pom.xml
+++ b/topia-templates-extension/pom.xml
@@ -26,7 +26,7 @@
   <parent>
     <groupId>fr.ird.observe</groupId>
     <artifactId>pom</artifactId>
-    <version>6.0-RC-1</version>
+    <version>6.0-RC-2-SNAPSHOT</version>
   </parent>
 
   <artifactId>topia-templates-extension</artifactId>



View it on GitLab: https://gitlab.com/ultreia.io/ird-observe/compare/76b52572c97d33a6e0c2f254ed...

    

Tony CHEMIT

tags

participants (1)