This is an automated email from the ASF dual-hosted git repository.
adoroszlai pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ozone.git
The following commit(s) were added to refs/heads/master by this push:
new ae0dd5c6d7f HDDS-14484. Clean up leftover references to Hadoop shaded
protobuf (#9659)
ae0dd5c6d7f is described below
commit ae0dd5c6d7fab6340d4ad628ec6a5056f5c79f2f
Author: Doroszlai, Attila <[email protected]>
AuthorDate: Fri Jan 23 15:09:39 2026 +0100
HDDS-14484. Clean up leftover references to Hadoop shaded protobuf (#9659)
---
hadoop-hdds/interface-client/dev-support/findbugsExcludeFile.xml | 3 ---
.../org/apache/hadoop/ozone/om/ha/OMFailoverProxyProviderBase.java | 1 -
hadoop-ozone/dev-support/checks/coverage.sh | 2 +-
hadoop-ozone/interface-client/dev-support/findbugsExcludeFile.xml | 6 ------
pom.xml | 2 +-
5 files changed, 2 insertions(+), 12 deletions(-)
diff --git a/hadoop-hdds/interface-client/dev-support/findbugsExcludeFile.xml
b/hadoop-hdds/interface-client/dev-support/findbugsExcludeFile.xml
index 3969355a300..18cdb6c5c4e 100644
--- a/hadoop-hdds/interface-client/dev-support/findbugsExcludeFile.xml
+++ b/hadoop-hdds/interface-client/dev-support/findbugsExcludeFile.xml
@@ -24,7 +24,4 @@
<Match>
<Package name="org.apache.hadoop.hdds.protocol.scm.proto"/>
</Match>
- <Match>
- <Package name="org.apache.hadoop.hdds.protocol.proto3"/>
- </Match>
</FindBugsFilter>
diff --git
a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/ha/OMFailoverProxyProviderBase.java
b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/ha/OMFailoverProxyProviderBase.java
index 739999d39f8..ae2c2e37d20 100644
---
a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/ha/OMFailoverProxyProviderBase.java
+++
b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/ha/OMFailoverProxyProviderBase.java
@@ -150,7 +150,6 @@ protected T createOMProxy(InetSocketAddress omAddress)
throws IOException {
Configuration hadoopConf =
LegacyHadoopConfigurationSource.asHadoopConfiguration(getConf());
- // TODO: Post upgrade to Protobuf 3.x we need to use ProtobufRpcEngine2
RPC.setProtocolEngine(hadoopConf, getInterface(), ProtobufRpcEngine.class);
// Ensure we do not attempt retry on the same OM in case of exceptions
diff --git a/hadoop-ozone/dev-support/checks/coverage.sh
b/hadoop-ozone/dev-support/checks/coverage.sh
index 3544bde8a3d..0d54fe3a1ae 100755
--- a/hadoop-ozone/dev-support/checks/coverage.sh
+++ b/hadoop-ozone/dev-support/checks/coverage.sh
@@ -49,7 +49,7 @@ find hadoop-ozone/dist/target/*/share/ozone/lib -name
'hdds-*.jar' -or -name 'oz
xargs -n1 unzip -o -q -d target/coverage-classes
#Exclude some classes from the coverage
-find target/coverage-classes -type d \( -name proto -or -name proto3 -or -name
codegen -or -name generated -or -name v1 -or -name freon \) \
+find target/coverage-classes -type d \( -name proto -or -name codegen -or
-name generated -or -name v1 -or -name freon \) \
| xargs rm -rf
#generate the reports
diff --git a/hadoop-ozone/interface-client/dev-support/findbugsExcludeFile.xml
b/hadoop-ozone/interface-client/dev-support/findbugsExcludeFile.xml
index 442b8aae014..ed27981af02 100644
--- a/hadoop-ozone/interface-client/dev-support/findbugsExcludeFile.xml
+++ b/hadoop-ozone/interface-client/dev-support/findbugsExcludeFile.xml
@@ -21,10 +21,4 @@
<Match>
<Package name="org.apache.hadoop.ozone.security.proto"/>
</Match>
- <Match>
- <Package name="org.apache.hadoop.ozone.protocol.proto3"/>
- </Match>
- <Match>
- <Package name="org.apache.hadoop.ozone.security.proto3"/>
- </Match>
</FindBugsFilter>
diff --git a/pom.xml b/pom.xml
index 216c80dd964..9e327beee16 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1724,7 +1724,7 @@
<artifactId>maven-javadoc-plugin</artifactId>
<version>${maven-javadoc-plugin.version}</version>
<configuration>
-
<excludePackageNames>org.apache.hadoop.hdds.protocol.datanode.proto:org.apache.hadoop.hdds.protocol.proto:org.apache.hadoop.hdds.protocol.proto3:org.apache.hadoop.hdds.protocol.scm.proto:org.apache.hadoop.ozone.protocol.proto:org.apache.hadoop.ozone.protocol.proto3:org.apache.hadoop.ozone.security.proto:org.apache.hadoop.ozone.security.proto3:org.apache.hadoop.ozone.storage.proto:org.apache.ozone.recon.schema.generated:org.apache.ozone.recon.schema.generated.tables</excludePa
[...]
+
<excludePackageNames>org.apache.hadoop.hdds.protocol.datanode.proto:org.apache.hadoop.hdds.protocol.proto:org.apache.hadoop.hdds.protocol.scm.proto:org.apache.hadoop.ozone.protocol.proto:org.apache.hadoop.ozone.security.proto:org.apache.hadoop.ozone.storage.proto:org.apache.ozone.recon.schema.generated:org.apache.ozone.recon.schema.generated.tables</excludePackageNames>
<sourceFileExcludes>
<exclude>**/package-info.java</exclude>
<exclude>**/org/apache/ozone/recon/schema/generated/tables/**/*.java</exclude>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
