diff --git a/pom.xml b/pom.xml index d76272c..9e64cf6 100644 --- a/pom.xml +++ b/pom.xml @@ -94,6 +94,20 @@ + + org.springframework.boot + spring-boot-parent + ${spring-boot.version} + pom + import + + + org.springframework.boot + spring-boot-dependencies + ${spring-boot.version} + pom + import + org.springframework.cloud spring-cloud-dependencies diff --git a/spring-cloud-cli-integration-tests/src/test/java/org/springframework/cloud/cli/SampleIntegrationTests.java b/spring-cloud-cli-integration-tests/src/test/java/org/springframework/cloud/cli/SampleIntegrationTests.java index 1cda67c..07e3120 100644 --- a/spring-cloud-cli-integration-tests/src/test/java/org/springframework/cloud/cli/SampleIntegrationTests.java +++ b/spring-cloud-cli-integration-tests/src/test/java/org/springframework/cloud/cli/SampleIntegrationTests.java @@ -34,16 +34,14 @@ public class SampleIntegrationTests { public CliTester cli = new CliTester("samples/"); @Test - @Ignore public void appSample() throws Exception { - String output = this.cli.run("app.groovy"); + String output = this.cli.run("app.groovy", "--verbose"); URI scriptUri = new File("samples/app.groovy").toURI(); assertTrue("Wrong output: " + output, output.contains("Hello World! From " + scriptUri)); } @Test - @Ignore public void eurekaSample() throws Exception { String output = this.cli.run("eureka.groovy"); assertTrue("Wrong output: " + output, @@ -51,7 +49,6 @@ public class SampleIntegrationTests { } @Test - @Ignore public void eurekaServerSample() throws Exception { String output = this.cli.run("eurekaserver.groovy", "--", "--debug"); assertTrue("Wrong output: " + output, @@ -59,7 +56,7 @@ public class SampleIntegrationTests { } @Test - @Ignore + @Ignore("Seems like this might still be working but the logs are different?") public void rabbitSample() throws Exception { String output = this.cli.run("rabbit.groovy"); assertTrue("Wrong output: " + output, @@ -67,7 +64,6 @@ public class SampleIntegrationTests { } @Test - @Ignore public void configServerSample() throws Exception { String output = this.cli.run("configserver.groovy", "--", "--spring.config.name=configserver"); @@ -76,7 +72,6 @@ public class SampleIntegrationTests { } @Test - @Ignore public void zuulProxySample() throws Exception { String output = this.cli.run("zuulproxy.groovy"); assertTrue("Wrong output: " + output, diff --git a/spring-cloud-launcher/pom.xml b/spring-cloud-launcher/pom.xml index 858c1a8..5fafa3d 100644 --- a/spring-cloud-launcher/pom.xml +++ b/spring-cloud-launcher/pom.xml @@ -30,20 +30,12 @@ - Camden.BUILD-SNAPSHOT 1.0.0.BUILD-SNAPSHOT 1.0.0.BUILD-SNAPSHOT - - org.springframework.cloud - spring-cloud-dependencies - ${spring-cloud.version} - pom - import - org.springframework.cloud spring-cloud-dataflow-dependencies @@ -69,6 +61,7 @@ org.springframework.boot spring-boot-configuration-processor true + provided