Merge branch 'master' of https://github.com/aderm/skywalking

apache · Oct 19, 2019 · 14a4d86 · 14a4d86
2 parents 93c8a89 + f76657e
commit 14a4d86
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 7 deletions.
diff --git a/docs/en/setup/service-agent/java-agent/Supported-list.md b/docs/en/setup/service-agent/java-agent/Supported-list.md
@@ -60,7 +60,6 @@
     * [SolrJ](https://github.com/apache/lucene-solr/tree/master/solr/solrj) 7.x
   * [Cassandra](https://github.com/apache/cassandra) 3.x
     * [cassandra-java-driver](https://github.com/datastax/java-driver) 3.6.0-3.7.2
-
 * Service Discovery
   * [Netflix Eureka](https://github.com/Netflix/eureka)
 * Distributed Coordination

diff --git a/skywalking-ui b/skywalking-ui
diff --git a/test/plugin/run.sh b/test/plugin/run.sh
@@ -123,7 +123,7 @@ agent_home_selector() {
 
     target_agent_home=${workspace}/${target_agent_dir}
     mkdir -p ${target_agent_home}
-    cp -fur ${agent_home}/* ${target_agent_home}
+    cp -fr ${agent_home}/* ${target_agent_home}
 
     with_plugins=`echo $with_plugins |sed -e "s/;/ /g"`
     for plugin in ${with_plugins};

diff --git a/test/plugin/scenarios/gateway-scenario/configuration.yml b/test/plugin/scenarios/gateway-scenario/configuration.yml
@@ -20,3 +20,4 @@ healthCheck: http://localhost:8080/provider/b/healthCheck
 startScript: ./bin/startup.sh
 framework: spring-cloud-gateway
 runningMode: with_optional
+withPlugins: apm-spring-cloud-gateway-2.x-plugin-*.jar
diff --git a/...rc/main/java/org/apache/skywalking/apm/testcase/sc/gateway/projectA/TestFilterConfig.java b/...rc/main/java/org/apache/skywalking/apm/testcase/sc/gateway/projectA/TestFilterConfig.java
@@ -18,7 +18,9 @@
 package org.apache.skywalking.apm.testcase.sc.gateway.projectA;
 
 import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
 
+@Configuration
 public class TestFilterConfig {
 
     @Bean

diff --git a/...n/scenarios/gateway-scenario/gateway-projectA-scenario/src/main/resources/application.yml b/...n/scenarios/gateway-scenario/gateway-projectA-scenario/src/main/resources/application.yml
@@ -24,7 +24,4 @@ spring:
       - id: provider_route
         uri: http://localhost:18070
         predicates:
-        - Path=/provider/b/*
-endpoints:
-  refresh:
-    sensitive: false
+        - Path=/provider/b/*