spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2026-10-07 09:49:39 +00:00
Code Issues Projects Releases Wiki Activity
16,443 Commits 25 Branches 395 Tags
38f7b2b9da2b4e052d6f15f310ff51bd4672495e
Commit Graph
16443 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Stephane Nicoll 54c0b85608 Merge pull request #10741 from vadeg:feature/jvm-arguments 
* pr/10741:
  Polish "Add system properties support using explicit configuration tag"
  Add system properties support using explicit configuration tag
 2018-04-24 11:46:40 +02:00
Stephane Nicoll 03539d8e16 Polish "Add system properties support using explicit configuration tag" 
Closes gh-10741
 2018-04-24 11:46:20 +02:00
Vadeg ba34bf6470 Add system properties support using explicit configuration tag 
See gh-10741
 2018-04-24 11:46:20 +02:00
Andy Wilkinson fe497d70b8 Merge branch '2.0.x' 2018-04-24 10:39:11 +01:00
Andy Wilkinson f6cc1cbd76 Make Testcontainer wait strategies final 2018-04-24 10:38:57 +01:00
Andy Wilkinson c9b2afbd1e Merge branch '2.0.x' 2018-04-24 10:27:32 +01:00
Andy Wilkinson f39cea0428 Try to stabilize build by giving Cassandra longer to start 2018-04-24 10:27:11 +01:00
Andy Wilkinson 6c504a5098 Fix deprecation warnings in Testcontainers wait strategies 
See gh-12821
 2018-04-24 10:27:11 +01:00
Stephane Nicoll 760b5e8510 Merge branch '2.0.x' 2018-04-24 10:18:20 +02:00
Stephane Nicoll dc9254c3b2 Merge pull request #12926 from izeye:application-context-header 
* pr/12926:
  Remove ManagementServerProperties.addApplicationContextHeader
 2018-04-24 10:17:28 +02:00
Johnny Lim a15319ee30 Remove ManagementServerProperties.addApplicationContextHeader 
Closes gh-12926
 2018-04-24 10:16:49 +02:00
Madhura Bhave da6a8e8624 Merge branch '2.0.x' 2018-04-23 12:32:32 -07:00
Madhura Bhave 877c4f702e Use empty key-store-password if storeprovider present 
For tomcat, if an SslStoreProvider is configured,
`SslStoreProviderUrlStreamHandlerFactory` stores the keyStore with an
empty password. Previously, if a password was supplied using the
ssl.key-store-password property, that would be the password used to
load the keystore and the connector would fail with a
"Password verification failed" exception.

Fixes gh-11391
 2018-04-23 12:31:47 -07:00
Andy Wilkinson 60bf4ef430 Merge branch '2.0.x' 2018-04-23 17:25:29 +01:00
Andy Wilkinson a5f3f36b58 Test the Gradle plugin against Gradle 4.7 
Closes gh-12952
 2018-04-23 17:24:50 +01:00
Andy Wilkinson 15a70153c1 Merge branch '2.0.x' 2018-04-23 17:08:21 +01:00
Andy Wilkinson 5ce0e07c2b Merge pull request #12784 from Danny Hyun 
* gh-12784:
  Polish “Only analyze configurations that we've registered to check”
  Only analyze configurations that we've registered to check
 2018-04-23 17:07:29 +01:00
Andy Wilkinson 72ec2c8644 Polish “Only analyze configurations that we've registered to check” 
Closes gh-12784
 2018-04-23 16:45:21 +01:00
danhyun 1e447ebfbf Only analyze configurations that we've registered to check 
See gh-12784
 2018-04-23 16:25:17 +01:00
Andy Wilkinson 806978b8f1 Test unresolved dependency analysis in the Gradle plugin 
See gh-12784
 2018-04-23 15:52:56 +01:00
Brian Clozel e39e125aa2 Merge branch '2.0.x' 2018-04-23 13:54:42 +02:00
Brian Clozel e3e404f9f9 Fix optional ContentNegotiationStrategy for Actuator 
Since https://jira.spring.io/browse/SPR-16624, the contract for
`ContentNegotiationStrategy` has been refined and should never return an
empty list if it's got no preference for a media type, but it should
rather respond with a `"*/*"` instead.

This commit fixes the `OptionalPathExtensionContentNegotiationStrategy`
defined in the Spring MVC auto-configuration to have that behavior.

Fixes gh-12900
 2018-04-23 13:48:42 +02:00
