Commit Graph

872 Commits

Author SHA1 Message Date
Marcin Grzejszczak
04d764d33a Updated copyrights 2019-02-01 14:41:18 +01:00
Marcin Grzejszczak
30b59dacae Added springformat 2019-02-01 13:42:45 +01:00
Marcin Grzejszczak
ae314100f5 Applied checkstyle and turned it on by default 2019-02-01 12:50:02 +01:00
Jasper Aarts
e024f6f5c2 Fix override behaviour when using CompositePropertySource. (#473)
* Fix override behaviour when using CompositePropertySource.
Fixes gh-471

* Improve imports
2019-01-31 20:51:37 -05:00
Bruce E. Thelen
6cffcf9352 Update to RELEASE version of dependency (#474) 2019-01-29 16:23:23 -05:00
buildmaster
b761f276e7 Bumping versions 2019-01-25 12:42:52 +00:00
buildmaster
0c9f9f1d6e Bumping versions to 2.1.1.BUILD-SNAPSHOT after release 2019-01-22 17:52:15 +00:00
buildmaster
de56340e7b Going back to snapshots 2019-01-22 17:52:15 +00:00
buildmaster
5c64a6d02c Update SNAPSHOT to 2.1.0.RELEASE 2019-01-22 17:49:47 +00:00
Ryan Baxter
ddcd40736f Merge remote-tracking branch 'origin/2.0.x' 2019-01-18 16:14:12 -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
Ryan Baxter
7ee51d9bc8 Provide exact error when there is a problem opening the logging config file. Fixes #464 (#470) 2019-01-18 10:29:14 -05:00
Spencer Gibb
493a324d03 Bumps spring cloud build to 2.1.2.BUILD-SNAPSHOT 2019-01-12 12:46:25 -05:00
Ryan Baxter
ecabe2bb8d Merge remote-tracking branch 'origin/2.0.x' 2019-01-07 12:43:08 -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
buildmaster
bc521c4ab6 Going back to snapshots 2018-12-11 21:36:00 +00:00
buildmaster
57c2f9a154 Update SNAPSHOT to 2.1.0.RC2 2018-12-11 21:35:03 +00:00
buildmaster
c410aa749f Going back to snapshots 2018-12-11 16:10:18 +00:00
buildmaster
1251411295 Update SNAPSHOT to 2.1.0.RC1 2018-12-11 16:09:27 +00:00
Dave Syer
daff90f230 Ensure null order is not allowed to bubble up to annotation utils
Fixes gh-456
2018-12-11 11:00:31 +00:00
Ryan Baxter
8d0f64fd93 Add property to disable WritableEnvironmentEndpoint. Fixes #432. (#453) 2018-12-06 22:09:13 +01:00
Spencer Gibb
2515e45405 Closes bootstrap context on parent ApplicationFailedEvent. (#450)
Closes bootstrap context on parent ApplicationFailedEvent.

fixes gh-440
2018-11-29 10:59:11 -05:00
Spencer Gibb
ef6865cbc5 References DiscoveryClient with ObjectProvider.
fixes gh-451
2018-11-28 12:54:24 -05:00
Spencer Gibb
1acb2b8b8b Moves away from Class.forName() to order. 2018-11-19 16:47:18 -05:00
Spencer Gibb
5df3c48fae Moves BootstrapConfiguration classes to ImportSelector. (#444)
This change moves a dynamic list of classes passed to
`SpringApplicationBuilder.sources` to a `DeferredImportSelector` loaded
by a simple `@Configuration` class. `BootstrapImportSelector` now loads
the classes and orders them and returns the class names so that
`@Conditional` annotations (such as `@ConditionalOnClass`) function
properly.

This was exposed while using java 11.

fixes gh-438
2018-11-19 11:12:23 -05:00
Marcin Grzejszczak
0f9789511d Merge branch '2.0.x' 2018-11-19 15:18:33 +01: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
buildmaster
8ed921523b Going back to snapshots 2018-11-18 09:19:14 +00:00
buildmaster
275cdfa43a Update SNAPSHOT to 2.1.0.M2 2018-11-18 09:18:28 +00:00
Marcin Grzejszczak
8e0af5b715 Fixed invalid versions for compatibility verifier 2018-11-15 16:29:15 +01:00
Marcin Grzejszczak
4fa41a0235 Merge branch '2.0.x' 2018-11-15 16:27:21 +01:00
Marcin Grzejszczak
0166ac37cd Fixed invalid versions for compatibility verifier 2018-11-15 16:27:11 +01:00
Marcin Grzejszczak
f4f7a5811c Fixed Boot version for master 2018-11-15 15:52:33 +01:00
Marcin Grzejszczak
c396dbb1d4 Polish 2018-11-15 15:48:09 +01:00
Marcin Grzejszczak
02d53bda82 Merge branch '2.0.x' 2018-11-15 15:47:18 +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
Tim Ysewyn
5eb23a8c3c Added the service instance id to the ServiceInstance interface (#419)
* Added the service instance id to the `ServiceInstance` interface

* Updated `toString()`, `equals()` and `hashCode()`

* Updated Javadoc to fix warnings
2018-11-05 13:22:50 -05:00
Dave Syer
c5138b5bb8 Merge remote-tracking branch 'origin/2.0.x' 2018-10-29 08:47:09 +00: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
c9e69f8cde Merge branch '2.0.x' 2018-10-24 12:10:38 -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