From 7ec853e24afb65cbc0f7a9e5c7ce54a148ef9959 Mon Sep 17 00:00:00 2001 From: Spencer Gibb Date: Tue, 16 Apr 2019 15:34:12 -0400 Subject: [PATCH 1/5] Temporarily go back to commons 2.0.3 --- pom.xml | 2 +- .../cloud/config/server/config/EncryptionAutoConfiguration.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index d7ec1e77..5ebcd20e 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ config - 2.0.4.BUILD-SNAPSHOT + 2.0.3.BUILD-SNAPSHOT spring-cloud-config-dependencies diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/config/EncryptionAutoConfiguration.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/config/EncryptionAutoConfiguration.java index 02b1dbf7..2e9ffe0d 100644 --- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/config/EncryptionAutoConfiguration.java +++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/config/EncryptionAutoConfiguration.java @@ -97,7 +97,7 @@ public class EncryptionAutoConfiguration { KeyStore keyStore = this.key.getKeyStore(); KeyStoreTextEncryptorLocator locator = new KeyStoreTextEncryptorLocator( new KeyStoreKeyFactory(keyStore.getLocation(), - keyStore.getPassword().toCharArray(), key.getKeyStore().getType()), + keyStore.getPassword().toCharArray()/*, key.getKeyStore().getType()*/), keyStore.getSecret(), keyStore.getAlias()); RsaAlgorithm algorithm = this.rsaProperties.getAlgorithm(); locator.setRsaAlgorithm(algorithm); From 743a5fb692dc329721d16507ec4d252803202201 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Tue, 16 Apr 2019 19:38:38 +0000 Subject: [PATCH 2/5] Update SNAPSHOT to 2.0.4.RELEASE --- README.adoc | 2 +- docs/pom.xml | 2 +- pom.xml | 6 +++--- spring-cloud-config-client/pom.xml | 2 +- spring-cloud-config-dependencies/pom.xml | 4 ++-- spring-cloud-config-monitor/pom.xml | 4 ++-- spring-cloud-config-sample/pom.xml | 2 +- spring-cloud-config-server/pom.xml | 4 ++-- spring-cloud-starter-config/pom.xml | 4 ++-- 9 files changed, 15 insertions(+), 15 deletions(-) diff --git a/README.adoc b/README.adoc index c1e978c8..33120d95 100644 --- a/README.adoc +++ b/README.adoc @@ -243,7 +243,7 @@ credentials and you already have those. The projects that require middleware generally include a `docker-compose.yml`, so consider using -https://compose.docker.io/[Docker Compose] to run the middeware servers +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, diff --git a/docs/pom.xml b/docs/pom.xml index f4bc2906..cd8fbbc5 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-config - 2.0.4.BUILD-SNAPSHOT + 2.0.4.RELEASE .. diff --git a/pom.xml b/pom.xml index 5ebcd20e..b5def069 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.cloud spring-cloud-config - 2.0.4.BUILD-SNAPSHOT + 2.0.4.RELEASE pom Spring Cloud Config Spring Cloud Config @@ -11,7 +11,7 @@ org.springframework.cloud spring-cloud-build - 2.0.6.BUILD-SNAPSHOT + 2.0.5.RELEASE @@ -22,7 +22,7 @@ config - 2.0.3.BUILD-SNAPSHOT + 2.0.3.RELEASE spring-cloud-config-dependencies diff --git a/spring-cloud-config-client/pom.xml b/spring-cloud-config-client/pom.xml index 43433f1d..39595a87 100644 --- a/spring-cloud-config-client/pom.xml +++ b/spring-cloud-config-client/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-config - 2.0.4.BUILD-SNAPSHOT + 2.0.4.RELEASE .. diff --git a/spring-cloud-config-dependencies/pom.xml b/spring-cloud-config-dependencies/pom.xml index 58f6e485..57ff5bc4 100644 --- a/spring-cloud-config-dependencies/pom.xml +++ b/spring-cloud-config-dependencies/pom.xml @@ -5,11 +5,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 2.0.6.BUILD-SNAPSHOT + 2.0.5.RELEASE spring-cloud-config-dependencies - 2.0.4.BUILD-SNAPSHOT + 2.0.4.RELEASE pom spring-cloud-config-dependencies Spring Cloud Config Dependencies diff --git a/spring-cloud-config-monitor/pom.xml b/spring-cloud-config-monitor/pom.xml index 83ac0b40..6673f83e 100644 --- a/spring-cloud-config-monitor/pom.xml +++ b/spring-cloud-config-monitor/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-config - 2.0.4.BUILD-SNAPSHOT + 2.0.4.RELEASE .. spring-cloud-config-monitor @@ -13,7 +13,7 @@ Spring Cloud Config Monitor ${basedir}/../.. - 2.0.1.BUILD-SNAPSHOT + 2.0.1.RELEASE diff --git a/spring-cloud-config-sample/pom.xml b/spring-cloud-config-sample/pom.xml index 05c6da84..41295683 100644 --- a/spring-cloud-config-sample/pom.xml +++ b/spring-cloud-config-sample/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-config - 2.0.4.BUILD-SNAPSHOT + 2.0.4.RELEASE .. diff --git a/spring-cloud-config-server/pom.xml b/spring-cloud-config-server/pom.xml index 10542918..408fec1a 100644 --- a/spring-cloud-config-server/pom.xml +++ b/spring-cloud-config-server/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-config - 2.0.4.BUILD-SNAPSHOT + 2.0.4.RELEASE .. @@ -98,7 +98,7 @@ UTF-8 - Finchley.BUILD-SNAPSHOT + Finchley.SR3 org.springframework.cloud.config.server.ConfigServerApplication diff --git a/spring-cloud-starter-config/pom.xml b/spring-cloud-starter-config/pom.xml index 06d8df09..23197b44 100644 --- a/spring-cloud-starter-config/pom.xml +++ b/spring-cloud-starter-config/pom.xml @@ -5,10 +5,10 @@ org.springframework.cloud spring-cloud-config - 2.0.4.BUILD-SNAPSHOT + 2.0.4.RELEASE spring-cloud-starter-config - 2.0.4.BUILD-SNAPSHOT + 2.0.4.RELEASE spring-cloud-starter-config Spring Cloud Starter https://projects.spring.io/spring-cloud From 9670cc5d00a5d3a6f266ee811eee936875635c5e Mon Sep 17 00:00:00 2001 From: buildmaster Date: Tue, 16 Apr 2019 19:39:59 +0000 Subject: [PATCH 3/5] Going back to snapshots --- README.adoc | 2 +- docs/pom.xml | 2 +- pom.xml | 6 +++--- spring-cloud-config-client/pom.xml | 2 +- spring-cloud-config-dependencies/pom.xml | 4 ++-- spring-cloud-config-monitor/pom.xml | 4 ++-- spring-cloud-config-sample/pom.xml | 2 +- spring-cloud-config-server/pom.xml | 4 ++-- spring-cloud-starter-config/pom.xml | 4 ++-- 9 files changed, 15 insertions(+), 15 deletions(-) diff --git a/README.adoc b/README.adoc index 33120d95..c1e978c8 100644 --- a/README.adoc +++ b/README.adoc @@ -243,7 +243,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, diff --git a/docs/pom.xml b/docs/pom.xml index cd8fbbc5..f4bc2906 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-config - 2.0.4.RELEASE + 2.0.4.BUILD-SNAPSHOT .. diff --git a/pom.xml b/pom.xml index b5def069..5ebcd20e 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.cloud spring-cloud-config - 2.0.4.RELEASE + 2.0.4.BUILD-SNAPSHOT pom Spring Cloud Config Spring Cloud Config @@ -11,7 +11,7 @@ org.springframework.cloud spring-cloud-build - 2.0.5.RELEASE + 2.0.6.BUILD-SNAPSHOT @@ -22,7 +22,7 @@ config - 2.0.3.RELEASE + 2.0.3.BUILD-SNAPSHOT spring-cloud-config-dependencies diff --git a/spring-cloud-config-client/pom.xml b/spring-cloud-config-client/pom.xml index 39595a87..43433f1d 100644 --- a/spring-cloud-config-client/pom.xml +++ b/spring-cloud-config-client/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-config - 2.0.4.RELEASE + 2.0.4.BUILD-SNAPSHOT .. diff --git a/spring-cloud-config-dependencies/pom.xml b/spring-cloud-config-dependencies/pom.xml index 57ff5bc4..58f6e485 100644 --- a/spring-cloud-config-dependencies/pom.xml +++ b/spring-cloud-config-dependencies/pom.xml @@ -5,11 +5,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 2.0.5.RELEASE + 2.0.6.BUILD-SNAPSHOT spring-cloud-config-dependencies - 2.0.4.RELEASE + 2.0.4.BUILD-SNAPSHOT pom spring-cloud-config-dependencies Spring Cloud Config Dependencies diff --git a/spring-cloud-config-monitor/pom.xml b/spring-cloud-config-monitor/pom.xml index 6673f83e..83ac0b40 100644 --- a/spring-cloud-config-monitor/pom.xml +++ b/spring-cloud-config-monitor/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-config - 2.0.4.RELEASE + 2.0.4.BUILD-SNAPSHOT .. spring-cloud-config-monitor @@ -13,7 +13,7 @@ Spring Cloud Config Monitor ${basedir}/../.. - 2.0.1.RELEASE + 2.0.1.BUILD-SNAPSHOT diff --git a/spring-cloud-config-sample/pom.xml b/spring-cloud-config-sample/pom.xml index 41295683..05c6da84 100644 --- a/spring-cloud-config-sample/pom.xml +++ b/spring-cloud-config-sample/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-config - 2.0.4.RELEASE + 2.0.4.BUILD-SNAPSHOT .. diff --git a/spring-cloud-config-server/pom.xml b/spring-cloud-config-server/pom.xml index 408fec1a..10542918 100644 --- a/spring-cloud-config-server/pom.xml +++ b/spring-cloud-config-server/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-config - 2.0.4.RELEASE + 2.0.4.BUILD-SNAPSHOT .. @@ -98,7 +98,7 @@ UTF-8 - Finchley.SR3 + Finchley.BUILD-SNAPSHOT org.springframework.cloud.config.server.ConfigServerApplication diff --git a/spring-cloud-starter-config/pom.xml b/spring-cloud-starter-config/pom.xml index 23197b44..06d8df09 100644 --- a/spring-cloud-starter-config/pom.xml +++ b/spring-cloud-starter-config/pom.xml @@ -5,10 +5,10 @@ org.springframework.cloud spring-cloud-config - 2.0.4.RELEASE + 2.0.4.BUILD-SNAPSHOT spring-cloud-starter-config - 2.0.4.RELEASE + 2.0.4.BUILD-SNAPSHOT spring-cloud-starter-config Spring Cloud Starter https://projects.spring.io/spring-cloud From ce9f835ee8319e695ce53b0748c77d850614a610 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Tue, 16 Apr 2019 19:40:00 +0000 Subject: [PATCH 4/5] Bumping versions to 2.0.5.BUILD-SNAPSHOT after release --- docs/pom.xml | 2 +- pom.xml | 2 +- spring-cloud-config-client/pom.xml | 2 +- spring-cloud-config-dependencies/pom.xml | 2 +- spring-cloud-config-monitor/pom.xml | 2 +- spring-cloud-config-sample/pom.xml | 2 +- spring-cloud-config-server/pom.xml | 2 +- spring-cloud-starter-config/pom.xml | 4 ++-- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index f4bc2906..012e03f8 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-config - 2.0.4.BUILD-SNAPSHOT + 2.0.5.BUILD-SNAPSHOT .. diff --git a/pom.xml b/pom.xml index 5ebcd20e..a64f36a6 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.cloud spring-cloud-config - 2.0.4.BUILD-SNAPSHOT + 2.0.5.BUILD-SNAPSHOT pom Spring Cloud Config Spring Cloud Config diff --git a/spring-cloud-config-client/pom.xml b/spring-cloud-config-client/pom.xml index 43433f1d..c33284c9 100644 --- a/spring-cloud-config-client/pom.xml +++ b/spring-cloud-config-client/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-config - 2.0.4.BUILD-SNAPSHOT + 2.0.5.BUILD-SNAPSHOT .. diff --git a/spring-cloud-config-dependencies/pom.xml b/spring-cloud-config-dependencies/pom.xml index 58f6e485..b8230b8c 100644 --- a/spring-cloud-config-dependencies/pom.xml +++ b/spring-cloud-config-dependencies/pom.xml @@ -9,7 +9,7 @@ spring-cloud-config-dependencies - 2.0.4.BUILD-SNAPSHOT + 2.0.5.BUILD-SNAPSHOT pom spring-cloud-config-dependencies Spring Cloud Config Dependencies diff --git a/spring-cloud-config-monitor/pom.xml b/spring-cloud-config-monitor/pom.xml index 83ac0b40..c6519d7d 100644 --- a/spring-cloud-config-monitor/pom.xml +++ b/spring-cloud-config-monitor/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-config - 2.0.4.BUILD-SNAPSHOT + 2.0.5.BUILD-SNAPSHOT .. spring-cloud-config-monitor diff --git a/spring-cloud-config-sample/pom.xml b/spring-cloud-config-sample/pom.xml index 05c6da84..284b2252 100644 --- a/spring-cloud-config-sample/pom.xml +++ b/spring-cloud-config-sample/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-config - 2.0.4.BUILD-SNAPSHOT + 2.0.5.BUILD-SNAPSHOT .. diff --git a/spring-cloud-config-server/pom.xml b/spring-cloud-config-server/pom.xml index 10542918..03bfdfce 100644 --- a/spring-cloud-config-server/pom.xml +++ b/spring-cloud-config-server/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-config - 2.0.4.BUILD-SNAPSHOT + 2.0.5.BUILD-SNAPSHOT .. diff --git a/spring-cloud-starter-config/pom.xml b/spring-cloud-starter-config/pom.xml index 06d8df09..0d463e47 100644 --- a/spring-cloud-starter-config/pom.xml +++ b/spring-cloud-starter-config/pom.xml @@ -5,10 +5,10 @@ org.springframework.cloud spring-cloud-config - 2.0.4.BUILD-SNAPSHOT + 2.0.5.BUILD-SNAPSHOT spring-cloud-starter-config - 2.0.4.BUILD-SNAPSHOT + 2.0.5.BUILD-SNAPSHOT spring-cloud-starter-config Spring Cloud Starter https://projects.spring.io/spring-cloud From aa9191402027a7544a69c176610f9c320fe3b4c4 Mon Sep 17 00:00:00 2001 From: Spencer Gibb Date: Tue, 16 Apr 2019 15:41:45 -0400 Subject: [PATCH 5/5] Revert "Temporarily go back to commons 2.0.3" This reverts commit 7ec853e2 --- pom.xml | 2 +- .../cloud/config/server/config/EncryptionAutoConfiguration.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index a64f36a6..a9c34e9a 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ config - 2.0.3.BUILD-SNAPSHOT + 2.0.4.BUILD-SNAPSHOT spring-cloud-config-dependencies diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/config/EncryptionAutoConfiguration.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/config/EncryptionAutoConfiguration.java index 2e9ffe0d..02b1dbf7 100644 --- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/config/EncryptionAutoConfiguration.java +++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/config/EncryptionAutoConfiguration.java @@ -97,7 +97,7 @@ public class EncryptionAutoConfiguration { KeyStore keyStore = this.key.getKeyStore(); KeyStoreTextEncryptorLocator locator = new KeyStoreTextEncryptorLocator( new KeyStoreKeyFactory(keyStore.getLocation(), - keyStore.getPassword().toCharArray()/*, key.getKeyStore().getType()*/), + keyStore.getPassword().toCharArray(), key.getKeyStore().getType()), keyStore.getSecret(), keyStore.getAlias()); RsaAlgorithm algorithm = this.rsaProperties.getAlgorithm(); locator.setRsaAlgorithm(algorithm);