Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
9,771 Commits 23 Branches 0 Tags
3c873b08fc9d8b4fff0dca22cb451ec6805148fd
Commit Graph

9771 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andy Wilkinson
50c19250f2 Merge branch '1.5.x' 2016-11-22 15:05:48 +00:00
Andy Wilkinson
af67decab6 Merge pull request #6957 from Vedran Pavić 
* gh-6957:
  Update Docker images used by launch script integration tests
 2016-11-22 15:05:35 +00:00
Vedran Pavic
8bd2e69915 Update Docker images used by launch script integration tests 2016-11-22 15:05:15 +00:00
Andy Wilkinson
2913ea9733 Merge branch '1.5.x' 2016-11-22 14:55:22 +00:00
Andy Wilkinson
617a8259b4 Merge pull request #6782 from sangwook 
* gh-6782:
  Make it easier to override FILE_LOG_PATTERN
 2016-11-22 14:54:14 +00:00
sangwook
7e46f8e2e3 Make it easier to override FILE_LOG_PATTERN 
Closes gh-6782
 2016-11-22 14:52:51 +00:00
Andy Wilkinson
8d589b9a05 Merge branch '1.5.x' 2016-11-22 14:38:07 +00:00
Andy Wilkinson
112ec53baa Merge pull request #7407 from Madhura Bhave 
* gh-7407:
  Polish "Validate excluded autoconfiguration classes"
  Validate excluded autoconfiguration classes
 2016-11-22 14:10:59 +00:00
Andy Wilkinson
65d0c07fd6 Polish "Validate excluded autoconfiguration classes" 
- Apply code formatting
- Move configuration of excepted exception to immediately before line
  that will throw the exception
- Use String.format with %n to produce platform-specific new lines

See gh-7407
 2016-11-22 14:10:37 +00:00
Madhura Bhave
a9ffdca6f2 Validate excluded autoconfiguration classes 
Closes gh-7407
See gh-6865
 2016-11-22 14:02:51 +00:00
Andy Wilkinson
bc6b2a9c75 Merge branch '1.5.x' 2016-11-22 13:54:49 +00:00
Andy Wilkinson
c7a566fd24 Merge pull request #7234 from Christian Koops 
* gh-7234:
  Make launch script's logFilename and pidFilename configurable via properties
 2016-11-22 13:54:28 +00:00
Christian Koops
5c11059e1d Make launch script's logFilename and pidFilename configurable via properties 
Closes gh-7234
 2016-11-22 13:54:16 +00:00
Andy Wilkinson
9e4a370a98 Merge branch '1.5.x' 2016-11-22 13:47:18 +00:00
Andy Wilkinson
09a235b1e8 Upgrade to Neo4j OGM 2.1.0-M01 
Closes gh-7448
 2016-11-22 13:45:30 +00:00
Andy Wilkinson
fd2b417252 Merge branch '1.5.x' 2016-11-22 13:10:01 +00:00
Andy Wilkinson
d12c21ae2f Add spring-kafka dependency to spring-boot-docs for Javadoc links 
See gh-6961
 2016-11-22 13:09:15 +00:00
Andy Wilkinson
0b94d71671 Merge branch '1.5.x' 2016-11-22 11:35:20 +00:00
Andy Wilkinson
ff4bbd9291 Fix javadoc and apply code formatting to Kafka contribution 
See gh-6961
 2016-11-22 11:34:29 +00:00
Andy Wilkinson
95a763d528 Merge branch '1.5.x' 2016-11-22 11:08:10 +00:00
Andy Wilkinson
f5dd90815b Polishing: fix some compiler warnings 2016-11-22 11:07:51 +00:00
Andy Wilkinson
9e4fea5f54 Merge branch '1.5.x' 2016-11-22 11:03:11 +00:00
Andy Wilkinson
29f0ae3fa8 Use a random port in new tests in SpringBootWebSecurityConfigurationTests 
See gh-7373
 2016-11-22 11:03:05 +00:00
