Merge branch 'release/v2.1.5'

milaboratory · Jul 24, 2017 · 75f2620 · 75f2620
2 parents 34bb5f8 + 8cf3e23
commit 75f2620
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 4 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,4 +1,11 @@
 
+MiXCR 2.1.5 (24 Jul 2017)
+========================
+
+-- Fixed backward compatibility of `*.vdjca` files produced by MiXCR 2.1.2 and lower with 
+   `kaligner2`.
+
+
 MiXCR 2.1.4 (24 Jul 2017)
 ========================
 

diff --git a/pom.xml b/pom.xml
@@ -32,7 +32,7 @@
 
     <groupId>com.milaboratory</groupId>
     <artifactId>mixcr</artifactId>
-    <version>2.1.4</version>
+    <version>2.1.5</version>
     <packaging>jar</packaging>
     <name>MiXCR</name>
 
@@ -44,14 +44,14 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <milib.version>1.8</milib.version>
+        <milib.version>1.8.1</milib.version>
     </properties>
 
     <dependencies>
         <dependency>
             <groupId>io.repseq</groupId>
             <artifactId>repseqio</artifactId>
-            <version>1.2.9</version>
+            <version>1.2.10</version>
         </dependency>
 
         <dependency>

diff --git a/repseqio b/repseqio
diff --git a/src/test/java/com/milaboratory/mixcr/tests/BackwardCompatibilityTests.java b/src/test/java/com/milaboratory/mixcr/tests/BackwardCompatibilityTests.java
@@ -44,6 +44,7 @@ public class BackwardCompatibilityTests {
     public void testAlignments() throws Exception {
         assertGoodVDJCA("/backward_compatibility/2.1.0/test.vdjca.gz", 76);
         assertGoodVDJCA("/backward_compatibility/2.1.2/test.vdjca.gz", 76);
+        assertGoodVDJCA("/backward_compatibility/2.1.2-kAligner2/test.vdjca.gz", 78);
     }
 
     public static void assertGoodVDJCA(String resource, int size) throws IOException {
@@ -67,6 +68,7 @@ public static void assertGoodVDJCA(String resource, int size) throws IOException
     public void testBC16Cloneset() throws Exception {
         assertGoodCLNS("/backward_compatibility/2.1.0/test.clns.gz", 22, 17);
         assertGoodCLNS("/backward_compatibility/2.1.2/test.clns.gz", 22, 17);
+        assertGoodCLNS("/backward_compatibility/2.1.2-kAligner2/test.clns.gz", 21, 16);
     }
 
     public static void assertGoodCLNS(String resource, int size, int good) throws IOException {

diff --git a/src/test/resources/backward_compatibility/2.1.2-kAligner2/test.clns.gz b/src/test/resources/backward_compatibility/2.1.2-kAligner2/test.clns.gz
diff --git a/src/test/resources/backward_compatibility/2.1.2-kAligner2/test.vdjca.gz b/src/test/resources/backward_compatibility/2.1.2-kAligner2/test.vdjca.gz