Merge 7cedede into 9362f15

bigdatagenomics · Mar 1, 2019 · b0c6028 · b0c6028
2 parents 9362f15 + 7cedede
commit b0c6028
Show file tree

Hide file tree

Showing 15 changed files with 624 additions and 577 deletions.
diff --git a/adam-core/pom.xml b/adam-core/pom.xml
@@ -106,14 +106,14 @@
                 <argument>org.bdgenomics.formats.avro.Feature</argument>
                 <argument>org.bdgenomics.formats.avro.Fragment</argument>
                 <argument>org.bdgenomics.formats.avro.Genotype</argument>
+                <argument>org.bdgenomics.formats.avro.GenotypeAnnotation</argument>
                 <argument>org.bdgenomics.formats.avro.NucleotideContigFragment</argument>
                 <argument>org.bdgenomics.formats.avro.OntologyTerm</argument>
                 <argument>org.bdgenomics.formats.avro.ProcessingStep</argument>
                 <argument>org.bdgenomics.formats.avro.Reference</argument>
                 <argument>org.bdgenomics.formats.avro.TranscriptEffect</argument>
                 <argument>org.bdgenomics.formats.avro.Variant</argument>
                 <argument>org.bdgenomics.formats.avro.VariantAnnotation</argument>
-                <argument>org.bdgenomics.formats.avro.VariantCallingAnnotations</argument>
                 <argument>${project.basedir}/target/generated-sources/src/main/scala/org/bdgenomics/adam/sql/Schemas.scala</argument>
               </arguments>
               <classpathScope>compile</classpathScope>
@@ -134,6 +134,7 @@
                 <argument>org.bdgenomics.formats.avro.Feature</argument>
                 <argument>org.bdgenomics.formats.avro.Fragment</argument>
                 <argument>org.bdgenomics.formats.avro.Genotype</argument>
+                <argument>org.bdgenomics.formats.avro.GenotypeAnnotation</argument>
                 <argument>org.bdgenomics.formats.avro.NucleotideContigFragment</argument>
                 <argument>org.bdgenomics.formats.avro.OntologyTerm</argument>
                 <argument>org.bdgenomics.formats.avro.Read</argument>
@@ -145,7 +146,6 @@
                 <argument>org.bdgenomics.formats.avro.TranscriptEffect</argument>
                 <argument>org.bdgenomics.formats.avro.Variant</argument>
                 <argument>org.bdgenomics.formats.avro.VariantAnnotation</argument>
-                <argument>org.bdgenomics.formats.avro.VariantCallingAnnotations</argument>
                 <argument>${project.basedir}/target/generated-sources/src/main/scala/org/bdgenomics/adam/projections/Enums.scala</argument>
               </arguments>
               <classpathScope>compile</classpathScope>