root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity
10,379 Commits 24 Branches 369 Tags 281 MiB
Commit Graph

10379 Commits

Author SHA1 Message Date
Stephane Nicoll fa3679af71 Merge branch '1.4.x' into 1.5.x 2017-03-16 12:40:12 +01:00
Stephane Nicoll cd76da9a4c Avoid using immutable collections for configuration proprerties 
Closes gh-8620
 2017-03-16 12:39:48 +01:00
Stephane Nicoll 22934e097d Merge branch '1.4.x' into 1.5.x 2017-03-15 15:10:37 +01:00
Stephane Nicoll ed2164b97b Merge pull request #8582 from vpavic:improve-redis-session-config 
* pr/8582:
  Improve `RedisSessionConfiguration` conditions
 2017-03-15 15:10:02 +01:00
Vedran Pavic 17aad4f00c Improve `RedisSessionConfiguration` conditions 
Closes gh-8582
 2017-03-15 15:09:31 +01:00
Stephane Nicoll cc79f6d83d Merge branch '1.4.x' into 1.5.x 2017-03-15 14:52:19 +01:00
Stephane Nicoll f72e0c08df Add a note to ActiveMQ pooling in the doc 
Closes gh-8598
 2017-03-15 14:51:55 +01:00
Stephane Nicoll cd8684499d Polish 
See gh-8621
 2017-03-15 08:57:24 +01:00
Stephane Nicoll 6be2cc30d3 Merge branch '1.4.x' into 1.5.x 2017-03-15 08:54:21 +01:00
Stephane Nicoll bc157d5b4f Polish 
See gh-8621
 2017-03-15 08:50:50 +01:00
Madhura Bhave 0dcebdaf7c Merge branch '1.4.x' into 1.5.x 2017-03-14 13:34:41 -07:00
Madhura Bhave 19da8d8271 Fix UnsupportedOperationException 
Fixes gh-8602
 2017-03-14 11:59:42 -07:00
Madhura Bhave 8deb72be80 Fix ResourceServerProperties validation 
Only try and validate if clientId is present.

Fixes gh-8565
 2017-03-14 11:03:21 -07:00
Madhura Bhave 4607f8bc2f Determine key from configured alias for undertow 
Closes gh-8245
 2017-03-13 12:37:54 -07:00
Andy Wilkinson 17062f9589 Merge branch '1.4.x' into 1.5.x 2017-03-13 16:10:32 +00:00
Andy Wilkinson 2ddcf0e831 Avoid using File.renameTo(File) as it doesn't work on Windows 2017-03-13 15:46:19 +00:00
Stephane Nicoll 6a137260c1 Merge branch '1.4.x' into 1.5.x 2017-03-12 08:44:18 +01:00
Stephane Nicoll 4158a6d50f Fix typo 
Closes gh-8574
 2017-03-12 08:43:51 +01:00
Stephane Nicoll 5d27c7e501 Handle non supported JOOQ dialect 
This commit uses a fallback translator if the JOOQ Dialect in use is not
one we support.

Closes gh-8521
 2017-03-10 16:27:44 +01:00
Stephane Nicoll cbde6ed096 Merge pull request #8474 from Nowheresly:gh-8396 
* pr/8474:
  Polish contribution
  Add Tomcat Access Log's fileDateFormat property
 2017-03-10 10:21:39 +01:00
Stephane Nicoll f8bf05b91f Polish contribution 
Closes gh-8474
 2017-03-10 10:20:48 +01:00
srichard 0ddaca57fb Add Tomcat Access Log's fileDateFormat property 
Closes gh-8396
 2017-03-10 09:57:00 +01:00
Stephane Nicoll b5fc68dfed Merge pull request #8490 from schlauergerd:gh-8390 
* pr/8490:
  Polish contribution
  Introduce reset method to OutputCapture
 2017-03-10 09:54:57 +01:00
Stephane Nicoll c8ac94b75d Polish contribution 
Closes gh-8490
 2017-03-10 09:51:35 +01:00
Roland Weisleder a6f0da8cc6 Introduce reset method to OutputCapture 
Closes gh-8390
 2017-03-10 09:48:36 +01:00
Stephane Nicoll feb1ab375f Merge branch '1.4.x' into 1.5.x 2017-03-10 09:36:55 +01:00
Stephane Nicoll 095eb779e2 Merge pull request #8562 from eddumelendez:missing_cassandra_metadata 
* pr/8562:
  Add missing spring-data-cassandra metadata
 2017-03-10 09:35:22 +01:00
