Commit Graph

835 Commits

Author SHA1 Message Date
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
buildmaster
080b4f77df Update SNAPSHOT to 2.0.2.RELEASE 2018-10-23 15:43:52 +00:00
Spencer Gibb
60d2a1ead3 Merge branch '2.0.x' 2018-10-22 16:00:25 -04: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
cd0ff1b1d5 Merge branch '2.0.x' 2018-10-05 17:46:12 -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
Spencer Gibb
b86b637f47 Removes previous bean definitions rather than calling setAllowBeanDefinitionOverriding
See gh-395
2018-10-05 14:31:39 -04:00
Spencer Gibb
1c03cbc067 Adds note about HikariDataSource and refreshable.
See gh-395
2018-10-04 11:57:29 -04:00
Spencer Gibb
6c9231a4da Verify ConfigProps is a bean and refreshables is actually tested. 2018-10-04 11:47:43 -04:00
Spencer Gibb
4da0d95e11 Restores refreshable support using BeanDefinitionRegistryPostProcessor 2018-10-04 11:42:19 -04:00
Spencer Gibb
1fa513194b Adds API and implementation of ReactiveLoadBalancer
API lives in spring-cloud-commons module and implementation in
spring-cloud-loadbalancer.
2018-10-03 12:38:12 -04:00
Marcin Grzejszczak
53f1f0bc3c Fixed invalid javadoc reference 2018-09-29 11:31:51 +01:00
buildmaster
a4fdc8e117 Going back to snapshots 2018-09-21 19:28:07 +00:00
buildmaster
4c1aa2b2d4 Update SNAPSHOT to Greenwich.M1 2018-09-21 19:27:04 +00: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
Jone
b606806066 Fixes decryption of CompositePropertySource
Since CompositePropertySource extends EnumerablePropertySource
the else statement in
EnvironmentDecryptApplicationInitializer.decrypt() was never reached.
2018-09-10 13:37:10 -04:00
Olga Maciaszek-Sharma
8c58a0b397 Merge pull request #412 from OlgaMaciaszek/gh-304-add-discovery-clients-order-support
Gh 304 add discovery clients order support
2018-09-10 17:58:53 +02:00
Olga Maciaszek-Sharma
e115562cf8 Fix after code review - add license notice, reformat imports, edit docs. 2018-09-10 09:21:20 +02:00
Olga Maciaszek-Sharma
ae2bba4d27 Adjust doc to order property changes. 2018-09-07 14:32:11 +02:00
Olga Maciaszek-Sharma
66a959b413 Change default order for SimpleDiscoveryClient. 2018-09-07 11:28:40 +02:00
Olga Maciaszek-Sharma
40f8603e4c Add changes after code review.
Modify

# Conflicts:
#	spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/composite/CompositeDiscoveryClient.java
#	spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/simple/SimpleDiscoveryProperties.java
2018-09-07 10:08:30 +02:00
Olga Maciaszek-Sharma
3105663946 Merge remote-tracking branch 'upstream/master' into gh-304-add-discovery-clients-order-support.
Add changes after code review.

Modify

# Conflicts:
#	spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/composite/CompositeDiscoveryClient.java
#	spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/simple/SimpleDiscoveryProperties.java
2018-09-07 10:08:02 +02: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
1d646290ab Moves away from @EventListener to interface implementations for framework 5.1 changes
fixes gh-405
2018-08-21 11:42:27 -04:00
Spencer Gibb
23d7eae038 Moves away from @EventListener to interface implementations for framework 5.1 changes 2018-08-21 11:14:48 -04:00
Spencer Gibb
75e504765f Merge branch '2.0.x' 2018-08-15 14:49:22 -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
Ben Klein
55c7833e4c Minor Javadoc cleanup (#401)
Nothing major found--mostly just polish.
2018-08-06 13:02:41 -04:00
Spencer Gibb
87bb8f1fa1 Upgrades to build 2.1.0.BUILD-SNAPSHOT and boot 2.1.x
Moves refresh scope proxy creation from BeanDefinitionRegistryPostProcessor to BeanPostProcessor

fixes gh-400
2018-08-02 11:19:17 -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