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
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
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
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
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
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
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
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
a416f496c0
Clean up deprecation and unused code warnings
2016-10-18 20:43:05 +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
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
d818a09ed8
Polish
2016-10-11 23:38:14 -07:00
d3e06c4627
Merge branch '1.4.x' into 1.5.x
2016-10-11 21:46:06 -07:00
db3f488d5a
Polish
2016-10-11 17:54:00 -07:00
6fb53f90e5
Polish contribution
...
Closes gh-6666
2016-10-11 17:03:10 +02:00
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
f0b235cbc5
Merge branch '1.4.x' into 1.5.x
2016-10-11 13:04:59 +01:00
0333416952
Update WelcomePageHandlerMapping to handle reqs with no Accept header
...
Closes gh-7138
2016-10-11 13:02:36 +01:00
ab2a2579c8
Polish contribution
...
Closes gh-6571
2016-10-10 11:37:21 +02:00
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
3e1425ebed
Polish contribution
...
Closes gh-6543
2016-10-10 10:43:12 +02:00
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
ed333a67b4
Expose Spring Data Rest RepositoryDetectionStrategy
...
Closes gh-7113
2016-10-07 10:35:48 +02:00
02b0e3955c
Merge branch '1.4.x' into 1.5.x
2016-10-07 09:46:21 +02:00
1c4c0c6119
Fix String.format() usages
...
Closes gh-7120
2016-10-07 09:45:43 +02:00
9b8f33df6d
Merge branch '1.4.x' into 1.5.x
2016-10-06 15:53:07 +01:00
20a2db79bd
Separate conditions that did and did not match in auto-config report
...
Closes gh-7098
2016-10-06 15:52:45 +01:00
f82e91df39
Merge branch '1.4.x' into 1.5.x
2016-10-06 13:29:53 +02:00
03961e6692
Polish contribution
...
Closes gh-7004
2016-10-06 13:28:23 +02:00
7fcb197092
Allow configuration to specify randomly generated database name
...
See gh-7004
2016-10-06 11:40:19 +02:00
200e246238
Merge branch '1.4.x' into 1.5.x
2016-10-06 09:35:01 +02:00
91254f2110
Remove unused parameters in String.format()
...
Closes gh-7111
2016-10-06 09:34:32 +02:00
cf28663cd7
Deprecate commons-dbcp 1
...
Closes gh-6787
2016-10-05 15:21:09 +02:00
07690bab25
Allow customization of the auto-configured JmsTemplate
...
Closes gh-6825
2016-10-04 15:00:42 +02:00
a2315378d4
Formatting
2016-10-03 22:44:36 -07:00
f2b0fa284e
Merge branch '1.4.x' into 1.5.x
2016-10-03 22:38:22 -07:00
3326841a97
Formatting
2016-10-03 22:19:35 -07:00
39ed0d4dfb
Polish
2016-10-03 21:58:13 -07:00
8ad477537e
Fail fast if both uri and client attributes are set
...
Previously, an URI and individual client attributes can be set to
configure the mongo client. In such a scenario, the URI is ignored.
This commit changes the URI to be "null" and the creation of the client
to fail if both the uri and client attributes are set. If no client
attributes are set, the uri is used as before.
Closes gh-6739
2016-10-03 11:29:20 +02:00
e643fc5bd1
Merge branch '1.4.x' into 1.5.x
2016-10-02 11:08:33 +02:00
Phillip Webb
Madhura Bhave
Stephane Nicoll
Matthieu Mouminoux
Andy Wilkinson
Maciej Walkowiak
Aurélien Leboulanger
Vedran Pavic
Johnny Lim
Rob Fletcher