From 44414263050c52268ee73c855df684475340b009 Mon Sep 17 00:00:00 2001 From: Wu Sheng Date: Sun, 4 Nov 2018 22:00:29 +0800 Subject: [PATCH] Remove the wrong test cases in release and fix some doc issues. --- .../webapp/proxy/RewritePathFilterTest.java | 60 ------------------- docs/en/guides/How-to-release.md | 3 +- 2 files changed, 1 insertion(+), 62 deletions(-) delete mode 100644 apm-webapp/src/test/java/org/apache/skywalking/apm/webapp/proxy/RewritePathFilterTest.java diff --git a/apm-webapp/src/test/java/org/apache/skywalking/apm/webapp/proxy/RewritePathFilterTest.java b/apm-webapp/src/test/java/org/apache/skywalking/apm/webapp/proxy/RewritePathFilterTest.java deleted file mode 100644 index 013d96d3f3..0000000000 --- a/apm-webapp/src/test/java/org/apache/skywalking/apm/webapp/proxy/RewritePathFilterTest.java +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -package org.apache.skywalking.apm.webapp.proxy; - -import com.netflix.zuul.context.RequestContext; -import org.junit.Before; -import org.junit.Test; - -import static org.hamcrest.core.Is.is; -import static org.junit.Assert.*; -import static org.springframework.cloud.netflix.zuul.filters.support.FilterConstants.PRE_DECORATION_FILTER_ORDER; - -public class RewritePathFilterTest { - - private RewritePathFilter filter = new RewritePathFilter(); - - @Before - public void init() { - filter.setPath("/graphql"); - } - - @Test - public void filterOrder() { - assertThat(filter.filterOrder(), is(PRE_DECORATION_FILTER_ORDER + 2)); - } - - @Test - public void filterType() { - assertThat(filter.filterType(), is("pre")); - } - - @Test - public void shouldFilter() { - assertFalse(filter.shouldFilter()); - RequestContext.getCurrentContext().set("requestURI"); - assertTrue(filter.shouldFilter()); - } - - @Test - public void run() { - filter.run(); - assertThat(RequestContext.getCurrentContext().get("requestURI"), is("/graphql")); - } -} \ No newline at end of file diff --git a/docs/en/guides/How-to-release.md b/docs/en/guides/How-to-release.md index 12fd0447eb..07da21067f 100644 --- a/docs/en/guides/How-to-release.md +++ b/docs/en/guides/How-to-release.md @@ -50,7 +50,6 @@ Use the following block as a template and place it in ~/.m2/settings.xml ```shell switch to release version tag export RELEASE_VERSION=x.y.z (example: RELEASE_VERSION=5.0.0-alpha) -export RELEASE_ROUND=1 (example: RELEASE_ROUND=1) cd tools/releasing sh create_source_release.sh ``` @@ -78,7 +77,7 @@ with .asc, .sha512, .md5 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 * See Section "Find and download distribution in Apache Nexus Staging repositories" for more details -    * Create .sha512 package: `shasum -a 512 file > file.sha512` + * Create .sha512 package: `shasum -a 512 file > file.sha512` 1. Upload gpg public key, named KEY ## Make the internal announcements -- GitLab