diff --git a/spring-cloud-launcher/spring-cloud-launcher-deployer/src/main/java/org/springframework/cloud/launcher/deployer/DeployerProperties.java b/spring-cloud-launcher/spring-cloud-launcher-deployer/src/main/java/org/springframework/cloud/launcher/deployer/DeployerProperties.java index a5fb6a5..f6cafb3 100644 --- a/spring-cloud-launcher/spring-cloud-launcher-deployer/src/main/java/org/springframework/cloud/launcher/deployer/DeployerProperties.java +++ b/spring-cloud-launcher/spring-cloud-launcher-deployer/src/main/java/org/springframework/cloud/launcher/deployer/DeployerProperties.java @@ -150,7 +150,8 @@ public class DeployerProperties { private Map enabled = new LinkedHashMap<>(); /** * A map of "deployment" properties passed to the deployer (not the app) when this - * app is launched. You can use javaOpts here to pass JVM args to a local deployer. + * app is launched. You can use spring.cloud.deployer.local.javaOpts + * here to pass JVM args to a local deployer. */ private Map properties = new LinkedHashMap<>(); diff --git a/spring-cloud-launcher/spring-cloud-launcher-deployer/src/main/resources/cloud.yml b/spring-cloud-launcher/spring-cloud-launcher-deployer/src/main/resources/cloud.yml index 6c0ea4c..aba6bba 100644 --- a/spring-cloud-launcher/spring-cloud-launcher-deployer/src/main/resources/cloud.yml +++ b/spring-cloud-launcher/spring-cloud-launcher-deployer/src/main/resources/cloud.yml @@ -1,7 +1,7 @@ dt: pre: maven://org.springframework.cloud.launcher:spring-cloud-launcher- ver: ${launcher.version} - opts: -Xmx128m + mem: 128m spring: cloud: @@ -21,12 +21,12 @@ spring: waitUntilStarted: true order: -100 properties: - spring.cloud.deployer.local.javaOpts: ${dt.opts} + spring.cloud.deployer.memory: ${dt.mem} dataflow: coordinates: ${dt.pre}dataflow:${dt.ver} port: 9393 properties: - spring.cloud.deployer.local.javaOpts: ${dt.opts} + spring.cloud.deployer.memory: ${dt.mem} eureka: coordinates: ${dt.pre}eureka:${dt.ver} port: 8761 @@ -34,7 +34,7 @@ spring: disabled: eureka.client.enabled: false properties: - spring.cloud.deployer.local.javaOpts: ${dt.opts} + spring.cloud.deployer.memory: ${dt.mem} h2: coordinates: ${dt.pre}h2:${dt.ver} port: 9095 @@ -44,12 +44,12 @@ spring: enabled: spring.datasource.url: jdbc:h2:tcp://localhost:9096/./target/test properties: - spring.cloud.deployer.local.javaOpts: ${dt.opts} + spring.cloud.deployer.memory: ${dt.mem} hystrixdashboard: coordinates: ${dt.pre}hystrixdashboard:${dt.ver} port: 7979 properties: - spring.cloud.deployer.local.javaOpts: ${dt.opts} + spring.cloud.deployer.memory: ${dt.mem} kafka: coordinates: ${dt.pre}kafka:${dt.ver} port: 9091 @@ -58,11 +58,11 @@ spring: disabled: spring.cloud.bus.enabled: false properties: - spring.cloud.deployer.local.javaOpts: ${dt.opts} + spring.cloud.deployer.memory: ${dt.mem} zipkin: coordinates: ${dt.pre}zipkin:${dt.ver} port: 9411 order: 0 properties: - spring.cloud.deployer.local.javaOpts: ${dt.opts} + spring.cloud.deployer.memory: ${dt.mem} deploy: ${launcher.deploy:configserver,eureka}