From d706ce57672fff6e5eda0aee32835c11cff55be6 Mon Sep 17 00:00:00 2001
From: Eric Zhao <sczyh16@gmail.com>
Date: Tue, 29 Mar 2022 13:59:38 +0800
Subject: [PATCH] dashboard: Update Spring Boot starter to 2.2.13.RELEASE

Signed-off-by: Eric Zhao <sczyh16@gmail.com>
---
 sentinel-dashboard/pom.xml                                    | 4 ++--
 .../sentinel/dashboard/config/NoAuthConfigurationTest.java    | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/sentinel-dashboard/pom.xml b/sentinel-dashboard/pom.xml
index e7348829..5d35c2e5 100644
--- a/sentinel-dashboard/pom.xml
+++ b/sentinel-dashboard/pom.xml
@@ -14,7 +14,7 @@
 
     <properties>
         <resource.delimiter>@</resource.delimiter>
-        <spring.boot.version>2.0.5.RELEASE</spring.boot.version>
+        <spring.boot.version>2.2.13.RELEASE</spring.boot.version>
         <curator.version>4.0.1</curator.version>
     </properties>
 
@@ -63,7 +63,7 @@
         <dependency>
             <groupId>log4j</groupId>
             <artifactId>log4j</artifactId>
-            <version>1.2.14</version>
+            <version>1.2.17</version>
         </dependency>
 
         <dependency>
diff --git a/sentinel-dashboard/src/test/java/com/alibaba/csp/sentinel/dashboard/config/NoAuthConfigurationTest.java b/sentinel-dashboard/src/test/java/com/alibaba/csp/sentinel/dashboard/config/NoAuthConfigurationTest.java
index a6d9fb11..78af4908 100644
--- a/sentinel-dashboard/src/test/java/com/alibaba/csp/sentinel/dashboard/config/NoAuthConfigurationTest.java
+++ b/sentinel-dashboard/src/test/java/com/alibaba/csp/sentinel/dashboard/config/NoAuthConfigurationTest.java
@@ -20,6 +20,7 @@ import com.alibaba.csp.sentinel.dashboard.auth.FakeAuthServiceImpl;
 import org.springframework.boot.test.context.TestConfiguration;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Import;
+import org.springframework.context.annotation.Primary;
 
 import javax.servlet.http.HttpServletRequest;
 
@@ -33,7 +34,8 @@ import javax.servlet.http.HttpServletRequest;
 public class NoAuthConfigurationTest {
 
     @Bean
-    public AuthService<HttpServletRequest> httpServletRequestAuthService() {
+    @Primary
+    public AuthService<HttpServletRequest> httpServletRequestNoopAuthService() {
         return new FakeAuthServiceImpl();
     }