Skip to content
Closed
Changes from 1 commit
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
Prev Previous commit
Next Next commit
Merge remote-tracking branch 'upstream/master' into hadoop-2.7-jdk11
# Conflicts:
#	pom.xml
  • Loading branch information
wangyum committed Nov 24, 2019
commit 728952be958afb97eb8f5ca4528618961003b2e7
13 changes: 2 additions & 11 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2919,17 +2919,8 @@
<profile>
<id>hadoop-3.2</id>
<properties>
<hadoop.version>2.7.4</hadoop.version>
<curator.version>2.7.1</curator.version>
<hive.group>org.apache.hive</hive.group>
<hive.classifier>core</hive.classifier>
<hive.version>${hive23.version}</hive.version>
<hive.version.short>2.3.5</hive.version.short>
<!-- Do not need parquet-hadoop-bundle because we already have
parquet-common, parquet-column and parquet-hadoop -->
<hive.parquet.scope>provided</hive.parquet.scope>
<orc.classifier></orc.classifier>
<datanucleus-core.version>4.1.17</datanucleus-core.version>
<hadoop.version>3.2.0</hadoop.version>
<curator.version>2.13.0</curator.version>
</properties>
</profile>

Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.