diff --git a/README.md b/README.md index 682e7980b9fd9d0ccbd916dda1c55a2fdcdb03eb..5d0bb3603b74b48628cc46dd1e56ef3484f555ae 100644 --- a/README.md +++ b/README.md @@ -39,6 +39,14 @@ for different scenarios. For better understanding, read our documents. # Document - [Documents in English](docs/README.md) +``` +5.x is still supported by SkyWalking community, and the agent-backend protocol is compatible with 6.x. +You can go to 5.x branch. At there, you have everything you need. +``` + +- Go to [5.x pages](https://github.com/apache/incubator-skywalking/tree/5.x) + + # Downloads Please head to the [releases page](ttp://skywalking.apache.org/downloads/) to download a release of Apache SkyWalking. diff --git a/docs/README.md b/docs/README.md index 197cad6521dd9f00bdf0fd9cd16b52d4c01c573b..42a7b32a7cb80ce8707071dde98f842bc6768b05 100644 --- a/docs/README.md +++ b/docs/README.md @@ -26,8 +26,3 @@ Or better yet, submit your own contributions through pull request to help make t -### 5.x releases -5.x is still supported by SkyWalking community, and the agent-backend protocol is compatible with 6.x. -You can go to [5.x branch](https://github.com/apache/incubator-skywalking/tree/5.x). -At there, you have everything you need. - diff --git a/docs/en/guides/How-to-release.md b/docs/en/guides/How-to-release.md index 051b2e49c7c025ab7dc5316c8a63ea43d08525bc..b46fc940e2826b5256a1341e98fedaf862da31ee 100644 --- a/docs/en/guides/How-to-release.md +++ b/docs/en/guides/How-to-release.md @@ -43,7 +43,7 @@ Use the following block as a template and place it in ~/.m2/settings.xml ``` ./mvnw release:perform -DskipTests -Ptravis-ci-submodule ``` -1. Set version number as x.y.z, and tag as x.y.z-RCx. `x` in `RCx` is based the number of attempts release, aka `RELEASE_ROUND` in this doc, and starts with 1. +1. Set version number as x.y.z, and tag as vx.y.z 1. The release will automatically be inserted into a temporary staging repository for you. ## Build and sign the source code package @@ -71,7 +71,7 @@ with .asc, .sha512, .md5 ## Upload to Apache svn 1. Use ApacheId to login `https://dist.apache.org/repos/dist/dev/incubator/skywalking/` -1. Create folder, named by release version and round, such as: x.y.z-RCx +1. Create folder, named by release version and round, such as: x.y.z 1. Upload Source code package to the folder with .asc, .sha512 * Package name: apache-skywalking-incubating-x.y.z-src.tar.gz * See Section "Build and sign the source code package" for more details @@ -112,7 +112,7 @@ Maven 2 staging repository: Release Tag : - * (Git Tag) x.y.z-RCx + * (Git Tag) x.y.z Release CommitID : @@ -165,7 +165,7 @@ Maven 2 staging repository: Release Tag : - * (Git Tag) x.y.z-RCx + * (Git Tag) x.y.z Release CommitID : @@ -247,7 +247,7 @@ Maven 2 staging repository: Release Tag : - * (Git Tag) x.y.z-RCx + * (Git Tag) x.y.z Release CommitID : @@ -297,7 +297,7 @@ I will process to publish the release and send ANNOUNCE. 1. Move source codes tar balls and distributions to `https://dist.apache.org/repos/dist/release/incubator/skywalking/`. ``` > export SVN_EDITOR=vim -> svn mv https://dist.apache.org/repos/dist/dev/incubator/skywalking/x.y.z-RCx https://dist.apache.org/repos/dist/release/incubator/skywalking +> svn mv https://dist.apache.org/repos/dist/dev/incubator/skywalking/x.y.z https://dist.apache.org/repos/dist/release/incubator/skywalking .... enter your apache password .... @@ -306,7 +306,6 @@ enter your apache password 2. Do release in nexus staging repo. 3. Public download URLs under `http://www.apache.org/dyn/closer.cgi/incubator/skywalking/x.y.z`. 4. Public KEYS, sigs and sha512 URLs under `https://www.apache.org/dist/incubator/skywalking/xxxx` -5. Re-tag on GitHub, tag `x.y.z-RCx` as `x.y.z`, and publish a GitHub release based on this tag. 5. Send ANNOUNCE mail to `general@incubator.apache.org` and `dev@skywalking.apache.org`. ``` Mail title: [ANNOUNCE] Release Apache SkyWalking (incubating) version x.y.z diff --git a/oap-server/server-alarm-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/AlarmCoreTest.java b/oap-server/server-alarm-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/AlarmCoreTest.java index e37a462528e1bdab999dbc32cf1b5589580960b5..e91b4224a2942d9e93ee8d923a4e1ef7f81c2ffd 100644 --- a/oap-server/server-alarm-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/AlarmCoreTest.java +++ b/oap-server/server-alarm-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/AlarmCoreTest.java @@ -81,7 +81,7 @@ public class AlarmCoreTest { Assert.assertTrue(checkTimePoints(checkTime)); break; } - if(i == 9){ + if (i == 9) { Assert.assertTrue(false); } } diff --git a/tools/releasing/create_source_release.sh b/tools/releasing/create_source_release.sh index c3747f2db870e84cc88be6ab078ddc02e35acf35..24c7f7a6b21d280f2b202aeb352b278662aa9376 100755 --- a/tools/releasing/create_source_release.sh +++ b/tools/releasing/create_source_release.sh @@ -20,13 +20,11 @@ # This script relies on few environment variables to determine source code package # behavior, those variables are: # RELEASE_VERSION -- The version of this source package. -# RELEASE_ROUND -- The round of this version release. # For example: RELEASE_VERSION=5.0.0-alpha -# RELEASE_ROUND=1 RELEASE_VERSION=${RELEASE_VERSION} -TAG_NAME=v${RELEASE_VERSION}-RC${RELEASE_ROUND} +TAG_NAME=v${RELEASE_VERSION} PRODUCT_NAME="apache-skywalking-apm-incubating" echo "Release version "${RELEASE_VERSION} @@ -38,12 +36,6 @@ if [ "$RELEASE_VERSION" == "" ]; then exit 1 fi -if [ "$RELEASE_ROUND" == "" ]; then - echo "RELEASE_ROUND environment variable not found, Please setting the RELEASE_ROUND." - echo "For example: export RELEASE_ROUND=1" - exit 1 -fi - echo "Creating source package" PRODUCT_NAME=${PRODUCT_NAME}-${RELEASE_VERSION}