From fab421a1d3bbadf778bf9b69600ac7ea5e25169f Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Fri, 21 Jul 2017 13:25:15 +0200 Subject: [PATCH] [maven-release-plugin] prepare for next development iteration See gh-138. --- README.adoc | 4 +--- docs/pom.xml | 4 ++-- pom.xml | 6 +++--- spring-cloud-starter-vault-config/pom.xml | 2 +- spring-cloud-vault-config-aws/pom.xml | 2 +- spring-cloud-vault-config-consul/pom.xml | 2 +- spring-cloud-vault-config-databases/pom.xml | 2 +- spring-cloud-vault-config-rabbitmq/pom.xml | 2 +- spring-cloud-vault-config/pom.xml | 2 +- spring-cloud-vault-dependencies/pom.xml | 8 ++------ src/main/resources/notice.txt | 2 +- 11 files changed, 15 insertions(+), 21 deletions(-) diff --git a/README.adoc b/README.adoc index 24cbfd83..9afbc85e 100644 --- a/README.adoc +++ b/README.adoc @@ -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). \ No newline at end of file diff --git a/docs/pom.xml b/docs/pom.xml index b33b556e..095b0644 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -5,12 +5,12 @@ org.springframework.cloud spring-cloud-vault-parent - 1.0.2.RELEASE + 1.0.3.BUILD-SNAPSHOT .. spring-cloud-vault-config-docs - 1.0.2.RELEASE + 1.0.3.BUILD-SNAPSHOT pom Spring Cloud Vault Config Docs diff --git a/pom.xml b/pom.xml index d61b5629..614921da 100644 --- a/pom.xml +++ b/pom.xml @@ -5,13 +5,13 @@ org.springframework.cloud spring-cloud-build - 1.3.3.RELEASE + 1.3.4.BUILD-SNAPSHOT spring-cloud-vault-parent - 1.0.2.RELEASE + 1.0.3.BUILD-SNAPSHOT pom Spring Cloud Vault @@ -35,7 +35,7 @@ scm:git:ssh://git@github.com/spring-cloud/spring-cloud-vault.git - v1.0.2.RELEASE + HEAD diff --git a/spring-cloud-starter-vault-config/pom.xml b/spring-cloud-starter-vault-config/pom.xml index 8f596995..9250145c 100644 --- a/spring-cloud-starter-vault-config/pom.xml +++ b/spring-cloud-starter-vault-config/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-vault-parent - 1.0.2.RELEASE + 1.0.3.BUILD-SNAPSHOT .. diff --git a/spring-cloud-vault-config-aws/pom.xml b/spring-cloud-vault-config-aws/pom.xml index 502f243c..eb51664b 100644 --- a/spring-cloud-vault-config-aws/pom.xml +++ b/spring-cloud-vault-config-aws/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-vault-parent - 1.0.2.RELEASE + 1.0.3.BUILD-SNAPSHOT .. diff --git a/spring-cloud-vault-config-consul/pom.xml b/spring-cloud-vault-config-consul/pom.xml index 85db046b..5267e854 100644 --- a/spring-cloud-vault-config-consul/pom.xml +++ b/spring-cloud-vault-config-consul/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-vault-parent - 1.0.2.RELEASE + 1.0.3.BUILD-SNAPSHOT .. diff --git a/spring-cloud-vault-config-databases/pom.xml b/spring-cloud-vault-config-databases/pom.xml index ba11a9ad..4c2afb34 100644 --- a/spring-cloud-vault-config-databases/pom.xml +++ b/spring-cloud-vault-config-databases/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-vault-parent - 1.0.2.RELEASE + 1.0.3.BUILD-SNAPSHOT .. diff --git a/spring-cloud-vault-config-rabbitmq/pom.xml b/spring-cloud-vault-config-rabbitmq/pom.xml index 2c141e1b..1e691528 100644 --- a/spring-cloud-vault-config-rabbitmq/pom.xml +++ b/spring-cloud-vault-config-rabbitmq/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-vault-parent - 1.0.2.RELEASE + 1.0.3.BUILD-SNAPSHOT .. diff --git a/spring-cloud-vault-config/pom.xml b/spring-cloud-vault-config/pom.xml index 7774aaf0..5d3ae43b 100644 --- a/spring-cloud-vault-config/pom.xml +++ b/spring-cloud-vault-config/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-vault-parent - 1.0.2.RELEASE + 1.0.3.BUILD-SNAPSHOT .. diff --git a/spring-cloud-vault-dependencies/pom.xml b/spring-cloud-vault-dependencies/pom.xml index 21987dda..e062528c 100644 --- a/spring-cloud-vault-dependencies/pom.xml +++ b/spring-cloud-vault-dependencies/pom.xml @@ -5,13 +5,13 @@ org.springframework.cloud spring-cloud-dependencies-parent - 1.3.3.RELEASE + 1.3.4.BUILD-SNAPSHOT spring-cloud-vault-dependencies - 1.0.2.RELEASE + 1.0.3.BUILD-SNAPSHOT pom Spring Cloud Vault Dependencies @@ -134,8 +134,4 @@ - - - v1.0.2.RELEASE - diff --git a/src/main/resources/notice.txt b/src/main/resources/notice.txt index 7e23b155..3b717850 100644 --- a/src/main/resources/notice.txt +++ b/src/main/resources/notice.txt @@ -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").