diff --git a/ivy.xml b/ivy.xml index b7ca65406..6b60acfa3 100644 --- a/ivy.xml +++ b/ivy.xml @@ -82,7 +82,7 @@ - + diff --git a/public/java/test/org/broadinstitute/sting/utils/fragments/FragmentUtilsBenchmark.java b/public/java/test/org/broadinstitute/sting/utils/fragments/FragmentUtilsBenchmark.java index 7d295c6f0..e06149f67 100644 --- a/public/java/test/org/broadinstitute/sting/utils/fragments/FragmentUtilsBenchmark.java +++ b/public/java/test/org/broadinstitute/sting/utils/fragments/FragmentUtilsBenchmark.java @@ -27,14 +27,14 @@ package org.broadinstitute.sting.utils.fragments; import com.google.caliper.Param; import com.google.caliper.SimpleBenchmark; -import com.google.caliper.runner.CaliperMain; import net.sf.samtools.SAMFileHeader; import org.broadinstitute.sting.utils.GenomeLoc; import org.broadinstitute.sting.utils.GenomeLocParser; import org.broadinstitute.sting.utils.pileup.ReadBackedPileup; import org.broadinstitute.sting.utils.sam.ArtificialSAMUtils; -import java.util.*; +import java.util.ArrayList; +import java.util.List; /** * Caliper microbenchmark of fragment pileup @@ -76,6 +76,6 @@ public class FragmentUtilsBenchmark extends SimpleBenchmark { } public static void main(String[] args) { - CaliperMain.main(FragmentUtilsBenchmark.class, args); + com.google.caliper.Runner.main(FragmentUtilsBenchmark.class, args); } } diff --git a/public/java/test/org/broadinstitute/variant/variantcontext/VariantContextBenchmark.java b/public/java/test/org/broadinstitute/variant/variantcontext/VariantContextBenchmark.java index e6c67970c..34abe372f 100644 --- a/public/java/test/org/broadinstitute/variant/variantcontext/VariantContextBenchmark.java +++ b/public/java/test/org/broadinstitute/variant/variantcontext/VariantContextBenchmark.java @@ -27,13 +27,15 @@ package org.broadinstitute.variant.variantcontext; import com.google.caliper.Param; import com.google.caliper.SimpleBenchmark; -import com.google.caliper.runner.CaliperMain; import org.broad.tribble.Feature; import org.broad.tribble.FeatureCodec; import org.broadinstitute.sting.utils.GenomeLocParser; import org.broadinstitute.variant.vcf.VCFCodec; -import java.util.*; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; +import java.util.Set; /** * Caliper microbenchmark of parsing a VCF file @@ -372,6 +374,6 @@ public class VariantContextBenchmark extends SimpleBenchmark { // } public static void main(String[] args) { - CaliperMain.main(VariantContextBenchmark.class, args); + com.google.caliper.Runner.main(VariantContextBenchmark.class, args); } }