diff --git a/disjob-admin/pom.xml b/disjob-admin/pom.xml index d1c724acb..dd72ba069 100644 --- a/disjob-admin/pom.xml +++ b/disjob-admin/pom.xml @@ -24,7 +24,7 @@ 1.0.0-SNAPSHOT - 2.0.10 + 2.1.0-SNAPSHOT UTF-8 1.8 diff --git a/disjob-admin/ruoyi-framework/src/main/java/com/ruoyi/framework/config/DisjobAdminDataSourceConfig.java b/disjob-admin/ruoyi-framework/src/main/java/com/ruoyi/framework/config/DisjobAdminDataSourceConfig.java index d0f5eab39..a185345d9 100644 --- a/disjob-admin/ruoyi-framework/src/main/java/com/ruoyi/framework/config/DisjobAdminDataSourceConfig.java +++ b/disjob-admin/ruoyi-framework/src/main/java/com/ruoyi/framework/config/DisjobAdminDataSourceConfig.java @@ -46,9 +46,9 @@ public class DisjobAdminDataSourceConfig { private static final String DRUID_PREFIX_KEY = "spring.datasource.druid"; - public static final String RUOYI_DRUID_PROPERTIES = "ruoyiDruidProperties"; - public static final String RUOYI_MASTER_JDBC_PROPERTIES = "ruoyiMasterJdbcProperties"; - public static final String RUOYI_SLAVE_JDBC_PROPERTIES = "ruoyiSlaveJdbcProperties"; + private static final String RUOYI_DRUID_PROPERTIES = "ruoyiDruidProperties"; + private static final String RUOYI_MASTER_JDBC_PROPERTIES = "ruoyiMasterJdbcProperties"; + private static final String RUOYI_SLAVE_JDBC_PROPERTIES = "ruoyiSlaveJdbcProperties"; private final Environment env; diff --git a/disjob-core/src/main/java/cn/ponfee/disjob/core/base/JobConstants.java b/disjob-core/src/main/java/cn/ponfee/disjob/core/base/JobConstants.java index 48cca9f8f..734ce80fe 100644 --- a/disjob-core/src/main/java/cn/ponfee/disjob/core/base/JobConstants.java +++ b/disjob-core/src/main/java/cn/ponfee/disjob/core/base/JobConstants.java @@ -30,7 +30,7 @@ public final class JobConstants { /** * Version */ - public static final String VERSION = "2.0.10"; + public static final String VERSION = "2.1.0-SNAPSHOT"; /** * Process batch size diff --git a/disjob-samples/pom.xml b/disjob-samples/pom.xml index 1eb393440..7eba0ffd5 100644 --- a/disjob-samples/pom.xml +++ b/disjob-samples/pom.xml @@ -23,7 +23,7 @@ 1.0.0-SNAPSHOT - 2.0.10 + 2.1.0-SNAPSHOT UTF-8 1.8 diff --git a/docs/MAVEN.md b/docs/MAVEN.md index 4b151d367..954f0263f 100644 --- a/docs/MAVEN.md +++ b/docs/MAVEN.md @@ -31,7 +31,7 @@ - flatten-maven-plugin ```xml - + org.codehaus.mojo flatten-maven-plugin diff --git a/pom.xml b/pom.xml index 853d5b11c..49b16e3d0 100644 --- a/pom.xml +++ b/pom.xml @@ -61,7 +61,7 @@ - 2.0.10 + 2.1.0-SNAPSHOT UTF-8 1.8