Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

HBASE-28208 Use x86_64 protoc 2.5.0 on Aarch64 Mac #5524

Closed
wants to merge 1 commit into from
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
16 changes: 15 additions & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -749,6 +749,7 @@
<!-- Still need this to ignore some errors when building javadoc-->
<doclint>none</doclint>
<javax.activation.version>1.2.0</javax.activation.version>
<protoc.arch>${os.detected.classifier}</protoc.arch>
</properties>
<!-- Sorted by groups of dependencies then groupId and artifactId -->
<dependencyManagement>
Expand Down Expand Up @@ -1837,7 +1838,7 @@
<artifactId>protobuf-maven-plugin</artifactId>
<version>${protobuf.plugin.version}</version>
<configuration>
<protocArtifact>${external.protobuf.groupid}:protoc:${external.protoc.version}:exe:${os.detected.classifier}</protocArtifact>
<protocArtifact>${external.protobuf.groupid}:protoc:${external.protoc.version}:exe:${protoc.arch}</protocArtifact>
<protoSourceRoot>${basedir}/src/main/protobuf/</protoSourceRoot>
<clearOutputDirectory>false</clearOutputDirectory>
<checkStaleness>true</checkStaleness>
Expand Down Expand Up @@ -4981,5 +4982,18 @@
<external.protoc.version>2.5.0.2</external.protoc.version>
</properties>
</profile>
<profile>
<!-- HBASE-28208 Use x86_64 protoc 2.5.0 on Aarch64 Mac -->
<id>osx-aarch64</id>
<activation>
<os>
<family>mac</family>
<arch>aarch64</arch>
</os>
</activation>
<properties>
<protoc.arch>osx-x86_64</protoc.arch>
</properties>
</profile>
</profiles>
</project>