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.

Sign up for GitHub

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

HBASE-28793 Update hbase-thirdparty to 4.1.8 #6166

Merged
merged 2 commits into from
Aug 31, 2024
Merged

HBASE-28793 Update hbase-thirdparty to 4.1.8 #6166

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d54c364
HBASE-28793 Update hbase-thirdparty to 4.1.8
pankaj72981 Aug 18, 2024
c476594
HBASE-28793 Removed hbase-thirdparty 4.1.8RC1 staging repository
pankaj72981 Aug 30, 2024
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
2 changes: 1 addition & 1 deletion hbase-examples/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
<!--Version of protobuf that hbase uses internally (we shade our pb)
Must match what is out in hbase-thirdparty include.
-->
<internal.protobuf.version>4.26.1</internal.protobuf.version>
<internal.protobuf.version>4.27.3</internal.protobuf.version>
</properties>
<dependencies>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestsDriver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ protected void addOptions() {

@Override
protected void processOptions(CommandLine cmd) {
String testFilterString = cmd.getOptionValue(SHORT_REGEX_ARG, null);
String testFilterString = cmd.getOptionValue(SHORT_REGEX_ARG);
if (testFilterString != null) {
intTestFilter.setPattern(testFilterString);
}
Expand Down
2 changes: 1 addition & 1 deletion hbase-protocol-shaded/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
<!--Version of protobuf that hbase uses internally (we shade our pb)
Must match what is out in hbase-thirdparty include.
-->
<internal.protobuf.version>4.26.1</internal.protobuf.version>
<internal.protobuf.version>4.27.3</internal.protobuf.version>
</properties>
<dependencies>
<!--BE CAREFUL! Any dependency added here needs to be
Expand Down
2 changes: 1 addition & 1 deletion hbase-server/src/main/java/org/apache/hadoop/hbase/util/compaction/MajorCompactor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -420,7 +420,7 @@ public int run(String[] args) throws Exception {
return -1;
}
String tableName = commandLine.getOptionValue("table");
String cf = commandLine.getOptionValue("cf", null);
String cf = commandLine.getOptionValue("cf");
Set<String> families = Sets.newHashSet();
if (cf != null) {
Iterables.addAll(families, Splitter.on(",").split(cf));
Expand Down
4 changes: 2 additions & 2 deletions hbase-server/src/test/java/org/apache/hadoop/hbase/quotas/TestSpaceQuotasWithSnapshots.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ public boolean evaluate() throws Exception {
// Make sure we see the "final" new size for the table, not some intermediate
waitForStableRegionSizeReport(conn, tn);
final long finalSize = getRegionSizeReportForTable(conn, tn);
assertNotNull("Did not expect to see a null size", finalSize);
assertTrue("Table data size must be greater than zero", finalSize > 0);
LOG.info("Last seen size: " + finalSize);

// Make sure the QuotaObserverChore has time to reflect the new region size reports
Expand Down Expand Up @@ -263,7 +263,7 @@ public boolean evaluate() throws Exception {
// Make sure we see the "final" new size for the table, not some intermediate
waitForStableRegionSizeReport(conn, tn);
final long finalSize = getRegionSizeReportForTable(conn, tn);
assertNotNull("Did not expect to see a null size", finalSize);
assertTrue("Table data size must be greater than zero", finalSize > 0);
LOG.info("Final observed size of table: " + finalSize);

// Make sure the QuotaObserverChore has time to reflect the new region size reports
Expand Down
10 changes: 5 additions & 5 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -832,7 +832,7 @@
modules and cause trouble if we only rely on transitive dependencies.
-->
<netty3.version>3.10.6.Final</netty3.version>
<netty4.version>4.1.108.Final</netty4.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 @@ -852,8 +852,8 @@
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.0</jackson.version>
<jackson.databind.version>2.17.0</jackson.databind.version>
<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>
Expand Down Expand Up @@ -894,7 +894,7 @@
-->
<checkstyle.version>8.29</checkstyle.version>
<exec.maven.version>3.1.0</exec.maven.version>
<error-prone.version>2.26.1</error-prone.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 Down Expand Up @@ -926,7 +926,7 @@
databind] must be kept in sync with the version of jackson-jaxrs-json-provider shipped in
hbase-thirdparty.
-->
<hbase-thirdparty.version>4.1.7</hbase-thirdparty.version>
<hbase-thirdparty.version>4.1.8</hbase-thirdparty.version>
NihalJain marked this conversation as resolved.
Show resolved Hide resolved
<!-- Coverage properties -->
<jacoco.version>0.8.8</jacoco.version>
<jacocoArgLine/>
Expand Down