From e50b5a6781ffa4095079da98930cc5082fa62d08 Mon Sep 17 00:00:00 2001 From: lamber-ken Date: Thu, 30 Jan 2020 23:28:34 +0800 Subject: [PATCH 1/4] [HUDI-585] Optimize the steps of building with scala-2.12 --- README.md | 4 +- dev/change-scala-version.sh | 66 ------------------------- hudi-spark/pom.xml | 2 +- hudi-utilities/pom.xml | 2 +- packaging/hudi-spark-bundle/pom.xml | 2 +- packaging/hudi-utilities-bundle/pom.xml | 2 +- pom.xml | 4 ++ 7 files changed, 9 insertions(+), 73 deletions(-) delete mode 100755 dev/change-scala-version.sh diff --git a/README.md b/README.md index ae53e724484cc..4153ccb079c1a 100644 --- a/README.md +++ b/README.md @@ -65,11 +65,9 @@ mvn clean javadoc:aggregate -Pjavadocs ### Build with Scala 2.12 -The default Scala version supported is 2.11. To build for Scala 2.12 version, after code checkout run dev/change-scala-version.sh -and build using `scala-2.12` profile +The default Scala version supported is 2.11. To build for Scala 2.12 version, build using `scala-2.12` profile ``` -dev/change-scala-version 2.12 mvn clean package -DskipTests -DskipITs -Pscala-2.12 ``` diff --git a/dev/change-scala-version.sh b/dev/change-scala-version.sh deleted file mode 100755 index 151581def60e9..0000000000000 --- a/dev/change-scala-version.sh +++ /dev/null @@ -1,66 +0,0 @@ -#!/usr/bin/env bash - -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -set -e - -VALID_VERSIONS=( 2.11 2.12 ) - -usage() { - echo "Usage: $(basename $0) [-h|--help] -where : - -h| --help Display this help text - valid version values : ${VALID_VERSIONS[*]} -" 1>&2 - exit 1 -} - -if [[ ($# -ne 1) || ( $1 == "--help") || $1 == "-h" ]]; then - usage -fi - -TO_VERSION=$1 - -check_scala_version() { - for i in ${VALID_VERSIONS[*]}; do [ $i = "$1" ] && return 0; done - echo "Invalid Scala version: $1. Valid versions: ${VALID_VERSIONS[*]}" 1>&2 - exit 1 -} - -check_scala_version "$TO_VERSION" - -if [ $TO_VERSION = "2.11" ]; then - FROM_VERSION="2.12" -else - FROM_VERSION="2.11" -fi - -sed_i() { - sed -e "$1" "$2" > "$2.tmp" && mv "$2.tmp" "$2" -} - -export -f sed_i - -BASEDIR=$(dirname $0)/.. -find "$BASEDIR" -name 'pom.xml' -not -path '*target*' -print \ - -exec bash -c "sed_i 's/\(artifactId.*\)_'$FROM_VERSION'/\1_'$TO_VERSION'/g' {}" \; - -# Also update in parent POM -# Match any scala binary version to ensure idempotency -sed_i '1,/[0-9]*\.[0-9]*[0-9]*\.[0-9]*'$TO_VERSION' 4.0.0 - hudi-spark_2.11 + hudi-spark_${scala.binary.version} jar diff --git a/hudi-utilities/pom.xml b/hudi-utilities/pom.xml index ed0b283f6ccfe..3c1e0fc8a0b75 100644 --- a/hudi-utilities/pom.xml +++ b/hudi-utilities/pom.xml @@ -23,7 +23,7 @@ 4.0.0 - hudi-utilities_2.11 + hudi-utilities_${scala.binary.version} jar diff --git a/packaging/hudi-spark-bundle/pom.xml b/packaging/hudi-spark-bundle/pom.xml index afce7741d5421..754b5cf8b47da 100644 --- a/packaging/hudi-spark-bundle/pom.xml +++ b/packaging/hudi-spark-bundle/pom.xml @@ -23,7 +23,7 @@ ../../pom.xml 4.0.0 - hudi-spark-bundle_2.11 + hudi-spark-bundle_${scala.binary.version} jar diff --git a/packaging/hudi-utilities-bundle/pom.xml b/packaging/hudi-utilities-bundle/pom.xml index c794ff1f405c5..08620fe017d66 100644 --- a/packaging/hudi-utilities-bundle/pom.xml +++ b/packaging/hudi-utilities-bundle/pom.xml @@ -24,7 +24,7 @@ ../../pom.xml 4.0.0 - hudi-utilities-bundle_2.11 + hudi-utilities-bundle_${scala.binary.version} jar diff --git a/pom.xml b/pom.xml index e4cdbd220e6ef..f9aeae099a355 100644 --- a/pom.xml +++ b/pom.xml @@ -1052,6 +1052,10 @@ scala-2.11 + + 2.11.8 + 2.11 + From 9c9c8031b8f499ab6c1d469613f8b929abd0d702 Mon Sep 17 00:00:00 2001 From: lamber-ken Date: Fri, 31 Jan 2020 00:26:42 +0800 Subject: [PATCH 2/4] Remove change-scala-version.sh from LICENSE --- LICENSE | 2 -- 1 file changed, 2 deletions(-) diff --git a/LICENSE b/LICENSE index 85b7feac41757..e5cb0ce682e53 100644 --- a/LICENSE +++ b/LICENSE @@ -245,8 +245,6 @@ This product includes code from Apache Spark * org.apache.hudi.AvroConversionHelper copied from classes in org/apache/spark/sql/avro package -* dev/change-scala-version.sh copied from https://github.com/apache/spark/blob/branch-2.4/dev/change-scala-version.sh - Copyright: 2014 and onwards The Apache Software Foundation Home page: http://spark.apache.org/ License: http://www.apache.org/licenses/LICENSE-2.0 From 1db4b3bc53b2d17c9112f1879e8b4f147c67a456 Mon Sep 17 00:00:00 2001 From: lamber-ken Date: Sun, 2 Feb 2020 20:46:42 +0800 Subject: [PATCH 3/4] Fix build error --- README.md | 2 +- pom.xml | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 4153ccb079c1a..6bb56597b3f20 100644 --- a/README.md +++ b/README.md @@ -68,7 +68,7 @@ mvn clean javadoc:aggregate -Pjavadocs The default Scala version supported is 2.11. To build for Scala 2.12 version, build using `scala-2.12` profile ``` -mvn clean package -DskipTests -DskipITs -Pscala-2.12 +mvn clean package -DskipTests -DskipITs -Dscala-2.12 ``` ## Quickstart diff --git a/pom.xml b/pom.xml index f9aeae099a355..81560351ea140 100644 --- a/pom.xml +++ b/pom.xml @@ -1064,6 +1064,11 @@ 2.12.10 2.12 + + + scala-2.12 + + From 3370f126a0389a7fe6df6406470f61cd21e6fff4 Mon Sep 17 00:00:00 2001 From: lamber-ken Date: Wed, 5 Feb 2020 21:59:51 +0800 Subject: [PATCH 4/4] revert scala-2.11 --- pom.xml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pom.xml b/pom.xml index 81560351ea140..afadbbf8bf985 100644 --- a/pom.xml +++ b/pom.xml @@ -1052,10 +1052,6 @@ scala-2.11 - - 2.11.8 - 2.11 -