feature: upgrade spring-boot to 2.3.1.RELEASE, spring-cloud-dependenc…

…ies to Hoxton.SR6, code adapter

myoss-starter-apm/pom.xml

@@ -43,6 +43,12 @@
             <groupId>app.myoss.cloud.boot</groupId>
             <artifactId>myoss-starter-core</artifactId>
         </dependency>
+        <dependency>
+            <!-- 编译 Jackson 代码 -->
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-json</artifactId>
+            <optional>true</optional>
+        </dependency>
         <!-- myoss cloud dependencies end -->
 
         <!-- spring cloud dependency start -->

myoss-starter-apm/src/main/java/app/myoss/cloud/apm/spring/cloud/sleuth/trace/ApplicationEventTracer.java

@@ -26,9 +26,9 @@
 import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
 import org.springframework.context.ConfigurableApplicationContext;
 
-import brave.internal.HexCodec;
 import brave.internal.Nullable;
 import brave.internal.Platform;
+import brave.internal.codec.HexCodec;
 
 /**
  * 应用事件调用链

myoss-starter-apm/src/test/java/app/myoss/cloud/apm/log/method/MonitorMethodAfterCase0Tests.java

@@ -33,7 +33,7 @@
 import org.junit.Test;
 import org.mockito.Mockito;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.rule.OutputCapture;
+import org.springframework.boot.test.system.OutputCaptureRule;
 import org.springframework.stereotype.Component;
 import org.springframework.util.ClassUtils;
 
@@ -53,7 +53,7 @@
 @SpringBootTest(properties = { "myoss-cloud.log.method.app-name:myoss-starter-apm" })
 public class MonitorMethodAfterCase0Tests {
     @Rule
-    public OutputCapture       output      = new OutputCapture();
+    public OutputCaptureRule   output      = new OutputCaptureRule();
     private MonitorMethodAfter methodAfter = new MonitorMethodAfter();
 
     @Test

myoss-starter-apm/src/test/java/app/myoss/cloud/apm/log/method/MonitorMethodAfterCase1Tests.java

@@ -26,7 +26,7 @@
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.rule.OutputCapture;
+import org.springframework.boot.test.system.OutputCaptureRule;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -51,7 +51,7 @@
 @RunWith(SpringRunner.class)
 public class MonitorMethodAfterCase1Tests {
     @Rule
-    public OutputCapture       output = new OutputCapture();
+    public OutputCaptureRule   output = new OutputCaptureRule();
     @Rule
     public ExpectedException   thrown = ExpectedException.none();
 

myoss-starter-apm/src/test/java/app/myoss/cloud/apm/log/method/MonitorMethodAfterCase2Tests.java

@@ -26,7 +26,7 @@
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.rule.OutputCapture;
+import org.springframework.boot.test.system.OutputCaptureRule;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -51,7 +51,7 @@
 @RunWith(SpringRunner.class)
 public class MonitorMethodAfterCase2Tests {
     @Rule
-    public OutputCapture       output = new OutputCapture();
+    public OutputCaptureRule   output = new OutputCaptureRule();
     @Rule
     public ExpectedException   thrown = ExpectedException.none();
 

myoss-starter-apm/src/test/java/app/myoss/cloud/apm/log/method/MonitorMethodAfterCase3Tests.java

@@ -26,7 +26,7 @@
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.rule.OutputCapture;
+import org.springframework.boot.test.system.OutputCaptureRule;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -51,7 +51,7 @@
 @RunWith(SpringRunner.class)
 public class MonitorMethodAfterCase3Tests {
     @Rule
-    public OutputCapture       output = new OutputCapture();
+    public OutputCaptureRule   output = new OutputCaptureRule();
     @Rule
     public ExpectedException   thrown = ExpectedException.none();
 

myoss-starter-apm/src/test/java/app/myoss/cloud/apm/log/method/MonitorMethodAroundCase0Tests.java

@@ -33,7 +33,7 @@
 import org.junit.Test;
 import org.mockito.Mockito;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.rule.OutputCapture;
+import org.springframework.boot.test.system.OutputCaptureRule;
 import org.springframework.stereotype.Component;
 import org.springframework.util.ClassUtils;
 
@@ -55,7 +55,7 @@
 @SpringBootTest(properties = { "myoss-cloud.log.method.app-name:myoss-starter-apm" })
 public class MonitorMethodAroundCase0Tests {
     @Rule
-    public OutputCapture        output      = new OutputCapture();
+    public OutputCaptureRule    output      = new OutputCaptureRule();
     private MonitorMethodAround methodAfter = new MonitorMethodAround();
 
     @Test

myoss-starter-apm/src/test/java/app/myoss/cloud/apm/log/method/MonitorMethodAroundCase1Tests.java

@@ -26,7 +26,7 @@
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.rule.OutputCapture;
+import org.springframework.boot.test.system.OutputCaptureRule;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -51,7 +51,7 @@
 @RunWith(SpringRunner.class)
 public class MonitorMethodAroundCase1Tests {
     @Rule
-    public OutputCapture       output = new OutputCapture();
+    public OutputCaptureRule   output = new OutputCaptureRule();
     @Rule
     public ExpectedException   thrown = ExpectedException.none();
 

myoss-starter-apm/src/test/java/app/myoss/cloud/apm/log/method/MonitorMethodAroundCase2Tests.java

@@ -26,7 +26,7 @@
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.rule.OutputCapture;
+import org.springframework.boot.test.system.OutputCaptureRule;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -51,7 +51,7 @@
 @RunWith(SpringRunner.class)
 public class MonitorMethodAroundCase2Tests {
     @Rule
-    public OutputCapture       output = new OutputCapture();
+    public OutputCaptureRule   output = new OutputCaptureRule();
     @Rule
     public ExpectedException   thrown = ExpectedException.none();
 

myoss-starter-apm/src/test/java/app/myoss/cloud/apm/log/method/MonitorMethodAroundCase3Tests.java

@@ -26,7 +26,7 @@
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.rule.OutputCapture;
+import org.springframework.boot.test.system.OutputCaptureRule;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -51,7 +51,7 @@
 @RunWith(SpringRunner.class)
 public class MonitorMethodAroundCase3Tests {
     @Rule
-    public OutputCapture       output = new OutputCapture();
+    public OutputCaptureRule   output = new OutputCaptureRule();
     @Rule
     public ExpectedException   thrown = ExpectedException.none();
 

myoss-starter-apm/src/test/java/app/myoss/cloud/apm/log/method/MonitorMethodAroundCase4Tests.java

@@ -26,7 +26,7 @@
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.rule.OutputCapture;
+import org.springframework.boot.test.system.OutputCaptureRule;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -54,7 +54,7 @@
 @RunWith(SpringRunner.class)
 public class MonitorMethodAroundCase4Tests {
     @Rule
-    public OutputCapture       output = new OutputCapture();
+    public OutputCaptureRule   output = new OutputCaptureRule();
     @Rule
     public ExpectedException   thrown = ExpectedException.none();
 

myoss-starter-apm/src/test/java/app/myoss/cloud/apm/log/method/MonitorMethodAroundCase5Tests.java

@@ -26,7 +26,7 @@
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.rule.OutputCapture;
+import org.springframework.boot.test.system.OutputCaptureRule;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -54,7 +54,7 @@
 @RunWith(SpringRunner.class)
 public class MonitorMethodAroundCase5Tests {
     @Rule
-    public OutputCapture       output = new OutputCapture();
+    public OutputCaptureRule   output = new OutputCaptureRule();
     @Rule
     public ExpectedException   thrown = ExpectedException.none();
 

myoss-starter-apm/src/test/java/app/myoss/cloud/apm/log/method/MonitorMethodAroundCase6Tests.java

@@ -26,7 +26,7 @@
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.rule.OutputCapture;
+import org.springframework.boot.test.system.OutputCaptureRule;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -54,7 +54,7 @@
 @RunWith(SpringRunner.class)
 public class MonitorMethodAroundCase6Tests {
     @Rule
-    public OutputCapture       output = new OutputCapture();
+    public OutputCaptureRule   output = new OutputCaptureRule();
     @Rule
     public ExpectedException   thrown = ExpectedException.none();
 

myoss-starter-apm/src/test/java/app/myoss/cloud/apm/log/method/MonitorMethodBeforeCase0Tests.java

@@ -33,7 +33,7 @@
 import org.junit.Test;
 import org.mockito.Mockito;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.rule.OutputCapture;
+import org.springframework.boot.test.system.OutputCaptureRule;
 import org.springframework.stereotype.Component;
 import org.springframework.util.ClassUtils;
 
@@ -55,7 +55,7 @@
 @SpringBootTest(properties = { "myoss-cloud.log.method.app-name:myoss-starter-apm" })
 public class MonitorMethodBeforeCase0Tests {
     @Rule
-    public OutputCapture        output      = new OutputCapture();
+    public OutputCaptureRule    output      = new OutputCaptureRule();
     private MonitorMethodBefore methodAfter = new MonitorMethodBefore();
 
     @Test

myoss-starter-apm/src/test/java/app/myoss/cloud/apm/log/method/MonitorMethodBeforeCase1Tests.java

@@ -26,7 +26,7 @@
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.rule.OutputCapture;
+import org.springframework.boot.test.system.OutputCaptureRule;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -51,7 +51,7 @@
 @RunWith(SpringRunner.class)
 public class MonitorMethodBeforeCase1Tests {
     @Rule
-    public OutputCapture       output = new OutputCapture();
+    public OutputCaptureRule   output = new OutputCaptureRule();
     @Rule
     public ExpectedException   thrown = ExpectedException.none();
 

myoss-starter-apm/src/test/java/app/myoss/cloud/apm/log/method/MonitorMethodBeforeCase2Tests.java

@@ -26,7 +26,7 @@
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.rule.OutputCapture;
+import org.springframework.boot.test.system.OutputCaptureRule;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -51,7 +51,7 @@
 @RunWith(SpringRunner.class)
 public class MonitorMethodBeforeCase2Tests {
     @Rule
-    public OutputCapture       output = new OutputCapture();
+    public OutputCaptureRule   output = new OutputCaptureRule();
     @Rule
     public ExpectedException   thrown = ExpectedException.none();
 

myoss-starter-apm/src/test/java/app/myoss/cloud/apm/log/method/MonitorMethodBeforeCase3Tests.java

@@ -26,7 +26,7 @@
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.rule.OutputCapture;
+import org.springframework.boot.test.system.OutputCaptureRule;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -51,7 +51,7 @@
 @RunWith(SpringRunner.class)
 public class MonitorMethodBeforeCase3Tests {
     @Rule
-    public OutputCapture       output = new OutputCapture();
+    public OutputCaptureRule   output = new OutputCaptureRule();
     @Rule
     public ExpectedException   thrown = ExpectedException.none();
 

myoss-starter-apm/src/test/java/app/myoss/cloud/apm/log/method/MonitorMethodBeforeCase4Tests.java

@@ -29,7 +29,7 @@
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.rule.OutputCapture;
+import org.springframework.boot.test.system.OutputCaptureRule;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -55,7 +55,7 @@
 @RunWith(SpringRunner.class)
 public class MonitorMethodBeforeCase4Tests {
     @Rule
-    public OutputCapture       output = new OutputCapture();
+    public OutputCaptureRule   output = new OutputCaptureRule();
     @Rule
     public ExpectedException   thrown = ExpectedException.none();
 

myoss-starter-apm/src/test/java/app/myoss/cloud/apm/log/method/UnMonitorMethodAfterCase1Tests.java

@@ -24,7 +24,7 @@
 import org.junit.rules.ExpectedException;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.rule.OutputCapture;
+import org.springframework.boot.test.system.OutputCaptureRule;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -50,7 +50,7 @@
 @DirtiesContext
 public class UnMonitorMethodAfterCase1Tests {
     @Rule
-    public OutputCapture       output = new OutputCapture();
+    public OutputCaptureRule   output = new OutputCaptureRule();
     @Rule
     public ExpectedException   thrown = ExpectedException.none();
 

myoss-starter-apm/src/test/java/app/myoss/cloud/apm/log/method/UnMonitorMethodAfterCase2Tests.java

@@ -24,7 +24,7 @@
 import org.junit.rules.ExpectedException;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.rule.OutputCapture;
+import org.springframework.boot.test.system.OutputCaptureRule;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -48,7 +48,7 @@
 @RunWith(SpringRunner.class)
 public class UnMonitorMethodAfterCase2Tests {
     @Rule
-    public OutputCapture       output = new OutputCapture();
+    public OutputCaptureRule   output = new OutputCaptureRule();
     @Rule
     public ExpectedException   thrown = ExpectedException.none();
 

myoss-starter-apm/src/test/java/app/myoss/cloud/apm/log/method/UnMonitorMethodAfterCase3Tests.java

@@ -24,7 +24,7 @@
 import org.junit.rules.ExpectedException;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.rule.OutputCapture;
+import org.springframework.boot.test.system.OutputCaptureRule;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -48,7 +48,7 @@
 @RunWith(SpringRunner.class)
 public class UnMonitorMethodAfterCase3Tests {
     @Rule
-    public OutputCapture       output = new OutputCapture();
+    public OutputCaptureRule   output = new OutputCaptureRule();
     @Rule
     public ExpectedException   thrown = ExpectedException.none();
 

myoss-starter-apm/src/test/java/app/myoss/cloud/apm/log/method/UnMonitorMethodAroundCase1Tests.java

@@ -24,7 +24,7 @@
 import org.junit.rules.ExpectedException;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.rule.OutputCapture;
+import org.springframework.boot.test.system.OutputCaptureRule;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -48,7 +48,7 @@
 @RunWith(SpringRunner.class)
 public class UnMonitorMethodAroundCase1Tests {
     @Rule
-    public OutputCapture       output = new OutputCapture();
+    public OutputCaptureRule   output = new OutputCaptureRule();
     @Rule
     public ExpectedException   thrown = ExpectedException.none();