Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
19,225 Commits 23 Branches 0 Tags
3d2fbdf3bd9a98a3f58bb01ce174ec842559ebfa
Commit Graph

3951 Commits

Author SHA1 Message Date
dreis2211
3d2fbdf3bd Polish mocks with default answer 
Closes gh-14971
 2018-10-26 16:39:48 -07:00
Phillip Webb
c393f6262e Merge branch '2.0.x' 2018-10-26 16:36:02 -07:00
Phillip Webb
33c7a74bee Update copyright year for changed files 2018-10-26 16:35:28 -07:00
Phillip Webb
997de53f20 Remove uncessary call in PropertiesMigrationReport 
Closes gh-14974
 2018-10-26 16:35:00 -07:00
Phillip Webb
5603d61909 Polish "Consider aliases when checking descendants" 
See gh-14967
 2018-10-26 16:24:23 -07:00
chang-chao
256ca681fd Consider aliases when checking descendants 
Update `AliasedConfigurationPropertySource` to consider aliases in
`containsDescendantOf`.

Prior to this commit, given a source containing `example.name` with
a defined alias of `other.name -> example.name` calling
`containsDescendantOf("other")` would incorrectly return
`ConfigurationPropertyState.ABSENT`.

Closes gh-14967
 2018-10-26 16:08:56 -07:00
Phillip Webb
1a0a8470e5 Merge branch '2.0.x' 2018-10-26 13:37:39 -07:00
Phillip Webb
62b9268cec Polish "Fix Spring Batch job restart parameters handling" 
See gh-14933
 2018-10-26 13:30:50 -07:00
Mahmoud Ben Hassine
ad3c3ad361 Fix Spring Batch job restart parameters handling 
Fix the `JobLauncherCommandLineRunner` to correctly deal with job
parameters when restarting a job.

Prior to this commit, we were was calling the `getNextJobParameters`
method of the `JobParametersBuilder` from batch. This method was getting
the previous parameters of the wrong job instance in a restart scenario.

This commit fixes the issue by first getting the right job instance with
the provided parameters, then restarting it.

Closes gh-14933
 2018-10-26 13:24:02 -07:00
Phillip Webb
1a85e629d7 Stop using streams when working with sources 
Replace `streamSources()` calls with `getSources()` in an attempt to
reduce the amount of garbage created.

Closes gh-13565
 2018-10-26 11:30:28 -07:00
Vedran Pavic
6e967fe860 Upgrade to Hazelcast 3.11 
Closes gh-14949
 2018-10-25 15:57:59 -07:00
Phillip Webb
acb5a90273 Log warning when using deprecated EndpointId chars 
Update `EndpointId` to log a warning when `-` or `.` are used.

Closes gh-14840
 2018-10-25 15:56:48 -07:00
Stephane Nicoll
d1ce315602 Merge branch '1.5.x' into 2.0.x 2018-10-26 07:48:40 +09:00
Hanope
65e3b9ff5b Fix typos 
Closes gh-14954
 2018-10-26 07:34:58 +09:00
dreis2211
5b6e94d78a Polish javadoc of CachesEndpoint 
Closes gh-14969
 2018-10-26 07:31:49 +09:00
Brian Clozel
b424fa6039 Upgrade to Maven Failsafe Plugin 2.22.1 
Closes gh-14965
 2018-10-25 12:53:14 +02:00
Brian Clozel
b5ea9c1eb2 Upgrade to Flyway 5.2.1 
Closes gh-14964
 2018-10-25 12:53:14 +02:00
Brian Clozel
3c367d8a46 Upgrade to Aspectj 1.9.2 
Closes gh-14963
 2018-10-25 12:53:14 +02:00
Brian Clozel
0c00d1d482 Upgrade to Ehcache 2.10.6 
Closes gh-14962
 2018-10-25 12:53:14 +02:00
Brian Clozel
8c400c8522 Upgrade to Mysql 8.0.13 
Closes gh-14960
 2018-10-25 12:53:14 +02:00
Brian Clozel
ecd2efd4e4 Upgrade to Undertow 2.0.14.Final 
Closes gh-14959
 2018-10-25 12:53:14 +02:00
Brian Clozel
2f244057e2 Upgrade to Rxjava2 2.2.3 
Closes gh-14958
 2018-10-25 12:53:14 +02:00
Brian Clozel
a046aa0138 Upgrade to Appengine Sdk 1.9.67 
Closes gh-14955
 2018-10-25 12:52:25 +02:00
Brian Clozel
cf882c9b40 Fix import error in 8376bc369 2018-10-25 12:52:25 +02:00
Brian Clozel
8376bc3697 Fix build after checkstyle imports updates 
See gh-14911
 2018-10-25 11:25:56 +02:00
