diff --git a/protected/gatk-tools-protected/src/test/java/org/broadinstitute/gatk/tools/walkers/annotator/InbreedingCoeffUnitTest.java b/protected/gatk-tools-protected/src/test/java/org/broadinstitute/gatk/tools/walkers/annotator/InbreedingCoeffUnitTest.java index 888d761af..d76a5351d 100644 --- a/protected/gatk-tools-protected/src/test/java/org/broadinstitute/gatk/tools/walkers/annotator/InbreedingCoeffUnitTest.java +++ b/protected/gatk-tools-protected/src/test/java/org/broadinstitute/gatk/tools/walkers/annotator/InbreedingCoeffUnitTest.java @@ -59,6 +59,7 @@ import org.testng.annotations.Test; import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import java.util.Set; /** * Created with IntelliJ IDEA. @@ -102,7 +103,10 @@ public class InbreedingCoeffUnitTest { private VariantContext makeVC(String source, List alleles, Genotype... genotypes) { int start = 10; int stop = start; // alleles.contains(ATC) ? start + 3 : start; - return new VariantContextBuilder(source, "1", start, stop, alleles).genotypes(Arrays.asList(genotypes)).filters(null).make(); + return new VariantContextBuilder(source, "1", start, stop, alleles) + .genotypes(Arrays.asList(genotypes)) + .filters((String)null) + .make(); } @Test diff --git a/protected/gatk-tools-protected/src/test/java/org/broadinstitute/gatk/tools/walkers/variantutils/PosteriorLikelihoodsUtilsUnitTest.java b/protected/gatk-tools-protected/src/test/java/org/broadinstitute/gatk/tools/walkers/variantutils/PosteriorLikelihoodsUtilsUnitTest.java index e24623998..d6213ccde 100644 --- a/protected/gatk-tools-protected/src/test/java/org/broadinstitute/gatk/tools/walkers/variantutils/PosteriorLikelihoodsUtilsUnitTest.java +++ b/protected/gatk-tools-protected/src/test/java/org/broadinstitute/gatk/tools/walkers/variantutils/PosteriorLikelihoodsUtilsUnitTest.java @@ -134,7 +134,7 @@ public class PosteriorLikelihoodsUtilsUnitTest extends BaseTest { private VariantContext makeVC(String source, List alleles, Genotype... genotypes) { int start = 10; int stop = start; // alleles.contains(ATC) ? start + 3 : start; - return new VariantContextBuilder(source, "1", start, stop, alleles).genotypes(Arrays.asList(genotypes)).filters(null).make(); + return new VariantContextBuilder(source, "1", start, stop, alleles).genotypes(Arrays.asList(genotypes)).filters((String)null).make(); } @Test diff --git a/public/gatk-root/pom.xml b/public/gatk-root/pom.xml index 206f655b1..f24468fb2 100644 --- a/public/gatk-root/pom.xml +++ b/public/gatk-root/pom.xml @@ -64,7 +64,7 @@ com.google.code.cofoja cofoja - 1.0-r139 + 1.2-20140817 com.github.samtools diff --git a/public/gatk-tools-public/src/main/java/org/broadinstitute/gatk/tools/walkers/annotator/interfaces/AnnotationInterfaceManager.java b/public/gatk-tools-public/src/main/java/org/broadinstitute/gatk/tools/walkers/annotator/interfaces/AnnotationInterfaceManager.java index 37b570c87..56c4087c3 100644 --- a/public/gatk-tools-public/src/main/java/org/broadinstitute/gatk/tools/walkers/annotator/interfaces/AnnotationInterfaceManager.java +++ b/public/gatk-tools-public/src/main/java/org/broadinstitute/gatk/tools/walkers/annotator/interfaces/AnnotationInterfaceManager.java @@ -133,7 +133,7 @@ public class AnnotationInterfaceManager { // note that technically an annotation can work on both the INFO and FORMAT fields for ( Class c : classes ) - annotations.add(pluginManager.createByType(c)); + annotations.add((T)pluginManager.createByType(c)); return annotations; } diff --git a/public/repo/com/google/code/cofoja/cofoja/1.0-r139/cofoja-1.0-r139.jar b/public/repo/com/google/code/cofoja/cofoja/1.0-r139/cofoja-1.0-r139.jar deleted file mode 100644 index 2cbdd380d..000000000 Binary files a/public/repo/com/google/code/cofoja/cofoja/1.0-r139/cofoja-1.0-r139.jar and /dev/null differ diff --git a/public/repo/com/google/code/cofoja/cofoja/1.0-r139/cofoja-1.0-r139.pom b/public/repo/com/google/code/cofoja/cofoja/1.0-r139/cofoja-1.0-r139.pom deleted file mode 100644 index 5a6fb69b9..000000000 --- a/public/repo/com/google/code/cofoja/cofoja/1.0-r139/cofoja-1.0-r139.pom +++ /dev/null @@ -1,9 +0,0 @@ - - 4.0.0 - com.google.code.cofoja - cofoja - cofoja - 1.0-r139 - diff --git a/public/repo/com/google/code/cofoja/cofoja/1.2-20140817/cofoja-1.2-20140817.jar b/public/repo/com/google/code/cofoja/cofoja/1.2-20140817/cofoja-1.2-20140817.jar new file mode 100644 index 000000000..2b105c88c Binary files /dev/null and b/public/repo/com/google/code/cofoja/cofoja/1.2-20140817/cofoja-1.2-20140817.jar differ diff --git a/public/repo/com/google/code/cofoja/cofoja/1.2-20140817/cofoja-1.2-20140817.pom b/public/repo/com/google/code/cofoja/cofoja/1.2-20140817/cofoja-1.2-20140817.pom new file mode 100644 index 000000000..92fbea553 --- /dev/null +++ b/public/repo/com/google/code/cofoja/cofoja/1.2-20140817/cofoja-1.2-20140817.pom @@ -0,0 +1,89 @@ + + 4.0.0 + + com.google.java.contract + cofoja + 1.2-20140817 + Contracts for Java + Contracts for Java is a contract programming framework for Java. + http://code.google.com/p/cofoja + + + code.google.com + http://code.google.com/p/cofoja/issues + + + 2010 + + + + GNU Lesser General Public License, version 2.1 or later + http://www.gnu.org/licenses/lgpl-2.1.html + repo + + + + + scm:svn:http://cofoja.googlecode.com/svn/trunk/ + scm:svn:https://cofoja.googlecode.com/svn/trunk/ + http://code.google.com/p/cofoja/source/browse + + + + UTF-8 + + + + + andreasleitner + Andreas Leitner + andreasleitner@google.com + Google + http://www.google.com + + Developer + + + + davidmorgan + David Morgan + davidmorgan@google.com + Google + http://www.google.com + + Developer + + + + lenh + Nhat Minh LĂȘ + nhat.minh.le@huoc.org + + Developer + + + + + + + org.ow2.asm + asm-all + 5.0.4 + compile + + + junit + junit + 4.8.2 + test + + + com.sun + tools + 1.5.0 + system + ${toolsjar} + + + +