Skip to content
Draft
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
3 changes: 1 addition & 2 deletions core-plugins/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15to18</artifactId>
<version>1.84</version>
<version>1.85</version>
</dependency>
<!-- EMail action -->
<dependency>
Expand Down Expand Up @@ -196,7 +196,6 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.15.0</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
Expand Down
2 changes: 2 additions & 0 deletions database-plugins/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-client</artifactId>
<!-- Provided by CDAP at runtime; compile scope packaged yarn-client, jline and jetty into the plugin jar. -->
<scope>provided</scope>
</dependency>
<dependency>
<groupId>io.cdap.cdap</groupId>
Expand Down
2 changes: 0 additions & 2 deletions format-delimited/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
<packaging>jar</packaging>

<properties>
<commons-io.version>2.5</commons-io.version>
<commons-lang3.version>3.1</commons-lang3.version>
</properties>

Expand Down Expand Up @@ -78,7 +77,6 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>${commons-io.version}</version>
</dependency>
</dependencies>

Expand Down
33 changes: 29 additions & 4 deletions format-orc/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,14 @@
<name>ORC format plugins</name>
<packaging>jar</packaging>

<properties>
<!-- ORC 2.x needs Java 17; 1.9.x is the last line that runs on Java 8. -->
<orc.version>1.9.8</orc.version>
<protobuf.version>3.25.5</protobuf.version>
<hive-storage-api.version>2.8.1</hive-storage-api.version>
<commons-lang3.version>3.18.0</commons-lang3.version>
</properties>

<dependencies>
<dependency>
<groupId>io.cdap.cdap</groupId>
Expand Down Expand Up @@ -60,7 +68,7 @@
<dependency>
<groupId>org.apache.orc</groupId>
<artifactId>orc-mapreduce</artifactId>
<version>1.1.0</version>
<version>${orc.version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.hadoop</groupId>
Expand All @@ -69,13 +77,30 @@
</exclusions>
</dependency>
<!--
required by orc but not and hadoop-common, but doesn't get packaged by felix unless
it is a direct dependency, probably because hadoop-common is in provided scope.
orc-core uses these, but its published pom does not declare them (hive-storage-api) or they lose to an
older version from other dependencies (commons-lang3 3.5 from hydrator-common, protobuf from hadoop-common
in provided scope), so declare them directly to get them packaged in the plugin jar.
-->
<dependency>
<groupId>org.apache.hive</groupId>
<artifactId>hive-storage-api</artifactId>
<version>${hive-storage-api.version}</version>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>${commons-lang3.version}</version>
</dependency>
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
<version>2.5.0</version>
<version>${protobuf.version}</version>
</dependency>
<dependency>
<groupId>junit</groupId>
Expand Down
9 changes: 8 additions & 1 deletion format-parquet/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,14 @@
<dependency>
<groupId>org.apache.parquet</groupId>
<artifactId>parquet-avro</artifactId>
<version>1.12.0</version>
</dependency>
<!--
parquet-hadoop declares parquet-jackson (its shaded jackson) at runtime scope, which the bundle plugin
does not embed (scope=compile), so declare it here to keep it in the plugin jar.
-->
<dependency>
<groupId>org.apache.parquet</groupId>
<artifactId>parquet-jackson</artifactId>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
Expand Down
Loading
Loading