Spencer Gibb
80b91d0a03
fix merge error
7 years ago
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
7 years ago
Spencer Gibb
c75673110b
formatting
7 years ago
Spencer Gibb
2baa775f65
Make getDiscoveryClients() public
7 years ago
Fabio Matos
2e81db24cf
Disables endpoint creation ( #208 )
...
Fixes gh-117
7 years ago
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
7 years ago
Spencer Gibb
2b6ad4a118
bump to version 1.3.0
7 years ago
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
7 years ago
Spencer Gibb
ce2e751ca3
Merge remote-tracking branch 'origin/2.0.x' into 2.0.x
7 years ago
Spencer Gibb
7ae5cc1abd
Set discovery client health indicator description included to false.
...
see gh-223
7 years ago
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
7 years ago
Spencer Gibb
c953240620
Allow Discovery HealthIndicator description to be disabled.
...
fixes gh-223
7 years ago
Ryan Baxter
787bea18e9
OK HTTP client factory implementations
7 years ago
Ryan Baxter
473c278983
Fixing code formatting
7 years ago
Ryan Baxter
8b6ec654ea
http client libraries are assumed to be present and not optional
7 years ago
Ryan Baxter
9bf1fe4685
Implementation of factories to provide Apache HTTP Clients
7 years ago
Ryan Baxter
423d09a995
Merge remote-tracking branch 'origin/master' into 2.0.x
7 years ago
Ryan Baxter
111bd1ccb2
Merge pull request #221 from jihor/master
...
Add option to control management registration
7 years ago
jihor
314a42339c
Switch back from Lombok to plain getters and setters in AutoServiceRegistrationProperties
7 years ago
jihor
011fa5d631
Add option to control management registration, switch AutoServiceRegistrationProperties to use Lombok
7 years ago
Spencer Gibb
d4326005f9
Going back to snapshots
8 years ago
Spencer Gibb
02c522d015
Update SNAPSHOT to 2.0.0.M1
8 years ago
Spencer Gibb
d55192ede6
Merge branch 'master' into 2.0.x
8 years ago
Spencer Gibb
40930de25d
Upgrade to mvn 3.5.0
...
fixes gh-199
8 years ago
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
8 years ago
Spencer Gibb
72bc4c1ffd
fix mockito changes for spring boot 2.0.0
8 years ago
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
8 years ago
Spencer Gibb
b5f5912125
add back removing of spring.application.name of bootstrap
...
see gh-214
8 years ago
Spencer Gibb
853d7c43a7
Comment out broken tests
8 years ago
Ryan Baxter
ef164427e4
Merge pull request #216 from ryanjbaxter/retry-on-status-codes
...
Retry requests on specified status codes. Fixes #215 .
8 years ago
Ryan Baxter
87c319ae8e
Retry requests on specified status codes. Also makes it easier to provide your own interceptor. Fixes #215 .
8 years ago
Spencer Gibb
0c041591d1
Bump to version 1.2.3.BUILD-SNAPSHOT
8 years ago
Spencer Gibb
6cfaea4bb7
Going back to snapshots
8 years ago
Spencer Gibb
79096fbf8d
Update SNAPSHOT to 1.2.2.RELEASE
8 years ago
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
8 years ago
Spencer Gibb
ebf4112116
Updates to boot 2.0 changes
8 years ago
Dave Syer
3f005ab238
Update to fix issues introduced in Boot 2.0.0.M1
8 years ago
Dave Syer
01cca0275a
Be defensive about web classes being available
8 years ago
Dave Syer
021a77d997
Uningnored some tests to do with binding to lists
...
See https://github.com/spring-projects/spring-boot/issues/9137
8 years ago
Jon Schneider
206ba7bcc1
Update spring-cloud-commons-dependencies version
8 years ago
Jon Schneider
c02398959d
Revert back to snapshots
8 years ago
Jon Schneider
9d53dd46bb
Update SNAPSHOT to 1.2.1.RELEASE
8 years ago
Dave Syer
ac9d609a27
Update rsa library
8 years ago
Dave Syer
d030225d46
Split out ModifiedClassPathRunner into a separate jar
8 years ago
Dave Syer
c3f9b1a821
Fix more Spring Boot related mayhem
8 years ago
Dave Syer
4b4e7650fa
Switch to new class loader filter runner
8 years ago
Jon Schneider
bf905ccae0
Merge branch 'master' into 2.0.x
8 years ago
Jon Schneider
15aad9ca5f
Point build badge to CircleCI
8 years ago
Dave Syer
1850155bad
Add link to comment
8 years ago
Dave Syer
f191110228
Hack the configuration properties to fix tests
...
See https://github.com/spring-projects/spring-boot/issues/9160
8 years ago