Dave Syer
7a82540f59
Merge branch 'master' into 2.0.x
2017-09-22 14:22:07 +01:00
Dave Syer
46253b746b
Fix some compiler warnings
2017-09-22 13:39:41 +01:00
Dave Syer
e362f39285
Add simple implementation of JDBC environment repository
2017-09-22 13:39:29 +01:00
Dave Syer
d2164400d7
Merge branch 'master' into 2.0.x
2017-09-21 14:02:27 +01:00
Dave Syer
6520992b31
Manage dependency for aws sdk
2017-09-21 14:00:10 +01:00
Dave Syer
5d80742e9c
Merge branch 'master' into 2.0.x
2017-09-21 13:54:55 +01:00
Dave Syer
70aea7c358
Fix ordering issues in environment repository config
2017-09-21 13:54:35 +01:00
Spencer Gibb
0e46f86082
Merge branch 'master' into 2.0.x
2017-09-11 16:02:10 -06:00
Spencer Gibb
90564e0572
Add missing import
2017-09-11 16:01:56 -06:00
Spencer Gibb
6b09a15856
Merge branch '1.3.x'
2017-09-11 15:55:40 -06:00
Spencer Gibb
6d89ed8059
Update jsch for newer keys
...
fixes gh-780
2017-09-11 15:53:51 -06:00
Spencer Gibb
ec51b0a9a9
Update jgit to 4.8.0.201706111038-r
2017-09-11 15:35:04 -06:00
Spencer Gibb
9b8fa89549
Merge branch 'master' into 2.0.x
2017-09-11 15:24:55 -06:00
Spencer Gibb
3e6fc09bba
Merge branch '1.3.x'
2017-09-11 15:17:03 -06:00
Spencer Gibb
f995217841
unignore test
2017-09-11 15:15:12 -06:00
Spencer Gibb
b555ddfe92
Move back to java7 compatible jgit.
...
Fixes gh-780
2017-09-11 15:14:47 -06:00
Edgars Jasmans
18a5da61d4
Added additional options for GIT SSH configuration property configuration ( #775 )
...
Abilty to specify known_hosts file
Added option to specify SSH 'PreferredAuthentications' property to override SSH server priorities for authentication methods.
fixes gh-101
2017-08-31 19:05:34 -04:00
Johnny Lim
5381497bdb
Fix error messages
2017-08-31 10:38:02 +09:00
Ryan Baxter
2f1c65dbca
Going back to snapshots
2017-08-24 16:27:49 -04:00
Ryan Baxter
170af24f89
Update SNAPSHOT to 1.4.0.M1
2017-08-24 16:26:38 -04:00
Ryan Baxter
f5cf304543
Merge remote-tracking branch 'origin/master' into 2.0.x
2017-08-24 16:13:49 -04:00
Tommy Ludwig
c916487795
Remove unused BaseSshUriProperties
...
I believe this class was added by mistake in merge commit 7e901a1d4f
2017-08-20 15:41:41 +09:00
Spencer Gibb
1d57a06001
Going back to snapshots
2017-08-17 15:42:24 -06:00
Spencer Gibb
37a5f8b3df
Update SNAPSHOT to 2.0.0.M2
2017-08-17 15:40:23 -06:00
Spencer Gibb
508c1a1b5d
Updates for broken tests
2017-08-09 10:17:47 -06:00
Spencer Gibb
99b06cc550
Update for spring boot 2 properties
2017-08-09 10:17:01 -06:00
Dave Syer
302e25544d
Merge branch 'master' into 2.0.x
2017-08-09 14:48:40 +01:00
Dave Syer
7412ec782e
Merge branch '1.3.x'
2017-08-09 14:48:30 +01:00
Ollie Hughes
c67699562a
Use prefix parameter when when matching encrypt.keyStore property
...
So that relaxed naming will also `encrypt.key-store`. Fixes gh-772.
2017-08-09 14:47:55 +01:00
Dave Syer
044e3348b0
Merge branch 'master' into 2.0.x
2017-08-04 12:42:25 +01:00
Dave Syer
7699652447
Merge branch '1.3.x'
2017-08-04 12:42:17 +01:00
Dave Syer
89115f195e
Add missing file
2017-08-04 12:42:11 +01:00
Dave Syer
30189771f0
Merge branch 'master' into 2.0.x
2017-08-04 11:53:06 +01:00
Dave Syer
399fb5161c
Merge branch '1.3.x'
2017-08-04 11:51:51 +01:00
Dave Syer
fe42a1d669
Check for existing TextEncryptor and create a TextEncryptorLocator
...
This addresses the corner case where encrypt.key is provided so a
TextEncryptor is available in the bootstrap context. Previously
it was not used and the /encrypt endpoints wouldn't work.
Fixes gh-760
2017-08-04 11:49:22 +01:00
Ryan Baxter
617c761f17
Merge remote-tracking branch 'origin/master' into 2.0.x
2017-07-31 10:14:22 -04:00
Ryan Baxter
1ba9353d7f
Merge remote-tracking branch 'origin/1.3.x'
2017-07-31 10:13:41 -04:00
Ryan Baxter
0751f9d69e
Merge pull request #753 from ojhughes/ssh-validation-typo
...
Fix incorrect message when private key is missing
2017-07-31 10:12:47 -04:00
Ollie Hughes
7f047fc0ce
Fix incorrect message when private key is missing
2017-07-25 11:32:49 +01:00
Spencer Gibb
d1561f8fb6
polish
2017-07-21 09:31:20 -06:00
Spencer Gibb
a9ab664e87
Merge branch 'master' into 2.0.x
2017-07-21 09:26:34 -06:00
Spencer Gibb
ebbe75d6aa
Bumping versions to 1.3.3.BUILD-SNAPSHOT after release
2017-07-20 11:03:30 -06:00
Spencer Gibb
00e08f99b3
Going back to snapshots
2017-07-20 11:03:30 -06:00
Spencer Gibb
d52715c061
Update SNAPSHOT to 1.3.2.RELEASE
2017-07-20 10:52:01 -06:00
Dave Syer
541fbff352
Change matcher to accoutn for updates in mockito
2017-07-20 13:36:46 +01:00
Dave Syer
69b3754ae1
Merge branch 'master' into 2.0.x
2017-07-20 13:31:10 +01:00
Dave Syer
7e901a1d4f
Merge branch '1.3.x'
2017-07-20 12:30:25 +01:00
Ollie Hughes
537f6ce648
Differentiate between SSH settings found at the top level of a Git configuration object and those found as a map under the Repos property. Do this by introducing common base class SshUri that holds common properties and SshUriNestedRepoProperties, that is used to contain properties in the repos property map. This avoids Boot from guarding against a potential infinite deserialization loop.
2017-07-20 12:08:15 +01:00
Ollie Hughes
67cdfab7fa
Use JGit URIish to parse SSH URIs
...
Use JSR-303 cross field validation for `SshUriProperties`
Rebase with 1.3.x Dalston
2017-07-20 12:07:02 +01:00
Ollie Hughes
acee8a1b10
Git SSH configuration using properties
...
By default, Spring Cloud Config Server uses SSH configuration files such
as ~/.ssh/known_hosts and /etc/ssh/ssh_config when connecting to Git repositories
using an SSH URI. In cloud environments such as Cloud Foundry,
the local filesystem may be ephemeral or not easily accessible.
For cases such as these, SSH configuration can be set using Java properties.
In order to activate property based SSH configuration,
the property spring.cloud.config.server.git.ignoreLocalSshSettings must be set to true
2017-07-20 12:06:39 +01:00
