From d5a3a8763f6afddfb7d68d3bc84513ada97b057d Mon Sep 17 00:00:00 2001
From: Johannes Schneider <js@cedarsoft.com>
Date: Sat, 3 Oct 2015 15:16:13 +0200
Subject: [PATCH] updating develop poms to master versions to avoid merge
 conflicts

---
 jackson/pom.xml                       | 2 +-
 neo4j/neo4j-test-utils/pom.xml        | 2 +-
 neo4j/neo4j/pom.xml                   | 2 +-
 neo4j/pom.xml                         | 2 +-
 pom.xml                               | 2 +-
 samples/demo1/pom.xml                 | 2 +-
 samples/evolution/pom.xml             | 2 +-
 samples/pom.xml                       | 2 +-
 samples/stax-mate/pom.xml             | 2 +-
 samples/stax/pom.xml                  | 2 +-
 serialization/pom.xml                 | 2 +-
 serializers/commons/jackson/pom.xml   | 2 +-
 serializers/commons/pom.xml           | 2 +-
 serializers/commons/stax-mate/pom.xml | 2 +-
 serializers/pom.xml                   | 2 +-
 stax-mate/pom.xml                     | 2 +-
 stax/pom.xml                          | 2 +-
 test-utils/pom.xml                    | 2 +-
 test/performance/pom.xml              | 2 +-
 test/pom.xml                          | 2 +-
 test/xalan-bug/pom.xml                | 2 +-
 21 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/jackson/pom.xml b/jackson/pom.xml
index 2688a1ca..d02f54a4 100644
--- a/jackson/pom.xml
+++ b/jackson/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>com.cedarsoft</groupId>
     <artifactId>serialization-parent</artifactId>
-    <version>7.2.0-SNAPSHOT</version>
+    <version>7.1.0</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/neo4j/neo4j-test-utils/pom.xml b/neo4j/neo4j-test-utils/pom.xml
index 23e268ed..ff24ff4a 100644
--- a/neo4j/neo4j-test-utils/pom.xml
+++ b/neo4j/neo4j-test-utils/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>com.cedarsoft.serialization</groupId>
     <artifactId>neo4j-parent</artifactId>
-    <version>7.2.0-SNAPSHOT</version>
+    <version>7.1.0</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/neo4j/neo4j/pom.xml b/neo4j/neo4j/pom.xml
index d3e8bbef..9e3c7d54 100644
--- a/neo4j/neo4j/pom.xml
+++ b/neo4j/neo4j/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>com.cedarsoft.serialization</groupId>
     <artifactId>neo4j-parent</artifactId>
-    <version>7.2.0-SNAPSHOT</version>
+    <version>7.1.0</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/neo4j/pom.xml b/neo4j/pom.xml
index 2dd7ecea..de09906a 100644
--- a/neo4j/pom.xml
+++ b/neo4j/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>com.cedarsoft</groupId>
     <artifactId>serialization-parent</artifactId>
-    <version>7.2.0-SNAPSHOT</version>
+    <version>7.1.0</version>
   </parent>
 
   <packaging>pom</packaging>
diff --git a/pom.xml b/pom.xml
index da7dc17b..f878e2e5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,7 +8,7 @@
 
   <modelVersion>4.0.0</modelVersion>
   <artifactId>serialization-parent</artifactId>
-  <version>7.2.0-SNAPSHOT</version>
+  <version>7.1.0</version>
   <name>Serialization</name>
   <packaging>pom</packaging>
   <url>http://serialization.cedarsoft.org</url>
diff --git a/samples/demo1/pom.xml b/samples/demo1/pom.xml
index fa36c9d8..23a74017 100644
--- a/samples/demo1/pom.xml
+++ b/samples/demo1/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>com.cedarsoft.serialization</groupId>
     <artifactId>samples</artifactId>
-    <version>7.2.0-SNAPSHOT</version>
+    <version>7.1.0</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/samples/evolution/pom.xml b/samples/evolution/pom.xml
index c88773a7..ea0327f3 100644
--- a/samples/evolution/pom.xml
+++ b/samples/evolution/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>com.cedarsoft.serialization</groupId>
     <artifactId>samples</artifactId>
-    <version>7.2.0-SNAPSHOT</version>
+    <version>7.1.0</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/samples/pom.xml b/samples/pom.xml
index cd87968d..ef4ca89d 100644
--- a/samples/pom.xml
+++ b/samples/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>com.cedarsoft</groupId>
     <artifactId>serialization-parent</artifactId>
