updating develop poms to master versions to avoid merge conflicts
authorjenkins <jenkins-int@bgbm.org>
Thu, 5 Jan 2023 16:29:37 +0000 (17:29 +0100)
committerjenkins <jenkins-int@bgbm.org>
Thu, 5 Jan 2023 16:29:37 +0000 (17:29 +0100)
14 files changed:
cdmlib-api/pom.xml
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 3fb6d885818c7c8bab8df881020367d2223a50e8..e1a1623e938a241268e2a11ffd29463c2fca25f7 100644 (file)
@@ -4,7 +4,7 @@
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>cdmlib-parent</artifactId>
-    <version>5.36.0-SNAPSHOT</version>
+    <version>5.35.0</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
index 79032dc0ef19f21662f67e4480deda5e96672b1d..3054338222d52324b6c68f35c9fe50e3dc2a9c8d 100644 (file)
@@ -4,7 +4,7 @@
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>cdmlib-parent</artifactId>
-    <version>5.36.0-SNAPSHOT</version>
+    <version>5.35.0</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
index 0250564df3278dab82e1bb239e0a7ce27b6cda30..07bd0346e5cd925e0fb90658b278a24f87e14ec5 100644 (file)
@@ -6,7 +6,7 @@
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>cdmlib-parent</artifactId>
-    <version>5.36.0-SNAPSHOT</version>
+    <version>5.35.0</version>
        <relativePath>../pom.xml</relativePath>
   </parent>
   
index 7c41c682930a58aa8cf1567415af0507fb5918dd..ca124f5a071f34793a42973bcac0d9b3b7b5bf30 100644 (file)
@@ -3,7 +3,7 @@
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>cdmlib-parent</artifactId>
-    <version>5.36.0-SNAPSHOT</version>
+    <version>5.35.0</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
index 2a69c8eecc8b2b61141b1c8439f65052e7187b36..a95882c738a2adb08d0616ba81113e4a1f6e2dc5 100644 (file)
@@ -4,7 +4,7 @@
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>cdmlib-parent</artifactId>
-    <version>5.36.0-SNAPSHOT</version>
+    <version>5.35.0</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
index b6feacea4c6daf9fab6ffc57a17c923986b1fd26..843ea6e6f41c7b3679100ddee7ff1026dfbe4dc2 100644 (file)
@@ -4,7 +4,7 @@
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>cdmlib-parent</artifactId>
-    <version>5.36.0-SNAPSHOT</version>
+    <version>5.35.0</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
index afcb2e19c38dbe613166822d9e92bb3ef7a3c712..3892dfae5197e9b8299f9690efa14e6daadaea45 100644 (file)
@@ -2,7 +2,7 @@
   <parent>
     <artifactId>cdmlib-parent</artifactId>
     <groupId>eu.etaxonomy</groupId>
-    <version>5.36.0-SNAPSHOT</version>
+    <version>5.35.0</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
index 41b82756563027cd5d2701da1c9ff2f11919dea2..1d027b40149f51d4bd9a2bc1a9aa850a68a54c2c 100644 (file)
@@ -3,7 +3,7 @@
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>cdmlib-parent</artifactId>
-    <version>5.36.0-SNAPSHOT</version>
+    <version>5.35.0</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
index 2d98f7db1a23e1b59459a3164e26ff2d15a971cd..91cb96318942def4e4973315179f7a06fc50b34f 100644 (file)
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>cdmlib-parent</artifactId>
     <groupId>eu.etaxonomy</groupId>
-    <version>5.36.0-SNAPSHOT</version>
+    <version>5.35.0</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
index c956944efbcfc692b90bb6c17483f47dad21e8ce..b626f69c5ded1b917d3c43187ea663879d639d98 100755 (executable)
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>cdmlib-parent</artifactId>
     <groupId>eu.etaxonomy</groupId>
-    <version>5.36.0-SNAPSHOT</version>
+    <version>5.35.0</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>cdmlib-remote-webapp</artifactId>
index b927fad35b455247ee299de628380222bb8cf4e1..8cb7dc5e446ef7c0876466d6d096d8b3d690f044 100644 (file)
@@ -4,7 +4,7 @@
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>cdmlib-parent</artifactId>
-    <version>5.36.0-SNAPSHOT</version>
+    <version>5.35.0</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
index e9050aebc85120fac96e48be784059bdc26791d6..1a62b6ef639a591491433898d65d22449eb7c1ce 100644 (file)
@@ -4,7 +4,7 @@
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>cdmlib-parent</artifactId>
-    <version>5.36.0-SNAPSHOT</version>
+    <version>5.35.0</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
index 033f3d731896b0c7c9a441fb01d59fd5f21a9425..b6de43fff7bec8410d6982cad451f995669a7776 100644 (file)
@@ -3,7 +3,7 @@
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>cdmlib-parent</artifactId>
-    <version>5.36.0-SNAPSHOT</version>
+    <version>5.35.0</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
diff --git a/pom.xml b/pom.xml
index 1267739af3981ba588fe50838e0c3b2e1bb469ed..44e0e6d605364d7f405e3b8b8784e0ef73f55aad 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.36.0-SNAPSHOT</version>
+  <version>5.35.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>https://cybertaxonomy.org/cdmlib/</url>