diff --git a/.gitignore b/.gitignore index 65f111587..2559c7747 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,4 @@ dump/ lib/ out/ /atlassian-ide-plugin.xml +maven-metadata-local.xml diff --git a/protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/variantutils/SelectVariantsParallelIntegrationTest.java b/protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/variantutils/SelectVariantsParallelIntegrationTest.java index 4d7fa28ad..68eb1cc41 100644 --- a/protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/variantutils/SelectVariantsParallelIntegrationTest.java +++ b/protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/variantutils/SelectVariantsParallelIntegrationTest.java @@ -92,6 +92,11 @@ public class SelectVariantsParallelIntegrationTest extends WalkerTest { final String args = "-select 'DP > 30' -V " + testfile; new ParallelSelectTestProvider(b37KGReference, args, "c64b45a14d41b1e5cddbe036b47e7519", nt); } + { // AD and PL decoding race condition + final String testfile = privateTestDir + "race_condition.vcf"; + final String args = "-env -sn SAMPLE -L 1:1-10,000,000 -V " + testfile; + new ParallelSelectTestProvider(b37KGReference, args, "62e6156387d6e91bd2b08ef649cb1129", nt); + } } return ParallelSelectTestProvider.getTests(ParallelSelectTestProvider.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.1676/picard-1.107.1676.jar new file mode 100644 index 000000000..dee7d931b Binary files /dev/null and b/public/repo/net/sf/picard/1.107.1676/picard-1.107.1676.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.1676/picard-1.107.1676.pom new file mode 100644 index 000000000..6fa774352 --- /dev/null +++ b/public/repo/net/sf/picard/1.107.1676/picard-1.107.1676.pom @@ -0,0 +1,44 @@ + + + 4.0.0 + net.sf + picard + 1.107.1676 + picard + + + net.sf + sam + 1.107.1676 + + + org.broadinstitute + variant + 1.107.1676 + + + org.broad + tribble + 1.107.1676 + + + + org.apache.ant + ant + 1.8.2 + + + org.apache.ant + ant-launcher + + + + + com.sun + tools.jar + 1.5 + system + ${java.home}../lib/tools.jar + + + diff --git a/public/repo/net/sf/sam/1.107.1676/sam-1.107.1676.jar b/public/repo/net/sf/sam/1.107.1676/sam-1.107.1676.jar new file mode 100644 index 000000000..65549cf8d Binary files /dev/null and b/public/repo/net/sf/sam/1.107.1676/sam-1.107.1676.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.1676/sam-1.107.1676.pom new file mode 100644 index 000000000..0acfb99ba --- /dev/null +++ b/public/repo/net/sf/sam/1.107.1676/sam-1.107.1676.pom @@ -0,0 +1,21 @@ + + + 4.0.0 + net.sf + sam + 1.107.1676 + sam-jdk + + + org.testng + testng + 5.5 + jdk15 + + + org.xerial.snappy + snappy-java + 1.0.3-rc3 + + + diff --git a/public/repo/org/broad/tribble/1.107.1676/tribble-1.107.1676.jar b/public/repo/org/broad/tribble/1.107.1676/tribble-1.107.1676.jar new file mode 100644 index 000000000..78e5a479f Binary files /dev/null and b/public/repo/org/broad/tribble/1.107.1676/tribble-1.107.1676.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.1676/tribble-1.107.1676.pom new file mode 100644 index 000000000..264cfe57b --- /dev/null +++ b/public/repo/org/broad/tribble/1.107.1676/tribble-1.107.1676.pom @@ -0,0 +1,15 @@ + + + 4.0.0 + org.broad + tribble + 1.107.1676 + tribble + + + net.sf + sam + 1.107.1676 + + + diff --git a/public/repo/org/broadinstitute/variant/1.107.1676/variant-1.107.1676.jar b/public/repo/org/broadinstitute/variant/1.107.1676/variant-1.107.1676.jar new file mode 100644 index 000000000..57c260852 Binary files /dev/null and b/public/repo/org/broadinstitute/variant/1.107.1676/variant-1.107.1676.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.1676/variant-1.107.1676.pom new file mode 100644 index 000000000..ec3709347 --- /dev/null +++ b/public/repo/org/broadinstitute/variant/1.107.1676/variant-1.107.1676.pom @@ -0,0 +1,31 @@ + + + 4.0.0 + org.broadinstitute + variant + 1.107.1676 + variant + + + org.broad + tribble + 1.107.1676 + + + net.sf + sam + 1.107.1676 + + + org.apache.commons + commons-jexl + 2.1.1 + + + + com.google.code.cofoja + cofoja + 1.0-r139 + + + diff --git a/public/sting-root/pom.xml b/public/sting-root/pom.xml index 080ed05c4..0179d026f 100644 --- a/public/sting-root/pom.xml +++ b/public/sting-root/pom.xml @@ -59,12 +59,18 @@ net.sf sam - 1.104.1628 + 1.107.1676 + + + org.testng + testng + + net.sf picard - 1.104.1628 + 1.107.1676 edu.mit.broad @@ -74,12 +80,12 @@ org.broad tribble - 1.104.1628 + 1.107.1676 org.broadinstitute variant - 1.105.1642 + 1.107.1676 log4j