Skip to content

Commit 3244490

Browse files
elahrvivazelahrvivaz
committed
GEOMESA-3413,GEOMESA-3414 Upgrade to Hadoop 3.4.1, HBase 2.6.1 (#3226)
1 parent 5cedfd1 commit 3244490

File tree

3 files changed

+87
-39
lines changed

3 files changed

+87
-39
lines changed

‎build/cqs.tsv‎

Lines changed: 32 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ com.github.pureconfig:pureconfig-generic-base_2.12 0.17.4 compile
2020
com.github.pureconfig:pureconfig-generic_2.12 0.17.4 compile
2121
com.github.pureconfig:pureconfig_2.12 0.17.4 compile
2222
com.google.code.gson:gson 2.10.1 compile
23-
com.google.errorprone:error_prone_annotations 2.21.1 compile
2423
com.google.flatbuffers:flatbuffers-java 24.3.25 compile
2524
com.google.guava:failureaccess 1.0 compile
2625
com.google.guava:failureaccess 1.0.2 compile
@@ -170,24 +169,24 @@ org.apache.curator:curator-framework 5.6.0 compile
170169
org.apache.curator:curator-recipes 5.6.0 compile
171170
org.apache.datasketches:datasketches-java 4.1.0 compile
172171
org.apache.datasketches:datasketches-memory 2.2.0 compile
173-
org.apache.hbase.thirdparty:hbase-shaded-gson 4.1.5 compile
174-
org.apache.hbase.thirdparty:hbase-shaded-miscellaneous 4.1.5 compile
175-
org.apache.hbase.thirdparty:hbase-shaded-netty 4.1.5 compile
176-
org.apache.hbase.thirdparty:hbase-shaded-protobuf 4.1.5 compile
177-
org.apache.hbase.thirdparty:hbase-unsafe 4.1.5 compile
178-
org.apache.hbase:hbase-asyncfs 2.5.8-hadoop3 compile
179-
org.apache.hbase:hbase-client 2.5.8-hadoop3 compile
180-
org.apache.hbase:hbase-common 2.5.8-hadoop3 compile
181-
org.apache.hbase:hbase-hadoop-compat 2.5.8-hadoop3 compile
182-
org.apache.hbase:hbase-hadoop2-compat 2.5.8-hadoop3 compile
183-
org.apache.hbase:hbase-logging 2.5.8-hadoop3 compile
184-
org.apache.hbase:hbase-mapreduce 2.5.8-hadoop3 compile
185-
org.apache.hbase:hbase-metrics 2.5.8-hadoop3 compile
186-
org.apache.hbase:hbase-metrics-api 2.5.8-hadoop3 compile
187-
org.apache.hbase:hbase-protocol 2.5.8-hadoop3 compile
188-
org.apache.hbase:hbase-protocol-shaded 2.5.8-hadoop3 compile
189-
org.apache.hbase:hbase-replication 2.5.8-hadoop3 compile
190-
org.apache.hbase:hbase-zookeeper 2.5.8-hadoop3 compile
172+
org.apache.hbase.thirdparty:hbase-shaded-gson 4.1.9 compile
173+
org.apache.hbase.thirdparty:hbase-shaded-miscellaneous 4.1.9 compile
174+
org.apache.hbase.thirdparty:hbase-shaded-netty 4.1.9 compile
175+
org.apache.hbase.thirdparty:hbase-shaded-protobuf 4.1.9 compile
176+
org.apache.hbase.thirdparty:hbase-unsafe 4.1.9 compile
177+
org.apache.hbase:hbase-asyncfs 2.6.1-hadoop3 compile
178+
org.apache.hbase:hbase-client 2.6.1-hadoop3 compile
179+
org.apache.hbase:hbase-common 2.6.1-hadoop3 compile
180+
org.apache.hbase:hbase-hadoop-compat 2.6.1-hadoop3 compile
181+
org.apache.hbase:hbase-hadoop2-compat 2.6.1-hadoop3 compile
182+
org.apache.hbase:hbase-logging 2.6.1-hadoop3 compile
183+
org.apache.hbase:hbase-mapreduce 2.6.1-hadoop3 compile
184+
org.apache.hbase:hbase-metrics 2.6.1-hadoop3 compile
185+
org.apache.hbase:hbase-metrics-api 2.6.1-hadoop3 compile
186+
org.apache.hbase:hbase-protocol 2.6.1-hadoop3 compile
187+
org.apache.hbase:hbase-protocol-shaded 2.6.1-hadoop3 compile
188+
org.apache.hbase:hbase-replication 2.6.1-hadoop3 compile
189+
org.apache.hbase:hbase-zookeeper 2.6.1-hadoop3 compile
191190
org.apache.htrace:htrace-core 3.2.0-incubating compile
192191
org.apache.httpcomponents:httpclient 4.5.14 compile
193192
org.apache.httpcomponents:httpcore 4.4.16 compile
@@ -208,8 +207,6 @@ org.apache.zookeeper:zookeeper 3.9.2 compile
208207
org.apache.zookeeper:zookeeper-jute 3.9.2 compile
209208
org.apiguardian:apiguardian-api 1.1.2 compile
210209
org.calrissian.mango:mango-core 3.0.0 compile
211-
org.checkerframework:checker-qual 3.37.0 compile
212-
org.checkerframework:checker-qual 3.42.0 compile
213210
org.eclipse.emf:org.eclipse.emf.common 2.15.0 compile
214211
org.eclipse.emf:org.eclipse.emf.ecore 2.15.0 compile
215212
org.eclipse.emf:org.eclipse.emf.ecore.xmi 2.15.0 compile
@@ -249,8 +246,8 @@ org.geotools:gt-transform 32.0 compile
249246
org.geotools:gt-xml 32.0 compile
250247
org.huldra.math:bigint 0.7.1 compile
251248
org.jetbrains:annotations 17.0.0 compile
252-
org.jruby.jcodings:jcodings 1.0.55 compile
253-
org.jruby.joni:joni 2.1.31 compile
249+
org.jruby.jcodings:jcodings 1.0.58 compile
250+
org.jruby.joni:joni 2.2.1 compile
254251
org.json4s:json4s-ast_2.12 3.6.12 compile
255252
org.json4s:json4s-core_2.12 3.6.12 compile
256253
org.json4s:json4s-native_2.12 3.6.12 compile
@@ -295,18 +292,17 @@ io.prometheus:prometheus-metrics-exporter-httpserver 1.3.1 provided
295292
io.prometheus:prometheus-metrics-exporter-pushgateway 1.3.1 provided
296293
javax.media:jai_core 1.1.3 provided
297294
org.apache.accumulo:accumulo-start 2.1.3 provided
298-
org.apache.hadoop:hadoop-annotations 3.4.0 provided
299-
org.apache.hadoop:hadoop-aws 3.4.0 provided
300-
org.apache.hadoop:hadoop-client 3.4.0 provided
301-
org.apache.hadoop:hadoop-common 3.4.0 provided
302-
org.apache.hadoop:hadoop-distcp 3.4.0 provided
303-
org.apache.hadoop:hadoop-hdfs 3.4.0 provided
304-
org.apache.hadoop:hadoop-mapreduce-client-core 3.3.6 provided
305-
org.apache.hadoop:hadoop-mapreduce-client-core 3.4.0 provided
306-
org.apache.hadoop:hadoop-mapreduce-client-jobclient 3.4.0 provided
307-
org.apache.hadoop:hadoop-yarn-api 3.4.0 provided
308-
org.apache.hadoop:hadoop-yarn-common 3.4.0 provided
309-
org.apache.hbase:hbase-server 2.5.8-hadoop3 provided
295+
org.apache.hadoop:hadoop-annotations 3.4.1 provided
296+
org.apache.hadoop:hadoop-aws 3.4.1 provided
297+
org.apache.hadoop:hadoop-client 3.4.1 provided
298+
org.apache.hadoop:hadoop-common 3.4.1 provided
299+
org.apache.hadoop:hadoop-distcp 3.4.1 provided
300+
org.apache.hadoop:hadoop-hdfs 3.4.1 provided
301+
org.apache.hadoop:hadoop-mapreduce-client-core 3.4.1 provided
302+
org.apache.hadoop:hadoop-mapreduce-client-jobclient 3.4.1 provided
303+
org.apache.hadoop:hadoop-yarn-api 3.4.1 provided
304+
org.apache.hadoop:hadoop-yarn-common 3.4.1 provided
305+
org.apache.hbase:hbase-server 2.6.1-hadoop3 provided
310306
org.apache.htrace:htrace-core4 4.1.0-incubating provided
311307
org.apache.kafka:kafka-clients 3.7.0 provided
312308
org.apache.kafka:kafka-streams-scala_2.12 3.7.0 provided
@@ -332,7 +328,7 @@ org.apache.arrow:arrow-vector tests:17.0.0 test
332328
org.apache.cassandra:cassandra-all 3.11.14 test
333329
org.apache.cassandra:cassandra-thrift 3.11.14 test
334330
org.apache.curator:curator-test 5.6.0 test
335-
org.apache.hbase:hbase-testing-util 2.5.8-hadoop3 test
331+
org.apache.hbase:hbase-testing-util 2.6.1-hadoop3 test
336332
org.apache.kafka:kafka-clients test:3.7.0 test
337333
org.apache.kafka:kafka-streams-test-utils 3.7.0 test
338334
org.apache.logging.log4j:log4j-api 2.22.1 test

‎docs/user/upgrade.rst‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,8 @@ Dependency Version Upgrades
9898

9999
The following dependencies have been upgraded:
100100

101+
* hbase ``2.5.8-hadoop3`` -> ``2.6.1-hadoop3``
102+
* hadoop ``3.4.0`` -> ``3.4.1``
101103
* spring-security ``5.8.14`` -> ``5.8.15``
102104

103105
Version 5.1.0 Upgrade Guide

‎pom.xml‎

Lines changed: 53 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -134,10 +134,10 @@
134134
<thrift.version>0.17.0</thrift.version>
135135
<thrift-accumulo-20.version>0.12.0</thrift-accumulo-20.version>
136136
<thrift-cassandra.version>0.12.0</thrift-cassandra.version>
137-
<hadoop.version>3.4.0</hadoop.version>
137+
<hadoop.version>3.4.1</hadoop.version>
138138
<spark.version>3.5.0</spark.version>
139-
<hbase.version>2.5.8-hadoop3</hbase.version>
140-
<hbase.hadoop.version>3.3.6</hbase.hadoop.version>
139+
<hbase.version>2.6.1-hadoop3</hbase.version>
140+
<hbase.hadoop.version>3.4.1</hbase.hadoop.version>
141141
<hbase.htrace.version>4.1.0-incubating</hbase.htrace.version>
142142
<hbase.protobuf.version>2.5.0</hbase.protobuf.version>
143143
<protobuf.version>3.25.3</protobuf.version> <!-- see also confluent.protobuf.version, hbase.protobuf.version -->
@@ -1015,6 +1015,13 @@
10151015
<groupId>org.postgresql</groupId>
10161016
<artifactId>postgresql</artifactId>
10171017
<version>${postgres.version}</version>
1018+
<exclusions>
1019+
<!-- these are not needed at runtime except in some alternate JVM languages -->
1020+
<exclusion>
1021+
<groupId>org.checkerframework</groupId>
1022+
<artifactId>checker-qual</artifactId>
1023+
</exclusion>
1024+
</exclusions>
10181025
</dependency>
10191026
<dependency>
10201027
<groupId>org.geotools</groupId>
@@ -1337,11 +1344,33 @@
13371344
<groupId>org.calrissian.mango</groupId>
13381345
<artifactId>mango-core</artifactId>
13391346
<version>${mango.version}</version>
1347+
<exclusions>
1348+
<!-- these are not needed at runtime except in some alternate JVM languages -->
1349+
<exclusion>
1350+
<groupId>org.checkerframework</groupId>
1351+
<artifactId>checker-qual</artifactId>
1352+
</exclusion>
1353+
<exclusion>
1354+
<groupId>com.google.errorprone</groupId>
1355+
<artifactId>error_prone_annotations</artifactId>
1356+
</exclusion>
1357+
</exclusions>
13401358
</dependency>
13411359
<dependency>
13421360
<groupId>com.github.ben-manes.caffeine</groupId>
13431361
<artifactId>caffeine</artifactId>
13441362
<version>${caffeine.version}</version>
1363+
<exclusions>
1364+
<!-- these are not needed at runtime except in some alternate JVM languages -->
1365+
<exclusion>
1366+
<groupId>org.checkerframework</groupId>
1367+
<artifactId>checker-qual</artifactId>
1368+
</exclusion>
1369+
<exclusion>
1370+
<groupId>com.google.errorprone</groupId>
1371+
<artifactId>error_prone_annotations</artifactId>
1372+
</exclusion>
1373+
</exclusions>
13451374
</dependency>
13461375
<dependency>
13471376
<groupId>com.google.code.gson</groupId>
@@ -1914,6 +1943,11 @@
19141943
<groupId>org.apache.logging.log4j</groupId>
19151944
<artifactId>*</artifactId>
19161945
</exclusion>
1946+
<!-- these are not needed at runtime except in some alternate JVM languages -->
1947+
<exclusion>
1948+
<groupId>org.checkerframework</groupId>
1949+
<artifactId>checker-qual</artifactId>
1950+
</exclusion>
19171951
</exclusions>
19181952
</dependency>
19191953
<dependency>
@@ -2329,6 +2363,10 @@
23292363
<groupId>log4j</groupId>
23302364
<artifactId>*</artifactId>
23312365
</exclusion>
2366+
<exclusion>
2367+
<groupId>com.google.errorprone</groupId>
2368+
<artifactId>error_prone_annotations</artifactId>
2369+
</exclusion>
23322370
</exclusions>
23332371
</dependency>
23342372
<dependency>
@@ -2365,6 +2403,10 @@
23652403
<groupId>log4j</groupId>
23662404
<artifactId>*</artifactId>
23672405
</exclusion>
2406+
<exclusion>
2407+
<groupId>com.google.errorprone</groupId>
2408+
<artifactId>error_prone_annotations</artifactId>
2409+
</exclusion>
23682410
</exclusions>
23692411
</dependency>
23702412
<dependency>
@@ -2381,6 +2423,10 @@
23812423
<groupId>org.slf4j</groupId>
23822424
<artifactId>slf4j-log4j12</artifactId>
23832425
</exclusion>
2426+
<exclusion>
2427+
<groupId>com.google.errorprone</groupId>
2428+
<artifactId>error_prone_annotations</artifactId>
2429+
</exclusion>
23842430
<!-- excluded due to license issues: https://gitlab.eclipse.org/eclipsefdn/emo-team/iplab/-/issues/10246 -->
23852431
<exclusion>
23862432
<groupId>org.mortbay.jetty</groupId>
@@ -2398,6 +2444,10 @@
23982444
<groupId>log4j</groupId>
23992445
<artifactId>*</artifactId>
24002446
</exclusion>
2447+
<exclusion>
2448+
<groupId>com.google.errorprone</groupId>
2449+
<artifactId>error_prone_annotations</artifactId>
2450+
</exclusion>
24012451
</exclusions>
24022452
</dependency>
24032453
<dependency>

0 commit comments

Comments
 (0)