updating develop poms to master versions to avoid merge conflicts
authorjenkins <jenkins-int@bgbm.org>
Wed, 2 Jun 2021 09:25:52 +0000 (11:25 +0200)
committerjenkins <jenkins-int@bgbm.org>
Wed, 2 Jun 2021 09:25:52 +0000 (11:25 +0200)
13 files changed:
cdmlib-cache/pom.xml
cdmlib-commons/pom.xml
cdmlib-db/pom.xml
cdmlib-ext/pom.xml
cdmlib-io/pom.xml
cdmlib-model/pom.xml
cdmlib-persistence/pom.xml
cdmlib-print/pom.xml
cdmlib-remote-webapp/pom.xml
cdmlib-remote/pom.xml
cdmlib-services/pom.xml
cdmlib-test/pom.xml
pom.xml

index 9cbc4d636961738a8c99895e91076af846b79d57..ac74de8e4a32b1c29bfa349c6445e5d1000448d0 100644 (file)
@@ -4,7 +4,7 @@
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>cdmlib-parent</artifactId>
-    <version>5.25.0-SNAPSHOT</version>
+    <version>5.24.0</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
index bb80e9c18fce693302c3064cfabd24d7a839dd5c..56dd341a45e00a7836cd3a19191e3e4549839dbd 100644 (file)
@@ -6,7 +6,7 @@
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>cdmlib-parent</artifactId>
-    <version>5.25.0-SNAPSHOT</version>
+    <version>5.24.0</version>
        <relativePath>../pom.xml</relativePath>
   </parent>
   
index b7c1940fa7b77875baf4e9d8b01089d21d38e5ad..dae26f936475d5c90835bca4050a23941556b448 100644 (file)
@@ -3,7 +3,7 @@
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>cdmlib-parent</artifactId>
-    <version>5.25.0-SNAPSHOT</version>
+    <version>5.24.0</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
index dd31cbf4a6d880be6eb6b588f7ca49d8906905f7..3c82435f5a583cc71d52a8db518d7362973b8488 100644 (file)
@@ -4,7 +4,7 @@
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>cdmlib-parent</artifactId>
-    <version>5.25.0-SNAPSHOT</version>
+    <version>5.24.0</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
index 2ef4d502913c11672849b06b587b54896745d38d..762ad9631574584652bc07608cd6246506ad0499 100644 (file)
@@ -4,7 +4,7 @@
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>cdmlib-parent</artifactId>
-    <version>5.25.0-SNAPSHOT</version>
+    <version>5.24.0</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
index 462be864272286e74f14d9d288cc284e9b3e5cd6..fb28cbd67fa8eae940bcc1539c882f5f422a0868 100644 (file)
@@ -2,7 +2,7 @@
   <parent>
     <artifactId>cdmlib-parent</artifactId>
     <groupId>eu.etaxonomy</groupId>
-    <version>5.25.0-SNAPSHOT</version>
+    <version>5.24.0</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
index 687b34d3da0890a2652c0b492dabdde54bacd497..0095694f87466fae90c5dc78714f22f0abcca54a 100644 (file)
@@ -3,7 +3,7 @@
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>cdmlib-parent</artifactId>
-    <version>5.25.0-SNAPSHOT</version>
+    <version>5.24.0</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
index 49232cf6cdd2d35455c294755916d28d094e8937..9163071e883203f534022e4eb9a1d06707116ffc 100644 (file)
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>cdmlib-parent</artifactId>
     <groupId>eu.etaxonomy</groupId>
-    <version>5.25.0-SNAPSHOT</version>
+    <version>5.24.0</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
index 415b71d8920ae538d9372770f7974f47417f86d5..8033cc5a2c64687356be31fd19167d512d092e19 100755 (executable)
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>cdmlib-parent</artifactId>
     <groupId>eu.etaxonomy</groupId>
-    <version>5.25.0-SNAPSHOT</version>
+    <version>5.24.0</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>cdmlib-remote-webapp</artifactId>
index a516e1d9d5146ddd310f22db577db90b32ead737..babf3ce1092247457841621a4249c0f4e597d16d 100644 (file)
@@ -4,7 +4,7 @@
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>cdmlib-parent</artifactId>
-    <version>5.25.0-SNAPSHOT</version>
+    <version>5.24.0</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
index d3f8b6ecf9ded03e221dae7373f919b324001a88..34937dcf43f98c073e40d7788bab6443a3452bcc 100644 (file)
@@ -4,7 +4,7 @@
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>cdmlib-parent</artifactId>
-    <version>5.25.0-SNAPSHOT</version>
+    <version>5.24.0</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
index 930553cd3dd921e97e725412027943d4df12b81e..8861f509f139102004f0be7a1b4529ffbb0baf20 100644 (file)
@@ -3,7 +3,7 @@
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>cdmlib-parent</artifactId>
-    <version>5.25.0-SNAPSHOT</version>
+    <version>5.24.0</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
diff --git a/pom.xml b/pom.xml
index f4324087f5447dd488fe48c6d6ee0dca0ff5f4a7..a7af94bb3924d7dbfe64f638424da7abe04c9eb0 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>5.25.0-SNAPSHOT</version>
+  <version>5.24.0</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>