Update SNAPSHOT to 3.0.5
This commit is contained in:
69
README.adoc
69
README.adoc
@@ -353,23 +353,9 @@ the `.mvn` configuration, so if you find you have to do it to make a
|
|||||||
build succeed, please raise a ticket to get the settings added to
|
build succeed, please raise a ticket to get the settings added to
|
||||||
source control.
|
source control.
|
||||||
|
|
||||||
For hints on how to build the project look in `.travis.yml` if there
|
The projects that require middleware (i.e. Redis) for testing generally
|
||||||
is one. There should be a "script" and maybe "install" command. Also
|
require that a local instance of [Docker](https://www.docker.com/get-started) is installed and running.
|
||||||
look at the "services" section to see if any services need to be
|
|
||||||
running locally (e.g. mongo or rabbit). Ignore the git-related bits
|
|
||||||
that you might find in "before_install" since they're related to setting git
|
|
||||||
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
|
|
||||||
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,
|
|
||||||
rabbit and redis.
|
|
||||||
|
|
||||||
NOTE: If all else fails, build with the command from `.travis.yml` (usually
|
|
||||||
`./mvnw install`).
|
|
||||||
|
|
||||||
=== Documentation
|
=== Documentation
|
||||||
|
|
||||||
@@ -602,3 +588,54 @@ Go to `File` -> `Settings` -> `Other settings` -> `Checkstyle`. There click on t
|
|||||||
- `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`.
|
- `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.
|
||||||
|
|
||||||
|
=== Duplicate Finder
|
||||||
|
|
||||||
|
Spring Cloud Build brings along the `basepom:duplicate-finder-maven-plugin`, that enables flagging duplicate and conflicting classes and resources on the java classpath.
|
||||||
|
|
||||||
|
==== Duplicate Finder configuration
|
||||||
|
|
||||||
|
Duplicate finder is *enabled by default* and will run in the `verify` phase of your Maven build, but it will only take effect in your project if you add the `duplicate-finder-maven-plugin` to the `build` section of the projecst's `pom.xml`.
|
||||||
|
|
||||||
|
.pom.xml
|
||||||
|
[source,xml]
|
||||||
|
----
|
||||||
|
<build>
|
||||||
|
<plugins>
|
||||||
|
<plugin>
|
||||||
|
<groupId>org.basepom.maven</groupId>
|
||||||
|
<artifactId>duplicate-finder-maven-plugin</artifactId>
|
||||||
|
</plugin>
|
||||||
|
</plugins>
|
||||||
|
</build>
|
||||||
|
----
|
||||||
|
|
||||||
|
For other properties, we have set defaults as listed in the https://github.com/basepom/duplicate-finder-maven-plugin/wiki[plugin documentation].
|
||||||
|
|
||||||
|
You can easily override them but setting the value of the selected property prefixed with `duplicate-finder-maven-plugin`. For example, set `duplicate-finder-maven-plugin.skip` to `true` in order to skip duplicates check in your build.
|
||||||
|
|
||||||
|
If you need to add `ignoredClassPatterns` or `ignoredResourcePatterns` to your setup, make sure to add them in the plugin configuration section of your project:
|
||||||
|
|
||||||
|
[source,xml]
|
||||||
|
----
|
||||||
|
<build>
|
||||||
|
<plugins>
|
||||||
|
<plugin>
|
||||||
|
<groupId>org.basepom.maven</groupId>
|
||||||
|
<artifactId>duplicate-finder-maven-plugin</artifactId>
|
||||||
|
<configuration>
|
||||||
|
<ignoredClassPatterns>
|
||||||
|
<ignoredClassPattern>org.joda.time.base.BaseDateTime</ignoredClassPattern>
|
||||||
|
<ignoredClassPattern>.*module-info</ignoredClassPattern>
|
||||||
|
</ignoredClassPatterns>
|
||||||
|
<ignoredResourcePatterns>
|
||||||
|
<ignoredResourcePattern>changelog.txt</ignoredResourcePattern>
|
||||||
|
</ignoredResourcePatterns>
|
||||||
|
</configuration>
|
||||||
|
</plugin>
|
||||||
|
</plugins>
|
||||||
|
</build>
|
||||||
|
|
||||||
|
|
||||||
|
----
|
||||||
|
|
||||||
|
|||||||
@@ -7,12 +7,12 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.springframework.cloud</groupId>
|
<groupId>org.springframework.cloud</groupId>
|
||||||
<artifactId>spring-cloud-vault-parent</artifactId>
|
<artifactId>spring-cloud-vault-parent</artifactId>
|
||||||
<version>3.0.5-SNAPSHOT</version>
|
<version>3.0.5</version>
|
||||||
<relativePath>..</relativePath>
|
<relativePath>..</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<artifactId>spring-cloud-vault-docs</artifactId>
|
<artifactId>spring-cloud-vault-docs</artifactId>
|
||||||
<version>3.0.5-SNAPSHOT</version>
|
<version>3.0.5</version>
|
||||||
|
|
||||||
<packaging>jar</packaging>
|
<packaging>jar</packaging>
|
||||||
<name>Spring Cloud Vault Docs</name>
|
<name>Spring Cloud Vault Docs</name>
|
||||||
|
|||||||
@@ -118,6 +118,7 @@
|
|||||||
|spring.cloud.vault.rabbitmq.password-property | `spring.rabbitmq.password` | Target property for the obtained password.
|
|spring.cloud.vault.rabbitmq.password-property | `spring.rabbitmq.password` | Target property for the obtained password.
|
||||||
|spring.cloud.vault.rabbitmq.role | | Role name for credentials.
|
|spring.cloud.vault.rabbitmq.role | | Role name for credentials.
|
||||||
|spring.cloud.vault.rabbitmq.username-property | `spring.rabbitmq.username` | Target property for the obtained username.
|
|spring.cloud.vault.rabbitmq.username-property | `spring.rabbitmq.username` | Target property for the obtained username.
|
||||||
|
|spring.cloud.vault.reactive.enabled | `true` | Flag to indicate that reactive discovery is enabled
|
||||||
|spring.cloud.vault.read-timeout | `15000` | Read timeout.
|
|spring.cloud.vault.read-timeout | `15000` | Read timeout.
|
||||||
|spring.cloud.vault.scheme | `https` | Protocol scheme. Can be either "http" or "https".
|
|spring.cloud.vault.scheme | `https` | Protocol scheme. Can be either "http" or "https".
|
||||||
|spring.cloud.vault.session.lifecycle.enabled | `true` | Enable session lifecycle management.
|
|spring.cloud.vault.session.lifecycle.enabled | `true` | Enable session lifecycle management.
|
||||||
|
|||||||
6
pom.xml
6
pom.xml
@@ -7,13 +7,13 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.springframework.cloud</groupId>
|
<groupId>org.springframework.cloud</groupId>
|
||||||
<artifactId>spring-cloud-build</artifactId>
|
<artifactId>spring-cloud-build</artifactId>
|
||||||
<version>3.0.4</version>
|
<version>3.0.5</version>
|
||||||
<relativePath/>
|
<relativePath/>
|
||||||
<!-- lookup parent from repository -->
|
<!-- lookup parent from repository -->
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<artifactId>spring-cloud-vault-parent</artifactId>
|
<artifactId>spring-cloud-vault-parent</artifactId>
|
||||||
<version>3.0.5-SNAPSHOT</version>
|
<version>3.0.5</version>
|
||||||
<packaging>pom</packaging>
|
<packaging>pom</packaging>
|
||||||
|
|
||||||
<name>Spring Cloud Vault</name>
|
<name>Spring Cloud Vault</name>
|
||||||
@@ -42,7 +42,7 @@
|
|||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||||
<spring-cloud-commons.version>3.0.5-SNAPSHOT</spring-cloud-commons.version>
|
<spring-cloud-commons.version>3.0.5</spring-cloud-commons.version>
|
||||||
<httpclient.version>4.5.13</httpclient.version>
|
<httpclient.version>4.5.13</httpclient.version>
|
||||||
<httpcore.version>4.4.14</httpcore.version>
|
<httpcore.version>4.4.14</httpcore.version>
|
||||||
<okhttp3.version>3.14.9</okhttp3.version>
|
<okhttp3.version>3.14.9</okhttp3.version>
|
||||||
|
|||||||
@@ -7,7 +7,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.springframework.cloud</groupId>
|
<groupId>org.springframework.cloud</groupId>
|
||||||
<artifactId>spring-cloud-vault-parent</artifactId>
|
<artifactId>spring-cloud-vault-parent</artifactId>
|
||||||
<version>3.0.5-SNAPSHOT</version>
|
<version>3.0.5</version>
|
||||||
<relativePath>..</relativePath>
|
<relativePath>..</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
|||||||
@@ -7,7 +7,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.springframework.cloud</groupId>
|
<groupId>org.springframework.cloud</groupId>
|
||||||
<artifactId>spring-cloud-vault-parent</artifactId>
|
<artifactId>spring-cloud-vault-parent</artifactId>
|
||||||
<version>3.0.5-SNAPSHOT</version>
|
<version>3.0.5</version>
|
||||||
<relativePath>..</relativePath>
|
<relativePath>..</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
|||||||
@@ -7,7 +7,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.springframework.cloud</groupId>
|
<groupId>org.springframework.cloud</groupId>
|
||||||
<artifactId>spring-cloud-vault-parent</artifactId>
|
<artifactId>spring-cloud-vault-parent</artifactId>
|
||||||
<version>3.0.5-SNAPSHOT</version>
|
<version>3.0.5</version>
|
||||||
<relativePath>..</relativePath>
|
<relativePath>..</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
@@ -16,7 +16,7 @@
|
|||||||
<description>Spring Cloud Vault Config Consul support</description>
|
<description>Spring Cloud Vault Config Consul support</description>
|
||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
<spring-cloud-consul.version>3.0.5-SNAPSHOT</spring-cloud-consul.version>
|
<spring-cloud-consul.version>3.0.4</spring-cloud-consul.version>
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
<dependencies>
|
<dependencies>
|
||||||
|
|||||||
@@ -7,7 +7,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.springframework.cloud</groupId>
|
<groupId>org.springframework.cloud</groupId>
|
||||||
<artifactId>spring-cloud-vault-parent</artifactId>
|
<artifactId>spring-cloud-vault-parent</artifactId>
|
||||||
<version>3.0.5-SNAPSHOT</version>
|
<version>3.0.5</version>
|
||||||
<relativePath>..</relativePath>
|
<relativePath>..</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
|||||||
@@ -7,7 +7,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.springframework.cloud</groupId>
|
<groupId>org.springframework.cloud</groupId>
|
||||||
<artifactId>spring-cloud-vault-parent</artifactId>
|
<artifactId>spring-cloud-vault-parent</artifactId>
|
||||||
<version>3.0.5-SNAPSHOT</version>
|
<version>3.0.5</version>
|
||||||
<relativePath>..</relativePath>
|
<relativePath>..</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
|||||||
@@ -7,7 +7,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.springframework.cloud</groupId>
|
<groupId>org.springframework.cloud</groupId>
|
||||||
<artifactId>spring-cloud-vault-parent</artifactId>
|
<artifactId>spring-cloud-vault-parent</artifactId>
|
||||||
<version>3.0.5-SNAPSHOT</version>
|
<version>3.0.5</version>
|
||||||
<relativePath>..</relativePath>
|
<relativePath>..</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
|||||||
@@ -7,13 +7,13 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.springframework.cloud</groupId>
|
<groupId>org.springframework.cloud</groupId>
|
||||||
<artifactId>spring-cloud-dependencies-parent</artifactId>
|
<artifactId>spring-cloud-dependencies-parent</artifactId>
|
||||||
<version>3.0.5-SNAPSHOT</version>
|
<version>3.0.5</version>
|
||||||
<relativePath/>
|
<relativePath/>
|
||||||
<!-- lookup parent from repository -->
|
<!-- lookup parent from repository -->
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<artifactId>spring-cloud-vault-dependencies</artifactId>
|
<artifactId>spring-cloud-vault-dependencies</artifactId>
|
||||||
<version>3.0.5-SNAPSHOT</version>
|
<version>3.0.5</version>
|
||||||
<packaging>pom</packaging>
|
<packaging>pom</packaging>
|
||||||
|
|
||||||
<name>Spring Cloud Vault Dependencies</name>
|
<name>Spring Cloud Vault Dependencies</name>
|
||||||
|
|||||||
Reference in New Issue
Block a user