SpringCloud/spring-cloud-cli
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Updates to remove hystrix and boot 2.3 compatibility.

Browse Source
This commit is contained in:
Spencer Gibb
2020-01-23 19:08:31 -05:00
parent 11df6d715d
commit fc533bfe2b
26 changed files with 76 additions and 288 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
spring-cloud-cli-integration-tests/pom.xml
View File

@@ -13,7 +13,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-cli-parent</artifactId>
<version>2.2.2.BUILD-SNAPSHOT</version>
<version>3.0.0.BUILD-SNAPSHOT</version>
</parent>
<dependencyManagement>
@@ -45,6 +45,11 @@
<version>1.2</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>

4
spring-cloud-cli-integration-tests/src/test/java/org/springframework/cloud/cli/CliTester.java
View File

@@ -34,11 +34,13 @@ import org.junit.Assume;
import org.junit.rules.TestRule;
import org.junit.runner.Description;
import org.junit.runners.model.Statement;
import org.springframework.boot.cli.command.AbstractCommand;
import org.springframework.boot.cli.command.OptionParsingCommand;
import org.springframework.boot.cli.command.archive.JarCommand;
import org.springframework.boot.cli.command.grab.GrabCommand;
import org.springframework.boot.cli.command.run.RunCommand;
import org.springframework.boot.test.system.OutputCaptureRule;
import org.springframework.util.SocketUtils;
/**
@@ -50,7 +52,7 @@ import org.springframework.util.SocketUtils;
*/
public class CliTester implements TestRule {
private final OutputCapture outputCapture = new OutputCapture();
private final OutputCaptureRule outputCapture = new OutputCaptureRule();
private long timeout = TimeUnit.MINUTES.toMillis(6);