-    <version>7.2.0-SNAPSHOT</version>
+    <version>7.1.0</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/samples/stax-mate/pom.xml b/samples/stax-mate/pom.xml
index 5ddf3afc..44dece67 100644
--- a/samples/stax-mate/pom.xml
+++ b/samples/stax-mate/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>com.cedarsoft.serialization</groupId>
     <artifactId>samples</artifactId>
-    <version>7.2.0-SNAPSHOT</version>
+    <version>7.1.0</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/samples/stax/pom.xml b/samples/stax/pom.xml
index 84d20256..aa300d34 100644
--- a/samples/stax/pom.xml
+++ b/samples/stax/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>com.cedarsoft.serialization</groupId>
     <artifactId>samples</artifactId>
-    <version>7.2.0-SNAPSHOT</version>
+    <version>7.1.0</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/serialization/pom.xml b/serialization/pom.xml
index a0b50fd6..ce9d6b67 100644
--- a/serialization/pom.xml
+++ b/serialization/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>com.cedarsoft</groupId>
     <artifactId>serialization-parent</artifactId>
-    <version>7.2.0-SNAPSHOT</version>
+    <version>7.1.0</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/serializers/commons/jackson/pom.xml b/serializers/commons/jackson/pom.xml
index 214ea87a..5dc72add 100644
--- a/serializers/commons/jackson/pom.xml
+++ b/serializers/commons/jackson/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>com.cedarsoft.serialization</groupId>
     <artifactId>commons-serializers</artifactId>
-    <version>7.2.0-SNAPSHOT</version>
+    <version>7.1.0</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/serializers/commons/pom.xml b/serializers/commons/pom.xml
index 2584f69e..01bb14c8 100644
--- a/serializers/commons/pom.xml
+++ b/serializers/commons/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>com.cedarsoft.serialization</groupId>
     <artifactId>serializers</artifactId>
-    <version>7.2.0-SNAPSHOT</version>
+    <version>7.1.0</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/serializers/commons/stax-mate/pom.xml b/serializers/commons/stax-mate/pom.xml
index 37157277..15bf5fb2 100644
--- a/serializers/commons/stax-mate/pom.xml
+++ b/serializers/commons/stax-mate/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>com.cedarsoft.serialization</groupId>
     <artifactId>commons-serializers</artifactId>
-    <version>7.2.0-SNAPSHOT</version>
+    <version>7.1.0</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/serializers/pom.xml b/serializers/pom.xml
index 0523efdb..084c00bc 100644
--- a/serializers/pom.xml
+++ b/serializers/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>com.cedarsoft</groupId>
     <artifactId>serialization-parent</artifactId>
-    <version>7.2.0-SNAPSHOT</version>
+    <version>7.1.0</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/stax-mate/pom.xml b/stax-mate/pom.xml
index de3ce6e6..ce3cad0c 100644
--- a/stax-mate/pom.xml
+++ b/stax-mate/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>com.cedarsoft</groupId>
     <artifactId>serialization-parent</artifactId>
-    <version>7.2.0-SNAPSHOT</version>
+    <version>7.1.0</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/stax/pom.xml b/stax/pom.xml
index 7ccf8351..597e1837 100644
--- a/stax/pom.xml
+++ b/stax/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>com.cedarsoft</groupId>
     <artifactId>serialization-parent</artifactId>
-    <version>7.2.0-SNAPSHOT</version>
+    <version>7.1.0</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/test-utils/pom.xml b/test-utils/pom.xml
index d3655398..232d0104 100644
--- a/test-utils/pom.xml
+++ b/test-utils/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>com.cedarsoft</groupId>
     <artifactId>serialization-parent</artifactId>
-    <version>7.2.0-SNAPSHOT</version>
+    <version>7.1.0</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/test/performance/pom.xml b/test/performance/pom.xml
index 2f09d029..9fcbf4de 100644
--- a/test/performance/pom.xml
+++ b/test/performance/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>com.cedarsoft.serialization</groupId>
     <artifactId>test</artifactId>
-    <version>7.2.0-SNAPSHOT</version>
+    <version>7.1.0</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/test/pom.xml b/test/pom.xml
index b303f8ad..d5fc2bb2 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>com.cedarsoft</groupId>
     <artifactId>serialization-parent</artifactId>
-    <version>7.2.0-SNAPSHOT</version>
+    <version>7.1.0</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/test/xalan-bug/pom.xml b/test/xalan-bug/pom.xml
index 73382922..9ce4a9b0 100644
--- a/test/xalan-bug/pom.xml
+++ b/test/xalan-bug/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>com.cedarsoft.serialization</groupId>
     <artifactId>test</artifactId>
-    <version>7.2.0-SNAPSHOT</version>
+    <version>7.1.0</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>