diff --git a/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/indels/ConstrainedMateFixingManager.java b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/indels/ConstrainedMateFixingManager.java index 4d50ef951..d554061c8 100644 --- a/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/indels/ConstrainedMateFixingManager.java +++ b/protected/gatk-protected/src/main/java/org/broadinstitute/sting/gatk/walkers/indels/ConstrainedMateFixingManager.java @@ -46,7 +46,7 @@ package org.broadinstitute.sting.gatk.walkers.indels; -import net.sf.picard.sam.SamPairUtil; +import net.sf.samtools.SamPairUtil; import net.sf.samtools.SAMFileWriter; import net.sf.samtools.SAMRecord; import net.sf.samtools.SAMRecordComparator; diff --git a/protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/indels/IndelRealignerIntegrationTest.java b/protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/indels/IndelRealignerIntegrationTest.java index 185082c2d..275ababda 100644 --- a/protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/indels/IndelRealignerIntegrationTest.java +++ b/protected/gatk-protected/src/test/java/org/broadinstitute/sting/gatk/walkers/indels/IndelRealignerIntegrationTest.java @@ -60,8 +60,8 @@ public class IndelRealignerIntegrationTest extends WalkerTest { private static final String knownIndels = validationDataLocation + "indelRealignerTest.pilot1.ceu.vcf"; private static final String baseCommandPrefix = "-T IndelRealigner -noPG -R " + b36KGReference + " -I " + mainTestBam + " -targetIntervals " + mainTestIntervals + " -compress 0 -L 20:49,500-55,500 "; private static final String baseCommand = baseCommandPrefix + "-o %s "; - private static final String base_md5 = "458588d68c8ea7e54443ea722604b265"; - private static final String base_md5_with_SW_or_VCF = "d5ed91bd5b2023c69078a0fc00268d3c"; + private static final String base_md5 = "a102dd55451799e5f053c784b762087e"; + private static final String base_md5_with_SW_or_VCF = "06b8eefcbd785e929027feaa22bb060d"; @Test public void testDefaults() { @@ -84,7 +84,7 @@ public class IndelRealignerIntegrationTest extends WalkerTest { WalkerTestSpec spec1 = new WalkerTestSpec( baseCommand + "--consensusDeterminationModel KNOWNS_ONLY -known " + knownIndels, 1, - Arrays.asList("a1b9396f4d5b65f7ae6e0062daf363a3")); + Arrays.asList("1b24b0f2a20aed1adc726d1b296a3192")); executeTest("realigner known indels only from VCF", spec1); } @@ -101,7 +101,7 @@ public class IndelRealignerIntegrationTest extends WalkerTest { public void testLods() { HashMap e = new HashMap(); e.put( "-LOD 60", base_md5 ); - e.put( "-LOD 1 --consensusDeterminationModel USE_SW", "dea9bd14323b33348d9cf28e256415f2" ); + e.put( "-LOD 1 --consensusDeterminationModel USE_SW", "4bf28d3c0337682d439257874377a681" ); for ( Map.Entry entry : e.entrySet() ) { WalkerTest.WalkerTestSpec spec = new WalkerTest.WalkerTestSpec( @@ -117,7 +117,7 @@ public class IndelRealignerIntegrationTest extends WalkerTest { WalkerTestSpec spec = new WalkerTestSpec( "-T IndelRealigner -noPG -R " + b36KGReference + " -I " + validationDataLocation + "NA12878.chrom1.SLX.SRP000032.2009_06.bam -L 1:10,000,000-11,000,000 -targetIntervals " + validationDataLocation + "indelRealignerTest.NA12878.chrom1.intervals -compress 0 -o %s", 1, - Arrays.asList("b91c0bf803247f703dc1cb6ccdc4f18f")); + Arrays.asList("f4f6c3b2a2be0306a0ecd3def334bafe")); executeTest("realigner long run", spec); } @@ -126,7 +126,7 @@ public class IndelRealignerIntegrationTest extends WalkerTest { WalkerTestSpec spec = new WalkerTestSpec( baseCommand + "--noOriginalAlignmentTags --consensusDeterminationModel USE_SW", 1, - Arrays.asList("041e2254f271261fb46dc3878cf638f6")); + Arrays.asList("71fb521f8febfe2dc683fc636e28ae7d")); executeTest("realigner no output tags", spec); } @@ -148,7 +148,7 @@ public class IndelRealignerIntegrationTest extends WalkerTest { @Test public void testMaxReadsInMemory() { HashMap e = new HashMap(); - e.put( "--maxReadsInMemory 10000", "0108cd5950f1a4eb90209c3dca8f9e11" ); + e.put( "--maxReadsInMemory 10000", base_md5 ); e.put( "--maxReadsInMemory 40000", base_md5 ); for ( Map.Entry entry : e.entrySet() ) { diff --git a/public/repo/net/sf/picard/1.109.1722/picard-1.109.1722.jar b/public/repo/net/sf/picard/1.110.1763/picard-1.110.1763.jar similarity index 79% rename from public/repo/net/sf/picard/1.109.1722/picard-1.109.1722.jar rename to public/repo/net/sf/picard/1.110.1763/picard-1.110.1763.jar index 38d1e5958..cea4a9512 100644 Binary files a/public/repo/net/sf/picard/1.109.1722/picard-1.109.1722.jar and b/public/repo/net/sf/picard/1.110.1763/picard-1.110.1763.jar differ diff --git a/public/repo/net/sf/picard/1.109.1722/picard-1.109.1722.pom b/public/repo/net/sf/picard/1.110.1763/picard-1.110.1763.pom similarity index 90% rename from public/repo/net/sf/picard/1.109.1722/picard-1.109.1722.pom rename to public/repo/net/sf/picard/1.110.1763/picard-1.110.1763.pom index 075b2606e..2438ab776 100644 --- a/public/repo/net/sf/picard/1.109.1722/picard-1.109.1722.pom +++ b/public/repo/net/sf/picard/1.110.1763/picard-1.110.1763.pom @@ -3,23 +3,23 @@ 4.0.0 net.sf picard - 1.109.1722 + 1.110.1763 picard net.sf sam - 1.109.1722 + 1.110.1763 org.broadinstitute variant - 1.109.1722 + 1.110.1763 org.broad tribble - 1.109.1722 + 1.110.1763 diff --git a/public/repo/net/sf/sam/1.109.1722/sam-1.109.1722.jar b/public/repo/net/sf/sam/1.110.1763/sam-1.110.1763.jar similarity index 88% rename from public/repo/net/sf/sam/1.109.1722/sam-1.109.1722.jar rename to public/repo/net/sf/sam/1.110.1763/sam-1.110.1763.jar index 88a396a9e..f2c40dd61 100644 Binary files a/public/repo/net/sf/sam/1.109.1722/sam-1.109.1722.jar and b/public/repo/net/sf/sam/1.110.1763/sam-1.110.1763.jar differ diff --git a/public/repo/net/sf/sam/1.109.1722/sam-1.109.1722.pom b/public/repo/net/sf/sam/1.110.1763/sam-1.110.1763.pom similarity index 95% rename from public/repo/net/sf/sam/1.109.1722/sam-1.109.1722.pom rename to public/repo/net/sf/sam/1.110.1763/sam-1.110.1763.pom index 59a0e5df7..5fe3c5cd8 100644 --- a/public/repo/net/sf/sam/1.109.1722/sam-1.109.1722.pom +++ b/public/repo/net/sf/sam/1.110.1763/sam-1.110.1763.pom @@ -3,7 +3,7 @@ 4.0.0 net.sf sam - 1.109.1722 + 1.110.1763 sam-jdk diff --git a/public/repo/org/broad/tribble/1.109.1722/tribble-1.109.1722.jar b/public/repo/org/broad/tribble/1.110.1763/tribble-1.110.1763.jar similarity index 89% rename from public/repo/org/broad/tribble/1.109.1722/tribble-1.109.1722.jar rename to public/repo/org/broad/tribble/1.110.1763/tribble-1.110.1763.jar index 7b60393ee..3c84086e6 100644 Binary files a/public/repo/org/broad/tribble/1.109.1722/tribble-1.109.1722.jar and b/public/repo/org/broad/tribble/1.110.1763/tribble-1.110.1763.jar differ diff --git a/public/repo/org/broad/tribble/1.109.1722/tribble-1.109.1722.pom b/public/repo/org/broad/tribble/1.110.1763/tribble-1.110.1763.pom similarity index 87% rename from public/repo/org/broad/tribble/1.109.1722/tribble-1.109.1722.pom rename to public/repo/org/broad/tribble/1.110.1763/tribble-1.110.1763.pom index 21ab0d712..4dee936f1 100644 --- a/public/repo/org/broad/tribble/1.109.1722/tribble-1.109.1722.pom +++ b/public/repo/org/broad/tribble/1.110.1763/tribble-1.110.1763.pom @@ -3,13 +3,13 @@ 4.0.0 org.broad tribble - 1.109.1722 + 1.110.1763 tribble net.sf sam - 1.109.1722 + 1.110.1763 diff --git a/public/repo/org/broadinstitute/variant/1.109.1722/variant-1.109.1722.jar b/public/repo/org/broadinstitute/variant/1.110.1763/variant-1.110.1763.jar similarity index 96% rename from public/repo/org/broadinstitute/variant/1.109.1722/variant-1.109.1722.jar rename to public/repo/org/broadinstitute/variant/1.110.1763/variant-1.110.1763.jar index 273b32d60..efeaf209c 100644 Binary files a/public/repo/org/broadinstitute/variant/1.109.1722/variant-1.109.1722.jar and b/public/repo/org/broadinstitute/variant/1.110.1763/variant-1.110.1763.jar differ diff --git a/public/repo/org/broadinstitute/variant/1.109.1722/variant-1.109.1722.pom b/public/repo/org/broadinstitute/variant/1.110.1763/variant-1.110.1763.pom similarity index 90% rename from public/repo/org/broadinstitute/variant/1.109.1722/variant-1.109.1722.pom rename to public/repo/org/broadinstitute/variant/1.110.1763/variant-1.110.1763.pom index 5e393b752..8e42e0665 100644 --- a/public/repo/org/broadinstitute/variant/1.109.1722/variant-1.109.1722.pom +++ b/public/repo/org/broadinstitute/variant/1.110.1763/variant-1.110.1763.pom @@ -3,18 +3,18 @@ 4.0.0 org.broadinstitute variant - 1.109.1722 + 1.110.1763 variant org.broad tribble - 1.109.1722 + 1.110.1763 net.sf sam - 1.109.1722 + 1.110.1763 org.apache.commons diff --git a/public/sting-root/pom.xml b/public/sting-root/pom.xml index 8e700cc4a..abda9ae01 100644 --- a/public/sting-root/pom.xml +++ b/public/sting-root/pom.xml @@ -43,7 +43,7 @@ -Xmx${test.maxmemory} -XX:+UseParallelOldGC -XX:ParallelGCThreads=${java.gc.threads} -XX:GCTimeLimit=${java.gc.timeLimit} -XX:GCHeapFreeLimit=${java.gc.heapFreeLimit} - 1.109.1722 + 1.110.1763 ${picard.public.version} ${picard.public.version} ${picard.public.version}