diff --git a/protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/variantutils/SelectVariantsIntegrationTest.java b/protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/variantutils/SelectVariantsIntegrationTest.java index 884b46692..703c044d4 100644 --- a/protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/variantutils/SelectVariantsIntegrationTest.java +++ b/protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/variantutils/SelectVariantsIntegrationTest.java @@ -321,6 +321,18 @@ public class SelectVariantsIntegrationTest extends WalkerTest { executeTest("test select from multi allelic with excludeNonVariants --" + testfile, spec); } + @Test + public void testMultiAllelicAnnotationOrdering() { + String testfile = privateTestDir + "multi-allelic-ordering.vcf"; + WalkerTestSpec spec = new WalkerTestSpec( + "-T SelectVariants -R " + b37KGReference + " -o %s --no_cmdline_in_header " + + "-sn SAMPLE-CC -sn SAMPLE-CT -sn SAMPLE-CA --excludeNonVariants --variant " + testfile, + 1, + Arrays.asList("8fe7cdca8638461909262cb0769b2527") + ); + executeTest("test multi allelic annotation ordering --" + testfile, spec); + } + @Test() public void testFileWithoutInfoLineInHeader() { testFileWithoutInfoLineInHeader("testFileWithoutInfoLineInHeader", IllegalStateException.class); diff --git a/public/repo/net/sf/picard/1.107.1676/picard-1.107.1676.jar b/public/repo/net/sf/picard/1.107.1683/picard-1.107.1683.jar similarity index 87% rename from public/repo/net/sf/picard/1.107.1676/picard-1.107.1676.jar rename to public/repo/net/sf/picard/1.107.1683/picard-1.107.1683.jar index dee7d931b..089b71385 100644 Binary files a/public/repo/net/sf/picard/1.107.1676/picard-1.107.1676.jar and b/public/repo/net/sf/picard/1.107.1683/picard-1.107.1683.jar differ diff --git a/public/repo/net/sf/picard/1.107.1676/picard-1.107.1676.pom b/public/repo/net/sf/picard/1.107.1683/picard-1.107.1683.pom similarity index 90% rename from public/repo/net/sf/picard/1.107.1676/picard-1.107.1676.pom rename to public/repo/net/sf/picard/1.107.1683/picard-1.107.1683.pom index 5cb3de5fd..fd8a61917 100644 --- a/public/repo/net/sf/picard/1.107.1676/picard-1.107.1676.pom +++ b/public/repo/net/sf/picard/1.107.1683/picard-1.107.1683.pom @@ -3,23 +3,23 @@ 4.0.0 net.sf picard - 1.107.1676 + 1.107.1683 picard net.sf sam - 1.107.1676 + 1.107.1683 org.broadinstitute variant - 1.107.1676 + 1.107.1683 org.broad tribble - 1.107.1676 + 1.107.1683 diff --git a/public/repo/net/sf/sam/1.107.1676/sam-1.107.1676.jar b/public/repo/net/sf/sam/1.107.1683/sam-1.107.1683.jar similarity index 96% rename from public/repo/net/sf/sam/1.107.1676/sam-1.107.1676.jar rename to public/repo/net/sf/sam/1.107.1683/sam-1.107.1683.jar index 65549cf8d..928838707 100644 Binary files a/public/repo/net/sf/sam/1.107.1676/sam-1.107.1676.jar and b/public/repo/net/sf/sam/1.107.1683/sam-1.107.1683.jar differ diff --git a/public/repo/net/sf/sam/1.107.1676/sam-1.107.1676.pom b/public/repo/net/sf/sam/1.107.1683/sam-1.107.1683.pom similarity index 95% rename from public/repo/net/sf/sam/1.107.1676/sam-1.107.1676.pom rename to public/repo/net/sf/sam/1.107.1683/sam-1.107.1683.pom index 0acfb99ba..89114f546 100644 --- a/public/repo/net/sf/sam/1.107.1676/sam-1.107.1676.pom +++ b/public/repo/net/sf/sam/1.107.1683/sam-1.107.1683.pom @@ -3,7 +3,7 @@ 4.0.0 net.sf sam - 1.107.1676 + 1.107.1683 sam-jdk diff --git a/public/repo/org/broad/tribble/1.107.1676/tribble-1.107.1676.jar b/public/repo/org/broad/tribble/1.107.1683/tribble-1.107.1683.jar similarity index 94% rename from public/repo/org/broad/tribble/1.107.1676/tribble-1.107.1676.jar rename to public/repo/org/broad/tribble/1.107.1683/tribble-1.107.1683.jar index 78e5a479f..efa04ad2c 100644 Binary files a/public/repo/org/broad/tribble/1.107.1676/tribble-1.107.1676.jar and b/public/repo/org/broad/tribble/1.107.1683/tribble-1.107.1683.jar differ diff --git a/public/repo/org/broad/tribble/1.107.1676/tribble-1.107.1676.pom b/public/repo/org/broad/tribble/1.107.1683/tribble-1.107.1683.pom similarity index 87% rename from public/repo/org/broad/tribble/1.107.1676/tribble-1.107.1676.pom rename to public/repo/org/broad/tribble/1.107.1683/tribble-1.107.1683.pom index 264cfe57b..7bf169bd4 100644 --- a/public/repo/org/broad/tribble/1.107.1676/tribble-1.107.1676.pom +++ b/public/repo/org/broad/tribble/1.107.1683/tribble-1.107.1683.pom @@ -3,13 +3,13 @@ 4.0.0 org.broad tribble - 1.107.1676 + 1.107.1683 tribble net.sf sam - 1.107.1676 + 1.107.1683 diff --git a/public/repo/org/broadinstitute/variant/1.107.1676/variant-1.107.1676.jar b/public/repo/org/broadinstitute/variant/1.107.1683/variant-1.107.1683.jar similarity index 89% rename from public/repo/org/broadinstitute/variant/1.107.1676/variant-1.107.1676.jar rename to public/repo/org/broadinstitute/variant/1.107.1683/variant-1.107.1683.jar index 57c260852..ea4ebe35e 100644 Binary files a/public/repo/org/broadinstitute/variant/1.107.1676/variant-1.107.1676.jar and b/public/repo/org/broadinstitute/variant/1.107.1683/variant-1.107.1683.jar differ diff --git a/public/repo/org/broadinstitute/variant/1.107.1676/variant-1.107.1676.pom b/public/repo/org/broadinstitute/variant/1.107.1683/variant-1.107.1683.pom similarity index 90% rename from public/repo/org/broadinstitute/variant/1.107.1676/variant-1.107.1676.pom rename to public/repo/org/broadinstitute/variant/1.107.1683/variant-1.107.1683.pom index ec3709347..256963812 100644 --- a/public/repo/org/broadinstitute/variant/1.107.1676/variant-1.107.1676.pom +++ b/public/repo/org/broadinstitute/variant/1.107.1683/variant-1.107.1683.pom @@ -3,18 +3,18 @@ 4.0.0 org.broadinstitute variant - 1.107.1676 + 1.107.1683 variant org.broad tribble - 1.107.1676 + 1.107.1683 net.sf sam - 1.107.1676 + 1.107.1683 org.apache.commons diff --git a/public/sting-root/pom.xml b/public/sting-root/pom.xml index 66f4c5ff1..1f384427e 100644 --- a/public/sting-root/pom.xml +++ b/public/sting-root/pom.xml @@ -40,7 +40,7 @@ -Xmx${test.maxmemory} - 1.107.1676 + 1.107.1683 ${picard.public.version} ${picard.public.version} ${picard.public.version}