Skip to content

Commit

Permalink
GEOMESA-3413,GEOMESA-3414 Upgrade to Hadoop 3.4.1, HBase 2.6.1 (#3226)
Browse files Browse the repository at this point in the history
  • Loading branch information
@elahrvivaz
elahrvivaz committed Nov 11, 2024
1 parent 5cedfd1 commit 3244490
Show file tree
Hide file tree
Showing 3 changed files with 87 additions and 39 deletions.
68 changes: 32 additions & 36 deletions build/cqs.tsv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ com.github.pureconfig:pureconfig-generic-base_2.12 0.17.4 compile
com.github.pureconfig:pureconfig-generic_2.12 0.17.4 compile
com.github.pureconfig:pureconfig_2.12 0.17.4 compile
com.google.code.gson:gson 2.10.1 compile
com.google.errorprone:error_prone_annotations 2.21.1 compile
com.google.flatbuffers:flatbuffers-java 24.3.25 compile
com.google.guava:failureaccess 1.0 compile
com.google.guava:failureaccess 1.0.2 compile
Expand Down Expand Up @@ -170,24 +169,24 @@ org.apache.curator:curator-framework 5.6.0 compile
org.apache.curator:curator-recipes 5.6.0 compile
org.apache.datasketches:datasketches-java 4.1.0 compile
org.apache.datasketches:datasketches-memory 2.2.0 compile
org.apache.hbase.thirdparty:hbase-shaded-gson 4.1.5 compile
org.apache.hbase.thirdparty:hbase-shaded-miscellaneous 4.1.5 compile
org.apache.hbase.thirdparty:hbase-shaded-netty 4.1.5 compile
org.apache.hbase.thirdparty:hbase-shaded-protobuf 4.1.5 compile
org.apache.hbase.thirdparty:hbase-unsafe 4.1.5 compile
org.apache.hbase:hbase-asyncfs 2.5.8-hadoop3 compile
org.apache.hbase:hbase-client 2.5.8-hadoop3 compile
org.apache.hbase:hbase-common 2.5.8-hadoop3 compile
org.apache.hbase:hbase-hadoop-compat 2.5.8-hadoop3 compile
org.apache.hbase:hbase-hadoop2-compat 2.5.8-hadoop3 compile
org.apache.hbase:hbase-logging 2.5.8-hadoop3 compile
org.apache.hbase:hbase-mapreduce 2.5.8-hadoop3 compile
org.apache.hbase:hbase-metrics 2.5.8-hadoop3 compile
org.apache.hbase:hbase-metrics-api 2.5.8-hadoop3 compile
org.apache.hbase:hbase-protocol 2.5.8-hadoop3 compile
org.apache.hbase:hbase-protocol-shaded 2.5.8-hadoop3 compile
org.apache.hbase:hbase-replication 2.5.8-hadoop3 compile
org.apache.hbase:hbase-zookeeper 2.5.8-hadoop3 compile
org.apache.hbase.thirdparty:hbase-shaded-gson 4.1.9 compile
org.apache.hbase.thirdparty:hbase-shaded-miscellaneous 4.1.9 compile
org.apache.hbase.thirdparty:hbase-shaded-netty 4.1.9 compile
org.apache.hbase.thirdparty:hbase-shaded-protobuf 4.1.9 compile
org.apache.hbase.thirdparty:hbase-unsafe 4.1.9 compile
org.apache.hbase:hbase-asyncfs 2.6.1-hadoop3 compile
org.apache.hbase:hbase-client 2.6.1-hadoop3 compile
org.apache.hbase:hbase-common 2.6.1-hadoop3 compile
org.apache.hbase:hbase-hadoop-compat 2.6.1-hadoop3 compile
org.apache.hbase:hbase-hadoop2-compat 2.6.1-hadoop3 compile
org.apache.hbase:hbase-logging 2.6.1-hadoop3 compile
org.apache.hbase:hbase-mapreduce 2.6.1-hadoop3 compile
org.apache.hbase:hbase-metrics 2.6.1-hadoop3 compile
org.apache.hbase:hbase-metrics-api 2.6.1-hadoop3 compile
org.apache.hbase:hbase-protocol 2.6.1-hadoop3 compile
org.apache.hbase:hbase-protocol-shaded 2.6.1-hadoop3 compile
org.apache.hbase:hbase-replication 2.6.1-hadoop3 compile
org.apache.hbase:hbase-zookeeper 2.6.1-hadoop3 compile
org.apache.htrace:htrace-core 3.2.0-incubating compile
org.apache.httpcomponents:httpclient 4.5.14 compile
org.apache.httpcomponents:httpcore 4.4.16 compile
Expand All @@ -208,8 +207,6 @@ org.apache.zookeeper:zookeeper 3.9.2 compile
org.apache.zookeeper:zookeeper-jute 3.9.2 compile
org.apiguardian:apiguardian-api 1.1.2 compile
org.calrissian.mango:mango-core 3.0.0 compile
org.checkerframework:checker-qual 3.37.0 compile
org.checkerframework:checker-qual 3.42.0 compile
org.eclipse.emf:org.eclipse.emf.common 2.15.0 compile
org.eclipse.emf:org.eclipse.emf.ecore 2.15.0 compile
org.eclipse.emf:org.eclipse.emf.ecore.xmi 2.15.0 compile
Expand Down Expand Up @@ -249,8 +246,8 @@ org.geotools:gt-transform 32.0 compile
org.geotools:gt-xml 32.0 compile
org.huldra.math:bigint 0.7.1 compile
org.jetbrains:annotations 17.0.0 compile
org.jruby.jcodings:jcodings 1.0.55 compile
org.jruby.joni:joni 2.1.31 compile
org.jruby.jcodings:jcodings 1.0.58 compile
org.jruby.joni:joni 2.2.1 compile
org.json4s:json4s-ast_2.12 3.6.12 compile
org.json4s:json4s-core_2.12 3.6.12 compile
org.json4s:json4s-native_2.12 3.6.12 compile
Expand Down Expand Up @@ -295,18 +292,17 @@ io.prometheus:prometheus-metrics-exporter-httpserver 1.3.1 provided
io.prometheus:prometheus-metrics-exporter-pushgateway 1.3.1 provided
javax.media:jai_core 1.1.3 provided
org.apache.accumulo:accumulo-start 2.1.3 provided
org.apache.hadoop:hadoop-annotations 3.4.0 provided
org.apache.hadoop:hadoop-aws 3.4.0 provided
org.apache.hadoop:hadoop-client 3.4.0 provided
org.apache.hadoop:hadoop-common 3.4.0 provided
org.apache.hadoop:hadoop-distcp 3.4.0 provided
org.apache.hadoop:hadoop-hdfs 3.4.0 provided
org.apache.hadoop:hadoop-mapreduce-client-core 3.3.6 provided
org.apache.hadoop:hadoop-mapreduce-client-core 3.4.0 provided
org.apache.hadoop:hadoop-mapreduce-client-jobclient 3.4.0 provided
org.apache.hadoop:hadoop-yarn-api 3.4.0 provided
org.apache.hadoop:hadoop-yarn-common 3.4.0 provided
org.apache.hbase:hbase-server 2.5.8-hadoop3 provided
org.apache.hadoop:hadoop-annotations 3.4.1 provided
org.apache.hadoop:hadoop-aws 3.4.1 provided
org.apache.hadoop:hadoop-client 3.4.1 provided
org.apache.hadoop:hadoop-common 3.4.1 provided
org.apache.hadoop:hadoop-distcp 3.4.1 provided
org.apache.hadoop:hadoop-hdfs 3.4.1 provided
org.apache.hadoop:hadoop-mapreduce-client-core 3.4.1 provided
org.apache.hadoop:hadoop-mapreduce-client-jobclient 3.4.1 provided
org.apache.hadoop:hadoop-yarn-api 3.4.1 provided
org.apache.hadoop:hadoop-yarn-common 3.4.1 provided
org.apache.hbase:hbase-server 2.6.1-hadoop3 provided
org.apache.htrace:htrace-core4 4.1.0-incubating provided
org.apache.kafka:kafka-clients 3.7.0 provided
org.apache.kafka:kafka-streams-scala_2.12 3.7.0 provided
Expand All @@ -332,7 +328,7 @@ org.apache.arrow:arrow-vector tests:17.0.0 test
org.apache.cassandra:cassandra-all 3.11.14 test
org.apache.cassandra:cassandra-thrift 3.11.14 test
org.apache.curator:curator-test 5.6.0 test
org.apache.hbase:hbase-testing-util 2.5.8-hadoop3 test
org.apache.hbase:hbase-testing-util 2.6.1-hadoop3 test
org.apache.kafka:kafka-clients test:3.7.0 test
org.apache.kafka:kafka-streams-test-utils 3.7.0 test
org.apache.logging.log4j:log4j-api 2.22.1 test
Expand Down
2 changes: 2 additions & 0 deletions docs/user/upgrade.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,8 @@ Dependency Version Upgrades

The following dependencies have been upgraded:

* hbase ``2.5.8-hadoop3`` -> ``2.6.1-hadoop3``
* hadoop ``3.4.0`` -> ``3.4.1``
* spring-security ``5.8.14`` -> ``5.8.15``

Version 5.1.0 Upgrade Guide
Expand Down
56 changes: 53 additions & 3 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -134,10 +134,10 @@
<thrift.version>0.17.0</thrift.version>
<thrift-accumulo-20.version>0.12.0</thrift-accumulo-20.version>
<thrift-cassandra.version>0.12.0</thrift-cassandra.version>
<hadoop.version>3.4.0</hadoop.version>
<hadoop.version>3.4.1</hadoop.version>
<spark.version>3.5.0</spark.version>
<hbase.version>2.5.8-hadoop3</hbase.version>
<hbase.hadoop.version>3.3.6</hbase.hadoop.version>
<hbase.version>2.6.1-hadoop3</hbase.version>
<hbase.hadoop.version>3.4.1</hbase.hadoop.version>
<hbase.htrace.version>4.1.0-incubating</hbase.htrace.version>
<hbase.protobuf.version>2.5.0</hbase.protobuf.version>
<protobuf.version>3.25.3</protobuf.version> <!-- see also confluent.protobuf.version, hbase.protobuf.version -->
Expand Down Expand Up @@ -1015,6 +1015,13 @@
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
<version>${postgres.version}</version>
<exclusions>
<!-- these are not needed at runtime except in some alternate JVM languages -->
<exclusion>
<groupId>org.checkerframework</groupId>
<artifactId>checker-qual</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.geotools</groupId>
Expand Down Expand Up @@ -1337,11 +1344,33 @@
<groupId>org.calrissian.mango</groupId>
<artifactId>mango-core</artifactId>
<version>${mango.version}</version>
<exclusions>
<!-- these are not needed at runtime except in some alternate JVM languages -->
<exclusion>
<groupId>org.checkerframework</groupId>
<artifactId>checker-qual</artifactId>
</exclusion>
<exclusion>
<groupId>com.google.errorprone</groupId>
<artifactId>error_prone_annotations</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.github.ben-manes.caffeine</groupId>
<artifactId>caffeine</artifactId>
<version>${caffeine.version}</version>
<exclusions>
<!-- these are not needed at runtime except in some alternate JVM languages -->
<exclusion>
<groupId>org.checkerframework</groupId>
<artifactId>checker-qual</artifactId>
</exclusion>
<exclusion>
<groupId>com.google.errorprone</groupId>
<artifactId>error_prone_annotations</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.google.code.gson</groupId>
Expand Down Expand Up @@ -1914,6 +1943,11 @@
<groupId>org.apache.logging.log4j</groupId>
<artifactId>*</artifactId>
</exclusion>
<!-- these are not needed at runtime except in some alternate JVM languages -->
<exclusion>
<groupId>org.checkerframework</groupId>
<artifactId>checker-qual</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
Expand Down Expand Up @@ -2329,6 +2363,10 @@
<groupId>log4j</groupId>
<artifactId>*</artifactId>
</exclusion>
<exclusion>
<groupId>com.google.errorprone</groupId>
<artifactId>error_prone_annotations</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
Expand Down Expand Up @@ -2365,6 +2403,10 @@
<groupId>log4j</groupId>
<artifactId>*</artifactId>
</exclusion>
<exclusion>
<groupId>com.google.errorprone</groupId>
<artifactId>error_prone_annotations</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
Expand All @@ -2381,6 +2423,10 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</exclusion>
<exclusion>
<groupId>com.google.errorprone</groupId>
<artifactId>error_prone_annotations</artifactId>
</exclusion>
<!-- excluded due to license issues: https://gitlab.eclipse.org/eclipsefdn/emo-team/iplab/-/issues/10246 -->
<exclusion>
<groupId>org.mortbay.jetty</groupId>
Expand All @@ -2398,6 +2444,10 @@
<groupId>log4j</groupId>
<artifactId>*</artifactId>
</exclusion>
<exclusion>
<groupId>com.google.errorprone</groupId>
<artifactId>error_prone_annotations</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
Expand Down

0 comments on commit 3244490

Please sign in to comment.