This is an automated email from the ASF dual-hosted git repository. jinsongzhou pushed a commit to branch 0.7.x in repository https://gitbox.apache.org/repos/asf/amoro.git
commit 4d4611ce94c5487307587a94f0a7ef1de1403890 Author: zhoujinsong <[email protected]> AuthorDate: Mon Jul 1 20:16:58 2024 +0800 Improve hadoop profile --- pom.xml | 22 +--------------------- tools/releasing/create_binary_release.sh | 12 +++++++----- 2 files changed, 8 insertions(+), 26 deletions(-) diff --git a/pom.xml b/pom.xml index db72154d2..aef477dd1 100644 --- a/pom.xml +++ b/pom.xml @@ -139,6 +139,7 @@ <amoro-shade-zookeeper.version>3.9.1</amoro-shade-zookeeper.version> <amoro-shade-thrift.version>0.20.0</amoro-shade-thrift.version> <annotation-api.version>1.3.2</annotation-api.version> + <guava.version>32.1.1-jre</guava.version> </properties> <dependencies> @@ -1274,12 +1275,6 @@ </profile> <profile> <id>hadoop2</id> - <activation> - <property> - <name>hadoop</name> - <value>v2</value> - </property> - </activation> <properties> <guava.version>14.0.1</guava.version> <hive.version>2.3.9</hive.version> @@ -1288,20 +1283,5 @@ <terminal.spark.major.version>3.2</terminal.spark.major.version> </properties> </profile> - <profile> - <id>hadoop3</id> - <activation> - <property> - <name>!hadoop</name> - </property> - </activation> - <properties> - <guava.version>32.1.1-jre</guava.version> - <hive.version>3.1.1</hive.version> - <hadoop.version>3.4.0</hadoop.version> - <terminal.spark.version>3.3.2</terminal.spark.version> - <terminal.spark.major.version>3.3</terminal.spark.major.version> - </properties> - </profile> </profiles> </project> diff --git a/tools/releasing/create_binary_release.sh b/tools/releasing/create_binary_release.sh index 53407cabd..74baf6ec4 100644 --- a/tools/releasing/create_binary_release.sh +++ b/tools/releasing/create_binary_release.sh @@ -56,16 +56,18 @@ mkdir -p ${RELEASE_DIR} # build maven package, create Flink distribution, generate signature make_binary_release() { - local HADOOP_PROFILE="hadoop3" + local HADOOP_PROFILE="" + local HADOOP_VERSION="hadoop3" if [[ $# -eq 1 ]]; then - HADOOP_PROFILE=$1 + HADOOP_VERSION=$1 + HADOOP_PROFILE="-P$1" fi - echo "Creating ${HADOOP_PROFILE} binary release" + echo "Creating ${HADOOP_VERSION} binary release" # enable release profile here (to check for the maven version) - $MVN clean package -P${HADOOP_PROFILE} -pl ':dist' -am -Dgpg.skip -Dcheckstyle.skip=true -DskipTests + $MVN clean package ${HADOOP_PROFILE} -pl ':dist' -am -Dgpg.skip -Dcheckstyle.skip=true -DskipTests - local TARGET_FILE="apache-amoro-${RELEASE_VERSION}-bin-${HADOOP_PROFILE}.tar.gz" + local TARGET_FILE="apache-amoro-${RELEASE_VERSION}-bin-${HADOOP_VERSION}.tar.gz" cp amoro-ams/dist/target/apache-amoro-${RELEASE_VERSION}-bin.tar.gz ${RELEASE_DIR}/${TARGET_FILE} cd ${RELEASE_DIR}
