Skip to content

Commit

Permalink
PHOENIX-6475 Use org.openlabtesting.protobuf:protoc when building on …
Browse files Browse the repository at this point in the history
…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
  • Loading branch information
martin-g authored and stoty committed May 27, 2021
1 parent 3231aad commit 63cbb11
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 1 deletion.
2 changes: 1 addition & 1 deletion phoenix-core/pom.xml
Expand Up @@ -211,7 +211,7 @@
<goal>compile</goal>
</goals>
<configuration>
<protocArtifact>com.google.protobuf:protoc:${protobuf-java.version}:exe:${os.detected.classifier}</protocArtifact>
<protocArtifact>${protobuf.group}:protoc:${protoc.version}:exe:${os.detected.classifier}</protocArtifact>
<protoSourceRoot>${basedir}/src/main/protobuf/</protoSourceRoot>
<clearOutputDirectory>false</clearOutputDirectory>
<checkStaleness>true</checkStaleness>
Expand Down
17 changes: 17 additions & 0 deletions pom.xml
Expand Up @@ -107,7 +107,10 @@
<log4j.version>1.2.17</log4j.version>
<disruptor.version>3.3.6</disruptor.version>
<slf4j.version>1.7.25</slf4j.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>
<commons-io.version>2.5</commons-io.version>
<commons-lang.version>3.8</commons-lang.version>
<commons-csv.version>1.0</commons-csv.version>
Expand Down Expand Up @@ -1757,6 +1760,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>
<reporting>
<plugins>
Expand Down

0 comments on commit 63cbb11

Please sign in to comment.