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
Dave Syer
15f4d046bb
Merge remote-tracking branch 'origin/master' into 2.0.x
2017-05-09 07:05:47 +01:00
Dave Syer
80555b3354
Updates to adapt to Spring Boot changes
...
Also adjusts bootstrap listener to be smarter about default
properties:
It's better not to use the default properties at all because the
user might pass some in and we don't want to overwrite them. Before
Boot 2.0 we got away with it, but since 2.0 we have to be more
cautious.
2017-05-09 07:01:46 +01:00
Dave Syer
fc2355b985
Make sure SimpleDiscoveryClient has a local service instance
...
Also allow user to configure it via application.yml, or default
to something sensible, the same way the Noop client used to.
Fixes https://github.com/spring-cloud/spring-cloud-netflix/issues/1909
2017-05-05 17:27:26 +01:00
Spencer Gibb
ac16a94880
comment out broken test
2017-05-01 10:25:55 -06:00
Spencer Gibb
ef19c34666
Work around https://github.com/spring-projects/spring-boot/issues/9053#issuecomment-298362685
2017-05-01 10:25:39 -06:00
Spencer Gibb
922608651a
fix test path
2017-05-01 09:27:37 -06:00
Spencer Gibb
f804361f38
Update to web app type enum
2017-05-01 09:08:31 -06:00
Spencer Gibb
6a4789a691
Update to new binder
2017-05-01 08:58:28 -06:00
Spencer Gibb
6abf2def40
Change type to String
2017-04-28 18:57:43 -06:00
Spencer Gibb
6e6dd493df
Fix tests
2017-04-28 18:37:10 -06:00
Spencer Gibb
c6c391158f
Removes RelaxedPropertyResolver
2017-04-28 15:29:49 -06:00
Spencer Gibb
51a3ba617b
Merge branch 'master' into 2.0.x
2017-04-28 14:52:23 -06:00
Spencer Gibb
a4169d451e
Only registerManagement if registration is non-null.
...
fixes https://github.com/spring-cloud/spring-cloud-zookeeper/issues/122
2017-04-19 20:01:04 -06:00
Spencer Gibb
b611e78075
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-04-06 21:43:05 -06:00
Spencer Gibb
9675df02f6
Bumping versions to 1.2.1.BUILD-SNAPSHOT after release
2017-04-05 14:19:30 -06:00
Spencer Gibb
72685376a9
Going back to snapshots
2017-04-05 14:19:29 -06:00
Spencer Gibb
6b30820b09
Update SNAPSHOT to 1.2.0.RELEASE
2017-04-05 14:16:21 -06:00
Spencer Gibb
fe360307fa
remove aggregate javadoc generation
2017-04-05 14:05:28 -06:00
Spencer Gibb
807e5c3ffd
Move test-jar plugin to s-c-commons module
2017-04-05 12:48:58 -06:00
Spencer Gibb
c7c3f55ae8
Update mvnw for central profile detection
2017-04-05 12:35:46 -06:00
Spencer Gibb
43fe59489e
Update test jar inclusion
2017-04-05 12:34:37 -06:00
Ryan Baxter
0dd6214ba4
Add retryable status code check ( #197 )
...
* Added API
* Add method to check response code retry in the policy.
2017-04-05 12:14:15 -04:00
Spencer Gibb
fb9e11b377
polish
2017-04-03 20:22:47 -06:00
Biju Kunjummen
930b927723
Support for config driven Discovery Client
...
Making SimpleDiscoveryClient the default, marking NoOpDiscoveryClient as deprecated
fixes gh-180
2017-04-03 22:17:02 -04:00
Spencer Gibb
b40ceef356
RefreshEventListener no longer depends on RefreshEndpoint.
...
Instead it depends on ContextRefresher with actually does the work.
This allows applications to use the listener even if they don't depend
on actuator.
fixes gh-171
2017-04-03 20:13:11 -06:00
Spencer Gibb
78d10fc223
Use relaxed property resolver in KeyCondition
...
Allows users to define properties like encrypt.key-store.password=letmein
fixes gh-191
(cherry picked from commit 7744b63
2017-04-03 19:52:17 -06:00
Spencer Gibb
61199a151c
Adds ServiceRegistry documentation.
...
fixes gh-170
fixes gh-196
2017-04-03 19:15:40 -06:00
Ryan Baxter
8b9821dd90
Merge pull request #194 from ryanjbaxter/make-retry-enabled-default-true
...
Set spring.cloud.loadbalancer.retry.enabled to true by default
2017-03-30 19:32:09 -04:00
Ryan Baxter
414b1704e1
Documenting property to disable retry logic with Spring Retry on the class path
2017-03-30 19:11:03 -04:00
Ryan Baxter
8e34e0c5e4
Set spring.cloud.loadbalancer.retry.enabled to true by default
2017-03-30 16:30:40 -04:00
