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

1660 Commits

Author SHA1 Message Date
Stephane Nicoll
e687d3aeba Merge branch '1.5.x' 2016-11-24 10:40:08 +01:00
Stephane Nicoll
c9fa1a1f70 Merge branch '1.4.x' into 1.5.x 2016-11-24 10:39:51 +01:00
Stephane Nicoll
0359b2f6f5 Document how to disable JMS transacted session 
Closes gh-7463
 2016-11-24 10:39:40 +01:00
Stephane Nicoll
2f57e1885a Merge branch '1.5.x' 2016-11-23 14:40:29 +01:00
Stephane Nicoll
ea023618a4 Polish upgrade to Spring Session 1.3.0.RC1 
Closes gh-7457
 2016-11-23 14:39:56 +01:00
Vedran Pavic
ffec6fddd2 Upgrade Spring Session to 1.3.0.RC1 
See gh-7457
 2016-11-23 14:39:56 +01:00
Phillip Webb
ab3a001286 Merge branch '1.5.x' 2016-11-22 15:49:27 -08:00
Phillip Webb
dc237043b8 Merge branch '1.4.x' into 1.5.x 2016-11-22 15:48:52 -08:00
Phillip Webb
74670cb20f Allow WebDriver beans to define their own scope 
Update `WebDriverScope` so that only `WebDriver` beans with no explicit
scope are moved.

Fixes gh-7454
 2016-11-22 15:48:28 -08:00
Phillip Webb
e0dfff2b23 Merge branch '1.5.x' 2016-11-22 14:54:17 -08:00
Phillip Webb
b6b8bef009 Polish 2016-11-22 14:51:56 -08:00
Andy Wilkinson
bc6b2a9c75 Merge branch '1.5.x' 2016-11-22 13:54:49 +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
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
Stephane Nicoll
e3688455fa Merge branch '1.5.x' 2016-11-22 10:30:31 +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
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
Andy Wilkinson
9273b1789b Merge branch '1.5.x' 2016-11-18 16:41:22 +00:00
Andy Wilkinson
1cd781b242 Make spring-boot-test compatible with Mockito 2.1 and 2.2 
We use some internal Mockito classes and some  breaking API changes
have been made to them in Mockito 2. This commit introduces a utility
class, SpringBootMockUtil, to shield our code from these differences.
Mockito 1 is called directly and Mockito 2 is called via reflection.

To allow these changes to be tested, FilteredClassPathRunner has been
enhanced to also support overriding a dependency on the class path.
As a result it has been renamed to ModifiedClassPathRunner. The new
ClassPathOverrides annotation can be used to provide the Maven
coordinates of one or more dependencies that should be resolved and
added to the class path. Such additions are added to the start of
the class path so that they override any existing dependency that
contains the same classes.

Closes gh-6520
 2016-11-18 16:39:44 +00:00
Stephane Nicoll
7ebe324514 Merge branch '1.5.x' 2016-11-18 11:58:17 +09:00
Stephane Nicoll
2ba3b27954 Merge branch '1.4.x' into 1.5.x 
# Conflicts:
#	spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/ServerProperties.java
#	spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc
 2016-11-18 11:56:22 +09:00
Stephane Nicoll
0072a93915 Expose Tomcat's accesslog requestAttributesEnabled 
This commit adds an extra property to the `server.tomcat.accesslog` to
control the `reqestAttributesEnabled` flag. This flag sets request
attributes for IP address, Hostname, protocol and port used for the
request.

Closes gh-7367
 2016-11-18 11:48:09 +09:00
Stephane Nicoll
22edb9eded Merge branch '1.5.x' 2016-11-17 14:45:07 +09:00
Stephane Nicoll
7b742fd792 Polish 
See gh-7357
 2016-11-17 14:44:40 +09:00
Phillip Webb
cb7c0b5031 Merge branch '1.5.x' 2016-11-16 16:06:53 -08:00
Christoffer Sawicki
d7bbea63b7 Add properties for content security policy 
Add `content-security-policy` and `content-security-policy-mode`
`security.header` properties and update auto-configuration to apply
them when specified.

Fixes gh-7373
Closes gh-7357
 2016-11-16 15:30:36 -08:00
Johnny Lim
8038882d46 Polish 
Closes gh-7403
 2016-11-16 13:36:51 -08:00
Phillip Webb
d8b7d6dfdc Merge branch '1.5.x' 2016-11-15 18:53:54 -08:00
Ben Hale
00099552db Add Logger actuator documentation 
Add Actuator and Reference documentation for the `/logger` endpoint.
This documentation includes information on listing, reading, and
modifying the configuration of loggers.

Closes gh-7390
See gh-7086
 2016-11-15 17:47:15 -08:00
Stephane Nicoll
6aa57e8ffe Merge branch '1.5.x' 2016-11-12 11:16:43 +01:00
Stephane Nicoll
2b8801a6b5 Merge branch '1.4.x' into 1.5.x 2016-11-12 11:16:30 +01:00
Emanuel Rabina
6b681ddfab Upgrade Thymeleaf 3 layout dialect in doc 
Closes gh-7370
 2016-11-12 11:15:00 +01:00
Spring Buildmaster
e712a9ba8c Next Development Version 2016-11-08 16:55:37 +00:00
Stephane Nicoll
e4be5c6102 Merge branch '1.5.x' 2016-11-05 07:44:48 +01:00
Stephane Nicoll
389acb094b Merge branch '1.4.x' into 1.5.x 2016-11-05 07:43:09 +01:00
Johnny Lim
ec9f0ab6b4 Polish 
Closes gh-7322
 2016-11-05 07:42:37 +01:00
Andy Wilkinson
229691338e Reinstate JsonPath dependency that is no longer pulled in transitively 2016-11-03 21:58:15 +00:00
Andy Wilkinson
4486d2d209 Upgrade to Reactor 3.0 and start building against SI 5.0 snapshots 
Closes gh-7301
See gh-7029
 2016-11-03 20:49:02 +00:00
Stephane Nicoll
5a88e47414 Merge branch '1.5.x' 2016-11-03 12:30:21 +01:00
Stephane Nicoll
f3ac98aa82 Merge branch '1.4.x' into 1.5.x 2016-11-03 12:30:09 +01:00
Stephane Nicoll
8350238b8c Polish doc 
See gh-5137
 2016-11-03 12:29:57 +01:00
Stephane Nicoll
97597ca54f Merge branch '1.5.x' 2016-11-03 12:27:43 +01:00
Stephane Nicoll
1b38528333 Polish doc 
Closes gh-7170
 2016-11-03 12:27:30 +01:00
Andy Wilkinson
7c3d7d882a Merge branch '1.5.x' 2016-11-01 16:25:07 +00:00
Andy Wilkinson
ef3395beaa Raise the minimum supported version of Gradle to 2.9 
Closes gh-6884
 2016-11-01 16:25:02 +00:00
Stephane Nicoll
f28fa3e1ab Merge branch '1.5.x' 2016-11-01 16:48:38 +01:00
Stephane Nicoll
a733c62689 Fix typo 2016-11-01 16:48:24 +01:00