HBASE-24238 Clean up root pom after removing hadoop-2.0 profile (#1571)

This commit is contained in:
Wei-Chiu Chuang 2020-05-04 14:05:24 -07:00 committed by GitHub
parent da7c6cc059
commit 1878db843c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 5 deletions

View File

@ -1483,11 +1483,10 @@
<!-- These must be defined here for downstream build tools that don't look at profiles. <!-- These must be defined here for downstream build tools that don't look at profiles.
--> -->
<hadoop.version>${hadoop-three.version}</hadoop.version> <hadoop.version>${hadoop-three.version}</hadoop.version>
<hadoop.guava.version>11.0.2</hadoop.guava.version>
<assembly.file>src/main/assembly/hadoop-two-compat.xml</assembly.file> <assembly.file>src/main/assembly/hadoop-two-compat.xml</assembly.file>
<!--This property is for hadoops netty. HBase netty <!--This property is for hadoops netty. HBase netty
comes in via hbase-thirdparty hbase-shaded-netty--> comes in via hbase-thirdparty hbase-shaded-netty-->
<netty.hadoop.version>3.6.2.Final</netty.hadoop.version> <netty.hadoop.version>3.10.5.Final</netty.hadoop.version>
<!-- end HBASE-15925 default hadoop compatibility values --> <!-- end HBASE-15925 default hadoop compatibility values -->
<audience-annotations.version>0.5.0</audience-annotations.version> <audience-annotations.version>0.5.0</audience-annotations.version>
<avro.version>1.7.7</avro.version> <avro.version>1.7.7</avro.version>
@ -2596,9 +2595,6 @@
<properties> <properties>
<hadoop.version>${hadoop-three.version}</hadoop.version> <hadoop.version>${hadoop-three.version}</hadoop.version>
<assembly.file>src/main/assembly/hadoop-three-compat.xml</assembly.file> <assembly.file>src/main/assembly/hadoop-three-compat.xml</assembly.file>
<!--This property is for hadoops netty. HBase netty
comes in via hbase-thirdparty hbase-shaded-netty-->
<netty.hadoop.version>3.10.5.Final</netty.hadoop.version>
</properties> </properties>
<dependencyManagement> <dependencyManagement>
<dependencies> <dependencies>