Phillip Webb
238c22cd73
Polish content security policy contribution
...
See gh-7373
See gh-7373
2016-11-16 15:30:36 -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
Andy Wilkinson
387a406aad
Merge branch '1.4.x' into 1.5.x
2016-11-16 09:13:17 +00:00
Andy Wilkinson
b3e0a37197
Remove unwanted System.out calls in test code
2016-11-16 09:12:13 +00:00
Spring Buildmaster
e712a9ba8c
Next Development Version
2016-11-08 16:55:37 +00:00
Stephane Nicoll
b51f92d9a4
Merge branch '1.4.x' into 1.5.x
2016-11-06 11:25:44 +01:00
Vedran Pavic
5783cd5593
Fix JWT token URI derivation
...
Closes gh-7299
2016-11-06 11:24:50 +01:00
Phillip Webb
81c5753f4d
Merge branch '1.4.x' into 1.5.x
2016-11-03 14:49:38 -07:00
Phillip Webb
90afc8ebbe
Formatting
2016-11-03 14:48:10 -07:00
Madhura Bhave
73308ba24b
Merge remote-tracking branch 'springsource/1.4.x' into 1.5.x
2016-11-03 10:15:49 -07:00
Madhura Bhave
b04a74f01d
Fix failure analysis for Collections and Maps
...
Closes gh-6996
2016-11-03 10:14:01 -07:00
Phillip Webb
5b66ffbb4b
Merge branch '1.4.x' into 1.5.x
2016-10-31 23:09:36 -07:00
Phillip Webb
f4328b41af
Polish
2016-10-31 23:09:25 -07:00
Phillip Webb
1b17677e0b
Polish TLD skip pattern support
...
See gh-5010
2016-10-31 23:09:24 -07:00
Phillip Webb
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
Stephane Nicoll
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
Stephane Nicoll
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
Stephane Nicoll
94da9ad6e6
Merge branch '1.4.x' into 1.5.x
2016-10-30 11:24:46 +01:00
Stephane Nicoll
1a6ab90255
Polish test
2016-10-30 11:24:33 +01:00
Stephane Nicoll
ed7de8eb60
Polish contribution
...
Also add rotate attribute to Undertow
Closes gh-7225
2016-10-26 11:31:17 +02:00
Matthieu Mouminoux
1d95219c4b
Allow to configure Tomcat's rotatable property
...
See gh-7225
2016-10-26 10:28:06 +02:00
Stephane Nicoll
ae4dd0d17e
Merge branch '1.4.x' into 1.5.x
2016-10-24 18:08:23 +02:00
Stephane Nicoll
a638dcd51b
Remove unnecessary use of System.out.println
2016-10-24 18:07:40 +02:00
Andy Wilkinson
a416f496c0
Clean up deprecation and unused code warnings
2016-10-18 20:43:05 +01:00
Andy Wilkinson
29d4a01b30
Merge branch '1.4.x' into 1.5.x
2016-10-13 12:30:05 +01:00
Andy Wilkinson
7968c6b548
Assign on order to OnPropertyCondition
...
Closes gh-7144
2016-10-13 12:29:35 +01:00
Andy Wilkinson
cc04621dc2
Assign an order to OnResourceCondition
...
Closes gh-7145
2016-10-13 12:27:47 +01:00
Madhura Bhave
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
Phillip Webb
d818a09ed8
Polish
2016-10-11 23:38:14 -07:00
Phillip Webb
d3e06c4627
Merge branch '1.4.x' into 1.5.x
2016-10-11 21:46:06 -07:00
Phillip Webb
db3f488d5a
Polish
2016-10-11 17:54:00 -07:00
Stephane Nicoll
6fb53f90e5
Polish contribution
...
Closes gh-6666
2016-10-11 17:03:10 +02:00
Maciej Walkowiak
47ec8630c8
Add Rabbit idleEventInterval property
...
This commit adds a property to configure how often idle container events
should be published.
See gh-6666
2016-10-11 15:49:10 +02:00
Andy Wilkinson
f0b235cbc5
Merge branch '1.4.x' into 1.5.x
2016-10-11 13:04:59 +01:00
Andy Wilkinson
0333416952
Update WelcomePageHandlerMapping to handle reqs with no Accept header
...
Closes gh-7138
2016-10-11 13:02:36 +01:00
Stephane Nicoll
ab2a2579c8
Polish contribution
...
Closes gh-6571
2016-10-10 11:37:21 +02:00
Aurélien Leboulanger
7efdb91641
Manage Tomcat queued connections
...
Adding two tomcat server properties:
- server.tomcat.accept-count
- server.tomcat.max-connections
Closes gh-6433
2016-10-10 11:37:12 +02:00
Stephane Nicoll
3e1425ebed
Polish contribution
...
Closes gh-6543
2016-10-10 10:43:12 +02:00
Vedran Pavic
286a928347
Improve database initializers
...
This commit improves database initializers for Spring Batch and Spring
Session by introducing `AbstractDatabaseInitializer` which eliminates
duplicated logic in existing initializers. Additionally, database
platform resolution now relies on `DatabaseDriver`.
See gh-6543
2016-10-10 09:53:40 +02:00
Stephane Nicoll
ed333a67b4
Expose Spring Data Rest RepositoryDetectionStrategy
...
Closes gh-7113
2016-10-07 10:35:48 +02:00
Stephane Nicoll
02b0e3955c
Merge branch '1.4.x' into 1.5.x
2016-10-07 09:46:21 +02:00
Johnny Lim
1c4c0c6119
Fix String.format() usages
...
Closes gh-7120
2016-10-07 09:45:43 +02:00
Andy Wilkinson
9b8f33df6d
Merge branch '1.4.x' into 1.5.x
2016-10-06 15:53:07 +01:00
Andy Wilkinson
20a2db79bd
Separate conditions that did and did not match in auto-config report
...
Closes gh-7098
2016-10-06 15:52:45 +01:00
Stephane Nicoll
f82e91df39
Merge branch '1.4.x' into 1.5.x
2016-10-06 13:29:53 +02:00
Stephane Nicoll
03961e6692
Polish contribution
...
Closes gh-7004
2016-10-06 13:28:23 +02:00
Rob Fletcher
7fcb197092
Allow configuration to specify randomly generated database name
...
See gh-7004
2016-10-06 11:40:19 +02:00
Stephane Nicoll
200e246238
Merge branch '1.4.x' into 1.5.x
2016-10-06 09:35:01 +02:00
Johnny Lim
91254f2110
Remove unused parameters in String.format()
...
Closes gh-7111
2016-10-06 09:34:32 +02:00