[minor](broker) fix name in broker's pom.xml (apache#20840)

change palo -> doris do not check compiler's version inenv.sh, because building broker does not need gcc compiler. And the version is also checked in CMakefile
w41ter · Jul 3, 2023 · d4a1549 · d4a1549
1 parent f80df20
commit d4a1549
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 14 deletions.
diff --git a/env.sh b/env.sh
@@ -121,12 +121,6 @@ if [[ "${DORIS_TOOLCHAIN}" == "gcc" ]]; then
         export DORIS_GCC_HOME
     fi
 
-    gcc_ver="$("${DORIS_GCC_HOME}/bin/gcc" -dumpfullversion -dumpversion)"
-    required_ver="11.0.0"
-    if [[ ! "$(printf '%s\n' "${required_ver}" "${gcc_ver}" | sort -V | head -n1)" = "${required_ver}" ]]; then
-        echo "Error: GCC version (${gcc_ver}) must be greater than or equal to ${required_ver}"
-        exit 1
-    fi
     export CC="${DORIS_GCC_HOME}/bin/gcc"
     export CXX="${DORIS_GCC_HOME}/bin/g++"
     if test -x "${DORIS_GCC_HOME}/bin/ld"; then
@@ -140,12 +134,6 @@ elif [[ "${DORIS_TOOLCHAIN}" == "clang" ]]; then
         export DORIS_CLANG_HOME
     fi
 
-    clang_ver="$("${DORIS_CLANG_HOME}/bin/clang" -dumpfullversion -dumpversion)"
-    required_ver="16.0.0"
-    if [[ ! "$(printf '%s\n' "${required_ver}" "${clang_ver}" | sort -V | head -n1)" = "${required_ver}" ]]; then
-        echo "Error: CLANG version (${clang_ver}) must be greater than or equal to ${required_ver}"
-        exit 1
-    fi
     export CC="${DORIS_CLANG_HOME}/bin/clang"
     export CXX="${DORIS_CLANG_HOME}/bin/clang++"
     if test -x "${DORIS_CLANG_HOME}/bin/ld.lld"; then

diff --git a/fs_brokers/apache_hdfs_broker/pom.xml b/fs_brokers/apache_hdfs_broker/pom.xml
@@ -63,7 +63,7 @@ under the License.
         </mailingList>
     </mailingLists>
     <properties>
-        <palo.home>${basedir}/../../</palo.home>
+        <doris.home>${basedir}/../../</doris.home>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
@@ -363,7 +363,7 @@ under the License.
                         <configuration>
                             <executable>cp</executable>
                             <arguments>
-                                <argument>${palo.home}/gensrc/thrift/PaloBrokerService.thrift</argument>
+                                <argument>${doris.home}/gensrc/thrift/PaloBrokerService.thrift</argument>
                                 <argument>${basedir}/src/main/resources/thrift/</argument>
                             </arguments>
                             <skip>${skip.plugin}</skip>