diff --git a/spring-cloud-launcher/pom.xml b/spring-cloud-launcher/pom.xml index ebdb777..f8a3361 100644 --- a/spring-cloud-launcher/pom.xml +++ b/spring-cloud-launcher/pom.xml @@ -18,7 +18,7 @@ - 1.0.0.RELEASE + 1.0.1.RELEASE diff --git a/spring-cloud-launcher/spring-cloud-launcher-dataflow/src/test/java/org/springframework/cloud/launcher/dataflow/DeployerApplicationTests.java b/spring-cloud-launcher/spring-cloud-launcher-dataflow/src/test/java/org/springframework/cloud/launcher/dataflow/DeployerApplicationTests.java index 8dbcb79..e114ac0 100644 --- a/spring-cloud-launcher/spring-cloud-launcher-dataflow/src/test/java/org/springframework/cloud/launcher/dataflow/DeployerApplicationTests.java +++ b/spring-cloud-launcher/spring-cloud-launcher-dataflow/src/test/java/org/springframework/cloud/launcher/dataflow/DeployerApplicationTests.java @@ -11,7 +11,6 @@ import org.springframework.test.context.junit4.SpringRunner; @SpringBootTest({ "spring.cloud.bus.enabled=false", "eureka.client.enabled=false" }) public class DeployerApplicationTests { - @Ignore("dataflox server is not compatible with boot 1.5.3") @Test public void contextLoads() { } diff --git a/spring-cloud-launcher/spring-cloud-launcher-deployer/pom.xml b/spring-cloud-launcher/spring-cloud-launcher-deployer/pom.xml index c3acf01..af9e586 100644 --- a/spring-cloud-launcher/spring-cloud-launcher-deployer/pom.xml +++ b/spring-cloud-launcher/spring-cloud-launcher-deployer/pom.xml @@ -72,6 +72,15 @@ org.springframework.boot spring-boot-maven-plugin + + org.apache.maven.plugins + maven-surefire-plugin + + + ${project.version} + + + diff --git a/spring-cloud-launcher/spring-cloud-launcher-deployer/src/main/java/org/springframework/cloud/launcher/deployer/DeployerApplication.java b/spring-cloud-launcher/spring-cloud-launcher-deployer/src/main/java/org/springframework/cloud/launcher/deployer/DeployerApplication.java index 06ec42c..e1d1d12 100644 --- a/spring-cloud-launcher/spring-cloud-launcher-deployer/src/main/java/org/springframework/cloud/launcher/deployer/DeployerApplication.java +++ b/spring-cloud-launcher/spring-cloud-launcher-deployer/src/main/java/org/springframework/cloud/launcher/deployer/DeployerApplication.java @@ -41,7 +41,7 @@ public class DeployerApplication { private static final Logger logger = LoggerFactory .getLogger(DeployerApplication.class); - private static final String DEFAULT_VERSION = "1.3.1.BUILD-SNAPSHOT"; + private static final String DEFAULT_VERSION = "1.3.2.BUILD-SNAPSHOT"; private String[] args; @@ -100,7 +100,7 @@ public class DeployerApplication { } } - private String getVersion() { + String getVersion() { Package pkg = DeployerApplication.class.getPackage(); return (pkg != null ? pkg.getImplementationVersion() == null ? DEFAULT_VERSION : pkg.getImplementationVersion() : DEFAULT_VERSION); 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 b649079..48bfa68 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 @@ -98,9 +98,10 @@ spring: deployables: configserver: properties: - spring.cloud.deployer.thin.profile: rabbit + thin.profile: rabbit application-properties: spring.cloud.bus.enabled: true + debug: true eureka: properties: spring.cloud.deployer.thin.profile: rabbit diff --git a/spring-cloud-launcher/spring-cloud-launcher-deployer/src/test/java/org/springframework/cloud/launcher/deployer/DeployerApplicationTests.java b/spring-cloud-launcher/spring-cloud-launcher-deployer/src/test/java/org/springframework/cloud/launcher/deployer/DeployerApplicationTests.java index c04712d..6cfc0cc 100644 --- a/spring-cloud-launcher/spring-cloud-launcher-deployer/src/test/java/org/springframework/cloud/launcher/deployer/DeployerApplicationTests.java +++ b/spring-cloud-launcher/spring-cloud-launcher-deployer/src/test/java/org/springframework/cloud/launcher/deployer/DeployerApplicationTests.java @@ -30,6 +30,15 @@ public class DeployerApplicationTests { @Rule public OutputCapture output = new OutputCapture(); + @Test + public void testDefaultLibrary() throws Exception { + DeployerApplication wrapper = new DeployerApplication(); + if (System.getProperty("project.version") != null) { + assertThat(wrapper.getVersion(), + containsString(System.getProperty("project.version"))); + } + } + @Test public void testCreateClassLoaderAndListDeployables() throws Exception { new DeployerApplication("--launcher.list=true").run();