Spencer Gibb
80b91d0a03
fix merge error
2017-06-30 19:33:31 -06:00
Spencer Gibb
c44c3f37e4
Merge branch 'master' into 2.0.x
...
# Conflicts:
# spring-cloud-context/src/main/java/org/springframework/cloud/autoconfigure/LifecycleMvcEndpointAutoConfiguration.java
# spring-cloud-context/src/test/java/org/springframework/cloud/autoconfigure/RefreshAutoConfigurationClassPathTests.java
# spring-cloud-context/src/test/java/org/springframework/cloud/autoconfigure/RefreshAutoConfigurationTests.java
2017-06-30 18:14:37 -06:00
Spencer Gibb
c75673110b
formatting
2017-06-30 17:47:08 -06:00
Spencer Gibb
2baa775f65
Make getDiscoveryClients() public
2017-06-30 17:45:46 -06:00
Fabio Matos
2e81db24cf
Disables endpoint creation ( #208 )
...
Fixes gh-117
2017-06-30 19:38:03 -04:00
Spencer Gibb
db7151918d
Merge branch 'master' into 2.0.x
...
# Conflicts:
# docs/pom.xml
# pom.xml
# spring-cloud-commons-dependencies/pom.xml
# spring-cloud-commons/pom.xml
# spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/simple/SimpleDiscoveryClientAutoConfiguration.java
# spring-cloud-context/pom.xml
# spring-cloud-starter/pom.xml
2017-06-30 17:22:35 -06:00
Spencer Gibb
2b6ad4a118
bump to version 1.3.0
2017-06-30 17:19:48 -06:00
Biju Kunjummen
ca06452be0
GH-140: Support for Composite Discovery client ( #198 )
...
Add support for Composite Discovery client
* Test that the default discovery client is present
* Return a local Service instance from Composite Discovery Client
fixes gh-140
2017-06-30 19:09:44 -04:00
Spencer Gibb
ce2e751ca3
Merge remote-tracking branch 'origin/2.0.x' into 2.0.x
2017-06-29 16:24:51 -06:00
Spencer Gibb
7ae5cc1abd
Set discovery client health indicator description included to false.
...
see gh-223
2017-06-29 16:24:39 -06:00
Spencer Gibb
78511e19b4
Merge branch 'master' into 2.0.x
...
# Conflicts:
# spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/health/DiscoveryCompositeHealthIndicatorTests.java
2017-06-29 16:16:32 -06:00
Spencer Gibb
c953240620
Allow Discovery HealthIndicator description to be disabled.
...
fixes gh-223
2017-06-29 16:15:09 -06:00
Ryan Baxter
423d09a995
Merge remote-tracking branch 'origin/master' into 2.0.x
2017-06-27 09:56:30 -04:00
Ryan Baxter
111bd1ccb2
Merge pull request #221 from jihor/master
...
Add option to control management registration
2017-06-27 09:55:08 -04:00
jihor
314a42339c
Switch back from Lombok to plain getters and setters in AutoServiceRegistrationProperties
2017-06-26 23:17:49 +03:00
jihor
011fa5d631
Add option to control management registration, switch AutoServiceRegistrationProperties to use Lombok
2017-06-26 19:18:20 +03:00
Spencer Gibb
d4326005f9
Going back to snapshots
2017-06-16 14:54:23 -06:00
Spencer Gibb
02c522d015
Update SNAPSHOT to 2.0.0.M1
2017-06-16 14:53:15 -06:00
Spencer Gibb
d55192ede6
Merge branch 'master' into 2.0.x
2017-06-16 14:22:32 -06:00
Spencer Gibb
40930de25d
Upgrade to mvn 3.5.0
...
fixes gh-199
2017-06-16 14:11:30 -06:00
Spencer Gibb
ed91ad845f
Programmatically set context id rather than using spring.application.name.
...
This allows other bootstrap application listeners to resolve the
spring.application.name during the bootstrap phase, but allows bootstrap
to determine if the context is the bootstrap context.
fixes gh-214
2017-06-16 13:42:17 -06:00
Spencer Gibb
72bc4c1ffd
fix mockito changes for spring boot 2.0.0
2017-06-08 13:12:22 -06:00
Spencer Gibb
1d1b77c99f
Merge branch 'master' into 2.0.x
...
# Conflicts:
# docs/pom.xml
# pom.xml
# spring-cloud-commons-dependencies/pom.xml
# spring-cloud-commons/pom.xml
# spring-cloud-context/pom.xml
# spring-cloud-starter/pom.xml
2017-06-06 10:07:32 -06:00
Spencer Gibb
b5f5912125
add back removing of spring.application.name of bootstrap
...
see gh-214
2017-06-06 10:05:53 -06:00
Spencer Gibb
853d7c43a7
Comment out broken tests
2017-05-31 14:18:05 -06:00
Ryan Baxter
ef164427e4
Merge pull request #216 from ryanjbaxter/retry-on-status-codes
...
Retry requests on specified status codes. Fixes #215 .
2017-05-31 14:17:43 -04:00
Ryan Baxter
87c319ae8e
Retry requests on specified status codes. Also makes it easier to provide your own interceptor. Fixes #215 .
2017-05-31 13:36:56 -04:00
Spencer Gibb
0c041591d1
Bump to version 1.2.3.BUILD-SNAPSHOT
2017-05-19 14:59:52 -06:00
Spencer Gibb
6cfaea4bb7
Going back to snapshots
2017-05-19 14:57:35 -06:00
Spencer Gibb
79096fbf8d
Update SNAPSHOT to 1.2.2.RELEASE
2017-05-19 14:54:42 -06:00
Spencer Gibb
f17edd2f7e
Merge branch 'master' into 2.0.x
...
# Conflicts:
# docs/pom.xml
# pom.xml
# spring-cloud-commons-dependencies/pom.xml
# spring-cloud-commons/pom.xml
# spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/simple/SimpleDiscoveryClientAutoConfiguration.java
# spring-cloud-context/pom.xml
# spring-cloud-starter/pom.xml
2017-05-16 13:27:31 -06:00
Spencer Gibb
ebf4112116
Updates to boot 2.0 changes
2017-05-16 13:23:21 -06:00
Dave Syer
3f005ab238
Update to fix issues introduced in Boot 2.0.0.M1
2017-05-16 18:16:14 +01:00
Dave Syer
01cca0275a
Be defensive about web classes being available
2017-05-16 14:48:19 +01:00
Dave Syer
021a77d997
Uningnored some tests to do with binding to lists
...
See https://github.com/spring-projects/spring-boot/issues/9137
2017-05-14 11:06:37 +01:00
Jon Schneider
206ba7bcc1
Update spring-cloud-commons-dependencies version
2017-05-12 10:33:18 -05:00
Jon Schneider
c02398959d
Revert back to snapshots
2017-05-12 10:25:38 -05:00
Jon Schneider
9d53dd46bb
Update SNAPSHOT to 1.2.1.RELEASE
2017-05-12 09:18:36 -05:00
Dave Syer
ac9d609a27
Update rsa library
2017-05-12 14:30:46 +01:00
Dave Syer
d030225d46
Split out ModifiedClassPathRunner into a separate jar
2017-05-12 11:05:17 +01:00
Dave Syer
c3f9b1a821
Fix more Spring Boot related mayhem
2017-05-12 10:42:06 +01:00
Dave Syer
4b4e7650fa
Switch to new class loader filter runner
2017-05-12 10:42:06 +01:00
Jon Schneider
bf905ccae0
Merge branch 'master' into 2.0.x
2017-05-11 14:24:56 -05:00
Jon Schneider
15aad9ca5f
Point build badge to CircleCI
2017-05-11 14:20:47 -05:00
Dave Syer
1850155bad
Add link to comment
2017-05-11 12:03:39 +01:00
Dave Syer
f191110228
Hack the configuration properties to fix tests
...
See https://github.com/spring-projects/spring-boot/issues/9160
2017-05-11 11:34:24 +01:00
Dave Syer
bf68a8ac10
Update RSA library
2017-05-11 11:20:16 +01:00
Dave Syer
5569778f99
Attempt to fix for new change in Boot
2017-05-10 14:54:07 +01:00
Spencer Gibb
618364239e
Comment out missing boot 1.5 code
2017-05-09 11:11:36 -06:00
Dave Syer
c1972a8574
Simplify EnvironmentUtils (maybe could be deleted?)
2017-05-09 09:09:34 +01:00
