Fix version of aether to same as Spring Boot CLI
Aether 1.1.0 is coming in from spring-cloud-contract, and it breaks the classpath badly for CLI apps (pulling in loads of optional dependencies). Fixing to the same version as Spring Boot works.
This commit is contained in:
14
pom.xml
14
pom.xml
@@ -94,6 +94,20 @@
|
|||||||
</profiles>
|
</profiles>
|
||||||
<dependencyManagement>
|
<dependencyManagement>
|
||||||
<dependencies>
|
<dependencies>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.springframework.boot</groupId>
|
||||||
|
<artifactId>spring-boot-parent</artifactId>
|
||||||
|
<version>${spring-boot.version}</version>
|
||||||
|
<type>pom</type>
|
||||||
|
<scope>import</scope>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.springframework.boot</groupId>
|
||||||
|
<artifactId>spring-boot-dependencies</artifactId>
|
||||||
|
<version>${spring-boot.version}</version>
|
||||||
|
<type>pom</type>
|
||||||
|
<scope>import</scope>
|
||||||
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.springframework.cloud</groupId>
|
<groupId>org.springframework.cloud</groupId>
|
||||||
<artifactId>spring-cloud-dependencies</artifactId>
|
<artifactId>spring-cloud-dependencies</artifactId>
|
||||||
|
|||||||
@@ -34,16 +34,14 @@ public class SampleIntegrationTests {
|
|||||||
public CliTester cli = new CliTester("samples/");
|
public CliTester cli = new CliTester("samples/");
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
@Ignore
|
|
||||||
public void appSample() throws Exception {
|
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();
|
URI scriptUri = new File("samples/app.groovy").toURI();
|
||||||
assertTrue("Wrong output: " + output,
|
assertTrue("Wrong output: " + output,
|
||||||
output.contains("Hello World! From " + scriptUri));
|
output.contains("Hello World! From " + scriptUri));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
@Ignore
|
|
||||||
public void eurekaSample() throws Exception {
|
public void eurekaSample() throws Exception {
|
||||||
String output = this.cli.run("eureka.groovy");
|
String output = this.cli.run("eureka.groovy");
|
||||||
assertTrue("Wrong output: " + output,
|
assertTrue("Wrong output: " + output,
|
||||||
@@ -51,7 +49,6 @@ public class SampleIntegrationTests {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
@Ignore
|
|
||||||
public void eurekaServerSample() throws Exception {
|
public void eurekaServerSample() throws Exception {
|
||||||
String output = this.cli.run("eurekaserver.groovy", "--", "--debug");
|
String output = this.cli.run("eurekaserver.groovy", "--", "--debug");
|
||||||
assertTrue("Wrong output: " + output,
|
assertTrue("Wrong output: " + output,
|
||||||
@@ -59,7 +56,7 @@ public class SampleIntegrationTests {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
@Ignore
|
@Ignore("Seems like this might still be working but the logs are different?")
|
||||||
public void rabbitSample() throws Exception {
|
public void rabbitSample() throws Exception {
|
||||||
String output = this.cli.run("rabbit.groovy");
|
String output = this.cli.run("rabbit.groovy");
|
||||||
assertTrue("Wrong output: " + output,
|
assertTrue("Wrong output: " + output,
|
||||||
@@ -67,7 +64,6 @@ public class SampleIntegrationTests {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
@Ignore
|
|
||||||
public void configServerSample() throws Exception {
|
public void configServerSample() throws Exception {
|
||||||
String output = this.cli.run("configserver.groovy", "--",
|
String output = this.cli.run("configserver.groovy", "--",
|
||||||
"--spring.config.name=configserver");
|
"--spring.config.name=configserver");
|
||||||
@@ -76,7 +72,6 @@ public class SampleIntegrationTests {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
@Ignore
|
|
||||||
public void zuulProxySample() throws Exception {
|
public void zuulProxySample() throws Exception {
|
||||||
String output = this.cli.run("zuulproxy.groovy");
|
String output = this.cli.run("zuulproxy.groovy");
|
||||||
assertTrue("Wrong output: " + output,
|
assertTrue("Wrong output: " + output,
|
||||||
|
|||||||
@@ -30,20 +30,12 @@
|
|||||||
</modules>
|
</modules>
|
||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
<spring-cloud.version>Camden.BUILD-SNAPSHOT</spring-cloud.version>
|
|
||||||
<spring-cloud-dataflow.version>1.0.0.BUILD-SNAPSHOT</spring-cloud-dataflow.version>
|
<spring-cloud-dataflow.version>1.0.0.BUILD-SNAPSHOT</spring-cloud-dataflow.version>
|
||||||
<spring-cloud-deployer.version>1.0.0.BUILD-SNAPSHOT</spring-cloud-deployer.version>
|
<spring-cloud-deployer.version>1.0.0.BUILD-SNAPSHOT</spring-cloud-deployer.version>
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
<dependencyManagement>
|
<dependencyManagement>
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<dependency>
|
|
||||||
<groupId>org.springframework.cloud</groupId>
|
|
||||||
<artifactId>spring-cloud-dependencies</artifactId>
|
|
||||||
<version>${spring-cloud.version}</version>
|
|
||||||
<type>pom</type>
|
|
||||||
<scope>import</scope>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.springframework.cloud</groupId>
|
<groupId>org.springframework.cloud</groupId>
|
||||||
<artifactId>spring-cloud-dataflow-dependencies</artifactId>
|
<artifactId>spring-cloud-dataflow-dependencies</artifactId>
|
||||||
@@ -69,6 +61,7 @@
|
|||||||
<groupId>org.springframework.boot</groupId>
|
<groupId>org.springframework.boot</groupId>
|
||||||
<artifactId>spring-boot-configuration-processor</artifactId>
|
<artifactId>spring-boot-configuration-processor</artifactId>
|
||||||
<optional>true</optional>
|
<optional>true</optional>
|
||||||
|
<scope>provided</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
</dependencies>
|
</dependencies>
|
||||||
</project>
|
</project>
|
||||||
|
|||||||
Reference in New Issue
Block a user