Stephane Nicoll
e3688455fa Merge branch '1.5.x' 2016-11-22 10:30:31 +01:00
Stephane Nicoll
cc07f56c87 Merge pull request #6961 from garyrussell:kafkaAutoConfig 
* pr/6961:
  Polish "Apache Kafka support" contribution
  Add Apache Kafka support
 2016-11-22 10:29:01 +01:00
Stephane Nicoll
642af52d01 Polish "Apache Kafka support" contribution 
Closes gh-6961
 2016-11-22 10:22:00 +01:00
Gary Russell
c4188c8e4a Add Apache Kafka support 
See gh-6961
 2016-11-22 09:34:01 +01:00
Andy Wilkinson
a501afdeb1 Merge branch '1.5.x' 2016-11-21 13:40:19 +00:00
Andy Wilkinson
b2a8be8bbe Merge branch '1.4.x' into 1.5.x 2016-11-21 13:40:11 +00:00
Andy Wilkinson
3423ca87b4 Ensure that RestClientTest can be used without Jackson on the class path 
Closes gh-7431
 2016-11-21 13:36:05 +00:00
Andy Wilkinson
bbf6fee446 Merge branch '1.5.x' 2016-11-21 13:35:35 +00:00
Andy Wilkinson
5a9fc9aa49 Merge branch '1.4.x' into 1.5.x 2016-11-21 13:35:22 +00:00
Andy Wilkinson
3464c0b16e Ensure that Hypermedia-related auto-config works without Jackson 
Previously, both HypermediaAutoConfiguration and HttpMessageConverters
assumed that if Spring HATEOAS was on the class path, then Jackson
would be too. When this was not the case, an application would fail
to start.

This commit updates both classes to back off appropriately when
Spring HATEOAS is on the classpath but Jackson is not.

Closes gh-7434
 2016-11-21 13:25:25 +00:00
Andy Wilkinson
a87f8419f8 Merge branch '1.5.x' 2016-11-21 13:20:54 +00:00
Andy Wilkinson
2c856124e1 Polish ModifiedClassPathRunner 2016-11-21 13:20:37 +00:00
Andy Wilkinson
f4b119cb53 Tidy up spring-boot-junit-runners' dependencies 2016-11-21 13:16:56 +00:00
Andy Wilkinson
34f73eb4e0 Correct the version of spring-boot-junit-runners' parent 2016-11-21 10:51:57 +00:00
Andy Wilkinson
37bdaf9ccf Merge branch '1.5.x' 2016-11-21 10:46:25 +00:00
Andy Wilkinson
ac05b61df9 Merge branch '1.4.x' into 1.5.x 2016-11-21 10:46:09 +00:00
Andy Wilkinson
c9427191ee Set TCCL before initialising test class in FilteredClassPathRunner 
Closes gh-7435
 2016-11-21 10:41:41 +00:00
Stephane Nicoll
77bef0536f Merge branch '1.5.x' 2016-11-20 15:53:04 +09:00
Stephane Nicoll
9423b9831c Merge branch '1.4.x' into 1.5.x 2016-11-20 15:52:49 +09:00
Stephane Nicoll
249ed899a6 Fix use of KB and MB in Multipart documentation 
Closes gh-7364
 2016-11-20 15:51:47 +09:00
Phillip Webb
20d7dd5747 Merge branch '1.5.x' 2016-11-18 17:30:03 -08:00
Phillip Webb
1657120286 Move ModifiedClassPathRunner to its own module 
Migrate `ModifiedClassPathRunner` from `spring-boot` test source to
its own module.

Fixes gh-7420
 2016-11-18 17:27:54 -08:00
Phillip Webb
9e18021e8c Merge branch '1.4.x' into 1.5.x 2016-11-18 15:59:05 -08:00
Phillip Webb
c2c5611f77 Polish 2016-11-18 15:58:56 -08:00
Phillip Webb
fce17ca6d9 Polish 2016-11-18 15:50:19 -08:00
Madhura Bhave
3a3228fc70 Add CORS interceptor for Cloud Foundry actuators 
This interceptor processes the response with CORS headers
and apepars before the Cloud Foundry security interceptor.

See gh-7108
 2016-11-18 09:26:31 -08:00
Andy Wilkinson
9ec38dc8c1 Merge branch '1.5.x' 2016-11-18 16:57:02 +00:00