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

Merge branch 'master' into 2.0.x

Browse Source
This commit is contained in:
Spencer Gibb
2017-11-28 00:10:38 -05:00
parent 12abb67a65 bb95cb50bd
commit c55560a0b6
22 changed files with 303 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
docs/pom.xml
View File

@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-cli-docs</artifactId>
@@ -12,43 +13,51 @@
<name>Spring Cloud Cli Docs</name>
<description>Spring Cloud Docs</description>
<properties>
<docs.main>spring-cloud-cli</docs.main>
<docs.main>spring-cloud-cli</docs.main>
<main.basedir>${basedir}/..</main.basedir>
<docs.whitelisted.branches>1.0.x</docs.whitelisted.branches>
<docs.whitelisted.branches>1.0.x,1.1.x,1.2.x,1.3.x</docs.whitelisted.branches>
</properties>
<build>
<build>
<plugins>
<plugin>
<!--skip deploy (this is just a test module) -->
<artifactId>maven-deploy-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
<plugin>
<!--skip deploy (this is just a test module) -->
<artifactId>maven-deploy-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
</plugins>
</build>
<profiles>
<profiles>
<profile>
<id>docs</id>
<build>
<plugins>
<plugin>
<groupId>org.asciidoctor</groupId>
<artifactId>asciidoctor-maven-plugin</artifactId>
<inherited>false</inherited>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<inherited>false</inherited>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<inherited>false</inherited>
</plugin>
</plugins>
</build>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.asciidoctor</groupId>
<artifactId>asciidoctor-maven-plugin</artifactId>
<inherited>false</inherited>
</plugin>
<plugin>
<groupId>com.agilejava.docbkx</groupId>
<artifactId>docbkx-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<inherited>false</inherited>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<inherited>false</inherited>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</profiles>
</project>

2
docs/src/main/asciidoc/README.adoc
View File

@@ -1,4 +1,4 @@
image::https://travis-ci.org/spring-cloud/spring-cloud-cli.svg?branch=master[Build Status, link=https://travis-ci.org/spring-cloud/spring-cloud-cli]
image:https://circleci.com/gh/spring-cloud/spring-cloud-cli.svg?style=svg["CircleCI", link="https://circleci.com/gh/spring-cloud/spring-cloud-cli"]
include::intro.adoc[]

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

@@ -4,20 +4,20 @@ https://github.com/spring-projects/spring-boot[Spring Boot CLI]
(1.5.2 or better):
$ spring version
Spring CLI v1.5.3.RELEASE
Spring CLI v1.5.8.RELEASE
E.g. for SDKMan users
```
$ sdk install springboot 1.5.3.RELEASE
$ sdk use springboot 1.5.3.RELEASE
$ sdk install springboot 1.5.8.RELEASE
$ sdk use springboot 1.5.8.RELEASE
```
and install the Spring Cloud plugin
```
$ mvn install
$ spring install org.springframework.cloud:spring-cloud-cli:1.3.4.BUILD-SNAPSHOT
$ spring install org.springframework.cloud:spring-cloud-cli:1.4.1.BUILD-SNAPSHOT
```
IMPORTANT: **Prerequisites:** to use the encryption and decryption features

18
docs/src/main/asciidoc/spring-cloud-cli.adoc
View File

@@ -21,7 +21,7 @@ of services just `spring cloud`. To choose the services to deploy,
just list them on the command line, e.g.
----
$ spring cloud eureka configserver h2 kafka zipkin
$ spring cloud eureka configserver h2 kafka stubrunner zipkin
----
Summary of supported deployables:
@@ -50,6 +50,9 @@ Summary of supported deployables:
|zipkin | Zipkin Server | http://localhost:9411
| Zipkin Server with UI for visualizing traces. Stores span data in memory and accepts them via HTTP POST of JSON data.
|stubrunner | Stub Runner Boot | http://localhost:8750
| Downloads WireMock stubs, starts WireMock and feeds the started servers with stored stubs. Pass `stubrunner.ids` to pass stub coordinates and then go to `http://localhost:8750/stubs`.
|===
Each of these apps can be configured using a local YAML file with the same name (in the current
@@ -69,6 +72,17 @@ spring:
uri: file://${user.home}/dev/demo/config-repo
----
E.g. in Stub Runner app you could fetch stubs from your local `.m2` in the following way.
.stubrunner.yml
[source,yaml,indent=0]
----
stubrunner:
workOffline: true
ids:
- com.example:beer-api-producer:+:9876
----
=== Adding Additional Applications
Additional applications can be added to `./config/cloud.yml` (not
@@ -94,7 +108,7 @@ when you list the apps:
[source]
----
$ spring cloud --list
source sink configserver dataflow eureka h2 hystrixdashboard kafka zipkin
source sink configserver dataflow eureka h2 hystrixdashboard kafka stubrunner zipkin
----
(notice the additional apps at the start of the list).