Commit Graph

604 Commits

Author SHA1 Message Date
Spencer Gibb
609cf30f53 Ignores NativeBootstrapFailureAnalyzerTests temporarily
see gh-1193
2018-11-19 17:30:21 -05:00
Spencer Gibb
e1e2b3b6e2 Disables JMX for tests 2018-11-19 17:05:54 -05:00
Ryan Baxter
c97e62dc09 Merge remote-tracking branch 'origin/2.0.x' 2018-11-19 16:28:48 -05:00
Ryan Baxter
e7ee0e299e Merge remote-tracking branch 'origin/1.4.x' into 2.0.x 2018-11-19 16:27:21 -05:00
buildmaster
663d9e503b Going back to snapshots 2018-11-18 09:23:50 +00:00
buildmaster
987575ecd4 Update SNAPSHOT to 2.1.0.M2 2018-11-18 09:23:07 +00:00
ramaiahkk
e380b83026 #1103 java.lang.NullPointerException (#1104)
java.lang.NullPointerException while decrypting due to value is null and still looking for cipher string. #1103
2018-11-16 16:40:56 -05:00
Dave Syer
585195d995 Remove redundant synchronized keyword
If the other 2 public methods don't need it, then I reckon this one doesn't.
2018-11-16 10:54:14 +00:00
juneycha
f0ea304a87 Make 'JGitEnvironmentRepository.JGitFactory' public (#1188) 2018-11-14 19:56:27 -05:00
Ryan Baxter
cabc55469b Only override native default label if config server default label is not null. Fixes #1184 (#1185) 2018-11-12 12:22:22 -05:00
hanjin lee
b057195fa7 Fix GitCredentialsProviderFactory (#1178)
* Fix GitCredentialsProviderFactory

* Fix GitCredentialsProviderFactory

* Fix GitCredentialsProviderFactory
2018-11-07 10:31:30 -05:00
Marcin Grzejszczak
c0faa81676 Bumping jgit to 5.1.3.201810200350-r (#1179)
* Bumping jgit

* Updated tests
2018-11-07 15:38:36 +01:00
Lukáš Vyhlídka
be4155eb12 Fix wrong synchronization on Spring Refresh Context Event (#1168) (#1170) 2018-10-25 09:56:51 -04:00
buildmaster
c47f8a07a4 Bumping versions to 2.0.3.BUILD-SNAPSHOT after release 2018-10-23 17:45:48 +00:00
buildmaster
a2e411fbd0 Going back to snapshots 2018-10-23 17:45:47 +00:00
buildmaster
2d73a66a5a Update SNAPSHOT to 2.0.2.RELEASE 2018-10-23 17:44:11 +00:00
buildmaster
b6bae9ad44 Bumping versions to 1.4.6.BUILD-SNAPSHOT after release 2018-10-15 20:34:29 +00:00
buildmaster
f58993305f Going back to snapshots 2018-10-15 20:34:28 +00:00
buildmaster
cb96c60331 Update SNAPSHOT to Edgware.SR5 2018-10-15 20:33:02 +00:00
Ryan Baxter
2e5933aafa Log exception when error occurs cloning Git repo. Fixes #1160 2018-10-11 11:31:44 -04:00
Ryan Baxter
8b122cc3f5 Adds failure analyzer for git uri error. Fixes #1060 (#1162) 2018-10-10 16:53:19 -04:00
Marcin Grzejszczak
abbd14fd01 Updated config 2018-10-02 11:55:01 +02:00
buildmaster
89cc0dc70d Going back to snapshots 2018-09-21 19:46:48 +00:00
buildmaster
c3a093e02a Update SNAPSHOT to Greenwich.M1 2018-09-21 19:45:51 +00:00
durigon
ccd3bc2ff6 Refactor String#replaceAll (#1146)
If we repeatedly call String#replaceAll, we internally repeatedly call the regular expression pattern compilation every time as following:

```java
    public String replaceAll(String regex, String replacement) {
        return Pattern.compile(regex).matcher(this).replaceAll(replacement);
    }
```
The modifications are to keep the compiled pattern.
Therefore, compiling a relatively expensive regular expression pattern does not have to be done every time.
2018-09-19 20:39:35 -04:00
Ryan Baxter
aee1ae1b5c Merge remote-tracking branch 'origin/2.0.x' 2018-09-17 10:32:45 -04:00
Ryan Baxter
8ecc20e119 Merge remote-tracking branch 'origin/1.4.x' into 2.0.x 2018-09-17 10:32:13 -04:00
Lukáš Vyhlídka
80f98c387a Fix branch not to be updated when refreshRate used (#1136) (#1138) 2018-09-17 09:49:08 -04:00
Larry Ogrodnek
35d176e56f #974 remove one or two escapes for supporting JSON (#982)
Hi.  This is an attempt to fix #974 (cc @ryanjbaxter )

As mentioned previously in the ticket, the original code tries to mask out escaped variables (i.e. `\${hello}`) before performing replacement, and then finally removing the escapes before returning.  

This works fine for .yaml or .properties, but not for JSON.

The jackson serialization that happens before the property resolution ends up adding an extra `\` (so that the JSON is well-formed) [EnvironmentController.labelledJsonPropertes](https://github.com/spring-cloud/spring-cloud-config/blob/master/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/EnvironmentController.java#L169).

I've updated the `resolverPlaceholders` to accept one or two escapes (`\` or `\\`).

I realize this will now treat `\\` as an escape in yml or properties, which may be unintended, but seems unlikely.

An alternative might be to add a flag to this method to indicate whether or not to allow double escape, and updating the `labelledJson` method to pass the flag?

I'm open to any feedback on this approach or another.

Thanks!
2018-09-17 09:36:50 -04:00
Johnny Lim
f7fa6dde60 Remove @ResponseBody when using ResponseEntity (#1125) 2018-09-04 09:55:08 -04:00
Joël
4ee026b03d Add too weak custom encryption exception (#1119)
* Add too weak custom encryption exception
2018-08-28 13:45:58 -04:00
ramaiahkk
306e018691 #1103 java.lang.NullPointerException (#1104)
java.lang.NullPointerException while decrypting due to value is null and still looking for cipher string. #1103
2018-08-06 12:51:43 -04:00
Spencer Gibb
513353b8e7 Bumps to 2.1.0.BUILD-SNAPSHOT and updates for boot 2.1.0 2018-08-01 19:10:24 -04:00
Mark Paluch
0395ad06cb Omit secret backend URL encoding for Vault. (#1098)
We now construct the URL template from the base URL, API version prefix and secret backend upfront and apply templating only for the secret key. This bypasses URL encoding for the secret backend which allows for special characters such as slashes to be passed thru directly.

Fixes gh-1094.
2018-08-01 13:46:21 -04:00
buildmaster
53b22b6ec3 Bumping versions to 2.0.2.BUILD-SNAPSHOT after release 2018-07-31 18:43:22 +00:00
buildmaster
602c786639 Going back to snapshots 2018-07-31 18:43:21 +00:00
buildmaster
85029323f7 Update SNAPSHOT to 2.0.1.RELEASE 2018-07-31 18:41:51 +00:00
Tomasz Juchniewicz
3aaf6ea0b8 Log exception when server health check fails (#1092)
Fixes gh-1091
2018-07-20 10:34:06 -04:00
Dylan Roberts
02ae15c3b9 Configure httpclient instances to use jvm http proxy (#1077)
Httpclient instances were ignoring http proxy settings set with system properties
gh-1071
2018-07-10 13:56:56 -04:00
buildmaster
c42c3c27ae Bumping versions to 1.4.5.BUILD-SNAPSHOT after release 2018-06-28 20:06:20 +00:00
buildmaster
3c3985e1f3 Going back to snapshots 2018-06-28 20:06:19 +00:00
buildmaster
76188d4461 Update SNAPSHOT to 1.4.4.RELEASE 2018-06-28 20:02:38 +00:00
bisigc
496412bd8e Adding ssh proxy capability (#1054)
Adding the capability to configure a proxy host and port for ssh git
repo connections.
2018-06-27 09:56:30 -04:00
buildmaster
5ff3f0d698 Bumping versions to 2.0.1.BUILD-SNAPSHOT after release 2018-06-18 18:04:11 +00:00
buildmaster
55df651837 Going back to snapshots 2018-06-18 18:04:10 +00:00
buildmaster
f266d9581c Update SNAPSHOT to 2.0.0.RELEASE 2018-06-18 17:53:04 +00:00
Spencer Gibb
f352ecf5f3 Adds multi-repo shortcut support back.
fixes gh-1055
2018-06-11 13:14:38 -04:00
Ryan Baxter
247e280410 Merge remote-tracking branch 'origin/1.4.x' 2018-06-07 19:48:09 -04:00
Ryan Baxter
dbf29ad12c Added spring boot autoconfigure processor 2018-06-07 19:47:28 -04:00
Spencer Gibb
20b88b5b5f Checks for null uri to avoid NPE
fixes gh-1051
2018-06-07 13:06:06 -04:00