Skip to content

Commit 4e5e3da

Browse files
committed
Update avro dependency version to 1.10.1, parquet to 1.11.1, spark to 3.2.0-SNAPSHOT
1 parent 7464166 commit 4e5e3da

File tree

8 files changed

+6
-1229
lines changed

8 files changed

+6
-1229
lines changed

adam-assembly/pom.xml

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,6 @@
3939
<plugin>
4040
<groupId>org.apache.maven.plugins</groupId>
4141
<artifactId>maven-shade-plugin</artifactId>
42-
<dependencies>
43-
<dependency>
44-
<groupId>org.bdgenomics.adam</groupId>
45-
<artifactId>adam-shade-spark3_${scala.version.prefix}</artifactId>
46-
<version>${project.version}</version>
47-
</dependency>
48-
</dependencies>
4942
<configuration>
5043
<createDependencyReducedPom>false</createDependencyReducedPom>
5144
<filters>
@@ -58,12 +51,6 @@
5851
</excludes>
5952
</filter>
6053
</filters>
61-
<relocations>
62-
<relocation>
63-
<pattern>org.apache.parquet.avro</pattern>
64-
<shadedPattern>org.bdgenomics.adam.shaded.org.apache.parquet.avro</shadedPattern>
65-
</relocation>
66-
</relocations>
6754
</configuration>
6855
<executions>
6956
<execution>
@@ -72,7 +59,6 @@
7259
<goal>shade</goal>
7360
</goals>
7461
<configuration>
75-
<shaderHint>workaround</shaderHint>
7662
<transformers>
7763
<transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
7864
</transformers>

adam-cli/src/main/scala/org/bdgenomics/adam/cli/PrintADAM.scala

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,9 +83,6 @@ class PrintADAM(protected val args: PrintADAMArgs) extends BDGSparkCommand[Print
8383
val schema = hd.getSchema
8484
val writer = new GenericDatumWriter[Object](schema)
8585
val encoder = EncoderFactory.get().jsonEncoder(schema, out)
86-
val jg = new org.codehaus.jackson.JsonFactory().createJsonGenerator(out)
87-
jg.useDefaultPrettyPrinter()
88-
encoder.configure(jg)
8986
it.foreach(pileup => {
9087
writer.write(pileup, encoder)
9188
})

0 commit comments

Comments
 (0)