Commit Graph

821 Commits

Author SHA1 Message Date
buildmaster
f19f4be761 Bumping versions to 2.0.4.BUILD-SNAPSHOT after release 2019-02-22 15:22:11 +00:00
buildmaster
ea5abfd3a5 Going back to snapshots 2019-02-22 15:22:11 +00:00
buildmaster
5ea5bdcf70 Update SNAPSHOT to 2.0.3.RELEASE 2019-02-22 15:19:33 +00:00
Olga Maciaszek-Sharma
77fd62d4f6 Add ConditionalOnDiscoveryEnabled. (#482)
* Add ConditionalOnDiscoveryEnabled.

* Fix typo.

* Fix typo.

* Add @since info. Fix typo.
2019-02-17 15:57:28 +01:00
Ryan Baxter
4413f136aa Revert "Only attempt to decrypt properties that are not overridden (#462)"
This reverts commit 59798f52ed.
2019-02-14 17:14:14 -05:00
Ryan Baxter
5e52806440 Revert "Allow overriding encrypted properties with unencrypted properties (#459)"
This reverts commit 4a66435d38.
2019-02-14 17:09:28 -05:00
buildmaster
8c4fe5626e Bumping versions 2019-02-14 17:23:19 +00:00
Spencer Gibb
703c7c2bbf Ignores MapPropertySources not created by boot
Prior to this change, any `MapPropertySource` created by an `EnvironmentPostProcessor` would be processed by `BootstrapApplicationListener`. If that property source had a conditional property that it created itself, the 2nd run (bootstrap causes EPPs to run twice) would not have the property and that property source would end up in the main `Environment` effectively deleting a property.

This change only deals with `MapPropertySource`s created by boot testing for a specific sub-type.

Fixes gh-476
2019-02-13 11:34:26 -05:00
Ryan Baxter
d7d0320905 Merge remote-tracking branch 'origin/1.3.x' into 2.0.x 2019-01-18 16:13:43 -05:00
Ryan Baxter
b91e2ab731 Trim profile names in array (#469)
* Trim profile names in array.  Fixes #460

* Use tokenizeToStringArray
2019-01-18 16:12:52 -05:00
Ryan Baxter
43c270a53c Provide exact error when there is a problem opening the logging config file. Fixes #464 (#470) 2019-01-18 10:30:05 -05:00
Jasper Aarts
59798f52ed Only attempt to decrypt properties that are not overridden (#462) 2019-01-07 12:33:09 -05:00
Jasper Aarts
4a66435d38 Allow overriding encrypted properties with unencrypted properties (#459) 2018-12-21 15:05:57 -05:00
Marcin Grzejszczak
0821e2b1cd Merge branch '1.3.x' into 2.0.x 2018-11-19 15:18:23 +01:00
Marcin Grzejszczak
2b4c30c4b2 Added more info about how to disable compatibility check; fixes gh-449 2018-11-19 15:18:13 +01:00
Marcin Grzejszczak
0166ac37cd Fixed invalid versions for compatibility verifier 2018-11-15 16:27:11 +01:00
Marcin Grzejszczak
c5560b49a8 Polish 2018-11-15 15:47:08 +01:00
Marcin Grzejszczak
38a754cf9a Merge branch '1.3.x' into 2.0.x 2018-11-15 15:44:03 +01:00
Marcin Grzejszczak
80659a36b1 Spring Cloud Compatibility Verification
Due to the fact that some users have problem with setting up Spring Cloud application, we've decided
to add a compatibility verification mechanism. It will break if your current setup is not compatible
with Spring Cloud requirements, together with a report, showing what exactly went wrong.

At the moment we verify which version of Spring Boot is added to your classpath.

Example of a report

```
***************************
APPLICATION FAILED TO START
***************************

Description:

Your project setup is incompatible with our requirements due to following reasons:

- Spring Boot [1.5.16.RELEASE] is not compatible with this Spring Cloud release train


Action:

Consider applying the following actions:

- Change Spring Boot version to one of the following versions [1.2.x, 1.3.x] .
You can find the latest Spring Boot versions here [https://spring.io/projects/spring-boot#learn].
If you want to learn more about the Spring Cloud Release train compatibility, you can visit this page [https://spring.io/projects/spring-cloud#overview] and check the [Release Trains] section.
```


In order to disable this feature, set `spring.cloud.compatibility-verifier.enabled` to `false`.
If you want to override the compatible Spring Boot versions, just set the
`spring.cloud.compatibility-verifier.compatible-boot-versions` property with a comma separated list
of compatible Spring Boot versions.

fixes gh-442
2018-11-15 15:40:29 +01:00
Ryan Baxter
9b8a70e557 Check type before invoking bean factory to prevent early creation of FactoryBeans. (#436) 2018-10-27 07:45:26 -04:00
Spencer Gibb
791a8807b5 Adds test for existence of ManagementServerProperties class.
fixes gh-435
2018-10-24 12:07:01 -04:00
Spencer Gibb
e2e1450ea7 Updates to s-c-build 2.0.5.BUILD-SNAPSHOT 2018-10-23 17:07:01 -04:00
buildmaster
e80bb61107 Bumping versions to 2.0.3.BUILD-SNAPSHOT after release 2018-10-23 15:46:50 +00:00
buildmaster
8c6e38b789 Going back to snapshots 2018-10-23 15:46:50 +00:00
buildmaster
080b4f77df Update SNAPSHOT to 2.0.2.RELEASE 2018-10-23 15:43:52 +00:00
Spencer Gibb
ca80e3ac78 Uses custom WebClientCustomizer rather than one from Boot.
Using the boot WebClientCustomizer caused the auto configured
WebClient.Builder to use the loadbalancer filter function even though
it wasn't annotated with `@LoadBalanced`.

Fixes gh-434
2018-10-22 15:59:56 -04:00
lxy
bbc82b423c Set MainApplicationClass if it is null (#426)
MainApplicationClass will be null, if it is booted from SpringBootServletInitializer. So we need to set it properly.

Fixes gh-425
2018-10-18 09:51:59 -04:00
Ryan Baxter
5248f3fc32 Return a client response from filter function instead of throwing an exception. Fixes #386 (#430) 2018-10-17 20:11:56 -04:00
Ryan Baxter
a2ba7a57e3 Bumping versions to 1.3.6.BUILD-SNAPSHOT after release 2018-10-15 14:29:42 -04:00
Ryan Baxter
dcc1a8339e Going back to snapshots 2018-10-15 14:29:41 -04:00
Ryan Baxter
da245fc428 Update SNAPSHOT to 1.3.5.RELEASE 2018-10-15 14:28:06 -04:00
Ryan Baxter
575fb31412 Fix documentation for adding a backoff policy. Fixes #423 2018-10-15 11:35:09 -04:00
Ryan Baxter
e7e391a65a Adds event that will be fired before a service is registered. Fixes #302 (#424) 2018-10-15 09:11:16 -04:00
Spencer Gibb
edd4d0e759 Adds @ConditionalOnBean(HealthAggregator.class) to DiscoveryCompositeHealthIndicator bean.
see https://github.com/spring-cloud/spring-cloud-netflix/issues/3161
2018-10-05 17:43:08 -04:00
durigon
b91313d913 Refactor String#replaceAll (#417)
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:41:07 -04:00
Ryan Baxter
99a3b6e226 Adding additional-spring-configuraition-metadata.json (#408)
* Adding additional-spring-configuraition-metadata.json.  Fixes #407
2018-09-04 15:59:50 -04:00
Spencer Gibb
6533e0ca53 Makes ContextRefresher easier to extend.
Adds protected getters for context and scope.

Adds new refreshEnvironment() method.

fixes gh-382
2018-08-15 14:48:58 -04:00
Spencer Gibb
69181c14d1 formatting 2018-08-01 13:20:28 -04:00
Dave Syer
df2ba5cf2a Update RSA deps to latest release 2018-08-01 15:51:14 +01:00
buildmaster
8efcb1577e Bumping versions to 2.0.2.BUILD-SNAPSHOT after release 2018-07-31 18:05:58 +00:00
buildmaster
36146312ab Going back to snapshots 2018-07-31 18:05:58 +00:00
buildmaster
1998ac2892 Update SNAPSHOT to 2.0.1.RELEASE 2018-07-31 18:03:14 +00:00
Ryan Baxter
7949aaa1b5 Merge remote-tracking branch 'origin/1.3.x' 2018-07-30 16:40:12 -04:00
Ryan Baxter
57ab7ed469 Add null check in RefreshScopeHealthIndicator. Fixes #397. (#398) 2018-07-26 15:09:05 -04:00
Ryan Baxter
84659685d6 Add note about custom logging prefix 2018-07-19 10:28:22 -04:00
Ryan Baxter
1de9d12150 Extract target class code into utility class (#391)
* Extract target class code into utility class
2018-07-11 16:01:14 -04:00
Spencer Gibb
e28f75b010 Merge changes from boots ModifiedClassPathRunner 2018-07-02 14:03:16 -04:00
buildmaster
d711556fe8 Bumping versions to 1.3.5.BUILD-SNAPSHOT after release 2018-06-28 14:20:22 +00:00
buildmaster
9896cb7062 Going back to snapshots 2018-06-28 14:20:21 +00:00
buildmaster
b9c04fb14b Update SNAPSHOT to 1.3.4.RELEASE 2018-06-28 14:19:20 +00:00