SpringCloud/spring-cloud-config
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Temporarily go back to commons 2.0.3

Browse Source
This commit is contained in:
Spencer Gibb
2019-04-16 15:34:12 -04:00
parent 3632fc6f64
commit 7ec853e24a
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@@ -22,7 +22,7 @@
</scm> </scm>
<properties> <properties>
<bintray.package>config</bintray.package> <bintray.package>config</bintray.package>
<spring-cloud-commons.version>2.0.4.BUILD-SNAPSHOT</spring-cloud-commons.version> <spring-cloud-commons.version>2.0.3.BUILD-SNAPSHOT</spring-cloud-commons.version>
</properties> </properties>
<modules> <modules>
<module>spring-cloud-config-dependencies</module> <module>spring-cloud-config-dependencies</module>

2
spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/config/EncryptionAutoConfiguration.java
View File

@@ -97,7 +97,7 @@ public class EncryptionAutoConfiguration {
KeyStore keyStore = this.key.getKeyStore(); KeyStore keyStore = this.key.getKeyStore();
KeyStoreTextEncryptorLocator locator = new KeyStoreTextEncryptorLocator( KeyStoreTextEncryptorLocator locator = new KeyStoreTextEncryptorLocator(
new KeyStoreKeyFactory(keyStore.getLocation(), new KeyStoreKeyFactory(keyStore.getLocation(),
keyStore.getPassword().toCharArray(), key.getKeyStore().getType()), keyStore.getPassword().toCharArray()/*, key.getKeyStore().getType()*/),
keyStore.getSecret(), keyStore.getAlias()); keyStore.getSecret(), keyStore.getAlias());
RsaAlgorithm algorithm = this.rsaProperties.getAlgorithm(); RsaAlgorithm algorithm = this.rsaProperties.getAlgorithm();
locator.setRsaAlgorithm(algorithm); locator.setRsaAlgorithm(algorithm);