From ee4e21242c2cb3ea5eadf3e4b65c84865a3d3a39 Mon Sep 17 00:00:00 2001
From: JuanfeSanahuja <juanfe.sanahuja@zettagenomics.com>
Date: Mon, 4 Mar 2024 16:29:56 +0100
Subject: [PATCH] Prepare new development version 6.1.0-SNAPSHOT

---
 cellbase-app/pom.xml    |  4 ----
 cellbase-client/pom.xml |  4 ----
 cellbase-core/pom.xml   |  4 ----
 cellbase-lib/pom.xml    |  4 ----
 cellbase-server/pom.xml |  4 ----
 pom.xml                 | 10 +---------
 6 files changed, 1 insertion(+), 29 deletions(-)

diff --git a/cellbase-app/pom.xml b/cellbase-app/pom.xml
index a2cb67967..999f545d1 100644
--- a/cellbase-app/pom.xml
+++ b/cellbase-app/pom.xml
@@ -6,11 +6,7 @@
     <parent>
         <groupId>org.opencb.cellbase</groupId>
         <artifactId>cellbase</artifactId>
-<<<<<<< HEAD
-        <version>6.0.0</version>
-=======
         <version>6.1.0-SNAPSHOT</version>
->>>>>>> release-6.0.x
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/cellbase-client/pom.xml b/cellbase-client/pom.xml
index daed6848f..fdc2ece46 100644
--- a/cellbase-client/pom.xml
+++ b/cellbase-client/pom.xml
@@ -6,11 +6,7 @@
     <parent>
         <groupId>org.opencb.cellbase</groupId>
         <artifactId>cellbase</artifactId>
-<<<<<<< HEAD
-        <version>6.0.0</version>
-=======
         <version>6.1.0-SNAPSHOT</version>
->>>>>>> release-6.0.x
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/cellbase-core/pom.xml b/cellbase-core/pom.xml
index 2c7cdab95..d711a053f 100644
--- a/cellbase-core/pom.xml
+++ b/cellbase-core/pom.xml
@@ -6,11 +6,7 @@
     <parent>
         <groupId>org.opencb.cellbase</groupId>
         <artifactId>cellbase</artifactId>
-<<<<<<< HEAD
-        <version>6.0.0</version>
-=======
         <version>6.1.0-SNAPSHOT</version>
->>>>>>> release-6.0.x
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/cellbase-lib/pom.xml b/cellbase-lib/pom.xml
index 02cf753a3..71964bb36 100644
--- a/cellbase-lib/pom.xml
+++ b/cellbase-lib/pom.xml
@@ -6,11 +6,7 @@
     <parent>
         <groupId>org.opencb.cellbase</groupId>
         <artifactId>cellbase</artifactId>
-<<<<<<< HEAD
-        <version>6.0.0</version>
-=======
         <version>6.1.0-SNAPSHOT</version>
->>>>>>> release-6.0.x
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/cellbase-server/pom.xml b/cellbase-server/pom.xml
index ae54a2c52..3b3e1b743 100644
--- a/cellbase-server/pom.xml
+++ b/cellbase-server/pom.xml
@@ -6,11 +6,7 @@
     <parent>
         <groupId>org.opencb.cellbase</groupId>
         <artifactId>cellbase</artifactId>
-<<<<<<< HEAD
-        <version>6.0.0</version>
-=======
         <version>6.1.0-SNAPSHOT</version>
->>>>>>> release-6.0.x
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/pom.xml b/pom.xml
index c63805c51..42f2e0932 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,11 +6,7 @@
 
     <groupId>org.opencb.cellbase</groupId>
     <artifactId>cellbase</artifactId>
-<<<<<<< HEAD
-    <version>6.0.0</version>
-=======
     <version>6.1.0-SNAPSHOT</version>
->>>>>>> release-6.0.x
     <packaging>pom</packaging>
 
     <name>CellBase project</name>
@@ -27,13 +23,9 @@
 
     <properties>
         <pycellbase.version>${project.version}</pycellbase.version>
-<<<<<<< HEAD
-        <java-common-libs.version>5.0.0</java-common-libs.version>
-        <biodata.version>3.0.0</biodata.version>
-=======
         <java-common-libs.version>5.1.0-SNAPSHOT</java-common-libs.version>
         <biodata.version>3.1.0-SNAPSHOT</biodata.version>
->>>>>>> release-6.0.x
+
         <bionetdb.version>0.1.0</bionetdb.version>
         <jetty.version>9.4.51.v20230217</jetty.version>