Skip to content

Commit

Permalink
Merge branch 'TASK-5564' into TASK-5387
Browse files Browse the repository at this point in the history
  • Loading branch information
jtarraga committed May 27, 2024
2 parents 7972070 + 4586542 commit 562e78d
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 11 deletions.
2 changes: 1 addition & 1 deletion biodata-external/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion biodata-formats/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion biodata-models/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion biodata-tools/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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;

Expand All @@ -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();
}
Expand Down
9 changes: 2 additions & 7 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down Expand Up @@ -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>
Expand Down

0 comments on commit 562e78d

Please sign in to comment.