Skip to content

Commit

Permalink
[#10131] End of support for hbase 1.x
Browse files Browse the repository at this point in the history
  • Loading branch information
@emeroad
emeroad committed Jul 19, 2023
1 parent 91a911b commit 4befb81
Show file tree
Hide file tree
Showing 9 changed files with 17 additions and 70 deletions.
17 changes: 9 additions & 8 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,14 +93,15 @@ Java version required to run Pinpoint:
<!-- </compatibilityJava.md> -->
HBase compatibility table:
<!-- <compatibilityHbase.md> -->
| Pinpoint Version | HBase 1.0.x | HBase 1.2.x | HBase 1.4.x | HBase 2.0.x |
|------------------|-------------|-------------|-------------|-----------------------------------------------------------------------------------------------------------------------|
| 2.0.x | not tested | yes | yes | [optional](https://pinpoint-apm.gitbook.io/pinpoint/documents/hbase-upgrade#do-you-like-to-use-hbase-2x-for-pinpoint) |
| 2.1.x | not tested | yes | yes | [optional](https://pinpoint-apm.gitbook.io/pinpoint/documents/hbase-upgrade#do-you-like-to-use-hbase-2x-for-pinpoint) |
| 2.2.x | not tested | yes | yes | [optional](https://pinpoint-apm.gitbook.io/pinpoint/documents/hbase-upgrade#do-you-like-to-use-hbase-2x-for-pinpoint) |
| 2.3.x | not tested | yes | yes | [hbase2-module](https://github.com/pinpoint-apm/pinpoint/tree/master/hbase2-module) |
| 2.4.x | not tested | yes | yes | [hbase2-module](https://github.com/pinpoint-apm/pinpoint/tree/master/hbase2-module) |
| 2.5.x | not tested | yes | yes | [hbase2-module](https://github.com/pinpoint-apm/pinpoint/tree/master/hbase2-module) |
| Pinpoint Version | HBase 1.x | HBase 2.x |
|-----------------|-----------|-----------------------------------------------------------------------------------------------------------------------|
| 2.0.x | yes | [optional](https://pinpoint-apm.gitbook.io/pinpoint/documents/hbase-upgrade#do-you-like-to-use-hbase-2x-for-pinpoint) |
| 2.1.x | yes | [optional](https://pinpoint-apm.gitbook.io/pinpoint/documents/hbase-upgrade#do-you-like-to-use-hbase-2x-for-pinpoint) |
| 2.2.x | yes | [optional](https://pinpoint-apm.gitbook.io/pinpoint/documents/hbase-upgrade#do-you-like-to-use-hbase-2x-for-pinpoint) |
| 2.3.x | yes | [hbase2-module](https://github.com/pinpoint-apm/pinpoint/tree/master/hbase2-module) |
| 2.4.x | yes | [hbase2-module](https://github.com/pinpoint-apm/pinpoint/tree/master/hbase2-module) |
| 2.5.x | yes | [hbase2-module](https://github.com/pinpoint-apm/pinpoint/tree/master/hbase2-module) |
| 2.6.x | no | yes | |

<!-- </compatibilityHbase.md> -->
Agent - Collector compatibility table:
Expand Down
18 changes: 0 additions & 18 deletions commons-hbase/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,24 +54,6 @@
<dependency>
<groupId>org.apache.hbase</groupId>
<artifactId>hbase-shaded-client</artifactId>
<exclusions>
<exclusion>
<!-- change runtime scope -->
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- for hbase library-->
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<scope>runtime</scope>
</dependency>

<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-core-asl</artifactId>
</dependency>

<dependency>
Expand Down
4 changes: 0 additions & 4 deletions hbase/hbase-schema-manager/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,6 @@
<groupId>com.navercorp.pinpoint</groupId>
<artifactId>pinpoint-hbase-schema</artifactId>
<exclusions>
<exclusion>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</exclusion>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
Expand Down
4 changes: 0 additions & 4 deletions hbase2-module/hbase2-batch/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,6 @@
<groupId>org.apache.hbase</groupId>
<artifactId>hbase-shaded-client</artifactId>
</exclusion>
<exclusion>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-core-asl</artifactId>
</exclusion>
</exclusions>
</dependency>

Expand Down
4 changes: 0 additions & 4 deletions hbase2-module/hbase2-collector/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,6 @@
<groupId>org.apache.hbase</groupId>
<artifactId>hbase-shaded-client</artifactId>
</exclusion>
<exclusion>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-core-asl</artifactId>
</exclusion>
</exclusions>
</dependency>

Expand Down
4 changes: 0 additions & 4 deletions hbase2-module/hbase2-flink/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,6 @@
<groupId>org.apache.hbase</groupId>
<artifactId>hbase-shaded-client</artifactId>
</exclusion>
<exclusion>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-core-asl</artifactId>
</exclusion>
</exclusions>
</dependency>

Expand Down
4 changes: 0 additions & 4 deletions hbase2-module/hbase2-web/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,6 @@
<groupId>org.apache.hbase</groupId>
<artifactId>hbase-shaded-client</artifactId>
</exclusion>
<exclusion>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-core-asl</artifactId>
</exclusion>
</exclusions>
</dependency>

Expand Down
6 changes: 0 additions & 6 deletions hbase2-module/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,12 +66,6 @@
</exclusions>
</dependency>

<dependency>
<groupId>org.apache.hbase</groupId>
<artifactId>hbase-shaded-client</artifactId>
<version>${hbase2.client.version}</version>
</dependency>

<dependency>
<groupId>org.apache.curator</groupId>
<artifactId>curator-client</artifactId>
Expand Down
26 changes: 8 additions & 18 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@
<javadoc.source>${jdk.version}</javadoc.source>

<!-- hbase -->
<hbase.shaded.client.version>1.7.2</hbase.shaded.client.version>
<hbase.shaded.client.version>2.5.5-hadoop3</hbase.shaded.client.version>
<!-- for shaded hbase client 1.5.0+ version -->
<codehaus.jackson.version>1.9.13</codehaus.jackson.version>
<hbase2.client.version>2.5.5-hadoop3</hbase2.client.version>
Expand Down Expand Up @@ -211,10 +211,10 @@
<jjwt.version>0.9.1</jjwt.version>
<jaxb.version>2.3.3</jaxb.version>

<zookeeper.version>3.4.14</zookeeper.version>
<zookeeper.version>3.8.1</zookeeper.version>
<curator.version>4.2.0</curator.version>
<curator.framework.version>4.2.1</curator.framework.version>
<curator.test.version>2.13.0</curator.test.version>
<curator.test.version>5.5.0</curator.test.version>

<embed.mongo>3.4.6</embed.mongo>

Expand Down Expand Up @@ -827,27 +827,12 @@
<artifactId>hbase-shaded-client</artifactId>
<version>${hbase.shaded.client.version}</version>
<exclusions>
<!-- Do not remove the log4j -->
<!-- <exclusion>-->
<!-- <groupId>log4j</groupId>-->
<!-- <artifactId>log4j</artifactId>-->
<!-- </exclusion>-->
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</exclusion>
<exclusion>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- for hbase shaded client 1.5.x+ version -->
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-core-asl</artifactId>
<version>${codehaus.jackson.version}</version>
</dependency>

<dependency>
<groupId>com.sematext.hbasewd</groupId>
Expand Down Expand Up @@ -1340,6 +1325,11 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.xerial.snappy</groupId>
<artifactId>snappy-java</artifactId>
<version>1.1.10.2</version>
</dependency>

<dependency>
<groupId>org.apache.curator</groupId>
Expand Down

0 comments on commit 4befb81

Please sign in to comment.