You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by wu...@apache.org on 2019/01/30 12:37:47 UTC

[incubator-skywalking] branch master updated: Set dist bin tar with -bin in the final name. (#2221)

This is an automated email from the ASF dual-hosted git repository.

wusheng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git


The following commit(s) were added to refs/heads/master by this push:
     new f88ac3d  Set dist bin tar with -bin in the final name. (#2221)
f88ac3d is described below

commit f88ac3defe215bb6ac363d2d8703c95ea05d6612
Author: 吴晟 Wu Sheng <wu...@foxmail.com>
AuthorDate: Wed Jan 30 20:37:40 2019 +0800

    Set dist bin tar with -bin in the final name. (#2221)
    
    * Set dist bin tar with -bin in the final name.
    
    * Change dockerfile and makefile
---
 apm-dist/pom.xml                 |  6 +++---
 docker/Makefile                  |  4 ++--
 docker/oap/Dockerfile            |  2 +-
 docker/ui/Dockerfile             |  2 +-
 docs/en/guides/How-to-release.md | 24 +++++++++++++-----------
 5 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/apm-dist/pom.xml b/apm-dist/pom.xml
index 64e5e21..05a0b7b 100644
--- a/apm-dist/pom.xml
+++ b/apm-dist/pom.xml
@@ -48,7 +48,7 @@
     </dependencies>
 
     <build>
-        <finalName>apache-skywalking-apm-incubating</finalName>
+        <finalName>apache-skywalking-apm-incubating-bin</finalName>
         <plugins>
             <plugin>
                 <artifactId>maven-assembly-plugin</artifactId>
@@ -81,8 +81,8 @@
                         </goals>
                         <configuration>
                             <tasks>
-                                <copy file="${project.build.directory}/apache-skywalking-apm-incubating.tar.gz" tofile="${project.basedir}/../dist/apache-skywalking-apm-incubating.tar.gz" overwrite="true" />
-                                <copy file="${project.build.directory}/apache-skywalking-apm-incubating.zip" tofile="${project.basedir}/../dist/apache-skywalking-apm-incubating.zip" overwrite="true" />
+                                <copy file="${project.build.directory}/apache-skywalking-apm-incubating-bin.tar.gz" tofile="${project.basedir}/../dist/apache-skywalking-apm-incubating-bin.tar.gz" overwrite="true" />
+                                <copy file="${project.build.directory}/apache-skywalking-apm-incubating-bin.zip" tofile="${project.basedir}/../dist/apache-skywalking-apm-incubating-bin.zip" overwrite="true" />
                             </tasks>
                         </configuration>
                     </execution>
diff --git a/docker/Makefile b/docker/Makefile
index 0d16815..7ee7bb32 100644
--- a/docker/Makefile
+++ b/docker/Makefile
@@ -16,12 +16,12 @@
 
 oap:
 	cd oap; \
-	cp ../../dist/apache-skywalking-apm-incubating.tar.gz ./ ; \
+	cp ../../dist/apache-skywalking-apm-incubating-bin.tar.gz ./ ; \
 	docker build -t skywalking/oap:latest .
 
 ui:
 	cd ui; \
-	cp ../../dist/apache-skywalking-apm-incubating.tar.gz ./ ; \
+	cp ../../dist/apache-skywalking-apm-incubating-bin.tar.gz ./ ; \
 	docker build -t skywalking/ui:latest .
 	
 build: oap ui
diff --git a/docker/oap/Dockerfile b/docker/oap/Dockerfile
index 10d4859..b89b423 100644
--- a/docker/oap/Dockerfile
+++ b/docker/oap/Dockerfile
@@ -16,7 +16,7 @@
 
 FROM openjdk:8-jre-alpine
 
-ENV DIST_NAME=apache-skywalking-apm-incubating \
+ENV DIST_NAME=apache-skywalking-apm-incubating-bin \
     JAVA_OPTS=" -Xms256M -Xmx512M"
 
 # Install required packages
diff --git a/docker/ui/Dockerfile b/docker/ui/Dockerfile
index 62e1432..a6893d4 100644
--- a/docker/ui/Dockerfile
+++ b/docker/ui/Dockerfile
@@ -16,7 +16,7 @@
 
 FROM openjdk:8-jre-alpine
 
-ENV DIST_NAME=apache-skywalking-apm-incubating \
+ENV DIST_NAME=apache-skywalking-apm-incubating-bin \
     JAVA_OPTS=" -Xms256M -Xmx512M"
 
 # Install required packages
diff --git a/docs/en/guides/How-to-release.md b/docs/en/guides/How-to-release.md
index c81efc5..fd39459 100644
--- a/docs/en/guides/How-to-release.md
+++ b/docs/en/guides/How-to-release.md
@@ -48,6 +48,9 @@ This step is only for test, if your env is set right, don't need to check every
 ./mvnw release:clean
 ./mvnw release:prepare -DautoVersionSubmodules=true -Pauto-submodule
 ```
+
+- Set version number as x.y.z, and tag as **v**x.y.z (version tag must start with **v**, you will find the purpose in next step.)
+
 _You could do a GPG sign before doing release, if you need input the password to sign, and the maven don't give the chance,
 but just failure. Run `gpg --sign xxx` to any file could remember the password for enough time to do release._ 
 
@@ -55,8 +58,8 @@ but just failure. Run `gpg --sign xxx` to any file could remember the password f
 ```
 ./mvnw release:perform -DskipTests -Pauto-submodule
 ```
-1. Set version number as x.y.z, and tag as **v**x.y.z (version tag must start with **v**, you will find the purpose in next step.)
-1. The release will automatically be inserted into a temporary staging repository for you.
+
+- The release will automatically be inserted into a temporary staging repository for you.
 
 ## Build and sign the source code package
 ```shell
@@ -94,7 +97,7 @@ if you haven't done it before.
     * Package name: apache-skywalking-incubating-x.y.z-src.tar.gz
     * See Section "Build and sign the source code package" for more details 
 1. Upload distribution package to the folder with .asc, .sha512
-    * Package name: apache-skywalking-incubating-x.y.z.tar.gz, apache-skywalking-incubating-x.y.z.zip
+    * Package name: apache-skywalking-incubating-bin-x.y.z.tar.gz, apache-skywalking-incubating-bin-x.y.z.zip
     * See Section "Find and download distribution in Apache Nexus Staging repositories" for more details
     * Create .sha512 package: `shasum -a 512 file > file.sha512`
 
@@ -120,8 +123,8 @@ Release Candidate:
  * https://dist.apache.org/repos/dist/dev/incubator/skywalking/xxxx
  * sha512 checksums
    - sha512xxxxyyyzzz apache-skywalking-apm-incubating-x.x.x-src.tgz
-   - sha512xxxxyyyzzz apache-skywalking-apm-incubating-x.x.x.tar.gz
-   - sha512xxxxyyyzzz apache-skywalking-apm-incubating-x.x.x.zip
+   - sha512xxxxyyyzzz apache-skywalking-apm-incubating-bin-x.x.x.tar.gz
+   - sha512xxxxyyyzzz apache-skywalking-apm-incubating-bin-x.x.x.zip
 
 Maven 2 staging repository:
 
@@ -174,8 +177,8 @@ Release Candidate:
  * https://dist.apache.org/repos/dist/dev/incubator/skywalking/xxxx
  * sha512 checksums
    - sha512xxxxyyyzzz apache-skywalking-apm-incubating-x.x.x-src.tgz
-   - sha512xxxxyyyzzz apache-skywalking-apm-incubating-x.x.x.tar.gz
-   - sha512xxxxyyyzzz apache-skywalking-apm-incubating-x.x.x.zip
+   - sha512xxxxyyyzzz apache-skywalking-apm-incubating-bin-x.x.x.tar.gz
+   - sha512xxxxyyyzzz apache-skywalking-apm-incubating-bin-x.x.x.zip
 
 Maven 2 staging repository:
 
@@ -212,7 +215,7 @@ All PPMC members and committers should check these before vote +1.
 
 1. Features test.
 1. All artifacts in staging repository are published with .asc, .md5, *sha1 files
-1. Source code and distribution package (apache-skywalking-incubating-x.y.z-src.tar.gz, apache-skywalking-incubating-x.y.z.tar.gz, apache-skywalking-incubating-x.y.z.zip)
+1. Source code and distribution package (apache-skywalking-incubating-x.y.z-src.tar.gz, apache-skywalking-incubating-bin-x.y.z.tar.gz, apache-skywalking-incubating-bin-x.y.z.zip)
 are in `https://dist.apache.org/repos/dist/dev/incubator/skywalking/x.y.z` with .asc, .sha512
 1. `LICENSE` and `NOTICE` are in Source code and distribution package.
 1. Check `shasum -c apache-skywalking-apm-incubating-x.y.z-src.tgz.sha512`
@@ -261,8 +264,8 @@ Release Candidate:
  * https://dist.apache.org/repos/dist/dev/incubator/skywalking/xxxx
  * sha512 checksums
    - sha512xxxxyyyzzz apache-skywalking-apm-incubating-x.x.x-src.tgz
-   - sha512xxxxyyyzzz apache-skywalking-apm-incubating-x.x.x.tar.gz
-   - sha512xxxxyyyzzz apache-skywalking-apm-incubating-x.x.x.zip
+   - sha512xxxxyyyzzz apache-skywalking-apm-incubating-bin-x.x.x.tar.gz
+   - sha512xxxxyyyzzz apache-skywalking-apm-incubating-bin-x.x.x.zip
 
 Maven 2 staging repository:
 
@@ -344,7 +347,6 @@ Apache SkyWalking (incubating) Team is glad to announce the first release of Apa
 
 SkyWalking: APM (application performance monitor) tool for distributed systems, 
 especially designed for microservices, cloud native and container-based (Docker, Kubernetes, Mesos) architectures. 
-Underlying technology is a distributed tracing system.
 
 Vote Thread: