root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity
19,410 Commits 23 Branches 348 Tags 290 MiB
Commit Graph

19410 Commits

Author SHA1 Message Date
Madhura Bhave f0d1eb94bd Merge branch '2.0.x' 2018-11-19 12:54:45 -08:00
Madhura Bhave 35db10eb30 Use the right variable name in pipeline 2018-11-19 12:51:00 -08:00
Stephane Nicoll 5b825d90b1 Merge pull request #15097 from dsyer 
* pr/15097:
  Temporarily make @Bean methods in Spring Data JDBC public
 2018-11-16 14:56:31 +01:00
Dave Syer b6aff10244 Temporarily make @Bean methods in Spring Data JDBC public 
Closes gh-15097
 2018-11-16 14:53:33 +01:00
Brian Clozel f4db1d3c9a Upgrade to Reactor Californium-BUILD-SNAPSHOT 
See gh-15192
 2018-11-16 14:33:09 +01:00
Brian Clozel 5aabcedb24 Upgrade to Spring Framework 5.1.3.BUILD-SNAPSHOT 
See gh-15186
 2018-11-16 10:55:35 +01:00
Madhura Bhave 05f693a102 Merge branch '2.0.x' 2018-11-15 15:49:12 -08:00
Madhura Bhave ee4205a049 Remove unnecessary logging by start-docker script 2018-11-15 15:48:28 -08:00
Madhura Bhave 1bb788f5c2 Merge branch '2.0.x' 2018-11-15 14:17:05 -08:00
Phillip Webb 657a5347be Use random port for Devtools integration tests 
Closes gh-15013
 2018-11-15 14:02:21 -08:00
Phillip Webb bab111b37e Fix ConfigurationPropertyName.equals for uppercase 
Commit 7f35f8a9 for gh-14665 was unfortunately incomplete as it didn't
account for uppercase values. The run-off while loop should have used
`Character.toLowerCase` in the same way as the main while loop.

Fixes gh-15152
 2018-11-15 13:48:20 -08:00
Phillip Webb dbf09de203 Merge branch '2.0.x' 2018-11-15 13:29:09 -08:00
Phillip Webb e87664f295 Add JettyAccessLogCustomizer 
Add a `JettyAccessLogCustomizer` to customize management access logs
when the management server is running on a different port.

Closes gh-15041
 2018-11-15 13:28:51 -08:00
Phillip Webb c64a007e12 Format POM file 2018-11-15 13:22:50 -08:00
Phillip Webb 5825502c39 Merge branch '2.0.x' 2018-11-15 11:18:21 -08:00
Phillip Webb 3fb30fddb4 Use Bintray API key rather than password in CI 
Update CI scripts to use the Bintray API key rather than the password
when making curl calls.

Closes gh-15015
 2018-11-15 11:15:33 -08:00
Phillip Webb 3fe7bf4dc7 Fix Java 11 CI reference 
See gh-15179
 2018-11-15 11:14:39 -08:00
Phillip Webb 12a16dcfcf Merge branch '2.0.x' 2018-11-15 10:43:40 -08:00
Phillip Webb 5183dd120c Merge pull request #15182 from rahul404 
* pr/15182:
  Polish "Skip scoped targets when determining endpoints"
  Skip scoped targets when determining endpoints
 2018-11-15 10:42:43 -08:00
Phillip Webb e4d5714d50 Polish "Skip scoped targets when determining endpoints" 
See gh-15182
 2018-11-15 10:41:14 -08:00
Rahul Ahuja 4853e6a7af Skip scoped targets when determining endpoints 
Update `EndpointDiscoverer` to filter out scoped target beans when
finding endpoints.

Closes gh-15182
 2018-11-15 10:38:05 -08:00
Phillip Webb 578f093d64 Merge branch '2.0.x' 2018-11-15 10:12:59 -08:00
Phillip Webb 0bc4567898 Merge pull request #15179 from making 
* pr/15179:
  Fix CI Java 11 references
 2018-11-15 10:10:59 -08:00
Toshiaki Maki dd2ed72fae Fix CI Java 11 references 
Closes gh-15179
 2018-11-15 10:10:33 -08:00
Andy Wilkinson fe9d9ec4e2 Test the Gradle plugin against Gradle 5.0-rc-3 
Closes gh-15171
 2018-11-15 10:32:34 +00:00
Stephane Nicoll c1b1f14f5a Fix default unit for multipart properties 
This commit fixes a regression that wrongly changed the default unit of
multipart properties from bytes to megabytes.

Closes gh-15162
 2018-11-15 09:17:26 +01:00
Stephane Nicoll 2f4325d00f Polish 2018-11-15 09:06:44 +01:00
Phillip Webb cccf5e6d2b Merge branch '2.0.x' 2018-11-14 18:27:28 -08:00
Phillip Webb 3baf782822 Merge branch '1.5.x' into 2.0.x 2018-11-14 18:24:32 -08:00
Phillip Webb b60da5f85d Allow early ServletRequest Autowiring 
Update `EmbeddedWebApplicationContext` so that Servlet related
resolvable dependencies are registered in `postProcessBeanFactory`.

This allows a `ServletReqest` to be autowired into an early initialized
bean and brings parity with WAR based deployments.

Closes gh-14990
 2018-11-14 18:15:21 -08:00
Phillip Webb fb85d0acc1 Merge pull request #15176 from rs017991 
* pr/15176:
  Fixed typo in maven site documentation
 2018-11-14 16:10:55 -08:00
Ryan Scheidter f2d6490548 Fixed typo in maven site documentation 
Closes gh-15176
 2018-11-14 16:10:35 -08:00
Phillip Webb 79b5dd3ae7 Protect against NPE when collecting annotations 
Update `AnnotationsPropertySource` to ensure that `null` results from
`findMergedAnnotation` are not added to the annotation list.

Prior to this commit, if `findMergedAnnotation` returned `null` then
`AnnotationsPropertySource.collectProperties` would throw an NPE.
Although `findMergedAnnotation` should never return `null`, we're
best off being defensive so that bugs such as SPR-17495 won't cause
problems.

Closes gh-15175
 2018-11-14 15:50:53 -08:00
Brian Clozel d84421b7e1 Improve HttpMessageConverters javadoc 
Closes gh-15027
 2018-11-14 15:06:41 +01:00
Brian Clozel 8e86bcafc1 Improve actuator endpoint mapping debug logging 
Closes gh-14292
 2018-11-14 14:36:52 +01:00
Madhura Bhave 8cdfb6c70b Merge branch '2.0.x' 2018-11-13 17:07:29 -08:00
Madhura Bhave d47aaf2974 Merge pull request #15169 from izeye 
* gh-15169:
  Remove unnecessary echo in release notes script
 2018-11-13 17:06:51 -08:00
Johnny Lim 7eb93a0126 Remove unnecessary echo in release notes script 
Closes gh-15169
 2018-11-13 17:06:00 -08:00
Phillip Webb 90bfd0bf36 Merge branch '2.0.x' 2018-11-13 11:16:12 -08:00
Phillip Webb acf046ba27 Update all JDK images to AdoptJDK 
Closes gh-15158
 2018-11-13 11:15:05 -08:00
Phillip Webb 761ebf0336 Merge branch '2.0.x' 2018-11-13 10:17:10 -08:00
Phillip Webb 506fbd803b Use release notes generator docker image in CI 
Closes gh-15160
 2018-11-13 10:15:50 -08:00
Phillip Webb 2bd0a01344 Merge branch '2.0.x' 2018-11-13 09:54:20 -08:00
Phillip Webb ee2d469881 Upgrade CI to artifactory resource 0.0.5 
Closes gh-15159
 2018-11-13 09:53:36 -08:00
Stephane Nicoll 5f443d3288 Merge pull request #15144 from mpv1989 
* pr/15144:
  Add reference to ArangoDB starter
 2018-11-13 18:31:48 +01:00
Mark Vollmary 634b92001b Add reference to ArangoDB starter 
Closes gh-15144
 2018-11-13 18:31:19 +01:00
Phillip Webb 06e9a97dfd Merge branch '2.0.x' 2018-11-13 00:41:52 -08:00
Phillip Webb 27714b1e7d Attempt to fix docker-lib.sh script 
See gh-15158
 2018-11-13 00:04:55 -08:00
Phillip Webb e8eaeba20c Attempt to fix docker-lib.sh script 
See gh-15158
 2018-11-12 23:39:54 -08:00
Phillip Webb e9232288f4 Merge branch '2.0.x' 2018-11-12 22:47:17 -08:00