Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 43 additions & 6 deletions adls-plugins/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,35 @@
<artifactId>adls-plugins</artifactId>

<dependencies>
<!-- Avro used to come in only through avro-ipc; declare it so the plugin jar still packages it. Its commons-*
dependencies were not packaged before either (Hadoop, provided, supplies them), so keep them out. -->
<dependency>
<groupId>org.apache.avro</groupId>
<artifactId>avro</artifactId>
<version>${avro.version}</version>
<exclusions>
<exclusion>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
</exclusion>
<exclusion>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
</exclusion>
<exclusion>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.avro</groupId>
<artifactId>avro-mapred</artifactId>
Expand All @@ -41,12 +70,21 @@
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
</exclusion>
<!-- avro-ipc / avro-ipc-jetty are only used by Avro RPC (tether), not by AvroKeyOutputFormat. They bring
Jetty 9.4.54 (jetty-server, -http, -io, -servlet, -security, -util, -util-ajax) into the plugin jar. -->
<exclusion>
<groupId>org.apache.avro</groupId>
<artifactId>avro-ipc</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.avro</groupId>
<artifactId>avro-ipc-jetty</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>${jackson.databind.version}</version>
</dependency>
<dependency>
<groupId>junit</groupId>
Expand All @@ -64,13 +102,12 @@
<artifactId>orc-mapreduce</artifactId>
<version>1.1.0</version>
<exclusions>
<!-- Hadoop is provided by CDAP (hadoop-client 3.3.6, provided, in the parent pom). Without this, orc-mapreduce
packages hadoop-mapreduce-client-core / hadoop-yarn-common 2.6.0 and with them Netty 3.6.2, log4j 1.2.17,
slf4j-log4j12, jersey 1.9 and the codehaus jackson 1.9.13 jars. -->
<exclusion>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-hdfs</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
Expand Down
1 change: 0 additions & 1 deletion azure-blob-store/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>${jackson.databind.version}</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
Expand Down
20 changes: 19 additions & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@
<cdap.version>6.11.0</cdap.version>
<hadoop.version>3.3.6</hadoop.version>
<cdap.plugin.version>2.13.0</cdap.plugin.version>
<jackson.databind.version>2.13.4.2</jackson.databind.version>
<jackson.version>2.18.12</jackson.version>

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

To maintain consistency with other dependency versions in this project, it is recommended to define the versions for jettison and snappy as properties in the <properties> section instead of hardcoding them in <dependencyManagement>.

Suggested change
<jackson.version>2.18.12</jackson.version>
<jackson.version>2.18.12</jackson.version>
<jettison.version>1.5.4</jettison.version>
<snappy.version>0.5</snappy.version>

<guava.version>32.0.0-jre</guava.version>
<avro.version>1.11.4</avro.version>
<widgets.dir>widgets</widgets.dir>
Expand Down Expand Up @@ -141,6 +141,24 @@

<dependencyManagement>
<dependencies>
<dependency>
<groupId>com.fasterxml.jackson</groupId>
<artifactId>jackson-bom</artifactId>
<version>${jackson.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<!-- orc-core 1.1.0 depends on jettison 1.1 and iq80 snappy 0.2 (CVE fixes in 1.5.4 / 0.5). -->
<dependency>
<groupId>org.codehaus.jettison</groupId>
<artifactId>jettison</artifactId>
<version>1.5.4</version>
</dependency>
<dependency>
<groupId>org.iq80.snappy</groupId>
<artifactId>snappy</artifactId>
<version>0.5</version>
</dependency>
Comment on lines +151 to +161

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

Use the newly defined properties ${jettison.version} and ${snappy.version} here to avoid hardcoding the versions in <dependencyManagement>.

Suggested change
<!-- orc-core 1.1.0 depends on jettison 1.1 and iq80 snappy 0.2 (CVE fixes in 1.5.4 / 0.5). -->
<dependency>
<groupId>org.codehaus.jettison</groupId>
<artifactId>jettison</artifactId>
<version>1.5.4</version>
</dependency>
<dependency>
<groupId>org.iq80.snappy</groupId>
<artifactId>snappy</artifactId>
<version>0.5</version>
</dependency>
<!-- orc-core 1.1.0 depends on jettison 1.1 and iq80 snappy 0.2 (CVE fixes in 1.5.4 / 0.5). -->
<dependency>
<groupId>org.codehaus.jettison</groupId>
<artifactId>jettison</artifactId>
<version>${jettison.version}</version>
</dependency>
<dependency>
<groupId>org.iq80.snappy</groupId>
<artifactId>snappy</artifactId>
<version>${snappy.version}</version>
</dependency>

<dependency>
<groupId>io.cdap.cdap</groupId>
<artifactId>cdap-formats</artifactId>
Expand Down
Loading