[maven-release-plugin] prepare for next development iteration

See gh-138.
This commit is contained in:
Mark Paluch
2017-07-21 13:25:15 +02:00
parent 3844367bb8
commit fab421a1d3
11 changed files with 15 additions and 21 deletions

View File

@@ -211,7 +211,6 @@ spring.cloud.vault:
host: localhost
port: 8200
scheme: https
uri: https://localhost:8200
connection-timeout: 5000
read-timeout: 15000
config:
@@ -224,7 +223,6 @@ for SSL certificate validation
* `port` sets the Vault port
* `scheme` setting the scheme to `http` will use plain HTTP.
Supported schemes are `http` and `https`.
* `uri` configure the Vault endpoint with an URI. Takes precedence over host/port/scheme configuration
* `connection-timeout` sets the connection timeout in milliseconds
* `read-timeout` sets the read timeout in milliseconds
* `config.order` sets the order for the property source
@@ -425,4 +423,4 @@ added after the original pull request but before a merge.
other target branch in the main project).
* When writing a commit message please follow http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html[these conventions],
if you are fixing an existing issue please add `Fixes gh-XXXX` at the end of the commit
message (where XXXX is the issue number).
message (where XXXX is the issue number).

View File

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

View File

@@ -5,13 +5,13 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-build</artifactId>
<version>1.3.3.RELEASE</version>
<version>1.3.4.BUILD-SNAPSHOT</version>
<relativePath />
<!-- lookup parent from repository -->
</parent>
<artifactId>spring-cloud-vault-parent</artifactId>
<version>1.0.2.RELEASE</version>
<version>1.0.3.BUILD-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Spring Cloud Vault</name>
@@ -35,7 +35,7 @@
<developerConnection>
scm:git:ssh://git@github.com/spring-cloud/spring-cloud-vault.git
</developerConnection>
<tag>v1.0.2.RELEASE</tag>
<tag>HEAD</tag>
</scm>
<properties>

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@@ -5,13 +5,13 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dependencies-parent</artifactId>
<version>1.3.3.RELEASE</version>
<version>1.3.4.BUILD-SNAPSHOT</version>
<relativePath />
<!-- lookup parent from repository -->
</parent>
<artifactId>spring-cloud-vault-dependencies</artifactId>
<version>1.0.2.RELEASE</version>
<version>1.0.3.BUILD-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Spring Cloud Vault Dependencies</name>
@@ -134,8 +134,4 @@
</snapshots>
</repository>
</repositories>
<scm>
<tag>v1.0.2.RELEASE</tag>
</scm>
</project>

View File

@@ -1,4 +1,4 @@
Spring Cloud Vault 1.0.2.RELEASE
Spring Cloud Vault 1.0.3.BUILD-SNAPSHOT
Copyright (c) [2016-2017] Pivotal Software, Inc.
This product is licensed to you under the Apache License, Version 2.0 (the "License").