Merge pull request #125 from SkyeBeFreeman/main

feat:release 1.3.0-Hoxton.SR9.
pull/128/head 1.3.0-Hoxton.SR9
Haotian Zhang 3 years ago committed by GitHub
commit 6407c0e59e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -85,7 +85,7 @@
<properties>
<!-- Project revision -->
<revision>1.3.0-Hoxton.SR9-SNAPSHOT</revision>
<revision>1.3.0-Hoxton.SR9</revision>
<!-- Spring Cloud -->
<spring.cloud.version>Hoxton.SR9</spring.cloud.version>

@ -36,9 +36,10 @@ public class DiscoveryEnabledCondition implements Condition {
.parseBoolean(conditionContext.getEnvironment()
.getProperty("spring.cloud.polaris.discovery.enabled", "true"));
boolean isConsulDiscoveryEnabled = Boolean.parseBoolean(conditionContext.getEnvironment()
.getProperty("spring.cloud.consul.enabled", "false")) &&
Boolean.parseBoolean(conditionContext.getEnvironment()
boolean isConsulDiscoveryEnabled = Boolean
.parseBoolean(conditionContext.getEnvironment()
.getProperty("spring.cloud.consul.enabled", "false"))
&& Boolean.parseBoolean(conditionContext.getEnvironment()
.getProperty("spring.cloud.consul.discovery.enabled", "true"));
isDiscoveryEnabled |= isConsulDiscoveryEnabled;

@ -34,9 +34,10 @@ public class RegisterEnabledCondition implements Condition {
boolean isRegisterEnabled = Boolean.parseBoolean(conditionContext.getEnvironment()
.getProperty("spring.cloud.polaris.discovery.register", "true"));
boolean isConsulRegisterEnabled = Boolean.parseBoolean(conditionContext.getEnvironment()
.getProperty("spring.cloud.consul.enabled", "false")) &&
Boolean.parseBoolean(conditionContext.getEnvironment()
boolean isConsulRegisterEnabled = Boolean
.parseBoolean(conditionContext.getEnvironment()
.getProperty("spring.cloud.consul.enabled", "false"))
&& Boolean.parseBoolean(conditionContext.getEnvironment()
.getProperty("spring.cloud.consul.discovery.register", "true"));
isRegisterEnabled |= isConsulRegisterEnabled;

@ -70,8 +70,8 @@
</developers>
<properties>
<revision>1.3.0-Hoxton.SR9-SNAPSHOT</revision>
<polaris.version>1.4.0-SNAPSHOT</polaris.version>
<revision>1.3.0-Hoxton.SR9</revision>
<polaris.version>1.4.0</polaris.version>
<powermock.version>2.0.0</powermock.version>
<!-- Maven Plugin Versions -->

Loading…
Cancel
Save