Merge branch 'develop' into TASK-5318

opencb · Jun 4, 2024 · 3d544a1 · 3d544a1
2 parents 8998ff8 + 7ea67e4
commit 3d544a1
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 13 deletions.
diff --git a/.github/workflows/test-analysis.yml b/.github/workflows/test-analysis.yml
@@ -10,11 +10,11 @@ jobs:
     name: Test and push Sonar analysis
     runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: '0'
       - name: Set up JDK 11
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
           java-version: '11'

diff --git a/biodata-external/pom.xml b/biodata-external/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <artifactId>biodata</artifactId>
         <groupId>org.opencb.biodata</groupId>
-        <version>3.1.0-SNAPSHOT</version>
+        <version>3.2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/biodata-formats/pom.xml b/biodata-formats/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.opencb.biodata</groupId>
         <artifactId>biodata</artifactId>
-        <version>3.1.0-SNAPSHOT</version>
+        <version>3.2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/biodata-models/pom.xml b/biodata-models/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.opencb.biodata</groupId>
         <artifactId>biodata</artifactId>
-        <version>3.1.0-SNAPSHOT</version>
+        <version>3.2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/biodata-tools/pom.xml b/biodata-tools/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.opencb.biodata</groupId>
         <artifactId>biodata</artifactId>
-        <version>3.1.0-SNAPSHOT</version>
+        <version>3.2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/biodata-tools/src/test/java/org/opencb/biodata/tools/variant/VcfManagerTest.java b/biodata-tools/src/test/java/org/opencb/biodata/tools/variant/VcfManagerTest.java
@@ -1,6 +1,7 @@
 package org.opencb.biodata.tools.variant;
 
 import htsjdk.variant.variantcontext.VariantContext;
+import org.junit.BeforeClass;
 import org.junit.Test;
 import org.opencb.biodata.models.core.Region;
 import org.opencb.biodata.models.variant.Variant;
@@ -13,6 +14,7 @@
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.List;
+import java.util.Locale;
 
 import static org.junit.Assert.assertEquals;
 
@@ -22,6 +24,11 @@
 public class VcfManagerTest {
     String filename = "/ibs.vcf";
 
+    @BeforeClass
+    public static void setUp(){
+        Locale.setDefault(new Locale("en", "EN"));
+    }
+
     private Path index(VcfManager vcfManager) throws IOException {
         return vcfManager.createIndex();
     }

diff --git a/pom.xml b/pom.xml
@@ -22,7 +22,7 @@
 
     <groupId>org.opencb.biodata</groupId>
     <artifactId>biodata</artifactId>
-    <version>3.1.0-SNAPSHOT</version>
+    <version>3.2.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>Biodata</name>
@@ -38,7 +38,7 @@
 
     <properties>
         <!-- All dependency versions must be defined here -->
-        <java-common-libs.version>5.1.0-SNAPSHOT</java-common-libs.version>
+        <java-common-libs.version>5.2.0-SNAPSHOT</java-common-libs.version>
 
         <jackson.version>2.14.3</jackson.version>
         <collections.version>4.4</collections.version>
@@ -230,11 +230,6 @@
                 <artifactId>commons-lang3</artifactId>
                 <version>${commons-lang.version}</version>
             </dependency>
-           <!-- <dependency>
-                <groupId>org.codehaus.jackson</groupId>
-                <artifactId>jackson-mapper-asl</artifactId>
-                <version>${jackson-mapper.version}</version>
-            </dependency>-->
             <dependency>
                 <groupId>org.apache.avro</groupId>
                 <artifactId>avro</artifactId>