From 6a71af0434a71ba080115fae1d7f454233160e9c Mon Sep 17 00:00:00 2001 From: Cheng Pan Date: Fri, 13 Sep 2024 21:39:10 +0800 Subject: [PATCH] [ZEPPELIN-6073][BUILD] Canonicalize binary distribution tarball name (#4807) --- Dockerfile | 2 +- dev/create_release.sh | 4 ++-- docs/quickstart/kubernetes.md | 2 +- pom.xml | 2 +- zeppelin-distribution/README.md | 2 +- zeppelin-distribution/build-infrastructure.md | 8 ++++---- zeppelin-distribution/pom.xml | 6 +++--- zeppelin-distribution/src/assemble/distribution.xml | 11 ++++------- zeppelin-integration/pom.xml | 2 +- zeppelin-server/pom.xml | 2 +- 10 files changed, 19 insertions(+), 22 deletions(-) diff --git a/Dockerfile b/Dockerfile index 94fcb1dcf82..4f4fef399b3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -24,7 +24,7 @@ RUN echo "unsafe-perm=true" > ~/.npmrc && \ ./mvnw -B package -DskipTests -Pbuild-distr -Pspark-3.3 -Pinclude-hadoop -Phadoop3 -Pspark-scala-2.12 -Pweb-classic -Pweb-dist && \ # Example with doesn't compile all interpreters # ./mvnw -B package -DskipTests -Pbuild-distr -Pspark-3.2 -Pinclude-hadoop -Phadoop3 -Pspark-scala-2.12 -Pweb-classic -Pweb-dist -pl '!groovy,!livy,!hbase,!file,!flink' && \ - mv /workspace/zeppelin/zeppelin-distribution/target/zeppelin-*/zeppelin-* /opt/zeppelin/ && \ + mv /workspace/zeppelin/zeppelin-distribution/target/zeppelin-*-bin/zeppelin-*-bin /opt/zeppelin/ && \ # Removing stuff saves time, because docker creates a temporary layer rm -rf ~/.m2 && \ rm -rf /workspace/zeppelin/* diff --git a/dev/create_release.sh b/dev/create_release.sh index 36b20a1c35c..b5529169f6c 100755 --- a/dev/create_release.sh +++ b/dev/create_release.sh @@ -72,8 +72,8 @@ function make_binary_release() { fi # re-create package with proper dir name with binary license - cd zeppelin-distribution/target/zeppelin-* - mv zeppelin-* "zeppelin-${RELEASE_VERSION}-bin-${BIN_RELEASE_NAME}" + cd zeppelin-distribution/target/zeppelin-${RELEASE_VERSION}-bin + mv zeppelin-${RELEASE_VERSION}-bin "zeppelin-${RELEASE_VERSION}-bin-${BIN_RELEASE_NAME}" cat ../../src/bin_license/LICENSE >> "zeppelin-${RELEASE_VERSION}-bin-${BIN_RELEASE_NAME}/LICENSE" cat ../../src/bin_license/NOTICE >> "zeppelin-${RELEASE_VERSION}-bin-${BIN_RELEASE_NAME}/NOTICE" cp ../../src/bin_license/licenses/* "zeppelin-${RELEASE_VERSION}-bin-${BIN_RELEASE_NAME}/licenses/" diff --git a/docs/quickstart/kubernetes.md b/docs/quickstart/kubernetes.md index 02cff44693b..470614f2f04 100644 --- a/docs/quickstart/kubernetes.md +++ b/docs/quickstart/kubernetes.md @@ -169,7 +169,7 @@ $ ./mvnw package -DskipTests -Pbuild-distr Binary package will be created under `zeppelin-distribution/target` directory. Move created package file under `scripts/docker/zeppelin/bin/` directory. ``` -$ mv zeppelin-distribution/target/zeppelin-*.tar.gz scripts/docker/zeppelin/bin/ +$ mv zeppelin-distribution/target/zeppelin-*-bin.tgz scripts/docker/zeppelin/bin/ ``` `scripts/docker/zeppelin/bin/Dockerfile` downloads package from internet. Modify the file to add package from filesystem. diff --git a/pom.xml b/pom.xml index 4e4fb33dcd0..b9c6bb9f912 100644 --- a/pom.xml +++ b/pom.xml @@ -162,7 +162,7 @@ 1.8 - 3.2.0 + 3.7.1 1.7.7 1.7 1.4 diff --git a/zeppelin-distribution/README.md b/zeppelin-distribution/README.md index 312b27fca53..cfe61b20cad 100644 --- a/zeppelin-distribution/README.md +++ b/zeppelin-distribution/README.md @@ -20,7 +20,7 @@ Apache Zeppelin is distributed as a single gzip archive with the following structure: ``` -Zeppelin +zeppelin--bin ├── bin │ ├── zeppelin.sh │ └── zeppelin-daemon.sh diff --git a/zeppelin-distribution/build-infrastructure.md b/zeppelin-distribution/build-infrastructure.md index 676266c36f9..d33c3141b14 100644 --- a/zeppelin-distribution/build-infrastructure.md +++ b/zeppelin-distribution/build-infrastructure.md @@ -25,7 +25,7 @@ v v v Zeppelin Server <- Zengine + | - zeppeli web v + Zeppelin Web v ZAN ``` @@ -44,12 +44,12 @@ - compile => *.class, minify *.js - build modules => *.jar, war - test => UnitTest reports - - package -P build-distr => final .zip + - package -P build-distr => final .tgz - integration-test => selenium over running zeppelin-server (from package) ## Verify - - pre-inegration-test => start Zeppelin + - pre-integration-test => start Zeppelin - integration-test - - post-inegration-test => stop Zeppelin + - post-integration-test => stop Zeppelin diff --git a/zeppelin-distribution/pom.xml b/zeppelin-distribution/pom.xml index 39f01eb2a9f..9d67054d738 100644 --- a/zeppelin-distribution/pom.xml +++ b/zeppelin-distribution/pom.xml @@ -66,7 +66,7 @@ maven-assembly-plugin - ${project.parent.artifactId}-${project.version} + ${project.parent.artifactId}-${project.version}-bin false false posix @@ -144,8 +144,8 @@ zeppel.in s3-ap-northeast-1.amazonaws.com true - zeppelin-distribution/target/zeppelin-${project.version}.tar.gz - zeppelin-${project.version}.tar.gz + zeppelin-distribution/target/zeppelin-${project.version}-bin.tgz + zeppelin-${project.version}-bin.tgz diff --git a/zeppelin-distribution/src/assemble/distribution.xml b/zeppelin-distribution/src/assemble/distribution.xml index 579585b7ced..3529da3ddfa 100644 --- a/zeppelin-distribution/src/assemble/distribution.xml +++ b/zeppelin-distribution/src/assemble/distribution.xml @@ -15,17 +15,15 @@ ~ limitations under the License. --> - + final-distribution dir - tar.gz - + tgz true - zeppelin-${project.version} + zeppelin-${project.version}-bin @@ -57,7 +55,6 @@ README.md LICENSE* NOTICE - DISCLAIMER diff --git a/zeppelin-integration/pom.xml b/zeppelin-integration/pom.xml index 6d1ce720a7c..e2404485c88 100644 --- a/zeppelin-integration/pom.xml +++ b/zeppelin-integration/pom.xml @@ -255,7 +255,7 @@ - ../zeppelin-distribution/target/zeppelin-${project.version}/zeppelin-${project.version}/bin + ../zeppelin-distribution/target/zeppelin-${project.version}-bin/zeppelin-${project.version}-bin/bin diff --git a/zeppelin-server/pom.xml b/zeppelin-server/pom.xml index 7d5e2290192..dedda995edb 100644 --- a/zeppelin-server/pom.xml +++ b/zeppelin-server/pom.xml @@ -475,7 +475,7 @@ - ../zeppelin-distribution/target/zeppelin-${project.version}/zeppelin-${project.version}/bin + ../zeppelin-distribution/target/zeppelin-${project.version}-bin/zeppelin-${project.version}-bin/bin