7ebe324514
Merge branch '1.5.x'
2016-11-18 11:58:17 +09:00
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
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
cb7c0b5031
Merge branch '1.5.x'
2016-11-16 16:06:53 -08:00
238c22cd73
Polish content security policy contribution
...
See gh-7373
See gh-7373
2016-11-16 15:30:36 -08:00
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
8038882d46
Polish
...
Closes gh-7403
2016-11-16 13:36:51 -08:00
4edab86ba2
Merge branch '1.5.x'
2016-11-16 09:13:32 +00:00
387a406aad
Merge branch '1.4.x' into 1.5.x
2016-11-16 09:13:17 +00:00
b3e0a37197
Remove unwanted System.out calls in test code
2016-11-16 09:12:13 +00:00
e712a9ba8c
Next Development Version
2016-11-08 16:55:37 +00:00
af82cbbfa9
Relaxed test assertion
2016-11-07 22:55:25 +01:00
ea35da0305
Merge branch '1.5.x'
2016-11-06 11:26:58 +01:00
b51f92d9a4
Merge branch '1.4.x' into 1.5.x
2016-11-06 11:25:44 +01:00
5783cd5593
Fix JWT token URI derivation
...
Closes gh-7299
2016-11-06 11:24:50 +01:00
0cdde3b83c
Merge branch '1.5.x'
2016-11-03 14:50:26 -07:00
81c5753f4d
Merge branch '1.4.x' into 1.5.x
2016-11-03 14:49:38 -07:00
90afc8ebbe
Formatting
2016-11-03 14:48:10 -07:00
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
3fd586aeeb
Merge remote-tracking branch 'springsource/1.5.x'
2016-11-03 10:16:45 -07:00
73308ba24b
Merge remote-tracking branch 'springsource/1.4.x' into 1.5.x
2016-11-03 10:15:49 -07:00
b04a74f01d
Fix failure analysis for Collections and Maps
...
Closes gh-6996
2016-11-03 10:14:01 -07:00
05732613dd
Update ConditionalOnJava and its usage now that Boot requires Java 8
...
Closes gh-6982
2016-11-01 14:18:33 +00:00
98a3ae9ac4
Merge branch '1.5.x'
2016-10-31 23:13:37 -07:00
5b66ffbb4b
Merge branch '1.4.x' into 1.5.x
2016-10-31 23:09:36 -07:00
f4328b41af
Polish
2016-10-31 23:09:25 -07:00
1b17677e0b
Polish TLD skip pattern support
...
See gh-5010
2016-10-31 23:09:24 -07:00
dbf6d3d418
Don't detect persistenceUnitRootLocation
...
Update JpaBaseConfiguration so that the persistenceUnitRootLocation is
no longer detected. The update to gh-7003 means that we can now rely on
the standard detection mechanism.
Fixes gh-6983
See gh-6635
2016-10-31 15:57:18 -07:00
d6239b1202
Merge branch '1.5.x'
2016-10-31 16:04:01 +01:00
9100897dcb
Automatically exclude auto-configurations from component scan
...
Previously, if an auto-configuration class was (wrongly) located in a
candidate package for component scanning, the class was silently loaded
as an app configuration (i.e. with the wrong lifecycle).
This commit adds an `AutoConfigurationExcludeFilter` to
`@SpringBootApplication` so that such classes are automatically
filtered. Since they are registered in `spring.factories`, we can
silently ignore them since we know they'll be loaded later on.
Closes gh-7168
2016-10-31 15:13:58 +01:00
713f4dd723
Merge branch '1.5.x'
2016-10-31 10:18:51 +01:00
4f06e52d7e
Allow adding additional tld skip patterns
...
This commit improves `TomcatEmbeddedServletContainerFactory` so that tld
skip patterns can be set or added to an existing set. An additional
`server.tomcat.additional-tld-skip-patterns` is now being exposed to
easily add patterns via configuration.
Closes gh-5010
2016-10-31 10:15:16 +01:00
468a466100
Merge branch '1.5.x'
2016-10-30 11:24:57 +01:00
94da9ad6e6
Merge branch '1.4.x' into 1.5.x
2016-10-30 11:24:46 +01:00
1a6ab90255
Polish test
2016-10-30 11:24:33 +01:00
bbea134e1c
Merge branch '1.5.x'
2016-10-26 11:32:53 +02:00
ed7de8eb60
Polish contribution
...
Also add rotate attribute to Undertow
Closes gh-7225
2016-10-26 11:31:17 +02:00
1d95219c4b
Allow to configure Tomcat's rotatable property
...
See gh-7225
2016-10-26 10:28:06 +02:00
73b5afa56e
Merge branch '1.5.x'
2016-10-24 18:08:39 +02:00
ae4dd0d17e
Merge branch '1.4.x' into 1.5.x
2016-10-24 18:08:23 +02:00
a638dcd51b
Remove unnecessary use of System.out.println
2016-10-24 18:07:40 +02:00
a4bc341028
Merge branch '1.5.x'
2016-10-18 20:45:40 +01:00
a416f496c0
Clean up deprecation and unused code warnings
2016-10-18 20:43:05 +01:00
7c870ea4fb
Merge branch '1.5.x'
2016-10-13 12:30:16 +01:00
29d4a01b30
Merge branch '1.4.x' into 1.5.x
2016-10-13 12:30:05 +01:00
7968c6b548
Assign on order to OnPropertyCondition
...
Closes gh-7144
2016-10-13 12:29:35 +01:00
cc04621dc2
Assign an order to OnResourceCondition
...
Closes gh-7145
2016-10-13 12:27:47 +01:00
277d01ab53
Merge branch '1.5.x'
2016-10-12 13:35:21 -07:00
90722a9bca
Add @ConditionalOnCloudPlatform
...
Add a @ConditionalOnCloudPlatform annotation that matches based on the
active ClouldPlatform.
Fixes gh-7155
2016-10-12 13:32:37 -07:00
01900c8342
Merge branch '1.5.x'
2016-10-11 23:42:14 -07:00
Stephane Nicoll
Phillip Webb
Christoffer Sawicki
Johnny Lim
Andy Wilkinson
Spring Buildmaster
Vedran Pavic
Madhura Bhave
Matthieu Mouminoux