Eddú Meléndez 251090b1e5 Add missing spring-data-cassandra metadata 
This commit adds the missing
`spring.data.cassandra.repositories.enabled` in the metadata and the
documentation.

Closes gh-8562
 2017-03-10 09:34:19 +01:00
Stephane Nicoll 544c73841d Merge branch '1.4.x' into 1.5.x 2017-03-10 09:22:32 +01:00
Stephane Nicoll 633e75dce2 Fix typo 
Closes gh-8563
 2017-03-10 09:22:00 +01:00
Stephane Nicoll 6624fe47c3 Merge branch '1.4.x' into 1.5.x 2017-03-09 18:33:28 +01:00
Stephane Nicoll e7922a574a Polish 2017-03-09 18:33:13 +01:00
Stephane Nicoll 207ab3ecb4 Merge branch '1.4.x' into 1.5.x 2017-03-09 18:21:40 +01:00
Stephane Nicoll 07c56c60ba Make sure Hazelcast bootstraps before any JCache setup 
This commit makes sure that if a `javax.cache.CacheManager` is required,
an auto-configured `HazelcastInstance` is fully resolved first. This
prevents the case where the JCache bootstrap actually starts an instance
early, followed by a second (potentially unwanted) instance created by the
regular auto-configuration.

Since the JCache implementation works with an `HazelcastInstance` behind
the scenes, if there is one `HazelcastInstance` configured and it has a
name, then we configure the `CacheProvider` to use that. Future Hazelcast
version will allow to pass the instance directly (i.e. not requiring an
actual name).

Closes gh-8484
 2017-03-09 17:59:20 +01:00
Andy Wilkinson 50c0204f2d Merge branch '1.4.x' into 1.5.x 2017-03-09 14:05:42 +00:00
Andy Wilkinson d32c3a7f43 Correct the URL that's called to test servlet context resources 
See gh-8299
Closes gh-8525
 2017-03-09 14:04:19 +00:00
Andy Wilkinson 1395f38ee7 Merge branch '1.4.x' into 1.5.x 2017-03-09 13:11:28 +00:00
Andy Wilkinson a2cf0455fd Fix static resource handling when run in IDE or using Maven or Gradle 
The changes made for gh-8299 attempted to make static resource
handling consistent across Jetty, Tomcat, and Undertow. They did so
for application's launched using JarLauncher or WarLauncher but did
not consider application's launched in an IDE or using spring-boot:run
in Maven or bootRun in Gradle.

Running in an IDE or via Maven or Gradle introduces two new
resource locations:

 - Jars on the classpath with file protocol URLs (they are always
   jar protocol URLs when using either launcher)
 - Directories on the classpath from a project that is depended upon
   and contains resources in META-INF/resources

This commit updates the factories for all three containers to handle
these new resources locations. The integration tests have also been
updated.
 2017-03-09 12:41:32 +00:00
Madhura Bhave 7da70a52fd Mask sensitive placeholders in env endpoint 
Closes gh-8282
 2017-03-08 10:53:39 -08:00
Madhura Bhave 703b7d9268 Merge branch '1.4.x' into 1.5.x 2017-03-07 11:08:06 -08:00
Madhura Bhave 67068fc83d Ignore unresolvable nested placeholders 
The NamePatternEnvironmentFilter used to throw an exception if
placeholders in property values could not be resolved.

Fixes gh-8510
 2017-03-07 10:20:42 -08:00
Phillip Webb fedd7b9506 Polish 2017-03-06 12:01:05 -08:00
Phillip Webb a3d5101369 Merge branch '1.4.x' into 1.5.x 2017-03-06 11:48:52 -08:00
Phillip Webb f5aeac3658 Polish 2017-03-06 11:43:29 -08:00
Stephane Nicoll 28bba876fa Merge branch '1.4.x' into 1.5.x 2017-03-06 08:19:12 +01:00
Stephane Nicoll 9fb9a67c4b Avoid early initializations 
This commit flags the two `BeanPostProcessors` registered by the
embedded support as `synthetic` so that they don't trigger an early
initialization of other components.

Closes gh-8467
 2017-03-06 08:16:58 +01:00
Stephane Nicoll 3cdc81c351 Fixup version numbers following release 2017-03-03 17:34:05 +01:00
Spring Buildmaster d23fa24340 Next Development Version 2017-03-03 16:18:26 +00:00
Stephane Nicoll fe465f062e Merge branch '1.4.x' into 1.5.x 2017-03-03 16:15:25 +01:00
Stephane Nicoll dac3810bc1 Fixup version numbers following release 2017-03-03 16:14:56 +01:00