From 1735c95cd182e2ca992a09b985c744e6f2d93e6c Mon Sep 17 00:00:00 2001
From: bryan31 <weenyc31@163.com>
Date: Tue, 30 Mar 2021 13:49:53 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=8D=95=E5=85=83=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 liteflow-spring-boot-starter/pom.xml             |  5 +++--
 liteflow-test-spring/pom.xml                     |  7 +++++++
 liteflow-test-springboot/pom.xml                 |  2 +-
 liteflow-test/pom.xml                            |  5 ++++-
 .../liteflow/test/aop/LiteflowAOPTest.java       |  8 +++++++-
 .../yomahub/liteflow/test/aop/TestRunner.java    | 16 ----------------
 ...ion.properties => application-aop.properties} |  0
 pom.xml                                          |  1 +
 8 files changed, 23 insertions(+), 21 deletions(-)
 delete mode 100644 liteflow-test/src/test/java/com/yomahub/liteflow/test/aop/TestRunner.java
 rename liteflow-test/src/test/resources/{application.properties => application-aop.properties} (100%)

diff --git a/liteflow-spring-boot-starter/pom.xml b/liteflow-spring-boot-starter/pom.xml
index 57b54e9c..8430bb60 100644
--- a/liteflow-spring-boot-starter/pom.xml
+++ b/liteflow-spring-boot-starter/pom.xml
@@ -22,12 +22,12 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-autoconfigure</artifactId>
-            <version>2.0.5.RELEASE</version>
+            <version>${springboot.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-configuration-processor</artifactId>
-            <version>2.0.5.RELEASE</version>
+            <version>${springboot.version}</version>
         </dependency>
     </dependencies>
 
@@ -36,6 +36,7 @@
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
+                <version>${springboot.version}</version>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
diff --git a/liteflow-test-spring/pom.xml b/liteflow-test-spring/pom.xml
index 1e6b9408..ab7150a4 100644
--- a/liteflow-test-spring/pom.xml
+++ b/liteflow-test-spring/pom.xml
@@ -53,7 +53,14 @@
     <build>
         <plugins>
             <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>2.18.1</version>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-deploy-plugin</artifactId>
+                <version>2.8.2</version>
                 <configuration>
                     <skip>true</skip>
                 </configuration>
diff --git a/liteflow-test-springboot/pom.xml b/liteflow-test-springboot/pom.xml
index 389664a4..207a2a20 100644
--- a/liteflow-test-springboot/pom.xml
+++ b/liteflow-test-springboot/pom.xml
@@ -18,7 +18,7 @@
                 <!-- Import dependency management from Spring Boot -->
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-dependencies</artifactId>
-                <version>2.0.5.RELEASE</version>
+                <version>${springboot.version}</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
diff --git a/liteflow-test/pom.xml b/liteflow-test/pom.xml
index 9b535dc1..fc6a4c25 100644
--- a/liteflow-test/pom.xml
+++ b/liteflow-test/pom.xml
@@ -17,7 +17,7 @@
                 <!-- Import dependency management from Spring Boot -->
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-dependencies</artifactId>
-                <version>2.0.5.RELEASE</version>
+                <version>${springboot.version}</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -54,9 +54,12 @@
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
+                <version>${springboot.version}</version>
             </plugin>
             <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-deploy-plugin</artifactId>
+                <version>2.8.2</version>
                 <configuration>
                     <skip>true</skip>
                 </configuration>
diff --git a/liteflow-test/src/test/java/com/yomahub/liteflow/test/aop/LiteflowAOPTest.java b/liteflow-test/src/test/java/com/yomahub/liteflow/test/aop/LiteflowAOPTest.java
index b7598894..609d22ef 100644
--- a/liteflow-test/src/test/java/com/yomahub/liteflow/test/aop/LiteflowAOPTest.java
+++ b/liteflow-test/src/test/java/com/yomahub/liteflow/test/aop/LiteflowAOPTest.java
@@ -5,13 +5,19 @@ import com.yomahub.liteflow.entity.data.LiteflowResponse;
 import com.yomahub.liteflow.entity.data.Slot;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.context.junit4.SpringRunner;
 
 import javax.annotation.Resource;
 
 @RunWith(SpringRunner.class)
-@SpringBootTest(classes = TestRunner.class)
+@ActiveProfiles("aop")
+@SpringBootTest(classes = LiteflowAOPTest.class)
+@EnableAutoConfiguration
+@ComponentScan
 public class LiteflowAOPTest {
 
     @Resource
diff --git a/liteflow-test/src/test/java/com/yomahub/liteflow/test/aop/TestRunner.java b/liteflow-test/src/test/java/com/yomahub/liteflow/test/aop/TestRunner.java
deleted file mode 100644
index a8cea999..00000000
--- a/liteflow-test/src/test/java/com/yomahub/liteflow/test/aop/TestRunner.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.yomahub.liteflow.test.aop;
-
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-
-@SpringBootApplication
-public class TestRunner {
-    public static void main(String[] args) {
-        try{
-            SpringApplication.run(TestRunner.class, args);
-            System.exit(0);
-        }catch (Throwable t){
-            t.printStackTrace();
-        }
-    }
-}
diff --git a/liteflow-test/src/test/resources/application.properties b/liteflow-test/src/test/resources/application-aop.properties
similarity index 100%
rename from liteflow-test/src/test/resources/application.properties
rename to liteflow-test/src/test/resources/application-aop.properties
diff --git a/pom.xml b/pom.xml
index 1b3458fd..a5a22648 100644
--- a/pom.xml
+++ b/pom.xml
@@ -41,6 +41,7 @@
     <properties>
     	<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<java.version>1.8</java.version>
+		<springboot.version>2.0.5.RELEASE</springboot.version>
 		<spring.version>5.0.9.RELEASE</spring.version>
 		<org.slf4j.version>1.7.21</org.slf4j.version>
 		<log4j.version>1.2.17</log4j.version>