commit b6c6165e88699d46e2ff7a3b2192321fa2b4ddd6
author Martin Tzvetanov Grigorov <mgrigorov@apache.org> Wed May 26 17:08:02 2021 +0300
committer Istvan Toth <stoty@apache.org> Thu May 27 08:42:25 2021 +0200
tree 732bbc69c7261aa22c20c85579cfb65bdf2ff54a
parent 83ad1ac9a0aee1b66fc0a45c7fc62f50b0dd6b8a

OMID-210 Use org.openlabtesting.protobuf:protoc:2.5.0 on Linux ARM64

common/pom.xml

diff --git a/common/pom.xml b/common/pom.xml
index e827729..25f19d3 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -49,7 +49,7 @@
         <dependency>
             <groupId>com.google.protobuf</groupId>
             <artifactId>protobuf-java</artifactId>
-            <version>${protobuf.version}</version>
+            <version>${protobuf-java.version}</version>
             <scope>compile</scope>
         </dependency>
 
@@ -108,7 +108,7 @@
                             <goal>compile</goal>
                         </goals>
                         <configuration>
-                            <protocArtifact>com.google.protobuf:protoc:${protobuf.version}:exe:${os.detected.classifier}</protocArtifact>
+                            <protocArtifact>${protobuf.group}:protoc:${protoc.version}:exe:${os.detected.classifier}</protocArtifact>
                         </configuration>
                     </execution>
                 </executions>

pom.xml

diff --git a/pom.xml b/pom.xml
index bcd26cf..de3d8c6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -176,7 +176,10 @@
         <slf4j.version>1.7.7</slf4j.version>
         <log4j.version>1.2.17</log4j.version>
         <netty4.version>4.1.60.Final</netty4.version>
-        <protobuf.version>2.5.0</protobuf.version>
+        <!-- com.google repo will be used except on Aarch64 platform. -->
+        <protobuf.group>com.google.protobuf</protobuf.group>
+        <protobuf-java.version>2.5.0</protobuf-java.version>
+        <protoc.version>2.5.0</protoc.version>
         <protobuf.plugin.version>0.6.1</protobuf.plugin.version>
         <os.plugin.version>1.6.2</os.plugin.version>
         <junit.version>4.13</junit.version>
@@ -647,7 +650,20 @@
                 </plugins>
             </build>
         </profile>
-
+        <profile>
+            <id>linux-aarch64</id>
+            <activation>
+                <os>
+                <family>linux</family>
+                <arch>aarch64</arch>
+                </os>
+            </activation>
+            <properties>
+                <!-- PHOENIX-6475 Use custom protoc for Linux ARM64 -->
+                <protobuf.group>org.openlabtesting.protobuf</protobuf.group>
+                <protoc.version>2.5.0.2</protoc.version>
+            </properties>
+        </profile>
     </profiles>
 
     <dependencyManagement>

tso-server/pom.xml

diff --git a/tso-server/pom.xml b/tso-server/pom.xml
index e2e0253..cd81c95 100644
--- a/tso-server/pom.xml
+++ b/tso-server/pom.xml
@@ -117,7 +117,7 @@
         <dependency>
             <groupId>com.google.protobuf</groupId>
             <artifactId>protobuf-java</artifactId>
-            <version>${protobuf.version}</version>
+            <version>${protobuf-java.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.curator</groupId>