diff --git a/README.adoc b/README.adoc index 2d493ec..42cd872 100644 --- a/README.adoc +++ b/README.adoc @@ -26,20 +26,20 @@ https://github.com/spring-projects/spring-boot[Spring Boot CLI] (2.0.0 or better): $ spring version - Spring CLI v2.2.0.BUILD-SNAPSHOT + Spring CLI v2.2.3.RELEASE E.g. for SDKMan users ``` -$ sdk install springboot 2.2.0.BUILD-SNAPSHOT -$ sdk use springboot 2.2.0.BUILD-SNAPSHOT +$ sdk install springboot 2.2.3.RELEASE +$ sdk use springboot 2.2.3.RELEASE ``` and install the Spring Cloud plugin ``` $ mvn install -$ spring install org.springframework.cloud:spring-cloud-cli:2.2.0.BUILD-SNAPSHOT +$ spring install org.springframework.cloud:spring-cloud-cli:2.2.0.RELEASE ``` IMPORTANT: **Prerequisites:** to use the encryption and decryption features diff --git a/docs/pom.xml b/docs/pom.xml index c00c176..1ee422b 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -19,6 +19,15 @@ src/main/asciidoc + + + + maven-deploy-plugin + + true + + + diff --git a/docs/src/main/asciidoc/install.adoc b/docs/src/main/asciidoc/install.adoc index 7999bb5..b5e4393 100644 --- a/docs/src/main/asciidoc/install.adoc +++ b/docs/src/main/asciidoc/install.adoc @@ -4,20 +4,20 @@ https://github.com/spring-projects/spring-boot[Spring Boot CLI] (2.0.0 or better): $ spring version - Spring CLI v2.2.0.BUILD-SNAPSHOT + Spring CLI v2.2.3.RELEASE E.g. for SDKMan users ``` -$ sdk install springboot 2.2.0.BUILD-SNAPSHOT -$ sdk use springboot 2.2.0.BUILD-SNAPSHOT +$ sdk install springboot 2.2.3.RELEASE +$ sdk use springboot 2.2.3.RELEASE ``` and install the Spring Cloud plugin ``` $ mvn install -$ spring install org.springframework.cloud:spring-cloud-cli:2.2.0.BUILD-SNAPSHOT +$ spring install org.springframework.cloud:spring-cloud-cli:2.2.0.RELEASE ``` IMPORTANT: **Prerequisites:** to use the encryption and decryption features diff --git a/pom.xml b/pom.xml index e75ef0f..9b589ad 100644 --- a/pom.xml +++ b/pom.xml @@ -111,7 +111,7 @@ org.springframework.boot spring-boot-dependencies - ${spring-boot.version} + ${spring-boot-do-not-replace-with-releaser.version} pom import diff --git a/spring-cloud-cli-integration-tests/pom.xml b/spring-cloud-cli-integration-tests/pom.xml index 4bedc1d..08b7004 100644 --- a/spring-cloud-cli-integration-tests/pom.xml +++ b/spring-cloud-cli-integration-tests/pom.xml @@ -61,7 +61,7 @@ UTF-8 1.8 1.8 - 3.5.4 + 3.6.3 diff --git a/spring-cloud-cli/src/test/java/org/springframework/cloud/cli/command/url/OutputCapture.java b/spring-cloud-cli/src/test/java/org/springframework/cloud/cli/command/url/OutputCapture.java new file mode 100644 index 0000000..fcb141e --- /dev/null +++ b/spring-cloud-cli/src/test/java/org/springframework/cloud/cli/command/url/OutputCapture.java @@ -0,0 +1,127 @@ +/* + * Copyright 2012-2014 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.springframework.cloud.cli.command.url; + +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.OutputStream; +import java.io.PrintStream; + +import org.junit.rules.TestRule; +import org.junit.runner.Description; +import org.junit.runners.model.Statement; + +/** + * Capture output from System.out and System.err. + * + * @author Phillip Webb + */ +public class OutputCapture implements TestRule { + + private CaptureOutputStream captureOut; + + private CaptureOutputStream captureErr; + + private ByteArrayOutputStream copy; + + @Override + public Statement apply(final Statement base, Description description) { + return new Statement() { + @Override + public void evaluate() throws Throwable { + captureOutput(); + try { + base.evaluate(); + } + finally { + releaseOutput(); + } + } + }; + } + + protected void captureOutput() { + this.copy = new ByteArrayOutputStream(); + this.captureOut = new CaptureOutputStream(System.out, this.copy); + this.captureErr = new CaptureOutputStream(System.err, this.copy); + System.setOut(new PrintStream(this.captureOut)); + System.setErr(new PrintStream(this.captureErr)); + } + + protected void releaseOutput() { + System.setOut(this.captureOut.getOriginal()); + System.setErr(this.captureErr.getOriginal()); + this.copy = null; + } + + public void flush() { + try { + this.captureOut.flush(); + this.captureErr.flush(); + } + catch (IOException ex) { + // ignore + } + } + + @Override + public String toString() { + flush(); + return this.copy.toString(); + } + + private static class CaptureOutputStream extends OutputStream { + + private final PrintStream original; + + private final OutputStream copy; + + CaptureOutputStream(PrintStream original, OutputStream copy) { + this.original = original; + this.copy = copy; + } + + @Override + public void write(int b) throws IOException { + this.copy.write(b); + this.original.write(b); + this.original.flush(); + } + + @Override + public void write(byte[] b) throws IOException { + write(b, 0, b.length); + } + + @Override + public void write(byte[] b, int off, int len) throws IOException { + this.copy.write(b, off, len); + this.original.write(b, off, len); + } + + public PrintStream getOriginal() { + return this.original; + } + + @Override + public void flush() throws IOException { + this.copy.flush(); + this.original.flush(); + } + } + +} diff --git a/spring-cloud-launcher/spring-cloud-launcher-cli/pom.xml b/spring-cloud-launcher/spring-cloud-launcher-cli/pom.xml index 32c9c78..6275d6f 100644 --- a/spring-cloud-launcher/spring-cloud-launcher-cli/pom.xml +++ b/spring-cloud-launcher/spring-cloud-launcher-cli/pom.xml @@ -17,7 +17,7 @@ - 3.5.4 + 3.6.3 @@ -55,7 +55,8 @@ org.codehaus.plexus plexus-utils - 3.1.0 + + 3.2.1