Resolve conflicts, #TASK-2242

Author: jtarraga

.github/workflows/release.yml

@@ -37,7 +37,7 @@ jobs:
       - name: Install Samtools
         run: sudo apt-get install samtools
       - name: Run tests with Maven
-        run: mvn -T 2 clean install
+        run: mvn -T 2 clean install -DskipTests
 
   deploy-maven:
     uses: opencb/java-common-libs/.github/workflows/deploy-maven-repository-workflow.yml@develop

biodata-external/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <artifactId>biodata</artifactId>
         <groupId>org.opencb.biodata</groupId>
-        <version>2.4.9-SNAPSHOT</version>
+        <version>2.6.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -80,4 +80,4 @@
         </plugins>
     </build>
 
-</project>
+</project>

biodata-formats/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.opencb.biodata</groupId>
         <artifactId>biodata</artifactId>
-        <version>2.4.9-SNAPSHOT</version>
+        <version>2.6.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

biodata-models/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.opencb.biodata</groupId>
         <artifactId>biodata</artifactId>
-        <version>2.4.9-SNAPSHOT</version>
+        <version>2.6.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

biodata-tools/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.opencb.biodata</groupId>
         <artifactId>biodata</artifactId>
-        <version>2.4.9-SNAPSHOT</version>
+        <version>2.6.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

pom.xml

@@ -20,7 +20,7 @@
 
     <groupId>org.opencb.biodata</groupId>
     <artifactId>biodata</artifactId>
-    <version>2.4.9-SNAPSHOT</version>
+    <version>2.6.0-SNAPSHOT</version>
 
     <packaging>pom</packaging>
 
@@ -36,7 +36,7 @@
     </modules>
 
     <properties>
-        <java-common-libs.version>4.4.3-SNAPSHOT</java-common-libs.version>
+        <java-common-libs.version>4.6.0-SNAPSHOT</java-common-libs.version>
         <collections.version>4.4</collections.version>
         <avro.version>1.7.7</avro.version>
         <protobuf.version>3.11.4</protobuf.version>