diff --git a/liteflow-spring-boot-starter/pom.xml b/liteflow-spring-boot-starter/pom.xml index 57b54e9c5..8430bb604 100644 --- a/liteflow-spring-boot-starter/pom.xml +++ b/liteflow-spring-boot-starter/pom.xml @@ -22,12 +22,12 @@ org.springframework.boot spring-boot-autoconfigure - 2.0.5.RELEASE + ${springboot.version} org.springframework.boot spring-boot-configuration-processor - 2.0.5.RELEASE + ${springboot.version} @@ -36,6 +36,7 @@ org.springframework.boot spring-boot-maven-plugin + ${springboot.version} org.apache.maven.plugins diff --git a/liteflow-test-spring/pom.xml b/liteflow-test-spring/pom.xml index 1e6b94083..ab7150a40 100644 --- a/liteflow-test-spring/pom.xml +++ b/liteflow-test-spring/pom.xml @@ -53,7 +53,14 @@ + org.apache.maven.plugins + maven-surefire-plugin + 2.18.1 + + + org.apache.maven.plugins maven-deploy-plugin + 2.8.2 true diff --git a/liteflow-test-springboot/pom.xml b/liteflow-test-springboot/pom.xml index 389664a49..207a2a203 100644 --- a/liteflow-test-springboot/pom.xml +++ b/liteflow-test-springboot/pom.xml @@ -18,7 +18,7 @@ org.springframework.boot spring-boot-dependencies - 2.0.5.RELEASE + ${springboot.version} pom import diff --git a/liteflow-test/pom.xml b/liteflow-test/pom.xml index 9b535dc19..fc6a4c25a 100644 --- a/liteflow-test/pom.xml +++ b/liteflow-test/pom.xml @@ -17,7 +17,7 @@ org.springframework.boot spring-boot-dependencies - 2.0.5.RELEASE + ${springboot.version} pom import @@ -54,9 +54,12 @@ org.springframework.boot spring-boot-maven-plugin + ${springboot.version} + org.apache.maven.plugins maven-deploy-plugin + 2.8.2 true 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 b75988948..609d22ef4 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 a8cea9995..000000000 --- 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 1b3458fd3..a5a22648b 100644 --- a/pom.xml +++ b/pom.xml @@ -41,6 +41,7 @@ UTF-8 1.8 + 2.0.5.RELEASE 5.0.9.RELEASE 1.7.21 1.2.17