Skip to content

Commit f795fc0

Browse files
committed
HBASE-28883 Consume hbase-thirdparty-bom and cleanup impacted dependencies
1 parent cac58ba commit f795fc0

File tree

3 files changed

+13
-55
lines changed

3 files changed

+13
-55
lines changed

hbase-examples/pom.xml

-7
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,6 @@
2929
<artifactId>hbase-examples</artifactId>
3030
<name>Apache HBase - Examples</name>
3131
<description>Examples of HBase usage</description>
32-
<properties>
33-
<!--
34-
Version of protobuf that hbase uses internally (we shade our pb) Must match what is out
35-
in hbase-thirdparty include.
36-
-->
37-
<internal.protobuf.version>4.28.2</internal.protobuf.version>
38-
</properties>
3932
<dependencies>
4033
<dependency>
4134
<groupId>org.apache.hbase.thirdparty</groupId>

hbase-protocol-shaded/pom.xml

-5
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,6 @@
3131
<description>Shaded protobuf protocol classes used by HBase internally.</description>
3232
<properties>
3333
<maven.javadoc.skip>true</maven.javadoc.skip>
34-
<!--
35-
Version of protobuf that hbase uses internally (we shade our pb) Must match what is out
36-
in hbase-thirdparty include.
37-
-->
38-
<internal.protobuf.version>4.28.2</internal.protobuf.version>
3934
</properties>
4035
<dependencies>
4136
<!--BE CAREFUL! Any dependency added here needs to be

pom.xml

+13-43
Original file line numberDiff line numberDiff line change
@@ -838,11 +838,10 @@
838838
modules and cause trouble if we only rely on transitive dependencies.
839839
-->
840840
<netty3.version>3.10.6.Final</netty3.version>
841-
<netty4.version>4.1.112.Final</netty4.version>
842841
<!-- end HBASE-15925 default hadoop compatibility values -->
843842
<audience-annotations.version>0.15.0</audience-annotations.version>
844843
<javadoc.audience-annotations.version>0.15.0</javadoc.audience-annotations.version>
845-
<avro.version>1.11.4</avro.version>
844+
<avro.version>1.11.3</avro.version>
846845
<caffeine.version>2.8.1</caffeine.version>
847846
<commons-codec.version>1.15</commons-codec.version>
848847
<commons-validator.version>1.7</commons-validator.version>
@@ -854,14 +853,7 @@
854853
<httpclient.version>4.5.13</httpclient.version>
855854
<httpcore.version>4.4.13</httpcore.version>
856855
<metrics-core.version>3.2.6</metrics-core.version>
857-
<!--
858-
Note that the version of jackson-[annotations,core,databind] must be kept in sync with the
859-
version of jackson-jaxrs-json-provider shipped in hbase-thirdparty.
860-
-->
861-
<jackson.version>2.17.2</jackson.version>
862-
<jackson.databind.version>2.17.2</jackson.databind.version>
863856
<jaxb-api.version>2.3.1</jaxb-api.version>
864-
<servlet.api.version>3.1.0</servlet.api.version>
865857
<wx.rs.api.version>2.1.1</wx.rs.api.version>
866858
<tomcat.jasper.version>9.0.93</tomcat.jasper.version>
867859
<jruby.version>9.4.8.0</jruby.version>
@@ -899,7 +891,6 @@
899891
-->
900892
<checkstyle.version>8.29</checkstyle.version>
901893
<exec.maven.version>3.1.0</exec.maven.version>
902-
<error-prone.version>2.28.0</error-prone.version>
903894
<jamon.plugin.version>2.4.2</jamon.plugin.version>
904895
<lifecycle.mapping.version>1.0.0</lifecycle.mapping.version>
905896
<maven.antrun.version>1.8</maven.antrun.version>
@@ -925,13 +916,11 @@
925916
<lz4.version>1.8.0</lz4.version>
926917
<snappy.version>1.1.10.4</snappy.version>
927918
<zstd-jni.version>1.5.5-2</zstd-jni.version>
928-
<!--
929-
Note that the version of protobuf shipped in hbase-thirdparty must match the version used
930-
in hbase-protocol-shaded and hbase-examples. The version of jackson-[annotations,core,
931-
databind] must be kept in sync with the version of jackson-jaxrs-json-provider shipped in
932-
hbase-thirdparty.
919+
<hbase-thirdparty.version>4.1.10-SNAPSHOT</hbase-thirdparty.version>
920+
<!--Version of protobuf that hbase uses internally (we shade our pb)
921+
Must match what is out in hbase-thirdparty include.
933922
-->
934-
<hbase-thirdparty.version>4.1.9</hbase-thirdparty.version>
923+
<internal.protobuf.version>4.28.2</internal.protobuf.version>
935924
<!-- Coverage properties -->
936925
<jacoco.version>0.8.8</jacoco.version>
937926
<jacocoArgLine/>
@@ -1528,32 +1517,12 @@
15281517
<artifactId>joni</artifactId>
15291518
<version>${joni.version}</version>
15301519
</dependency>
1531-
<dependency>
1532-
<groupId>com.fasterxml.jackson.core</groupId>
1533-
<artifactId>jackson-annotations</artifactId>
1534-
<version>${jackson.version}</version>
1535-
</dependency>
1536-
<dependency>
1537-
<groupId>com.fasterxml.jackson.core</groupId>
1538-
<artifactId>jackson-core</artifactId>
1539-
<version>${jackson.version}</version>
1540-
</dependency>
1541-
<dependency>
1542-
<groupId>com.fasterxml.jackson.core</groupId>
1543-
<artifactId>jackson-databind</artifactId>
1544-
<version>${jackson.databind.version}</version>
1545-
</dependency>
15461520
<dependency>
15471521
<groupId>org.jamon</groupId>
15481522
<artifactId>jamon-runtime</artifactId>
15491523
<version>${jamon-runtime.version}</version>
15501524
</dependency>
15511525
<!-- REST dependencies -->
1552-
<dependency>
1553-
<groupId>javax.servlet</groupId>
1554-
<artifactId>javax.servlet-api</artifactId>
1555-
<version>${servlet.api.version}</version>
1556-
</dependency>
15571526
<dependency>
15581527
<groupId>javax.ws.rs</groupId>
15591528
<artifactId>javax.ws.rs-api</artifactId>
@@ -1767,6 +1736,14 @@
17671736
<artifactId>zstd-jni</artifactId>
17681737
<version>${zstd-jni.version}</version>
17691738
</dependency>
1739+
<!-- hbase-thirdparty bom -->
1740+
<dependency>
1741+
<groupId>org.apache.hbase.thirdparty</groupId>
1742+
<artifactId>hbase-thirdparty-bom</artifactId>
1743+
<version>${hbase-thirdparty.version}</version>
1744+
<type>pom</type>
1745+
<scope>import</scope>
1746+
</dependency>
17701747
<!-- shaded thirdparty -->
17711748
<dependency>
17721749
<groupId>org.apache.hbase.thirdparty</groupId>
@@ -1838,13 +1815,6 @@
18381815
<artifactId>netty</artifactId>
18391816
<version>${netty3.version}</version>
18401817
</dependency>
1841-
<dependency>
1842-
<groupId>io.netty</groupId>
1843-
<artifactId>netty-bom</artifactId>
1844-
<version>${netty4.version}</version>
1845-
<type>pom</type>
1846-
<scope>import</scope>
1847-
</dependency>
18481818
</dependencies>
18491819
</dependencyManagement>
18501820
<dependencies>

0 commit comments

Comments
 (0)