Stephane Nicoll 50d73285f7 Merge branch '2.0.x' 2018-04-22 11:12:12 +02:00
Stephane Nicoll f58f23c5b8 Document that binder doesn't handle static properties 
Closes gh-12912
 2018-04-22 11:11:56 +02:00
Stephane Nicoll 49f64aab48 Merge branch '2.0.x' 2018-04-22 09:21:09 +02:00
Stephane Nicoll 469ce57016 Remove outdated note 
As we've updated the complete ref doc to use a canonical format for
configuration keys, this not is outdated and this commit removes it.
 2018-04-22 09:20:19 +02:00
Stephane Nicoll 6df1ea3544 Fix use of deprecated property in docs 
Closes gh-12940
 2018-04-22 09:19:08 +02:00
Brian Clozel e0eadfe723 Merge branch '2.0.x' 2018-04-21 09:47:20 +02:00
Brian Clozel f1b3188c3c Upgrade to Netty 4.1.24.Final 2018-04-21 09:47:02 +02:00
Madhura Bhave c449660642 Merge branch '2.0.x' 2018-04-20 12:38:09 -07:00
Madhura Bhave 5afa7d1965 Reset URLStreamHandlerFactory instance between tests 2018-04-20 12:28:53 -07:00
Stephane Nicoll 719fcb4038 Merge branch '2.0.x' 2018-04-20 07:20:24 +02:00
Stephane Nicoll c9e819fdeb Merge pull request #12922 from dreis2211:replace-code-tags 
* pr/12922:
  Replace <code> tags where possible
 2018-04-20 07:19:58 +02:00
dreis2211 a930835b92 Replace <code> tags where possible 
Closes gh-12922
 2018-04-20 07:19:31 +02:00
Madhura Bhave d7abbe37cd Merge branch '2.0.x' 2018-04-19 15:00:38 -07:00
Madhura Bhave 5792042d5d Fix verify statements in tests 2018-04-19 14:59:48 -07:00
Madhura Bhave ca41a3c1cc Merge branch '2.0.x' 2018-04-19 14:22:25 -07:00
Madhura Bhave c93f7ddff6 Make truststore & keystore optional on SslStoreProvider 
Fixes gh-11395
 2018-04-19 14:21:57 -07:00
Madhura Bhave c81e984b79 Merge branch '2.0.x' 2018-04-19 10:40:17 -07:00
Madhura Bhave 2e836ac74b Use token to prevent rate limiting by Github API 2018-04-19 10:39:52 -07:00
Stephane Nicoll 36e33a3b94 Merge branch '2.0.x' 2018-04-19 09:26:56 +02:00
Stephane Nicoll 5ecf33958c Merge pull request #12877 from evernat:patch-1 
* pr/12877:
  Add reference to javamelody starter
 2018-04-19 09:26:43 +02:00
evernat 91fa76a9a2 Add reference to javamelody starter 
Closes gh-12877
 2018-04-19 09:25:38 +02:00
Madhura Bhave 5d949cc736 Merge branch '2.0.x' 2018-04-18 10:48:22 -07:00
Madhura Bhave 35af166750 Fix tests 
See gh-11380
 2018-04-18 10:47:37 -07:00
Madhura Bhave a8707c520c Merge branch '2.0.x' 2018-04-18 10:28:44 -07:00
Madhura Bhave cab9bff4f4 Log included profiles according to the processing order 
This commit includes some refactoring of active profiles
processing. Previously, there was a LIFO Queue for adding active
profiles. Profiles that were added last, were processed first.
Because of this reverse ordering, profiles were prepended to the
environment to preserve the order in which they were logged.
This however didn't work for "included" profiles as they were
prepended to the environment even though they were processed after
the active profile. In this commit, profiles are processed in a FIFO manner
and processed as they're found.

Fixes gh-11380
 2018-04-18 10:03:12 -07:00
Stephane Nicoll e72306b33e Merge branch '2.0.x' 2018-04-18 09:50:09 +02:00
Stephane Nicoll 4ef7ea324f Merge pull request #12895 from jnduan:master 
* pr/12895:
  Fix additional missing semicolon on sample code
  Add missing semicolon on sample code
 2018-04-18 09:49:52 +02:00
Stephane Nicoll 026d8bed5f Fix additional missing semicolon on sample code 
Closes gh-12895
 2018-04-18 09:49:15 +02:00