Brian Clozel
755c4b8b98 Update spring.mvc.log-resolved-exception description 
Closes gh-14936
 2018-10-25 11:04:20 +02:00
Phillip Webb
6aa2862f85 Merge branch '2.0.x' 2018-10-24 22:48:18 -07:00
Phillip Webb
7bcc793faf Fix WebMvcMetricsFilter logger imports 
Don't use SLF4J loggers in `WebMvcMetricsFilter`.

Fixes gh-14953
 2018-10-24 22:46:31 -07:00
Vedran Pavic
81c7ce1d15 Add starter for OAuth2 resource server 
Closes gh-14950
 2018-10-24 21:37:28 -07:00
Phillip Webb
683484e4a8 Fix primary beans with ApplicationContextAssert 
Update `ApplicationContextAssert.getBean` so that multiple beans are
supported as long as one of them is primary. This aligns better with
the way that the standard `ApplicationContext.getBean` method works.

Closes gh-14874
 2018-10-24 21:34:17 -07:00
Phillip Webb
62cb0f9593 Rename oauth2-oidc-client starter in dependencies 
Fixup dependencies POM following rename of the oauth2-oidc-client
starter.

See gh-14951
 2018-10-24 19:36:32 -07:00
Phillip Webb
69b0d37fe0 Rename oauth2-oidc-client starter 
Rename `spring-boot-starter-oauth2-oidc-client` to
`spring-boot-starter-oauth2-client`.

Closes gh-14951
 2018-10-24 18:08:44 -07:00
Phillip Webb
99e166516d Restore conversion service binary compatibility 
Change `ApplicationConversionService.getSharedInstance()` to again
return a `ConversionService` rather than `ApplicationConversionService`.

This restore binary compatibly with Spring Boot 2.0

Closes gh-14938
 2018-10-24 15:22:42 -07:00
Phillip Webb
2097b6a4c1 Improve ResourceUrlEncodingFilter conditions 
Update Thymeleaf and FreeMarker configurations to make use of the new
`@ConditionalOnMissingFilterBean` annotation.

Closes gh-14926
 2018-10-24 15:10:49 -07:00
Phillip Webb
44a46f1514 Add @ConditionalOnMissingFilterBean 
Add a new condition that can be used to check for servlet `Filter`
beans that are either registered directly, or via a
`FilterRegistrationBean`.

Closes gh-14940
 2018-10-24 15:10:49 -07:00
Phillip Webb
9f858e759c Support parameterizedContainer in bean conditions 
Add a `parameterizedContainer` attribute to `ConditionalOnBean` and
`ConditionalOnMissingBean` which can be used to support generic types
when checking for the presence of beans.

Closes gh-14940
 2018-10-24 15:10:49 -07:00
Phillip Webb
4d3d711e0e Migrate ConditionalOnMissingBeanTests to context runner 2018-10-24 15:10:49 -07:00
Phillip Webb
1bd1ffdb60 Polish 2018-10-24 15:10:49 -07:00
Madhura Bhave
34156b2137 Rename DatabaseDriver#SAP to DatabaseDriver#HANA 
Closes gh-14918
 2018-10-24 13:00:38 -07:00
dreis2211
4857b45ea5 Replace lambdas with method reference or call 
Closes gh-14937
 2018-10-24 10:12:36 +02:00
Madhura Bhave
eb61b2bbde Merge branch '2.0.x' 2018-10-23 14:21:31 -07:00
Madhura Bhave
4322b9781b Polish 2018-10-23 14:21:06 -07:00
Madhura Bhave
5f24af6c3c Polish 
Closes gh-14915
 2018-10-23 13:51:13 -07:00
michal
7181e76135 Skip restarter for JUnit5 
See gh-14915
 2018-10-23 13:50:57 -07:00
Madhura Bhave
80bb7ea9d6 Merge branch '2.0.x' 2018-10-23 13:43:40 -07:00
Madhura Bhave
bc58d4456f Rationalize DefaultRestartInitializerTests 
Closes gh-14927
 2018-10-23 13:43:11 -07:00
Brian Clozel
1651690d57 Fix tests after HandlerExceptionResolver logging changes 
See gh-14936
 2018-10-23 15:34:06 +02:00
Johnny Lim
c3ac423fdd Use Commons Logging for PrometheusPushGatewayManager 
Closes gh-14910
 2018-10-22 21:58:00 -07:00
Madhura Bhave
fd20618f4b Merge branch '2.0.x' 2018-10-22 21:55:01 -07:00
dreis2211
3fea487c7b Use Errors.hasErrors() in DefaultErrorAttributes 
Closes gh-14912
 2018-10-22 21:51:21 -07:00