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

12
spring-cloud-cli/pom.xml
View File

@@ -12,7 +12,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>
<dependencies>
@@ -26,6 +26,11 @@
<artifactId>spring-cloud-stream</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>net.sf.jopt-simple</groupId>
<artifactId>jopt-simple</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-rsa</artifactId>
@@ -46,6 +51,11 @@
<version>${spring-boot.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>

2
spring-cloud-cli/src/main/java/org/springframework/cloud/cli/compiler/SpringCloudBomAstTransformation.java
View File

@@ -28,7 +28,7 @@ import org.springframework.boot.cli.compiler.GenericBomAstTransformation;
@GroovyASTTransformation(phase = CompilePhase.CONVERSION)
public class SpringCloudBomAstTransformation extends GenericBomAstTransformation {
private static final String SPRING_CLOUD_VERSION = "Hoxton.BUILD-SNAPSHOT";
private static final String SPRING_CLOUD_VERSION = "Ilford.BUILD-SNAPSHOT";
@Override
protected String getBomModule() {

7
spring-cloud-cli/src/test/java/org/springframework/cloud/cli/command/url/UrlDecodeCommandTest.java
View File

@@ -17,11 +17,12 @@ package org.springframework.cloud.cli.command.url;
import org.junit.Rule;
import org.junit.Test;
import org.springframework.boot.cli.command.Command;
import org.springframework.boot.cli.command.status.ExitStatus;
import org.springframework.boot.test.rule.OutputCapture;
import org.springframework.boot.test.system.OutputCaptureRule;
import static org.junit.Assert.*;
import static org.junit.Assert.assertEquals;
/**
* @author William Witt
@@ -30,7 +31,7 @@ public class UrlDecodeCommandTest {
Command command = new UrlDecodeCommand();
@Rule
public OutputCapture capture = new OutputCapture();
public OutputCaptureRule capture = new OutputCaptureRule();
@Test
public void urlDecodeNoSpecialChars() throws Exception {

7
spring-cloud-cli/src/test/java/org/springframework/cloud/cli/command/url/UrlEncodeCommandTest.java
View File

@@ -17,11 +17,12 @@ package org.springframework.cloud.cli.command.url;
import org.junit.Rule;
import org.junit.Test;
import org.springframework.boot.cli.command.Command;
import org.springframework.boot.cli.command.status.ExitStatus;
import org.springframework.boot.test.rule.OutputCapture;
import org.springframework.boot.test.system.OutputCaptureRule;
import static org.junit.Assert.*;
import static org.junit.Assert.assertEquals;
/**
* @author William Witt
@@ -30,7 +31,7 @@ public class UrlEncodeCommandTest {
Command command = new UrlEncodeCommand();
@Rule
public OutputCapture capture = new OutputCapture();
public OutputCaptureRule capture = new OutputCaptureRule();
@Test
public void urlEncodeNoSpecialChars() throws Exception {