diff --git a/liteflow-solon-plugin/src/main/java/com/yomahub/liteflow/solon/config/LiteflowMainAutoConfiguration.java b/liteflow-solon-plugin/src/main/java/com/yomahub/liteflow/solon/config/LiteflowMainAutoConfiguration.java index e63eb4436..771096698 100644 --- a/liteflow-solon-plugin/src/main/java/com/yomahub/liteflow/solon/config/LiteflowMainAutoConfiguration.java +++ b/liteflow-solon-plugin/src/main/java/com/yomahub/liteflow/solon/config/LiteflowMainAutoConfiguration.java @@ -21,10 +21,10 @@ import org.noear.solon.core.AopContext; @Configuration public class LiteflowMainAutoConfiguration { - @Inject(value = "${liteflow.parse-on-start}",required = false) + @Inject(value = "${liteflow.parseOnStart}",required = false) boolean parseOnStart; - @Inject(value = "${liteflow.monitor.enable-log}", required = false) + @Inject(value = "${liteflow.monitor.enableLog}", required = false) boolean enableLog; @Inject diff --git a/liteflow-solon-plugin/src/main/java/com/yomahub/liteflow/solon/integration/XPluginImpl.java b/liteflow-solon-plugin/src/main/java/com/yomahub/liteflow/solon/integration/XPluginImpl.java index 2a7e58196..60947c8c4 100644 --- a/liteflow-solon-plugin/src/main/java/com/yomahub/liteflow/solon/integration/XPluginImpl.java +++ b/liteflow-solon-plugin/src/main/java/com/yomahub/liteflow/solon/integration/XPluginImpl.java @@ -4,7 +4,6 @@ import com.yomahub.liteflow.annotation.LiteflowComponent; import com.yomahub.liteflow.core.NodeComponent; import com.yomahub.liteflow.flow.FlowBus; import com.yomahub.liteflow.solon.LiteflowProperty; -import org.noear.solon.Solon; import org.noear.solon.Utils; import org.noear.solon.core.AopContext; import org.noear.solon.core.Plugin; @@ -22,12 +21,12 @@ public class XPluginImpl implements Plugin { Properties defProps = Utils.loadProperties("META-INF/liteflow-default.properties"); if (defProps != null && defProps.size() > 0) { defProps.forEach((k, v) -> { - Solon.cfg().putIfAbsent(k, v); + context.getProps().putIfAbsent(k, v); }); } //是否启用 - boolean enable = Solon.cfg().getBool("liteflow.enable", false); + boolean enable = context.getProps().getBool("liteflow.enable", false); if (!enable) { return; diff --git a/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/absoluteConfigPath/AbsoluteConfigPathELSpringbootTest.java b/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/absoluteConfigPath/AbsoluteConfigPathELSpringbootTest.java index d1cf311ee..64ab7a804 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/absoluteConfigPath/AbsoluteConfigPathELSpringbootTest.java +++ b/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/absoluteConfigPath/AbsoluteConfigPathELSpringbootTest.java @@ -18,7 +18,7 @@ import org.slf4j.LoggerFactory; * @since 2.6.4 */ @RunWith(SolonJUnit4ClassRunner.class) -@TestPropertySource(value = "classpath:/absoluteConfigPath/application.properties") +@TestPropertySource("classpath:/absoluteConfigPath/application.properties") public class AbsoluteConfigPathELSpringbootTest extends BaseTest { private final Logger log = LoggerFactory.getLogger(this.getClass()); diff --git a/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/cmpStep/CmpStepELSpringbootTest.java b/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/cmpStep/CmpStepELSpringbootTest.java index d28e207d2..7e8af51be 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/cmpStep/CmpStepELSpringbootTest.java +++ b/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/cmpStep/CmpStepELSpringbootTest.java @@ -22,7 +22,7 @@ import java.util.Set; * @since 2.7.0 */ @RunWith(SolonJUnit4ClassRunner.class) -@TestPropertySource(value = "classpath:/cmpStep/application.properties") +@TestPropertySource("classpath:/cmpStep/application.properties") public class CmpStepELSpringbootTest extends BaseTest { @Inject diff --git a/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/comments/LiteflowNodeELSpringbootTest.java b/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/comments/LiteflowNodeELSpringbootTest.java index 6bdec3f9e..90979739a 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/comments/LiteflowNodeELSpringbootTest.java +++ b/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/comments/LiteflowNodeELSpringbootTest.java @@ -12,7 +12,7 @@ import org.noear.solon.test.SolonJUnit4ClassRunner; import org.noear.solon.test.annotation.TestPropertySource; @RunWith(SolonJUnit4ClassRunner.class) -@TestPropertySource(value = "classpath:/comments/application.properties") +@TestPropertySource("classpath:/comments/application.properties") public class LiteflowNodeELSpringbootTest extends BaseTest { @Inject diff --git a/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/customWhenThreadPool/CustomWhenThreadPoolELSpringbootTest.java b/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/customWhenThreadPool/CustomWhenThreadPoolELSpringbootTest.java index aebcda78c..4659f56a1 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/customWhenThreadPool/CustomWhenThreadPoolELSpringbootTest.java +++ b/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/customWhenThreadPool/CustomWhenThreadPoolELSpringbootTest.java @@ -21,7 +21,7 @@ import org.slf4j.LoggerFactory; * @since 2.6.4 */ @RunWith(SolonJUnit4ClassRunner.class) -@TestPropertySource(value = "classpath:/customWhenThreadPool/application.properties") +@TestPropertySource("classpath:/customWhenThreadPool/application.properties") @Import(scanPackages = {"com.yomahub.liteflow.test.customWhenThreadPool.cmp"}) public class CustomWhenThreadPoolELSpringbootTest extends BaseTest { diff --git a/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/exception/Exception2ELSpringBootTest.java b/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/exception/Exception2ELSpringBootTest.java index 0e844f81a..813be1f6d 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/exception/Exception2ELSpringBootTest.java +++ b/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/exception/Exception2ELSpringBootTest.java @@ -23,7 +23,7 @@ import org.noear.solon.test.annotation.TestPropertySource; * @author zendwang */ @RunWith(SolonJUnit4ClassRunner.class) -@TestPropertySource(value = "classpath:/exception/application.properties") +@TestPropertySource("classpath:/exception/application.properties") @Import(scanPackages = {"com.yomahub.liteflow.test.exception.cmp"}) public class Exception2ELSpringBootTest extends BaseTest { diff --git a/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/multipleType/LiteflowMultipleTypeELSpringbootTest.java b/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/multipleType/LiteflowMultipleTypeELSpringbootTest.java index 33e2af85f..13a7cff9a 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/multipleType/LiteflowMultipleTypeELSpringbootTest.java +++ b/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/multipleType/LiteflowMultipleTypeELSpringbootTest.java @@ -18,7 +18,7 @@ import org.noear.solon.test.annotation.TestPropertySource; * @since 2.5.10 */ @RunWith(SolonJUnit4ClassRunner.class) -@TestPropertySource(value = "classpath:/multipleType/application.properties") +@TestPropertySource("classpath:/multipleType/application.properties") @Import(scanPackages = {"com.yomahub.liteflow.test.multipleType.cmp"}) public class LiteflowMultipleTypeELSpringbootTest extends BaseTest { diff --git a/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/nodeExecutor/LiteflowNodeExecutorELSpringbootTest.java b/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/nodeExecutor/LiteflowNodeExecutorELSpringbootTest.java index fcd2dcd42..b01ffcf88 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/nodeExecutor/LiteflowNodeExecutorELSpringbootTest.java +++ b/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/nodeExecutor/LiteflowNodeExecutorELSpringbootTest.java @@ -7,7 +7,6 @@ import com.yomahub.liteflow.test.BaseTest; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; -import org.noear.solon.annotation.Import; import org.noear.solon.annotation.Inject; import org.noear.solon.test.SolonJUnit4ClassRunner; import org.noear.solon.test.annotation.TestPropertySource; @@ -20,8 +19,7 @@ import org.noear.solon.test.annotation.TestPropertySource; * @since 2.5.10 */ @RunWith(SolonJUnit4ClassRunner.class) -@TestPropertySource(value = "classpath:/nodeExecutor/application.properties") -@Import(scanPackages = {"com.yomahub.liteflow.test.nodeExecutor.cmp"}) +@TestPropertySource("classpath:/nodeExecutor/application.properties") public class LiteflowNodeExecutorELSpringbootTest extends BaseTest { @Inject diff --git a/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/parsecustom/CustomParserJsonELSpringbootTest.java b/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/parsecustom/CustomParserJsonELSpringbootTest.java index da23f0563..c74b0b0a4 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/parsecustom/CustomParserJsonELSpringbootTest.java +++ b/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/parsecustom/CustomParserJsonELSpringbootTest.java @@ -17,7 +17,7 @@ import org.noear.solon.test.annotation.TestPropertySource; * @since 2.5.0 */ @RunWith(SolonJUnit4ClassRunner.class) -@TestPropertySource(value = "classpath:/parsecustom/application-custom-json.properties") +@TestPropertySource("classpath:/parsecustom/application-custom-json.properties") @Import(scanPackages = {"com.yomahub.liteflow.test.parsecustom.cmp"}) public class CustomParserJsonELSpringbootTest extends BaseTest { diff --git a/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/parsecustom/CustomParserXmlELSpringbootTest.java b/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/parsecustom/CustomParserXmlELSpringbootTest.java index 703441dfd..fb89695b2 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/parsecustom/CustomParserXmlELSpringbootTest.java +++ b/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/parsecustom/CustomParserXmlELSpringbootTest.java @@ -18,7 +18,7 @@ import org.noear.solon.test.annotation.TestPropertySource; * @since 2.5.7 */ @RunWith(SolonJUnit4ClassRunner.class) -@TestPropertySource(value = "classpath:/parsecustom/application-custom-xml.properties") +@TestPropertySource("classpath:/parsecustom/application-custom-xml.properties") @Import(scanPackages = {"com.yomahub.liteflow.test.parsecustom.cmp","com.yomahub.liteflow.test.parsecustom.bean"}) public class CustomParserXmlELSpringbootTest extends BaseTest { diff --git a/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/parsecustom/CustomParserYmlELSpringbootTest.java b/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/parsecustom/CustomParserYmlELSpringbootTest.java index e9e0474d0..2c456dfdf 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/parsecustom/CustomParserYmlELSpringbootTest.java +++ b/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/parsecustom/CustomParserYmlELSpringbootTest.java @@ -18,7 +18,7 @@ import org.noear.solon.test.annotation.TestPropertySource; * @author junjun */ @RunWith(SolonJUnit4ClassRunner.class) -@TestPropertySource(value = "classpath:/parsecustom/application-custom-yml.properties") +@TestPropertySource("classpath:/parsecustom/application-custom-yml.properties") @Import(scanPackages = {"com.yomahub.liteflow.test.parsecustom.cmp","com.yomahub.liteflow.test.parsecustom.bean"}) public class CustomParserYmlELSpringbootTest extends BaseTest { diff --git a/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/parser/JsonParserELSpringbootTest.java b/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/parser/JsonParserELSpringbootTest.java index 4dbb84041..f5be16f70 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/parser/JsonParserELSpringbootTest.java +++ b/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/parser/JsonParserELSpringbootTest.java @@ -16,7 +16,7 @@ import org.noear.solon.test.annotation.TestPropertySource; * @since 2.5.0 */ @RunWith(SolonJUnit4ClassRunner.class) -@TestPropertySource(value = "classpath:/parser/application-json.properties") +@TestPropertySource("classpath:/parser/application-json.properties") public class JsonParserELSpringbootTest extends BaseTest { @Inject diff --git a/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/parser/SpringELSupportELSpringbootTest.java b/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/parser/SpringELSupportELSpringbootTest.java index bec90fb64..41bd8cc96 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/parser/SpringELSupportELSpringbootTest.java +++ b/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/parser/SpringELSupportELSpringbootTest.java @@ -11,7 +11,7 @@ import org.noear.solon.test.SolonJUnit4ClassRunner; import org.noear.solon.test.annotation.TestPropertySource; @RunWith(SolonJUnit4ClassRunner.class) -@TestPropertySource(value = "classpath:/parser/application-springEL.properties") +@TestPropertySource("classpath:/parser/application-springEL.properties") public class SpringELSupportELSpringbootTest extends BaseTest { @Inject diff --git a/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/parser/XmlParserELSpringbootTest.java b/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/parser/XmlParserELSpringbootTest.java index 62c52d462..cba7a448f 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/parser/XmlParserELSpringbootTest.java +++ b/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/parser/XmlParserELSpringbootTest.java @@ -16,7 +16,7 @@ import org.noear.solon.test.annotation.TestPropertySource; * @since 2.5.0 */ @RunWith(SolonJUnit4ClassRunner.class) -@TestPropertySource(value = "classpath:/parser/application-xml.properties") +@TestPropertySource("classpath:/parser/application-xml.properties") public class XmlParserELSpringbootTest extends BaseTest { @Inject diff --git a/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/parser/YmlParserELSpringbootTest.java b/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/parser/YmlParserELSpringbootTest.java index 607c380b4..8d9db16b4 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/parser/YmlParserELSpringbootTest.java +++ b/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/parser/YmlParserELSpringbootTest.java @@ -16,7 +16,7 @@ import org.noear.solon.test.annotation.TestPropertySource; * @since 2.5.0 */ @RunWith(SolonJUnit4ClassRunner.class) -@TestPropertySource(value = "classpath:/parser/application-yml.properties") +@TestPropertySource("classpath:/parser/application-yml.properties") public class YmlParserELSpringbootTest extends BaseTest { @Inject diff --git a/pom.xml b/pom.xml index bac3f7696..3873c389b 100644 --- a/pom.xml +++ b/pom.xml @@ -65,7 +65,7 @@ 1.8.13 1.2.3 - 1.11.5 + 1.11.7 4.1.84.Final 31.1-jre @@ -326,35 +326,7 @@ maven-site-plugin 3.7.1 - - - org.apache.maven.plugins - maven-javadoc-plugin - 3.0.1 - - - package - - jar - - - - - - - org.apache.maven.plugins - maven-gpg-plugin - 1.6 - - - sign-artifacts - verify - - sign - - - - + org.codehaus.mojo