Skip to content

Commit

Permalink
remove global scala-* profiles (#4698)
Browse files Browse the repository at this point in the history
  • Loading branch information
pan3793 authored Nov 24, 2023
1 parent c9c3437 commit 56da029
Show file tree
Hide file tree
Showing 9 changed files with 10 additions and 162 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/core.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/frontend.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
75 changes: 0 additions & 75 deletions dev/change_scala_version.sh

This file was deleted.

5 changes: 2 additions & 3 deletions dev/create_release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ done

RELEASE_VERSION="$1"
GIT_TAG="$2"
SCALA_VERSION="2.11"

function make_source_package() {
# create source package
Expand Down Expand Up @@ -98,9 +97,9 @@ function make_binary_release() {
git_clone
make_source_package

make_binary_release netinst "-Pweb-angular -Phadoop-2.6 -pl !hbase,!jdbc,!file,!flink,!cassandra,!elasticsearch,!bigquery,!alluxio,!livy,!groovy,!java,!neo4j,!submarine,!sparql,!mongodb -am"
make_binary_release netinst "-Pweb-angular -pl !hbase,!jdbc,!file,!flink,!cassandra,!elasticsearch,!bigquery,!alluxio,!livy,!groovy,!java,!neo4j,!submarine,!sparql,!mongodb -am"

make_binary_release all "-Pweb-angular -Phadoop-2.6"
make_binary_release all "-Pweb-angular"

# remove non release files and dirs
rm -rf "${WORKING_DIR}/zeppelin"
Expand Down
6 changes: 1 addition & 5 deletions dev/publish_release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ if [[ $RELEASE_VERSION == *"SNAPSHOT"* ]]; then
DO_SNAPSHOT="yes"
fi

PUBLISH_PROFILES="-Ppublish-distr -Phadoop-2.6 -Pweb-angular"
PUBLISH_PROFILES="-Ppublish-distr -Pweb-angular"
PROJECT_OPTIONS="-pl !zeppelin-distribution -Dmaven.javadoc.skip=true"
NEXUS_STAGING="https://repository.apache.org/service/local/staging"
NEXUS_PROFILE="153446d1ac37c4"
Expand Down Expand Up @@ -94,10 +94,6 @@ function publish_snapshot_to_maven() {
./mvnw --settings $tmp_settings -Dmaven.repo.local="${tmp_repo}" -DskipTests \
$PUBLISH_PROFILES -Drat.skip=true deploy

"${BASEDIR}/change_scala_version.sh" 2.11
./mvnw -Pscala-2.11 --settings $tmp_settings -Dmaven.repo.local="${tmp_repo}" -DskipTests \
$PUBLISH_PROFILES -Drat.skip=true clean deploy

rm $tmp_settings
rm -rf $tmp_repo
}
Expand Down
7 changes: 3 additions & 4 deletions docs/development/contribution/useful_developer_tools.md
Original file line number Diff line number Diff line change
Expand Up @@ -66,12 +66,11 @@ you can use this function like `setjdk 1.8` / `setjdk 1.7`
# build `zeppelin-server` and its dependencies only
./mvnw clean package -pl 'spark,spark-dependencies,python,markdown,zeppelin-server' --am -DskipTests

# build spark related modules with default profiles: scala 2.10
# build spark related modules with default profiles
./mvnw clean package -pl 'spark,spark-dependencies,zeppelin-server' --am -DskipTests

# build spark related modules with profiles: scala 2.11, spark 2.1 hadoop 2.7
./dev/change_scala_version.sh 2.11
./mvnw clean package -Pspark-2.1 -Phadoop-2.7 -Pscala-2.11 \
# build spark related modules with profiles: scala 2.13, spark 3.5 hadoop 3.3
./mvnw clean package -Pspark-scala-2.13 -Pspark-3.5 -Phadoop-3.3 \
-pl 'spark,spark-dependencies,zeppelin-server' --am -DskipTests

# build `zeppelin-server` and `markdown` with dependencies
Expand Down
12 changes: 0 additions & 12 deletions docs/setup/basics/how_to_build.md
Original file line number Diff line number Diff line change
Expand Up @@ -79,18 +79,6 @@ You can directly start Zeppelin by running the following command after successfu

### Build profiles


#### Scala profile

To be noticed, this scala profile affect the modules (e.g. cassandra) that use scala except Spark interpreter (Spark interpreter use other profiles to control its scala version, see the doc below).

Set scala version (default 2.11). Available profiles are

```
-Pscala-2.11
-Pscala-2.12
```

#### Spark Interpreter

To be noticed, the spark profiles here only affect the unit test (no need to specify `SPARK_HOME`) of spark interpreter.
Expand Down
15 changes: 0 additions & 15 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1707,21 +1707,6 @@
</build>

<profiles>
<profile>
<id>scala-2.11</id>
<properties>
<scala.version>${scala.2.11.version}</scala.version>
<scala.binary.version>2.11</scala.binary.version>
</properties>
</profile>
<profile>
<id>scala-2.12</id>
<properties>
<scala.version>${scala.2.12.version}</scala.version>
<scala.binary.version>2.12</scala.binary.version>
</properties>
</profile>

<profile>
<id>web-angular</id>
<modules>
Expand Down
44 changes: 0 additions & 44 deletions zeppelin-distribution/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -31,37 +31,6 @@
<packaging>pom</packaging>
<name>Zeppelin: Packaging distribution</name>

<!-- NOTE: These dependency declarations are only required to sort this project to the
end of the line in the multi-module build.
-->
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.scala-lang</groupId>
<artifactId>scala-library</artifactId>
<version>${scala.version}</version>
</dependency>

<dependency>
<groupId>org.scala-lang</groupId>
<artifactId>scala-compiler</artifactId>
<version>${scala.version}</version>
</dependency>

<dependency>
<groupId>org.scala-lang</groupId>
<artifactId>scala-reflect</artifactId>
<version>${scala.version}</version>
</dependency>

<dependency>
<groupId>org.scala-lang</groupId>
<artifactId>scalap</artifactId>
<version>${scala.version}</version>
</dependency>
</dependencies>
</dependencyManagement>

<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
Expand Down Expand Up @@ -111,19 +80,6 @@
</build>

<profiles>
<profile>
<id>scala-2.11</id>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.scala-lang.modules</groupId>
<artifactId>scala-xml_${scala.binary.version}</artifactId>
<version>1.0.2</version>
</dependency>
</dependencies>
</dependencyManagement>
</profile>

<profile>
<id>web-angular</id>
<dependencies>
Expand Down

0 comments on commit 56da029

Please sign in to comment.