Update SOFABoot to 3.10.0

Fix issue #70
sofastack · Feb 10, 2022 · c0ef20d · c0ef20d
1 parent 432f792
commit c0ef20d
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 36 deletions.
diff --git a/pom.xml b/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>com.alipay.sofa</groupId>
         <artifactId>sofaboot-dependencies</artifactId>
-        <version>3.0.0</version>
+        <version>3.10.0</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
     <artifactId>sofa-dashboard</artifactId>

diff --git a/sofa-dashboard-backend/pom.xml b/sofa-dashboard-backend/pom.xml
@@ -30,11 +30,11 @@
         <mysql.connector.version>5.1.35</mysql.connector.version>
         <druid.version>1.1.9</druid.version>
         <sofaark.version>0.6.0</sofaark.version>
-        <dashboard.client.version>1.1.0-SNAPSHOT</dashboard.client.version>
-        <curator.version>2.9.1</curator.version>
-        <sofa.common.version>1.0.17</sofa.common.version>
+        <dashboard.client.version>1.1.1-SNAPSHOT</dashboard.client.version>
+        <curator.version>4.0.1</curator.version>
+        <!--        <sofa.common.version>1.0.17</sofa.common.version>-->
         <jmockit.version>1.14</jmockit.version>
-        <mybatis.spring.boot.version>1.3.2</mybatis.spring.boot.version>
+        <mybatis.spring.boot.version>2.2.2</mybatis.spring.boot.version>
     </properties>
 
     <dependencyManagement>
@@ -54,11 +54,6 @@
                 <artifactId>sofa-dashboard-governance</artifactId>
                 <version>${project.version}</version>
             </dependency>
-            <dependency>
-                <groupId>com.alipay.sofa</groupId>
-                <artifactId>sofa-dashboard-application</artifactId>
-                <version>${project.version}</version>
-            </dependency>
             <dependency>
                 <groupId>com.alipay.sofa</groupId>
                 <artifactId>dashboard-client-core</artifactId>
@@ -118,22 +113,17 @@
                 <version>${curator.version}</version>
             </dependency>
 
-            <dependency>
-                <groupId>com.alipay.sofa.common</groupId>
-                <artifactId>log-sofa-boot-starter</artifactId>
-                <version>${sofa.common.version}</version>
-                <exclusions>
-                    <exclusion>
-                        <artifactId>sofa-common-tools</artifactId>
-                        <groupId>com.alipay.sofa.common</groupId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
-            <dependency>
-                <groupId>com.alipay.sofa.common</groupId>
-                <artifactId>sofa-common-tools</artifactId>
-                <version>${sofa.common.version}</version>
-            </dependency>
+            <!--            <dependency>-->
+            <!--                <groupId>com.alipay.sofa.common</groupId>-->
+            <!--                <artifactId>log-sofa-boot-starter</artifactId>-->
+            <!--                <version>${sofa.common.version}</version>-->
+            <!--                <exclusions>-->
+            <!--                    <exclusion>-->
+            <!--                        <artifactId>sofa-common-tools</artifactId>-->
+            <!--                        <groupId>com.alipay.sofa.common</groupId>-->
+            <!--                    </exclusion>-->
+            <!--                </exclusions>-->
+            <!--            </dependency>-->
             <!-- test -->
             <dependency>
                 <groupId>com.h2database</groupId>

diff --git a/...sofa-dashboard-application/src/test/java/com/alipay/sofa/dashboard/mock/MockRegistry.java b/...sofa-dashboard-application/src/test/java/com/alipay/sofa/dashboard/mock/MockRegistry.java
@@ -19,7 +19,6 @@
 import com.alipay.sofa.dashboard.client.model.common.Application;
 import com.alipay.sofa.dashboard.client.registry.AppPublisher;
 import com.alipay.sofa.dashboard.client.registry.AppSubscriber;
-import org.jboss.netty.util.internal.ConcurrentHashMap;
 import org.junit.rules.TestRule;
 import org.junit.runner.Description;
 import org.junit.runners.model.Statement;
@@ -33,6 +32,7 @@
 import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentSkipListSet;
 import java.util.stream.Collectors;
 

diff --git a/sofa-dashboard-backend/sofa-dashboard-core/pom.xml b/sofa-dashboard-backend/sofa-dashboard-core/pom.xml
@@ -41,10 +41,6 @@
             <groupId>com.alibaba</groupId>
             <artifactId>fastjson</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.alipay.sofa.common</groupId>
-            <artifactId>log-sofa-boot-starter</artifactId>
-        </dependency>
         <dependency>
             <groupId>com.alipay.sofa.common</groupId>
             <artifactId>sofa-common-tools</artifactId>

diff --git a/sofa-dashboard-backend/sofa-dashboard-web/pom.xml b/sofa-dashboard-backend/sofa-dashboard-web/pom.xml
@@ -47,10 +47,6 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.alipay.sofa.common</groupId>
-            <artifactId>log-sofa-boot-starter</artifactId>
-        </dependency>
         <dependency>
             <groupId>com.alipay.sofa.common</groupId>
             <artifactId>sofa-common-tools</artifactId>

diff --git a/...-dashboard-backend/sofa-dashboard-web/src/main/resources/spring/mybatis-configuration.xml b/...-dashboard-backend/sofa-dashboard-web/src/main/resources/spring/mybatis-configuration.xml
@@ -6,7 +6,7 @@
         <property name="dialect" value="mysql"/>
     </properties>
     <settings>
-        <setting name="logImpl" value="STDOUT_LOGGING" />
+        <setting name="logImpl" value="SLF4J" />
         <setting name="mapUnderscoreToCamelCase" value="true"/>
     </settings>
     <!-- 别名的基础包，在该包下的会自动增加别名：bean的首字母小写-->