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

Merge branch '2.2.x'

Browse Source
This commit is contained in:
spencergibb
2021-02-08 13:33:36 -05:00
parent b71034f9c9 de714224a9
commit dc23d4ce24
12 changed files with 190 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
README.adoc
View File

@@ -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

9
docs/pom.xml
View File

@@ -19,6 +19,15 @@
</properties>
<build>
<sourceDirectory>src/main/asciidoc</sourceDirectory>
<plugins>
<plugin>
<!--skip deploy (this is just a test module) -->
<artifactId>maven-deploy-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
</plugins>
</build>
<profiles>
<profile>

8
docs/src/main/asciidoc/install.adoc
View File

@@ -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

2
pom.xml
View File

@@ -111,7 +111,7 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
<version>${spring-boot.version}</version>
<version>${spring-boot-do-not-replace-with-releaser.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>

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

@@ -61,7 +61,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java.version>1.8</java.version>
<maven-antrun-plugin.version>1.8</maven-antrun-plugin.version>
<maven.version>3.5.4</maven.version>
<maven.version>3.6.3</maven.version>
</properties>
<build>

127
spring-cloud-cli/src/test/java/org/springframework/cloud/cli/command/url/OutputCapture.java Normal file
View File

@@ -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();
}
}
}

5
spring-cloud-launcher/spring-cloud-launcher-cli/pom.xml
View File

@@ -17,7 +17,7 @@
</parent>
<properties>
<maven.version>3.5.4</maven.version>
<maven.version>3.6.3</maven.version>
</properties>
<dependencyManagement>
@@ -55,7 +55,8 @@
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
<version>3.1.0</version>
<!-- Compatible with Maven -->
<version>3.2.1</version>
</dependency>
<!-- FIXME: 3.0.0 missing classes running tests -->
<!--<dependency>

2
spring-cloud-launcher/spring-cloud-launcher-cli/src/main/java/org/springframework/cloud/launcher/cli/LauncherCommand.java
View File

@@ -51,7 +51,7 @@ public class LauncherCommand extends OptionParsingCommand {
public static final Log log = LogFactory.getLog(LauncherCommand.class);
private static final String DEFAULT_VERSION = "2.2.0.BUILD-SNAPSHOT";
private static final String DEFAULT_VERSION = "2.2.0.RELEASE";
private static final Collection<HelpExample> EXAMPLES = new ArrayList<>();

6
spring-cloud-launcher/spring-cloud-launcher-deployer/pom.xml
View File

@@ -92,6 +92,12 @@
</dependencies>
<build>
<resources>
<resource>
<directory>src/main/resources</directory>
<filtering>true</filtering>
</resource>
</resources>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>

23
spring-cloud-launcher/spring-cloud-launcher-deployer/src/main/java/org/springframework/cloud/launcher/deployer/DeployerApplication.java
View File

@@ -16,6 +16,9 @@
package org.springframework.cloud.launcher.deployer;
import java.io.IOException;
import java.io.InputStream;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
@@ -31,7 +34,10 @@ import org.springframework.boot.builder.SpringApplicationBuilder;
import org.springframework.boot.logging.LogLevel;
import org.springframework.boot.logging.logback.LogbackLoggingSystem;
import org.springframework.context.ConfigurableApplicationContext;
import org.springframework.core.io.ClassPathResource;
import org.springframework.util.ClassUtils;
import org.springframework.util.ReflectionUtils;
import org.springframework.util.StreamUtils;
import org.springframework.util.StringUtils;
/**
@@ -42,8 +48,6 @@ public class DeployerApplication {
private static final Logger logger = LoggerFactory
.getLogger(DeployerApplication.class);
private static final String DEFAULT_VERSION = "2.2.0.BUILD-SNAPSHOT";
private String[] args;
public DeployerApplication(String... args) {
@@ -103,8 +107,19 @@ public class DeployerApplication {
String getVersion() {
Package pkg = DeployerApplication.class.getPackage();
return (pkg != null ? pkg.getImplementationVersion() == null ? DEFAULT_VERSION
: pkg.getImplementationVersion() : DEFAULT_VERSION);
return (pkg != null ? pkg.getImplementationVersion() == null ? getDefaultVersion()
: pkg.getImplementationVersion() : getDefaultVersion());
}
String getDefaultVersion() {
try (InputStream in = new ClassPathResource("META-INF/cli-version.txt").getInputStream()) {
return StreamUtils.copyToString(in, StandardCharsets.UTF_8);
}
catch (IOException e) {
ReflectionUtils.rethrowRuntimeException(e);
}
// not reachable since exception rethrown at runtime
return null;
}
private void launch() {

1
spring-cloud-launcher/spring-cloud-launcher-deployer/src/main/resources/META-INF/cli-version.txt Normal file
View File

@@ -0,0 +1 @@
@project.version@

22
spring-cloud-launcher/spring-cloud-launcher-deployer/src/test/java/org/springframework/cloud/launcher/deployer/DeployerApplicationTests.java
View File

@@ -22,8 +22,7 @@ import org.junit.Test;
import org.springframework.boot.test.system.OutputCaptureRule;
import static org.hamcrest.CoreMatchers.containsString;
import static org.junit.Assert.assertThat;
import static org.assertj.core.api.Assertions.assertThat;
/**
* @author Spencer Gibb
@@ -38,28 +37,35 @@ public class DeployerApplicationTests {
public void testDefaultLibrary() throws Exception {
DeployerApplication wrapper = new DeployerApplication();
if (System.getProperty("project.version") != null) {
assertThat(wrapper.getVersion(),
containsString(System.getProperty("project.version")));
assertThat(wrapper.getVersion())
.contains(System.getProperty("project.version"));
}
}
@Test
public void testCreateClassLoaderAndListDeployables() throws Exception {
new DeployerApplication("--launcher.list=true").run();
assertThat(output.toString(), containsString("configserver"));
assertThat(output.toString()).contains("configserver");
}
@Test
public void testNonOptionArgsPassedDown() throws Exception {
new DeployerApplication("--launcher.list=true", "--spring.profiles.active=test")
.run();
assertThat(output.toString(), containsString("foo"));
assertThat(output.toString()).contains("foo");
}
@Test
public void testInvalidDeployableFails() throws Exception {
new DeployerApplication("--launcher.deploy=foo,bar").run();
assertThat(output.toString(),
containsString("The following are not valid: 'foo,bar'"));
assertThat(output.toString())
.contains("The following are not valid: 'foo,bar'");
}
@Test
public void defaultVersionReadFromFile() {
String defaultVersion = new DeployerApplication("--launcher.deploy=foo,bar").getDefaultVersion();
// starts with one or more digits then a .
assertThat(defaultVersion).isNotBlank().containsPattern("^\\d+\\..*");
}
}