From commits-return-4611-archive-asf-public=cust-asf.ponee.io@bigtop.apache.org Mon Nov 16 13:12:46 2020 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mxout1-ec2-va.apache.org (mxout1-ec2-va.apache.org [3.227.148.255]) by mx-eu-01.ponee.io (Postfix) with ESMTPS id CDDD918064A for ; Mon, 16 Nov 2020 14:12:45 +0100 (CET) Received: from mail.apache.org (mailroute1-lw-us.apache.org [207.244.88.153]) by mxout1-ec2-va.apache.org (ASF Mail Server at mxout1-ec2-va.apache.org) with SMTP id 1CCB746A6E for ; Mon, 16 Nov 2020 13:12:45 +0000 (UTC) Received: (qmail 69977 invoked by uid 500); 16 Nov 2020 13:12:44 -0000 Mailing-List: contact commits-help@bigtop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: bigtop-dev@bigtop.apache.org Delivered-To: mailing list commits@bigtop.apache.org Received: (qmail 69968 invoked by uid 99); 16 Nov 2020 13:12:44 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 16 Nov 2020 13:12:44 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id AC7658087C; Mon, 16 Nov 2020 13:12:44 +0000 (UTC) Date: Mon, 16 Nov 2020 13:12:44 +0000 To: "commits@bigtop.apache.org" Subject: [bigtop] branch master updated: BIGTOP-3449. Failed to build Haddop-2.10.1 on Arm64. (#701) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <160553236459.9413.16903080104847789092@gitbox.apache.org> From: sekikn@apache.org X-Git-Host: gitbox.apache.org X-Git-Repo: bigtop X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: bae3cd98538493dfa15a54e8c36786be255164d6 X-Git-Newrev: 0b45e14fec8e17af4ae7b2660933783d6b71448c X-Git-Rev: 0b45e14fec8e17af4ae7b2660933783d6b71448c X-Git-NotificationType: ref_changed_plus_diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated This is an automated email from the ASF dual-hosted git repository. sekikn pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/bigtop.git The following commit(s) were added to refs/heads/master by this push: new 0b45e14 BIGTOP-3449. Failed to build Haddop-2.10.1 on Arm64. (#701) 0b45e14 is described below commit 0b45e14fec8e17af4ae7b2660933783d6b71448c Author: Masatake Iwasaki AuthorDate: Mon Nov 16 22:11:57 2020 +0900 BIGTOP-3449. Failed to build Haddop-2.10.1 on Arm64. (#701) --- .../common/hadoop/patch0-revert-HADOOP-16598.diff | 796 +++++++++++++++++++++ 1 file changed, 796 insertions(+) diff --git a/bigtop-packages/src/common/hadoop/patch0-revert-HADOOP-16598.diff b/bigtop-packages/src/common/hadoop/patch0-revert-HADOOP-16598.diff new file mode 100644 index 0000000..8a7cae4 --- /dev/null +++ b/bigtop-packages/src/common/hadoop/patch0-revert-HADOOP-16598.diff @@ -0,0 +1,796 @@ +commit 49478f7a59d52cbb379f641d9e7a8ac5e08e3c0f +Author: Masatake Iwasaki +Date: Mon Nov 16 03:54:23 2020 +0000 + + Revert "HADOOP-16598. Backport "HADOOP-16558 [COMMON+HDFS] use protobuf-maven-plugin to generate protobuf classes" to all active branches" + + This reverts commit e649b30b32962256aa2fb48f8c69d30a705a1220. + +diff --git a/hadoop-common-project/hadoop-common/pom.xml b/hadoop-common-project/hadoop-common/pom.xml +index 1da0b49dc7a..e79e1e2d3cd 100644 +--- a/hadoop-common-project/hadoop-common/pom.xml ++++ b/hadoop-common-project/hadoop-common/pom.xml +@@ -369,20 +369,6 @@ + + + +- +- org.xolstice.maven.plugins +- protobuf-maven-plugin +- +- +- src-compile-protoc +- false +- +- +- src-test-compile-protoc +- false +- +- +- + + org.apache.hadoop + hadoop-maven-plugins +@@ -403,6 +389,57 @@ + + + ++ ++ compile-protoc ++ ++ protoc ++ ++ ++ ${protobuf.version} ++ ${protoc.path} ++ ++ ${basedir}/src/main/proto ++ ++ ++ ${basedir}/src/main/proto ++ ++ HAServiceProtocol.proto ++ IpcConnectionContext.proto ++ ProtocolInfo.proto ++ RpcHeader.proto ++ ZKFCProtocol.proto ++ ProtobufRpcEngine.proto ++ Security.proto ++ GetUserMappingsProtocol.proto ++ TraceAdmin.proto ++ RefreshAuthorizationPolicyProtocol.proto ++ RefreshUserMappingsProtocol.proto ++ RefreshCallQueueProtocol.proto ++ GenericRefreshProtocol.proto ++ ++ ++ ++ ++ ++ compile-test-protoc ++ ++ test-protoc ++ ++ ++ ${protobuf.version} ++ ${protoc.path} ++ ++ ${basedir}/src/test/proto ++ ++ ++ ${basedir}/src/test/proto ++ ++ test.proto ++ test_rpc_service.proto ++ ++ ++ ++ + + + +diff --git a/hadoop-common-project/hadoop-common/src/main/proto/GenericRefreshProtocol.proto b/hadoop-common-project/hadoop-common/src/main/proto/GenericRefreshProtocol.proto +index 6296f88da69..fe465490b19 100644 +--- a/hadoop-common-project/hadoop-common/src/main/proto/GenericRefreshProtocol.proto ++++ b/hadoop-common-project/hadoop-common/src/main/proto/GenericRefreshProtocol.proto +@@ -21,7 +21,7 @@ + * Please see http://wiki.apache.org/hadoop/Compatibility + * for what changes are allowed for a *stable* .proto interface. + */ +-syntax = "proto2"; ++ + option java_package = "org.apache.hadoop.ipc.proto"; + option java_outer_classname = "GenericRefreshProtocolProtos"; + option java_generic_services = true; +diff --git a/hadoop-common-project/hadoop-common/src/main/proto/GetUserMappingsProtocol.proto b/hadoop-common-project/hadoop-common/src/main/proto/GetUserMappingsProtocol.proto +index cb91a13b048..51552b879f3 100644 +--- a/hadoop-common-project/hadoop-common/src/main/proto/GetUserMappingsProtocol.proto ++++ b/hadoop-common-project/hadoop-common/src/main/proto/GetUserMappingsProtocol.proto +@@ -21,7 +21,7 @@ + * Please see http://wiki.apache.org/hadoop/Compatibility + * for what changes are allowed for a *stable* .proto interface. + */ +-syntax = "proto2"; ++ + option java_package = "org.apache.hadoop.tools.proto"; + option java_outer_classname = "GetUserMappingsProtocolProtos"; + option java_generic_services = true; +diff --git a/hadoop-common-project/hadoop-common/src/main/proto/HAServiceProtocol.proto b/hadoop-common-project/hadoop-common/src/main/proto/HAServiceProtocol.proto +index 5a88a7ff03f..16ee9a2e0a5 100644 +--- a/hadoop-common-project/hadoop-common/src/main/proto/HAServiceProtocol.proto ++++ b/hadoop-common-project/hadoop-common/src/main/proto/HAServiceProtocol.proto +@@ -21,7 +21,7 @@ + * Please see http://wiki.apache.org/hadoop/Compatibility + * for what changes are allowed for a *stable* .proto interface. + */ +-syntax = "proto2"; ++ + option java_package = "org.apache.hadoop.ha.proto"; + option java_outer_classname = "HAServiceProtocolProtos"; + option java_generic_services = true; +diff --git a/hadoop-common-project/hadoop-common/src/main/proto/IpcConnectionContext.proto b/hadoop-common-project/hadoop-common/src/main/proto/IpcConnectionContext.proto +index 16e2fb7c4db..4557e893cff 100644 +--- a/hadoop-common-project/hadoop-common/src/main/proto/IpcConnectionContext.proto ++++ b/hadoop-common-project/hadoop-common/src/main/proto/IpcConnectionContext.proto +@@ -21,7 +21,7 @@ + * Please see http://wiki.apache.org/hadoop/Compatibility + * for what changes are allowed for a *stable* .proto interface. + */ +-syntax = "proto2"; ++ + option java_package = "org.apache.hadoop.ipc.protobuf"; + option java_outer_classname = "IpcConnectionContextProtos"; + option java_generate_equals_and_hash = true; +diff --git a/hadoop-common-project/hadoop-common/src/main/proto/ProtobufRpcEngine.proto b/hadoop-common-project/hadoop-common/src/main/proto/ProtobufRpcEngine.proto +index fa113134027..a17e2078e94 100644 +--- a/hadoop-common-project/hadoop-common/src/main/proto/ProtobufRpcEngine.proto ++++ b/hadoop-common-project/hadoop-common/src/main/proto/ProtobufRpcEngine.proto +@@ -21,7 +21,7 @@ + * Please see http://wiki.apache.org/hadoop/Compatibility + * for what changes are allowed for a *stable* .proto interface. + */ +-syntax = "proto2"; ++ + /** + * These are the messages used by Hadoop RPC for the Rpc Engine Protocol Buffer + * to marshal the request and response in the RPC layer. +diff --git a/hadoop-common-project/hadoop-common/src/main/proto/ProtocolInfo.proto b/hadoop-common-project/hadoop-common/src/main/proto/ProtocolInfo.proto +index 0e9d0d4baa4..fdbc440d91c 100644 +--- a/hadoop-common-project/hadoop-common/src/main/proto/ProtocolInfo.proto ++++ b/hadoop-common-project/hadoop-common/src/main/proto/ProtocolInfo.proto +@@ -21,7 +21,7 @@ + * Please see http://wiki.apache.org/hadoop/Compatibility + * for what changes are allowed for a *stable* .proto interface. + */ +-syntax = "proto2"; ++ + option java_package = "org.apache.hadoop.ipc.protobuf"; + option java_outer_classname = "ProtocolInfoProtos"; + option java_generic_services = true; +diff --git a/hadoop-common-project/hadoop-common/src/main/proto/RefreshAuthorizationPolicyProtocol.proto b/hadoop-common-project/hadoop-common/src/main/proto/RefreshAuthorizationPolicyProtocol.proto +index f57c6d63039..5ef1c2d0a8c 100644 +--- a/hadoop-common-project/hadoop-common/src/main/proto/RefreshAuthorizationPolicyProtocol.proto ++++ b/hadoop-common-project/hadoop-common/src/main/proto/RefreshAuthorizationPolicyProtocol.proto +@@ -21,7 +21,7 @@ + * Please see http://wiki.apache.org/hadoop/Compatibility + * for what changes are allowed for a *stable* .proto interface. + */ +-syntax = "proto2"; ++ + option java_package = "org.apache.hadoop.security.proto"; + option java_outer_classname = "RefreshAuthorizationPolicyProtocolProtos"; + option java_generic_services = true; +diff --git a/hadoop-common-project/hadoop-common/src/main/proto/RefreshCallQueueProtocol.proto b/hadoop-common-project/hadoop-common/src/main/proto/RefreshCallQueueProtocol.proto +index 463b7c548fe..67ed1332510 100644 +--- a/hadoop-common-project/hadoop-common/src/main/proto/RefreshCallQueueProtocol.proto ++++ b/hadoop-common-project/hadoop-common/src/main/proto/RefreshCallQueueProtocol.proto +@@ -21,7 +21,7 @@ + * Please see http://wiki.apache.org/hadoop/Compatibility + * for what changes are allowed for a *stable* .proto interface. + */ +-syntax = "proto2"; ++ + option java_package = "org.apache.hadoop.ipc.proto"; + option java_outer_classname = "RefreshCallQueueProtocolProtos"; + option java_generic_services = true; +diff --git a/hadoop-common-project/hadoop-common/src/main/proto/RefreshUserMappingsProtocol.proto b/hadoop-common-project/hadoop-common/src/main/proto/RefreshUserMappingsProtocol.proto +index a1130f5c2d9..41031ed9ea0 100644 +--- a/hadoop-common-project/hadoop-common/src/main/proto/RefreshUserMappingsProtocol.proto ++++ b/hadoop-common-project/hadoop-common/src/main/proto/RefreshUserMappingsProtocol.proto +@@ -21,7 +21,7 @@ + * Please see http://wiki.apache.org/hadoop/Compatibility + * for what changes are allowed for a *stable* .proto interface. + */ +-syntax = "proto2"; ++ + option java_package = "org.apache.hadoop.security.proto"; + option java_outer_classname = "RefreshUserMappingsProtocolProtos"; + option java_generic_services = true; +diff --git a/hadoop-common-project/hadoop-common/src/main/proto/RpcHeader.proto b/hadoop-common-project/hadoop-common/src/main/proto/RpcHeader.proto +index 4705b4276b8..e8d8cbbfe70 100644 +--- a/hadoop-common-project/hadoop-common/src/main/proto/RpcHeader.proto ++++ b/hadoop-common-project/hadoop-common/src/main/proto/RpcHeader.proto +@@ -21,7 +21,7 @@ + * Please see http://wiki.apache.org/hadoop/Compatibility + * for what changes are allowed for a *stable* .proto interface. + */ +-syntax = "proto2"; ++ + option java_package = "org.apache.hadoop.ipc.protobuf"; + option java_outer_classname = "RpcHeaderProtos"; + option java_generate_equals_and_hash = true; +diff --git a/hadoop-common-project/hadoop-common/src/main/proto/Security.proto b/hadoop-common-project/hadoop-common/src/main/proto/Security.proto +index 736850110b6..5ff571decf5 100644 +--- a/hadoop-common-project/hadoop-common/src/main/proto/Security.proto ++++ b/hadoop-common-project/hadoop-common/src/main/proto/Security.proto +@@ -21,7 +21,7 @@ + * Please see http://wiki.apache.org/hadoop/Compatibility + * for what changes are allowed for a *stable* .proto interface. + */ +-syntax = "proto2"; ++ + option java_package = "org.apache.hadoop.security.proto"; + option java_outer_classname = "SecurityProtos"; + option java_generic_services = true; +diff --git a/hadoop-common-project/hadoop-common/src/main/proto/TraceAdmin.proto b/hadoop-common-project/hadoop-common/src/main/proto/TraceAdmin.proto +index 8cf131bfb46..52d2a90abf4 100644 +--- a/hadoop-common-project/hadoop-common/src/main/proto/TraceAdmin.proto ++++ b/hadoop-common-project/hadoop-common/src/main/proto/TraceAdmin.proto +@@ -21,7 +21,7 @@ + * Please see http://wiki.apache.org/hadoop/Compatibility + * for what changes are allowed for a *stable* .proto interface. + */ +-syntax = "proto2"; ++ + option java_package = "org.apache.hadoop.tracing"; + option java_outer_classname = "TraceAdminPB"; + option java_generic_services = true; +diff --git a/hadoop-common-project/hadoop-common/src/main/proto/ZKFCProtocol.proto b/hadoop-common-project/hadoop-common/src/main/proto/ZKFCProtocol.proto +index 98bc05f4a36..a2b8dd10b30 100644 +--- a/hadoop-common-project/hadoop-common/src/main/proto/ZKFCProtocol.proto ++++ b/hadoop-common-project/hadoop-common/src/main/proto/ZKFCProtocol.proto +@@ -21,7 +21,7 @@ + * Please see http://wiki.apache.org/hadoop/Compatibility + * for what changes are allowed for a *stable* .proto interface. + */ +-syntax = "proto2"; ++ + option java_package = "org.apache.hadoop.ha.proto"; + option java_outer_classname = "ZKFCProtocolProtos"; + option java_generic_services = true; +diff --git a/hadoop-common-project/hadoop-common/src/test/proto/test.proto b/hadoop-common-project/hadoop-common/src/test/proto/test.proto +index c5425f945c0..be148d1f475 100644 +--- a/hadoop-common-project/hadoop-common/src/test/proto/test.proto ++++ b/hadoop-common-project/hadoop-common/src/test/proto/test.proto +@@ -15,7 +15,7 @@ + * See the License for the specific language governing permissions and + * limitations under the License. + */ +-syntax = "proto2"; ++ + option java_package = "org.apache.hadoop.ipc.protobuf"; + option java_outer_classname = "TestProtos"; + option java_generate_equals_and_hash = true; +diff --git a/hadoop-common-project/hadoop-common/src/test/proto/test_rpc_service.proto b/hadoop-common-project/hadoop-common/src/test/proto/test_rpc_service.proto +index 9fdfb59dbd6..b0121ca217a 100644 +--- a/hadoop-common-project/hadoop-common/src/test/proto/test_rpc_service.proto ++++ b/hadoop-common-project/hadoop-common/src/test/proto/test_rpc_service.proto +@@ -15,7 +15,6 @@ + * See the License for the specific language governing permissions and + * limitations under the License. + */ +-syntax = "proto2"; + option java_package = "org.apache.hadoop.ipc.protobuf"; + option java_outer_classname = "TestRpcServiceProtos"; + option java_generic_services = true; +diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/pom.xml b/hadoop-hdfs-project/hadoop-hdfs-client/pom.xml +index 8b1b3dcdcc8..fe26603d81e 100644 +--- a/hadoop-hdfs-project/hadoop-hdfs-client/pom.xml ++++ b/hadoop-hdfs-project/hadoop-hdfs-client/pom.xml +@@ -124,18 +124,35 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> + + + +- org.xolstice.maven.plugins +- protobuf-maven-plugin ++ org.apache.hadoop ++ hadoop-maven-plugins + + +- src-compile-protoc ++ compile-protoc ++ ++ protoc ++ + +- false +- +- +- ${basedir}/../../hadoop-common-project/hadoop-common/src/main/proto +- +- ++ ${protobuf.version} ++ ${protoc.path} ++ ++ ${basedir}/../../hadoop-common-project/hadoop-common/src/main/proto ++ ${basedir}/src/main/proto ++ ++ ++ ${basedir}/src/main/proto ++ ++ ClientDatanodeProtocol.proto ++ ClientNamenodeProtocol.proto ++ acl.proto ++ xattr.proto ++ datatransfer.proto ++ hdfs.proto ++ encryption.proto ++ inotify.proto ++ ReconfigurationProtocol.proto ++ ++ + + + +diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/proto/ClientDatanodeProtocol.proto b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/proto/ClientDatanodeProtocol.proto +index bcc6ed4f7ca..b9077f6ef01 100644 +--- a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/proto/ClientDatanodeProtocol.proto ++++ b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/proto/ClientDatanodeProtocol.proto +@@ -21,7 +21,7 @@ + * Please see http://wiki.apache.org/hadoop/Compatibility + * for what changes are allowed for a *stable* .proto interface. + */ +-syntax="proto2"; ++ + // This file contains protocol buffers that are used throughout HDFS -- i.e. + // by the client, server, and data transfer protocols. + +diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/proto/ClientNamenodeProtocol.proto b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/proto/ClientNamenodeProtocol.proto +index bb4d5e8c3d9..1dbf56ced3f 100644 +--- a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/proto/ClientNamenodeProtocol.proto ++++ b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/proto/ClientNamenodeProtocol.proto +@@ -21,7 +21,7 @@ + * Please see http://wiki.apache.org/hadoop/Compatibility + * for what changes are allowed for a *stable* .proto interface. + */ +-syntax="proto2"; ++ + option java_package = "org.apache.hadoop.hdfs.protocol.proto"; + option java_outer_classname = "ClientNamenodeProtocolProtos"; + option java_generic_services = true; +diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/proto/ReconfigurationProtocol.proto b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/proto/ReconfigurationProtocol.proto +index bad9f45cf62..12a38b110fe 100644 +--- a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/proto/ReconfigurationProtocol.proto ++++ b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/proto/ReconfigurationProtocol.proto +@@ -15,7 +15,7 @@ + * See the License for the specific language governing permissions and + * limitations under the License. + */ +-syntax="proto2"; ++ + // This file contains protocol buffers that are used to reconfigure NameNode + // and DataNode by HDFS admin. + +diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/proto/acl.proto b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/proto/acl.proto +index 32aac91df30..bb7fdb0168f 100644 +--- a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/proto/acl.proto ++++ b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/proto/acl.proto +@@ -15,7 +15,7 @@ + * See the License for the specific language governing permissions and + * limitations under the License. + */ +-syntax="proto2"; ++ + option java_package = "org.apache.hadoop.hdfs.protocol.proto"; + option java_outer_classname = "AclProtos"; + option java_generate_equals_and_hash = true; +diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/proto/datatransfer.proto b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/proto/datatransfer.proto +index 91b58d2bd23..135bab1625f 100644 +--- a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/proto/datatransfer.proto ++++ b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/proto/datatransfer.proto +@@ -21,7 +21,7 @@ + * Please see http://wiki.apache.org/hadoop/Compatibility + * for what changes are allowed for a *stable* .proto interface. + */ +-syntax="proto2"; ++ + // This file contains protocol buffers that are used to transfer data + // to and from the datanode, as well as between datanodes. + +diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/proto/encryption.proto b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/proto/encryption.proto +index 6a2e0a19769..68b2f3af29c 100644 +--- a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/proto/encryption.proto ++++ b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/proto/encryption.proto +@@ -21,7 +21,7 @@ + * Please see http://wiki.apache.org/hadoop/Compatibility + * for what changes are allowed for a *stable* .proto interface. + */ +-syntax="proto2"; ++ + // This file contains protocol buffers that are used throughout HDFS -- i.e. + // by the client, server, and data transfer protocols. + +diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/proto/hdfs.proto b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/proto/hdfs.proto +index c07dd9e8c97..04f8730c5f7 100644 +--- a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/proto/hdfs.proto ++++ b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/proto/hdfs.proto +@@ -21,7 +21,7 @@ + * Please see http://wiki.apache.org/hadoop/Compatibility + * for what changes are allowed for a *stable* .proto interface. + */ +-syntax="proto2"; ++ + // This file contains protocol buffers that are used throughout HDFS -- i.e. + // by the client, server, and data transfer protocols. + +diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/proto/inotify.proto b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/proto/inotify.proto +index dfc6618b10a..53399029582 100644 +--- a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/proto/inotify.proto ++++ b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/proto/inotify.proto +@@ -21,7 +21,7 @@ + * Please see http://wiki.apache.org/hadoop/Compatibility + * for what changes are allowed for a *stable* .proto interface. + */ +-syntax="proto2"; ++ + // This file contains protocol buffers used to communicate edits to clients + // as part of the inotify system. + +diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/proto/xattr.proto b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/proto/xattr.proto +index a53aa86c16d..6c8b5eb5943 100644 +--- a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/proto/xattr.proto ++++ b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/proto/xattr.proto +@@ -15,7 +15,7 @@ + * See the License for the specific language governing permissions and + * limitations under the License. + */ +-syntax="proto2"; ++ + option java_package = "org.apache.hadoop.hdfs.protocol.proto"; + option java_outer_classname = "XAttrProtos"; + option java_generate_equals_and_hash = true; +diff --git a/hadoop-hdfs-project/hadoop-hdfs-rbf/pom.xml b/hadoop-hdfs-project/hadoop-hdfs-rbf/pom.xml +index 3944308f8b2..02339640576 100644 +--- a/hadoop-hdfs-project/hadoop-hdfs-rbf/pom.xml ++++ b/hadoop-hdfs-project/hadoop-hdfs-rbf/pom.xml +@@ -179,21 +179,29 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> + + + +- org.xolstice.maven.plugins +- protobuf-maven-plugin ++ org.apache.hadoop ++ hadoop-maven-plugins + + +- src-compile-protoc ++ compile-protoc ++ ++ protoc ++ + +- false +- +- +- ${basedir}/../../hadoop-common-project/hadoop-common/src/main/proto +- +- +- ${basedir}/../hadoop-hdfs-client/src/main/proto +- +- ++ ${protobuf.version} ++ ${protoc.path} ++ ++ ${basedir}/../hadoop-hdfs-client/src/main/proto ++ ${basedir}/../../hadoop-common-project/hadoop-common/src/main/proto ++ ${basedir}/src/main/proto ++ ++ ++ ${basedir}/src/main/proto ++ ++ FederationProtocol.proto ++ RouterProtocol.proto ++ ++ + + + +diff --git a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/proto/FederationProtocol.proto b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/proto/FederationProtocol.proto +index a7ef1a46843..2ea240c11d1 100644 +--- a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/proto/FederationProtocol.proto ++++ b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/proto/FederationProtocol.proto +@@ -15,7 +15,7 @@ + * See the License for the specific language governing permissions and + * limitations under the License. + */ +-syntax = "proto2"; ++ + option java_package = "org.apache.hadoop.hdfs.federation.protocol.proto"; + option java_outer_classname = "HdfsServerFederationProtos"; + option java_generic_services = true; +diff --git a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/proto/RouterProtocol.proto b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/proto/RouterProtocol.proto +index 3eff0929775..f3a2b6e8abc 100644 +--- a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/proto/RouterProtocol.proto ++++ b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/proto/RouterProtocol.proto +@@ -15,7 +15,7 @@ + * See the License for the specific language governing permissions and + * limitations under the License. + */ +-syntax = "proto2"; ++ + option java_package = "org.apache.hadoop.hdfs.protocol.proto"; + option java_outer_classname = "RouterProtocolProtos"; + option java_generic_services = true; +diff --git a/hadoop-hdfs-project/hadoop-hdfs/pom.xml b/hadoop-hdfs-project/hadoop-hdfs/pom.xml +index 97c7cec5998..573e2d68dd8 100644 +--- a/hadoop-hdfs-project/hadoop-hdfs/pom.xml ++++ b/hadoop-hdfs-project/hadoop-hdfs/pom.xml +@@ -324,21 +324,37 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> + + + +- org.xolstice.maven.plugins +- protobuf-maven-plugin ++ org.apache.hadoop ++ hadoop-maven-plugins + + +- src-compile-protoc ++ compile-protoc ++ ++ protoc ++ + +- false +- +- +- ${basedir}/../../hadoop-common-project/hadoop-common/src/main/proto +- +- +- ${basedir}/../hadoop-hdfs-client/src/main/proto +- +- ++ ${protobuf.version} ++ ${protoc.path} ++ ++ ${basedir}/../../hadoop-common-project/hadoop-common/src/main/proto ++ ${basedir}/../hadoop-hdfs-client/src/main/proto ++ ${basedir}/src/main/proto ++ ++ ++ ${basedir}/src/main/proto ++ ++ HdfsServer.proto ++ DatanodeProtocol.proto ++ DatanodeLifelineProtocol.proto ++ HAZKInfo.proto ++ InterDatanodeProtocol.proto ++ JournalProtocol.proto ++ NamenodeProtocol.proto ++ QJournalProtocol.proto ++ editlog.proto ++ fsimage.proto ++ ++ + + + +diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/contrib/bkjournal/src/main/proto/bkjournal.proto b/hadoop-hdfs-project/hadoop-hdfs/src/contrib/bkjournal/src/main/proto/bkjournal.proto +index 4b7a5f261cf..fc487186c53 100644 +--- a/hadoop-hdfs-project/hadoop-hdfs/src/contrib/bkjournal/src/main/proto/bkjournal.proto ++++ b/hadoop-hdfs-project/hadoop-hdfs/src/contrib/bkjournal/src/main/proto/bkjournal.proto +@@ -19,7 +19,6 @@ + // This file contains protocol buffers that are used by bkjournal + // mostly for storing data in zookeeper + +-syntax = "proto2"; + option java_package = "org.apache.hadoop.contrib.bkjournal"; + option java_outer_classname = "BKJournalProtos"; + option java_generate_equals_and_hash = true; +@@ -46,4 +45,4 @@ message MaxTxIdProto { + message CurrentInprogressProto { + required string path = 1; + optional string hostname = 2; +-} ++} +\ No newline at end of file +diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/proto/DatanodeLifelineProtocol.proto b/hadoop-hdfs-project/hadoop-hdfs/src/main/proto/DatanodeLifelineProtocol.proto +index e10a8861e61..b6ab75653a1 100644 +--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/proto/DatanodeLifelineProtocol.proto ++++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/proto/DatanodeLifelineProtocol.proto +@@ -21,7 +21,7 @@ + * Please see http://wiki.apache.org/hadoop/Compatibility + * for what changes are allowed for a *stable* .proto interface. + */ +-syntax = "proto2"; ++ + option java_package = "org.apache.hadoop.hdfs.protocol.proto"; + option java_outer_classname = "DatanodeLifelineProtocolProtos"; + option java_generic_services = true; +diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/proto/DatanodeProtocol.proto b/hadoop-hdfs-project/hadoop-hdfs/src/main/proto/DatanodeProtocol.proto +index 89b7c96efc7..0e4b2fb959c 100644 +--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/proto/DatanodeProtocol.proto ++++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/proto/DatanodeProtocol.proto +@@ -24,7 +24,7 @@ + + // This file contains protocol buffers that are used throughout HDFS -- i.e. + // by the client, server, and data transfer protocols. +-syntax = "proto2"; ++ + option java_package = "org.apache.hadoop.hdfs.protocol.proto"; + option java_outer_classname = "DatanodeProtocolProtos"; + option java_generic_services = true; +diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/proto/HAZKInfo.proto b/hadoop-hdfs-project/hadoop-hdfs/src/main/proto/HAZKInfo.proto +index 6d45a935ee4..aa8b6be4532 100644 +--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/proto/HAZKInfo.proto ++++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/proto/HAZKInfo.proto +@@ -21,7 +21,7 @@ + * Please see http://wiki.apache.org/hadoop/Compatibility + * for what changes are allowed for a *stable* .proto interface. + */ +-syntax = "proto2"; ++ + option java_package = "org.apache.hadoop.hdfs.server.namenode.ha.proto"; + option java_outer_classname = "HAZKInfoProtos"; + package hadoop.hdfs; +diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/proto/HdfsServer.proto b/hadoop-hdfs-project/hadoop-hdfs/src/main/proto/HdfsServer.proto +index 266024e3696..4c84615a494 100644 +--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/proto/HdfsServer.proto ++++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/proto/HdfsServer.proto +@@ -24,7 +24,7 @@ + + // This file contains protocol buffers that are used throughout HDFS -- i.e. + // by the client, server, and data transfer protocols. +-syntax = "proto2"; ++ + + option java_package = "org.apache.hadoop.hdfs.protocol.proto"; + option java_outer_classname = "HdfsServerProtos"; +diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/proto/InterDatanodeProtocol.proto b/hadoop-hdfs-project/hadoop-hdfs/src/main/proto/InterDatanodeProtocol.proto +index 47332a8817b..580f8d34730 100644 +--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/proto/InterDatanodeProtocol.proto ++++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/proto/InterDatanodeProtocol.proto +@@ -24,7 +24,7 @@ + + // This file contains protocol buffers that are used throughout HDFS -- i.e. + // by the client, server, and data transfer protocols. +-syntax = "proto2"; ++ + option java_package = "org.apache.hadoop.hdfs.protocol.proto"; + option java_outer_classname = "InterDatanodeProtocolProtos"; + option java_generic_services = true; +diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/proto/JournalProtocol.proto b/hadoop-hdfs-project/hadoop-hdfs/src/main/proto/JournalProtocol.proto +index 35c401e33e5..3fd029b7362 100644 +--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/proto/JournalProtocol.proto ++++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/proto/JournalProtocol.proto +@@ -24,7 +24,7 @@ + + // This file contains protocol buffers that are used throughout HDFS -- i.e. + // by the client, server, and data transfer protocols. +-syntax = "proto2"; ++ + option java_package = "org.apache.hadoop.hdfs.protocol.proto"; + option java_outer_classname = "JournalProtocolProtos"; + option java_generic_services = true; +diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/proto/NamenodeProtocol.proto b/hadoop-hdfs-project/hadoop-hdfs/src/main/proto/NamenodeProtocol.proto +index 201039890a4..8aa09d32ce4 100644 +--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/proto/NamenodeProtocol.proto ++++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/proto/NamenodeProtocol.proto +@@ -24,7 +24,7 @@ + + // This file contains protocol buffers that are used throughout HDFS -- i.e. + // by the client, server, and data transfer protocols. +-syntax = "proto2"; ++ + option java_package = "org.apache.hadoop.hdfs.protocol.proto"; + option java_outer_classname = "NamenodeProtocolProtos"; + option java_generic_services = true; +diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/proto/QJournalProtocol.proto b/hadoop-hdfs-project/hadoop-hdfs/src/main/proto/QJournalProtocol.proto +index b33d99c39a9..d230166e908 100644 +--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/proto/QJournalProtocol.proto ++++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/proto/QJournalProtocol.proto +@@ -21,7 +21,7 @@ + * Please see http://wiki.apache.org/hadoop/Compatibility + * for what changes are allowed for a *stable* .proto interface. + */ +-syntax = "proto2"; ++ + option java_package = "org.apache.hadoop.hdfs.qjournal.protocol"; + option java_outer_classname = "QJournalProtocolProtos"; + option java_generic_services = true; +diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/proto/editlog.proto b/hadoop-hdfs-project/hadoop-hdfs/src/main/proto/editlog.proto +index 22fd7437bb8..f25fe591ad3 100644 +--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/proto/editlog.proto ++++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/proto/editlog.proto +@@ -15,7 +15,7 @@ + * See the License for the specific language governing permissions and + * limitations under the License. + */ +-syntax = "proto2"; ++ + option java_package = "org.apache.hadoop.hdfs.protocol.proto"; + option java_outer_classname = "EditLogProtos"; + option java_generate_equals_and_hash = true; +diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/proto/fsimage.proto b/hadoop-hdfs-project/hadoop-hdfs/src/main/proto/fsimage.proto +index 2ea26cff940..5fb7c69a7fd 100644 +--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/proto/fsimage.proto ++++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/proto/fsimage.proto +@@ -15,7 +15,7 @@ + * See the License for the specific language governing permissions and + * limitations under the License. + */ +-syntax = "proto2"; ++ + option java_package = "org.apache.hadoop.hdfs.server.namenode"; + option java_outer_classname = "FsImageProto"; + +diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml +index f52c0c9ae29..ad3daaf589e 100644 +--- a/hadoop-project/pom.xml ++++ b/hadoop-project/pom.xml +@@ -1429,64 +1429,9 @@ + hadoop-maven-plugins + ${project.version} + +- +- org.xolstice.maven.plugins +- protobuf-maven-plugin +- ${protobuf-maven-plugin.version} +- true +- +- +- +- com.google.guava +- guava +- 20.0 +- +- +- +- +- com.google.protobuf:protoc:${protobuf.version}:exe:${os.detected.classifier} +- +- false +- +- +- +- src-compile-protoc +- generate-sources +- +- compile +- +- +- false +- ${basedir}/src/main/proto +- ${project.build.directory}/generated-sources/java +- false +- true +- +- +- +- src-test-compile-protoc +- generate-test-sources +- +- test-compile +- +- +- ${basedir}/src/test/proto +- ${project.build.directory}/generated-test-sources/java +- false +- true +- +- +- +- + + +- +- +- kr.motd.maven +- os-maven-plugin +- ${os-maven-plugin.version} +- +- ++ + + + org.codehaus.mojo