You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by zh...@apache.org on 2021/11/22 15:19:15 UTC
[hbase] branch branch-2.4 updated: HBASE-26470 Use openlabtesting protoc on linux arm64 in HBASE 2.x (#3860)
This is an automated email from the ASF dual-hosted git repository.
zhangduo pushed a commit to branch branch-2.4
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/branch-2.4 by this push:
new 113800b HBASE-26470 Use openlabtesting protoc on linux arm64 in HBASE 2.x (#3860)
113800b is described below
commit 113800bb06aa64155e1bf03afb43d886e07264e3
Author: markjens <94...@users.noreply.github.com>
AuthorDate: Mon Nov 22 17:13:27 2021 +0200
HBASE-26470 Use openlabtesting protoc on linux arm64 in HBASE 2.x (#3860)
Signed-off-by: Duo Zhang <zh...@apache.org>
---
pom.xml | 17 ++++++++++++++++-
1 file changed, 16 insertions(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 6fe3daa..47ff33c 100755
--- a/pom.xml
+++ b/pom.xml
@@ -786,7 +786,7 @@
<artifactId>protobuf-maven-plugin</artifactId>
<version>${protobuf.plugin.version}</version>
<configuration>
- <protocArtifact>com.google.protobuf:protoc:${external.protobuf.version}:exe:${os.detected.classifier}</protocArtifact>
+ <protocArtifact>${external.protobuf.groupid}:protoc:${external.protoc.version}:exe:${os.detected.classifier}</protocArtifact>
<protoSourceRoot>${basedir}/src/main/protobuf/</protoSourceRoot>
<clearOutputDirectory>false</clearOutputDirectory>
<checkStaleness>true</checkStaleness>
@@ -1464,7 +1464,9 @@
<log4j.version>1.2.17</log4j.version>
<mockito-core.version>2.28.2</mockito-core.version>
<!--Internally we use a different version of protobuf. See hbase-protocol-shaded-->
+ <external.protobuf.groupid>com.google.protobuf</external.protobuf.groupid>
<external.protobuf.version>2.5.0</external.protobuf.version>
+ <external.protoc.version>${external.protobuf.version}</external.protoc.version>
<protobuf.plugin.version>0.6.1</protobuf.plugin.version>
<thrift.path>thrift</thrift.path>
<thrift.version>0.14.1</thrift.version>
@@ -4032,6 +4034,19 @@
</pluginManagement>
</build>
</profile>
+ <profile>
+ <id>aarch64</id>
+ <properties>
+ <external.protobuf.groupid>org.openlabtesting.protobuf</external.protobuf.groupid>
+ <external.protoc.version>2.5.0.2</external.protoc.version>
+ </properties>
+ <activation>
+ <os>
+ <family>linux</family>
+ <arch>aarch64</arch>
+ </os>
+ </activation>
+ </profile>
</profiles>
<!-- See https://jira.codehaus.org/browse/MSITE-443 why the settings need to be here and not in pluginManagement. -->
<reporting>