[ZEPPELIN-6073][BUILD] Canonicalize binary distribution tarball name (a…

…pache#4807)
seung-00 · Sep 13, 2024 · 6a71af0 · 6a71af0
1 parent 940cf13
commit 6a71af0
Show file tree

Hide file tree

Showing 10 changed files with 19 additions and 22 deletions.
diff --git 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
@@ -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
@@ -169,7 +169,7 @@ $ ./mvnw package -DskipTests -Pbuild-distr <your flags>
 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
@@ -162,7 +162,7 @@
 
     <!-- plugin versions -->
     <plugin.antrun.version>1.8</plugin.antrun.version>
-    <plugin.assembly.version>3.2.0</plugin.assembly.version>
+    <plugin.assembly.version>3.7.1</plugin.assembly.version>
     <plugin.avro.version>1.7.7</plugin.avro.version>
     <plugin.buildhelper.version>1.7</plugin.buildhelper.version>
     <plugin.buildnumber.version>1.4</plugin.buildnumber.version>

diff --git 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-<version>-bin
  ├── bin
  │   ├── zeppelin.sh
  │   └── zeppelin-daemon.sh

diff --git 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
@@ -66,7 +66,7 @@
       <plugin>
         <artifactId>maven-assembly-plugin</artifactId>
         <configuration>
-          <finalName>${project.parent.artifactId}-${project.version}</finalName>
+          <finalName>${project.parent.artifactId}-${project.version}-bin</finalName>
           <appendAssemblyId>false</appendAssemblyId>
           <attach>false</attach>
           <tarLongFileMode>posix</tarLongFileMode>
@@ -144,8 +144,8 @@
               <bucketName>zeppel.in</bucketName>
               <endpoint>s3-ap-northeast-1.amazonaws.com</endpoint>
               <makePublic>true</makePublic>
-              <sourceFile>zeppelin-distribution/target/zeppelin-${project.version}.tar.gz</sourceFile>
-              <destinationFile>zeppelin-${project.version}.tar.gz</destinationFile>
+              <sourceFile>zeppelin-distribution/target/zeppelin-${project.version}-bin.tgz</sourceFile>
+              <destinationFile>zeppelin-${project.version}-bin.tgz</destinationFile>
             </configuration>
             <executions>
               <execution>

diff --git a/zeppelin-distribution/src/assemble/distribution.xml b/zeppelin-distribution/src/assemble/distribution.xml
@@ -15,17 +15,15 @@
   ~ limitations under the License.
   -->
 
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
+<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.2.0 https://maven.apache.org/xsd/assembly-2.2.0.xsd">
   <id>final-distribution</id>
   <formats>
     <format>dir</format>
-    <format>tar.gz</format>
-    <!-- format>zip</format -->
+    <format>tgz</format>
   </formats>
   <includeBaseDirectory>true</includeBaseDirectory>
-  <baseDirectory>zeppelin-${project.version}</baseDirectory>
+  <baseDirectory>zeppelin-${project.version}-bin</baseDirectory>
 
   <dependencySets>
     <dependencySet>
@@ -57,7 +55,6 @@
         <include>README.md</include>
         <include>LICENSE*</include>
         <include>NOTICE</include>
-        <include>DISCLAIMER</include>
       </includes>
     </fileSet>
     <fileSet>

diff --git a/zeppelin-integration/pom.xml b/zeppelin-integration/pom.xml
@@ -255,7 +255,7 @@
       </activation>
       <properties>
         <zeppelin.daemon.package.base>
-          ../zeppelin-distribution/target/zeppelin-${project.version}/zeppelin-${project.version}/bin
+          ../zeppelin-distribution/target/zeppelin-${project.version}-bin/zeppelin-${project.version}-bin/bin
         </zeppelin.daemon.package.base>
       </properties>
     </profile>

diff --git a/zeppelin-server/pom.xml b/zeppelin-server/pom.xml
@@ -475,7 +475,7 @@
       </activation>
       <properties>
         <zeppelin.daemon.package.base>
-	        ../zeppelin-distribution/target/zeppelin-${project.version}/zeppelin-${project.version}/bin
+	        ../zeppelin-distribution/target/zeppelin-${project.version}-bin/zeppelin-${project.version}-bin/bin
         </zeppelin.daemon.package.base>
       </properties>
     </profile>