Prepare new development version 6.1.0-SNAPSHOT

opencb · Mar 4, 2024 · ee4e212 · ee4e212
1 parent 7cf9b56
commit ee4e212
Show file tree

Hide file tree

Showing 6 changed files with 1 addition and 29 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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>