Going back to snapshots

This commit is contained in:
buildmaster
2019-11-18 20:17:35 +00:00
parent bc976f0620
commit bd2c67d3be
10 changed files with 18 additions and 23 deletions

View File

@@ -1,8 +1,4 @@
////
DO NOT EDIT THIS FILE. IT WAS GENERATED.
Manual changes to this file will be lost when it is generated again.
Edit the files in the src/main/asciidoc/ directory instead.
////
// Do not edit this file (e.g. go instead to src/main/asciidoc)
:docs: https://cloud.spring.io/spring-cloud-vault/spring-cloud-vault.html
@@ -331,7 +327,7 @@ credentials and you already have those.
The projects that require middleware generally include a
`docker-compose.yml`, so consider using
https://docs.docker.com/compose/[Docker Compose] to run the middeware servers
https://compose.docker.io/[Docker Compose] to run the middeware servers
in Docker containers. See the README in the
https://github.com/spring-cloud-samples/scripts[scripts demo
repository] for specific instructions about the common cases of mongo,
@@ -520,7 +516,6 @@ $ touch .springformat
==== Intellij IDEA
In order to setup Intellij you should import our coding conventions, inspection profiles and set up the checkstyle plugin.
The following files can be found in the https://github.com/spring-cloud/spring-cloud-build/tree/master/spring-cloud-build-tools[Spring Cloud Build] project.
.spring-cloud-build-tools/
----
@@ -561,8 +556,8 @@ image::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/{spring
Go to `File` -> `Settings` -> `Other settings` -> `Checkstyle`. There click on the `+` icon in the `Configuration file` section. There, you'll have to define where the checkstyle rules should be picked from. In the image above, we've picked the rules from the cloned Spring Cloud Build repository. However, you can point to the Spring Cloud Build's GitHub repository (e.g. for the `checkstyle.xml` : `https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/spring-cloud-build-tools/src/main/resources/checkstyle.xml`). We need to provide the following variables:
- `checkstyle.header.file` - please point it to the Spring Cloud Build's, `spring-cloud-build-tools/src/main/resources/checkstyle-header.txt` file either in your cloned repo or via the `https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/spring-cloud-build-tools/src/main/resources/checkstyle-header.txt` URL.
- `checkstyle.header.file` - please point it to the Spring Cloud Build's, `spring-cloud-build-tools/src/main/resources/checkstyle/checkstyle-header.txt` file either in your cloned repo or via the `https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/spring-cloud-build-tools/src/main/resources/checkstyle-header.txt` URL.
- `checkstyle.suppressions.file` - default suppressions. Please point it to the Spring Cloud Build's, `spring-cloud-build-tools/src/checkstyle/checkstyle-suppressions.xml` file either in your cloned repo or via the `https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/spring-cloud-build-tools/src/checkstyle/checkstyle-suppressions.xml` URL.
- `checkstyle.additional.suppressions.file` - this variable corresponds to suppressions in your local project. E.g. you're working on `spring-cloud-contract`. Then point to the `project-root/src/checkstyle/checkstyle-suppressions.xml` folder. Example for `spring-cloud-contract` would be: `/home/username/spring-cloud-contract/src/checkstyle/checkstyle-suppressions.xml`.
IMPORTANT: Remember to set the `Scan Scope` to `All sources` since we apply checkstyle rules for production and test sources.
IMPORTANT: Remember to set the `Scan Scope` to `All sources` since we apply checkstyle rules for production and test sources.

View File

@@ -7,12 +7,12 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-vault-parent</artifactId>
<version>2.1.4.RELEASE</version>
<version>2.1.4.BUILD-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<artifactId>spring-cloud-vault-config-docs</artifactId>
<version>2.1.4.RELEASE</version>
<version>2.1.4.BUILD-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Spring Cloud Vault Config Docs</name>

View File

@@ -7,13 +7,13 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-build</artifactId>
<version>2.1.9.RELEASE</version>
<version>2.1.8.BUILD-SNAPSHOT</version>
<relativePath/>
<!-- lookup parent from repository -->
</parent>
<artifactId>spring-cloud-vault-parent</artifactId>
<version>2.1.4.RELEASE</version>
<version>2.1.4.BUILD-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Spring Cloud Vault</name>
@@ -42,7 +42,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<spring-cloud-commons.version>2.1.4.RELEASE</spring-cloud-commons.version>
<spring-cloud-commons.version>2.1.4.BUILD-SNAPSHOT</spring-cloud-commons.version>
<httpclient.version>4.5.5</httpclient.version>
<httpcore.version>4.4.9</httpcore.version>
<okhttp3.version>3.10.0</okhttp3.version>

View File

@@ -7,7 +7,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-vault-parent</artifactId>
<version>2.1.4.RELEASE</version>
<version>2.1.4.BUILD-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -7,7 +7,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-vault-parent</artifactId>
<version>2.1.4.RELEASE</version>
<version>2.1.4.BUILD-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -7,7 +7,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-vault-parent</artifactId>
<version>2.1.4.RELEASE</version>
<version>2.1.4.BUILD-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
@@ -16,7 +16,7 @@
<description>Spring Cloud Vault Config Consul support</description>
<properties>
<spring-cloud-consul.version>2.1.4.RELEASE</spring-cloud-consul.version>
<spring-cloud-consul.version>2.1.4.BUILD-SNAPSHOT</spring-cloud-consul.version>
</properties>
<dependencies>

View File

@@ -7,7 +7,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-vault-parent</artifactId>
<version>2.1.4.RELEASE</version>
<version>2.1.4.BUILD-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -7,7 +7,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-vault-parent</artifactId>
<version>2.1.4.RELEASE</version>
<version>2.1.4.BUILD-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -7,7 +7,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-vault-parent</artifactId>
<version>2.1.4.RELEASE</version>
<version>2.1.4.BUILD-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -7,13 +7,13 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dependencies-parent</artifactId>
<version>2.1.9.RELEASE</version>
<version>2.1.8.BUILD-SNAPSHOT</version>
<relativePath/>
<!-- lookup parent from repository -->
</parent>
<artifactId>spring-cloud-vault-dependencies</artifactId>
<version>2.1.4.RELEASE</version>
<version>2.1.4.BUILD-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Spring Cloud Vault Dependencies</name>