From 56da029ffe413c55ba34f46e4e4b91b8d20d9ce2 Mon Sep 17 00:00:00 2001 From: Cheng Pan Date: Fri, 24 Nov 2023 20:13:56 +0800 Subject: [PATCH] remove global scala-* profiles (#4698) --- .github/workflows/core.yml | 4 +- .github/workflows/frontend.yml | 4 +- dev/change_scala_version.sh | 75 ------------------- dev/create_release.sh | 5 +- dev/publish_release.sh | 6 +- .../contribution/useful_developer_tools.md | 7 +- docs/setup/basics/how_to_build.md | 12 --- pom.xml | 15 ---- zeppelin-distribution/pom.xml | 44 ----------- 9 files changed, 10 insertions(+), 162 deletions(-) delete mode 100755 dev/change_scala_version.sh diff --git a/.github/workflows/core.yml b/.github/workflows/core.yml index 544bfc7a77d..b197fd16ebd 100644 --- a/.github/workflows/core.yml +++ b/.github/workflows/core.yml @@ -118,7 +118,7 @@ jobs: restore-keys: | ${{ runner.os }}-zeppelin- - name: install environment - run: ./mvnw install -DskipTests -am -pl ${INTERPRETERS} -Pscala-2.11 ${MAVEN_ARGS} + run: ./mvnw install -DskipTests -am -pl ${INTERPRETERS} ${MAVEN_ARGS} - name: Setup conda environment with python 3.9 and R uses: conda-incubator/setup-miniconda@v2 with: @@ -131,7 +131,7 @@ jobs: auto-activate-base: false use-mamba: true - name: verify interpreter - run: ./mvnw verify -am -pl ${INTERPRETERS} -Pscala-2.11 ${MAVEN_ARGS} + run: ./mvnw verify -am -pl ${INTERPRETERS} ${MAVEN_ARGS} # test interpreter modules for jupyter, python, rlang interpreter-test-jupyter-python-rlang: diff --git a/.github/workflows/frontend.yml b/.github/workflows/frontend.yml index e027ea64739..d7fcbc2fa76 100644 --- a/.github/workflows/frontend.yml +++ b/.github/workflows/frontend.yml @@ -53,9 +53,9 @@ jobs: restore-keys: | ${{ runner.os }}-zeppelin- - name: Install application - run: ./mvnw clean install -DskipTests -am -pl zeppelin-web -Pscala-2.11 -Pspark-scala-2.12 -Pspark-3.4 -Phadoop2 -Pweb-dist ${MAVEN_ARGS} + run: ./mvnw clean install -DskipTests -am -pl zeppelin-web -Pspark-scala-2.12 -Pspark-3.4 -Phadoop2 -Pweb-dist ${MAVEN_ARGS} - name: Run headless test - run: xvfb-run --auto-servernum --server-args="-screen 0 1024x768x24" ./mvnw verify -pl zeppelin-web -Pscala-2.12 -Pspark-scala-2.12 -Pspark-3.4 -Phadoop2 -Pweb-dist -Pweb-e2e ${MAVEN_ARGS} + run: xvfb-run --auto-servernum --server-args="-screen 0 1024x768x24" ./mvnw verify -pl zeppelin-web -Pspark-scala-2.12 -Pspark-3.4 -Phadoop2 -Pweb-dist -Pweb-e2e ${MAVEN_ARGS} - name: Print zeppelin logs if: always() run: if [ -d "logs" ]; then cat logs/*; fi diff --git a/dev/change_scala_version.sh b/dev/change_scala_version.sh deleted file mode 100755 index 581f463f018..00000000000 --- a/dev/change_scala_version.sh +++ /dev/null @@ -1,75 +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" - SCALA_LIB_VERSION="2.11.12" -else - FROM_VERSION="2.11" - SCALA_LIB_VERSION="2.12.17" -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' {}" \; - -# 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}' in parent POM -# This is to make variables in leaf pom to be substituted to real value when flattened-pom is created. -# maven-flatten plugin doesn't take properties defined under profile even if scala-2.11/scala-2.12 is activated via -Pscala-2.11/-Pscala-2.12, -# and use default defined properties to create flatten pom. -sed_i '1,/[0-9]*\.[0-9]*\.[0-9]*[0-9]*\.[0-9]*\.[0-9]*'${SCALA_LIB_VERSION}' - - scala-2.11 - - ${scala.2.11.version} - 2.11 - - - - scala-2.12 - - ${scala.2.12.version} - 2.12 - - - web-angular diff --git a/zeppelin-distribution/pom.xml b/zeppelin-distribution/pom.xml index f7f5d129c4c..6664a9ae5fa 100644 --- a/zeppelin-distribution/pom.xml +++ b/zeppelin-distribution/pom.xml @@ -31,37 +31,6 @@ pom Zeppelin: Packaging distribution - - - - - org.scala-lang - scala-library - ${scala.version} - - - - org.scala-lang - scala-compiler - ${scala.version} - - - - org.scala-lang - scala-reflect - ${scala.version} - - - - org.scala-lang - scalap - ${scala.version} - - - - ${project.groupId} @@ -111,19 +80,6 @@ - - scala-2.11 - - - - org.scala-lang.modules - scala-xml_${scala.binary.version} - 1.0.2 - - - - - web-angular