This is an automated email from the ASF dual-hosted git repository.
adonisling pushed a commit to branch branch-1.2-lts
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-1.2-lts by this push:
new f03d547fe1 [fix](chore) fix BE compile and FE protoc artifact issue
(#18120) (#19522)
f03d547fe1 is described below
commit f03d547fe1bc4a4779f7593e46aa63d3e3a0897f
Author: Adonis Ling <adonis0...@gmail.com>
AuthorDate: Thu May 11 10:37:50 2023 +0800
[fix](chore) fix BE compile and FE protoc artifact issue (#18120) (#19522)
1. add <optional> head to solve the compilation issue
use 3.12.9 as the protoc.artifact's version, because there is no 3.12.21
See: https://repo.maven.apache.org/maven2/com/google/protobuf/protoc/
2. Remove --show-progress arguments of wget because it is not supported in
low version wget
3. Downgrade grpc.version to 1.30.0 (See #8250).
Co-authored-by: Mingyu Chen <morning...@163.com>
---
fe/fe-core/pom.xml | 2 +-
fe/pom.xml | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/fe/fe-core/pom.xml b/fe/fe-core/pom.xml
index a3c3eb63a2..100f31f199 100644
--- a/fe/fe-core/pom.xml
+++ b/fe/fe-core/pom.xml
@@ -34,7 +34,7 @@ under the License.
<doris.thirdparty>${basedir}/../../thirdparty</doris.thirdparty>
<antlr4.version>4.9.3</antlr4.version>
<awssdk.version>2.17.257</awssdk.version>
-
<protoc.artifact>com.google.protobuf:protoc:${protobuf.version}</protoc.artifact>
+
<protoc.artifact>com.google.protobuf:protoc:${protoc.artifact.version}</protoc.artifact>
<grpc.java.artifact>io.grpc:protoc-gen-grpc-java:${grpc.version}</grpc.java.artifact>
</properties>
<profiles>
diff --git a/fe/pom.xml b/fe/pom.xml
index d9a645548d..9a2c7f3347 100644
--- a/fe/pom.xml
+++ b/fe/pom.xml
@@ -218,9 +218,12 @@ under the License.
<metrics-core.version>4.0.2</metrics-core.version>
<netty-all.version>4.1.89.Final</netty-all.version>
<objenesis.version>2.1</objenesis.version>
- <grpc.version>1.39.0</grpc.version>
+ <grpc.version>1.30.0</grpc.version>
<check.freamework.version>3.32.0</check.freamework.version>
<protobuf.version>3.21.12</protobuf.version>
+ <!-- we use protoc-jar-maven-plugin to generate protobuf generated
code -->
+ <!-- see
https://repo.maven.apache.org/maven2/com/google/protobuf/protoc/ to get correct
version -->
+ <protoc.artifact.version>3.21.9</protoc.artifact.version>
<protoparser.version>3.1.5</protoparser.version>
<snappy-java.version>1.1.7.2</snappy-java.version>
<automaton.version>1.11-8</automaton.version>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
