You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@phoenix.apache.org by st...@apache.org on 2021/05/27 17:27:28 UTC
[phoenix] branch 5.1 updated (c582e88 -> 421ecb2)
This is an automated email from the ASF dual-hosted git repository.
stoty pushed a change to branch 5.1
in repository https://gitbox.apache.org/repos/asf/phoenix.git.
from c582e88 PHOENIX-6437: Parent-Child Delete marker should get replicated via SystemCatalogWalEntryFilter (#1222)
new 4e88918 PHOENIX-6475 Use org.openlabtesting.protobuf:protoc when building on Linux ARM64
new 421ecb2 Remove duplicate entry of commons-io dependency
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
phoenix-core/pom.xml | 2 +-
phoenix-pherf/pom.xml | 4 ----
pom.xml | 17 +++++++++++++++++
3 files changed, 18 insertions(+), 5 deletions(-)
[phoenix] 02/02: Remove duplicate entry of commons-io dependency
Posted by st...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
stoty pushed a commit to branch 5.1
in repository https://gitbox.apache.org/repos/asf/phoenix.git
commit 421ecb209909d8d31a893205f710edc0bb531c33
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
AuthorDate: Wed May 26 11:09:11 2021 +0300
Remove duplicate entry of commons-io dependency
---
phoenix-pherf/pom.xml | 4 ----
1 file changed, 4 deletions(-)
diff --git a/phoenix-pherf/pom.xml b/phoenix-pherf/pom.xml
index 37b9572..f5a4aba 100644
--- a/phoenix-pherf/pom.xml
+++ b/phoenix-pherf/pom.xml
@@ -130,10 +130,6 @@
<artifactId>phoenix-shaded-commons-cli</artifactId>
</dependency>
<dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-csv</artifactId>
</dependency>
[phoenix] 01/02: PHOENIX-6475 Use
org.openlabtesting.protobuf:protoc when building on Linux ARM64
Posted by st...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
stoty pushed a commit to branch 5.1
in repository https://gitbox.apache.org/repos/asf/phoenix.git
commit 4e88918de8e458cebeb707cb24b82b64b07fa543
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
AuthorDate: Wed May 19 14:15:04 2021 +0300
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 848d7d1..2475565 100644
--- a/phoenix-core/pom.xml
+++ b/phoenix-core/pom.xml
@@ -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>
diff --git a/pom.xml b/pom.xml
index 602ba82..b011eac 100644
--- a/pom.xml
+++ b/pom.xml
@@ -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>
@@ -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>