Updating develop poms to hotfix version to avoid merge conflicts

diff --git a/cdmlib-commons/pom.xml b/cdmlib-commons/pom.xml
index 7d8d6f6cffeb007cdb023350abde09f3bb583b79..9bf6a30304b5f150839133e99e0183a587b834e9 100644 (file)
--- a/cdmlib-commons/pom.xml
+++ b/cdmlib-commons/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>cdmlib-parent</artifactId>
-    <version>3.12.0-SNAPSHOT</version>
+    <version>3.11.1</version>
        <relativePath>../pom.xml</relativePath>
   </parent>
   

diff --git a/cdmlib-ext/pom.xml b/cdmlib-ext/pom.xml
index 1c4790cdb484acb98c99af8f6504599d7aa88592..39a9c9d9a2ebd7886e7be295bdec788ffebac42d 100644 (file)
--- a/cdmlib-ext/pom.xml
+++ b/cdmlib-ext/pom.xml
@@ -6,7 +6,7 @@
        <parent>
                <groupId>eu.etaxonomy</groupId>
                <artifactId>cdmlib-parent</artifactId>
-           <version>3.12.0-SNAPSHOT</version>
+           <version>3.11.1</version>
                <relativePath>../pom.xml</relativePath>
        </parent>
 

diff --git a/cdmlib-io/pom.xml b/cdmlib-io/pom.xml
index 054ec0c044e11d7d77a675113388d3f80d5c3bb7..eacb2a30725830d7ccf97fc46b6a6f2c35d98ecb 100644 (file)
--- a/cdmlib-io/pom.xml
+++ b/cdmlib-io/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>cdmlib-parent</artifactId>
-               <version>3.12.0-SNAPSHOT</version>
+               <version>3.11.1</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/cdmlib-model/pom.xml b/cdmlib-model/pom.xml
index ed9bc92e30bfe5bf0181c142365e34f66f750740..342866e2721a16be568265751bc89dae404c7c0a 100644 (file)
--- a/cdmlib-model/pom.xml
+++ b/cdmlib-model/pom.xml
@@ -2,7 +2,7 @@
   <parent>
     <artifactId>cdmlib-parent</artifactId>
     <groupId>eu.etaxonomy</groupId>
-    <version>3.12.0-SNAPSHOT</version>
+    <version>3.11.1</version>
   <relativePath>../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>

diff --git a/cdmlib-persistence/pom.xml b/cdmlib-persistence/pom.xml
index 67b49d61613b4cf3a64b9906d17eb97a378e1d19..5e1d24927ed0f5b15be3e4a49fb4cf6b872982a5 100644 (file)
--- a/cdmlib-persistence/pom.xml
+++ b/cdmlib-persistence/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>cdmlib-parent</artifactId>
-               <version>3.12.0-SNAPSHOT</version>
+               <version>3.11.1</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/cdmlib-print/pom.xml b/cdmlib-print/pom.xml
index 1322ee041cd4ff1951db467d1d520a1dce735241..93aa87331bc0143dba1d6c95fb99ebcb8491c411 100644 (file)
--- a/cdmlib-print/pom.xml
+++ b/cdmlib-print/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>cdmlib-parent</artifactId>
     <groupId>eu.etaxonomy</groupId>
-    <version>3.12.0-SNAPSHOT</version>
+    <version>3.11.1</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>

diff --git a/cdmlib-remote-webapp/pom.xml b/cdmlib-remote-webapp/pom.xml
index 4e50827a1f266040455be5ed2a5bcb9d503d2a70..3709ca8c40baea027354d049b529dc7a19639302 100644 (file)
--- a/cdmlib-remote-webapp/pom.xml
+++ b/cdmlib-remote-webapp/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>cdmlib-parent</artifactId>
     <groupId>eu.etaxonomy</groupId>
-    <version>3.12.0-SNAPSHOT</version>
+    <version>3.11.1</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/cdmlib-remote/pom.xml b/cdmlib-remote/pom.xml
index 251b9c1db07b091ca3fdd0de0b0a2aa9b5fa9360..2d87d1f7a8c26364289583fd77635b865405096f 100644 (file)
--- a/cdmlib-remote/pom.xml
+++ b/cdmlib-remote/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>cdmlib-parent</artifactId>
-    <version>3.12.0-SNAPSHOT</version>
+    <version>3.11.1</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/cdmlib-services/pom.xml b/cdmlib-services/pom.xml
index 3fe26d1a400292a4525f15481a53a06d1df7e2e2..0f578efc98d8cddc6c1a2cfec75d314b91ffee46 100644 (file)
--- a/cdmlib-services/pom.xml
+++ b/cdmlib-services/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>cdmlib-parent</artifactId>
-    <version>3.12.0-SNAPSHOT</version>
+    <version>3.11.1</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/pom.xml b/pom.xml
index 7f1e24ed603f00504b4e8e0afc70c981c8082e46..6bbe1342031081a08a448493924611ccb1059d87 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>eu.etaxonomy</groupId>
   <artifactId>cdmlib-parent</artifactId>
-  <version>3.12.0-SNAPSHOT</version>
+  <version>3.11.1</version>
   <name>CDM Library</name>
   <description>The Java implementation of the Common Data Model (CDM), the data model for EDIT's internet platform for cybertaxonomy.</description>
   <url>http://cybertaxonomy.eu/cdmlib/</url>