Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

WIP: HBASE-28883 Consume hbase-thirdparty-bom and cleanup impacted depende… #6366

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions hbase-examples/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,6 @@
<artifactId>hbase-examples</artifactId>
<name>Apache HBase - Examples</name>
<description>Examples of HBase usage</description>
<properties>
<!--
Version of protobuf that hbase uses internally (we shade our pb) Must match what is out
in hbase-thirdparty include.
-->
<internal.protobuf.version>4.28.2</internal.protobuf.version>
</properties>
<dependencies>
<dependency>
<groupId>org.apache.hbase.thirdparty</groupId>
Expand Down
5 changes: 0 additions & 5 deletions hbase-protocol-shaded/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,6 @@
<description>Shaded protobuf protocol classes used by HBase internally.</description>
<properties>
<maven.javadoc.skip>true</maven.javadoc.skip>
<!--
Version of protobuf that hbase uses internally (we shade our pb) Must match what is out
in hbase-thirdparty include.
-->
<internal.protobuf.version>4.28.2</internal.protobuf.version>
</properties>
<dependencies>
<!--BE CAREFUL! Any dependency added here needs to be
Expand Down
55 changes: 13 additions & 42 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -838,7 +838,6 @@
modules and cause trouble if we only rely on transitive dependencies.
-->
<netty3.version>3.10.6.Final</netty3.version>
<netty4.version>4.1.112.Final</netty4.version>
<!-- end HBASE-15925 default hadoop compatibility values -->
<audience-annotations.version>0.15.0</audience-annotations.version>
<javadoc.audience-annotations.version>0.15.0</javadoc.audience-annotations.version>
Expand All @@ -854,14 +853,7 @@
<httpclient.version>4.5.13</httpclient.version>
<httpcore.version>4.4.13</httpcore.version>
<metrics-core.version>3.2.6</metrics-core.version>
<!--
Note that the version of jackson-[annotations,core,databind] must be kept in sync with the
version of jackson-jaxrs-json-provider shipped in hbase-thirdparty.
-->
<jackson.version>2.17.2</jackson.version>
<jackson.databind.version>2.17.2</jackson.databind.version>
<jaxb-api.version>2.3.1</jaxb-api.version>
<servlet.api.version>3.1.0</servlet.api.version>
<wx.rs.api.version>2.1.1</wx.rs.api.version>
<tomcat.jasper.version>9.0.93</tomcat.jasper.version>
<jruby.version>9.4.8.0</jruby.version>
Expand Down Expand Up @@ -899,7 +891,6 @@
-->
<checkstyle.version>8.29</checkstyle.version>
<exec.maven.version>3.1.0</exec.maven.version>
<error-prone.version>2.28.0</error-prone.version>
<jamon.plugin.version>2.4.2</jamon.plugin.version>
<lifecycle.mapping.version>1.0.0</lifecycle.mapping.version>
<maven.antrun.version>1.8</maven.antrun.version>
Expand All @@ -925,13 +916,12 @@
<lz4.version>1.8.0</lz4.version>
<snappy.version>1.1.10.4</snappy.version>
<zstd-jni.version>1.5.5-2</zstd-jni.version>
<!--
Note that the version of protobuf shipped in hbase-thirdparty must match the version used
in hbase-protocol-shaded and hbase-examples. The version of jackson-[annotations,core,
databind] must be kept in sync with the version of jackson-jaxrs-json-provider shipped in
hbase-thirdparty.
<hbase-thirdparty.version>4.1.10-SNAPSHOT</hbase-thirdparty.version>
<!-- Version of protobuf that hbase uses internally (we shade our pb). Must be kept in sync
with the version of protobuf shipped in hbase-thirdparty. We need this as the property is
needed by protobuf-maven-plugin to compile protoc
-->
<hbase-thirdparty.version>4.1.9</hbase-thirdparty.version>
<internal.protobuf.version>4.28.2</internal.protobuf.version>
<!-- Coverage properties -->
<jacoco.version>0.8.8</jacoco.version>
<jacocoArgLine/>
Expand Down Expand Up @@ -1528,32 +1518,12 @@
<artifactId>joni</artifactId>
<version>${joni.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
<version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>${jackson.databind.version}</version>
</dependency>
<dependency>
<groupId>org.jamon</groupId>
<artifactId>jamon-runtime</artifactId>
<version>${jamon-runtime.version}</version>
</dependency>
<!-- REST dependencies -->
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>${servlet.api.version}</version>
</dependency>
<dependency>
<groupId>javax.ws.rs</groupId>
<artifactId>javax.ws.rs-api</artifactId>
Expand Down Expand Up @@ -1767,6 +1737,14 @@
<artifactId>zstd-jni</artifactId>
<version>${zstd-jni.version}</version>
</dependency>
<!-- hbase-thirdparty bom -->
<dependency>
<groupId>org.apache.hbase.thirdparty</groupId>
<artifactId>hbase-thirdparty-bom</artifactId>
<version>${hbase-thirdparty.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<!-- shaded thirdparty -->
<dependency>
<groupId>org.apache.hbase.thirdparty</groupId>
Expand Down Expand Up @@ -1838,13 +1816,6 @@
<artifactId>netty</artifactId>
<version>${netty3.version}</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-bom</artifactId>
<version>${netty4.version}</version>
<type>pom</type>
<scope>import</scope>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does importing boms work this way? we can get transitivity over a series of imports?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes it seems to work!

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Proof added at #6366 (comment)

</dependency>
</dependencies>
</dependencyManagement>
<dependencies>
Expand Down