From d59219fd33a9a814fd717bfd56c64ab4a7287d5a Mon Sep 17 00:00:00 2001
From: fangjian0423 <fangjian0423@gmail.com>
Date: Mon, 27 May 2019 15:42:10 +0800
Subject: [PATCH] upgrade sentinel to 1.6.1

---
 spring-cloud-alibaba-dependencies/pom.xml                       | 2 +-
 .../sentinel/gateway/scg/SentinelSCGAutoConfiguration.java      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/spring-cloud-alibaba-dependencies/pom.xml b/spring-cloud-alibaba-dependencies/pom.xml
index 85dadc24..15de5a74 100644
--- a/spring-cloud-alibaba-dependencies/pom.xml
+++ b/spring-cloud-alibaba-dependencies/pom.xml
@@ -17,7 +17,7 @@
     <description>Spring Cloud Alibaba Dependencies</description>
 
     <properties>
-        <sentinel.version>1.6.0</sentinel.version>
+        <sentinel.version>1.6.1</sentinel.version>
         <oss.version>3.1.0</oss.version>
         <seata.version>0.5.1</seata.version>
         <nacos.client.version>1.0.0</nacos.client.version>
diff --git a/spring-cloud-alibaba-sentinel-gateway/src/main/java/org/springframework/cloud/alibaba/sentinel/gateway/scg/SentinelSCGAutoConfiguration.java b/spring-cloud-alibaba-sentinel-gateway/src/main/java/org/springframework/cloud/alibaba/sentinel/gateway/scg/SentinelSCGAutoConfiguration.java
index 373149db..52961fa1 100644
--- a/spring-cloud-alibaba-sentinel-gateway/src/main/java/org/springframework/cloud/alibaba/sentinel/gateway/scg/SentinelSCGAutoConfiguration.java
+++ b/spring-cloud-alibaba-sentinel-gateway/src/main/java/org/springframework/cloud/alibaba/sentinel/gateway/scg/SentinelSCGAutoConfiguration.java
@@ -147,7 +147,7 @@ public class SentinelSCGAutoConfiguration {
 	@Bean
 	@Order(-1)
 	@ConditionalOnMissingBean
-	public GlobalFilter sentinelGatewayFilter() {
+	public SentinelGatewayFilter sentinelGatewayFilter() {
 		logger.info("[Sentinel SpringCloudGateway] register SentinelGatewayFilter");
 		return new SentinelGatewayFilter();
 	}