From 2938ad6f9364785ba7517080219bffd49ed9188d Mon Sep 17 00:00:00 2001 From: Martin Tzvetanov Grigorov Date: Wed, 19 May 2021 14:15:04 +0300 Subject: [PATCH] PHOENIX-6475 Use org.openlabtesting.protobuf:protoc when building on Linux ARM64 Stock Protobuf-Java adds aarch64 protoc binary in 3.5.0. To be able to build on Linux ARM64 with Protobuf 2.x we should use https://github.com/theopenlab/protobuf --- phoenix-core/pom.xml | 2 +- pom.xml | 17 +++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/phoenix-core/pom.xml b/phoenix-core/pom.xml index f9bf1c16b47..70caaee3d5b 100644 --- a/phoenix-core/pom.xml +++ b/phoenix-core/pom.xml @@ -211,7 +211,7 @@ compile - com.google.protobuf:protoc:${protobuf-java.version}:exe:${os.detected.classifier} + ${protobuf.group}:protoc:${protoc.version}:exe:${os.detected.classifier} ${basedir}/src/main/protobuf/ false true diff --git a/pom.xml b/pom.xml index 605062a0b99..5af1d53bc65 100644 --- a/pom.xml +++ b/pom.xml @@ -107,7 +107,10 @@ 1.2.17 3.3.6 1.7.25 + + com.google.protobuf 2.5.0 + 2.5.0 2.5 3.8 1.0 @@ -1757,6 +1760,20 @@ + + linux-aarch64 + + + linux + aarch64 + + + + + org.openlabtesting.protobuf + 2.5.0.2 + +