Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
16,376 Commits 23 Branches 0 Tags
dafe8823ccca8d704d72c6ebcf52704879cf4aa4
Commit Graph

16376 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Madhura Bhave
dafe8823cc Merge branch '2.0.x' 2018-04-26 13:46:06 -07:00
Madhura Bhave
24ce3ecb43 Fix typo in docs 2018-04-26 13:43:51 -07:00
Madhura Bhave
6bebb931e5 Merge branch '2.0.x' 2018-04-26 12:21:51 -07:00
Madhura Bhave
228c85fe67 Improve List and Map binding documentation 
Closes gh-12444
 2018-04-26 12:18:49 -07:00
Stephane Nicoll
11d583ab46 Merge branch '2.0.x' 2018-04-26 16:45:03 +02:00
Stephane Nicoll
fbe88c483e Prevent rabbitmq starter to bring webflux on the classpath 
This commit excludes `com.rabbitmq:http-client` from `spring-rabbit` as
the former brings spring webflux for an optional feature. This also
prevents Spring Boot to consider that a web server should be started as
all the necessary pieces are unexpectedly present.

Closes gh-12853
 2018-04-26 16:44:42 +02:00
Stephane Nicoll
25414d1b58 Merge branch '2.0.x' 2018-04-25 17:20:30 +02:00
Stephane Nicoll
ae499c2c44 Merge pull request #12960 from sdeleuze:custom-metadata 
* pr/12960:
  Polish "Document Kotlin custom metadata generation"
  Document Kotlin custom metadata generation
 2018-04-25 17:20:18 +02:00
Stephane Nicoll
9cf8080a17 Polish "Document Kotlin custom metadata generation" 
Closes gh-12960
 2018-04-25 17:19:55 +02:00
sdeleuze
c24e7a5930 Document Kotlin custom metadata generation 
See gh-12960
 2018-04-25 17:19:38 +02:00
Stephane Nicoll
af6bbca376 Merge pull request #12331 from TYsewyn:feature/actuator-integration-graph 
* pr/12331:
  Polish "Add actuator endpoint for exposing the Spring Integration graph"
  Add actuator endpoint for exposing the Spring Integration graph
 2018-04-25 17:12:08 +02:00
Stephane Nicoll
03cf4fbb10 Polish "Add actuator endpoint for exposing the Spring Integration graph" 
Closes gh-12331
 2018-04-25 16:16:43 +02:00
Tim Ysewyn
8c67ef1079 Add actuator endpoint for exposing the Spring Integration graph 
See gh-12331
 2018-04-25 16:16:43 +02:00
Andy Wilkinson
3b80b3dd93 Merge branch '2.0.x' 2018-04-25 15:10:35 +01:00
Andy Wilkinson
1679fd87c8 Merge branch '1.5.x' into 2.0.x 2018-04-25 15:10:02 +01:00
Andy Wilkinson
df2372cd93 Avoid Kafka 0.10 destabilising the Windows build 
Closes gh-12963
 2018-04-25 15:03:40 +01:00
Stephane Nicoll
518f41a4ae Improve @ConditionalOnEnabledEndpoint to be used on any component 
This commit adds an `endpoint` attribute so that the condition can be
used on arbitrary components, not only endpoints or extensions.

Closes gh-12945
 2018-04-25 13:54:04 +02:00
Stephane Nicoll
b090280b0c Improve Couchbase auto-configuration 
This commit improves the couchbase auto-configuration so that it is
easier to customize the way the connection to the couchbase server is
initiated.

See gh-11146
 2018-04-25 13:35:49 +02:00
Andy Wilkinson
66872a0f96 Merge branch '2.0.x' 2018-04-25 11:58:45 +01:00
Andy Wilkinson
a358f3f0e8 Merge branch '1.5.x' into 2.0.x 2018-04-25 11:58:31 +01:00
Andy Wilkinson
c78bc0585c Make tests' detection of SSL handshake failures more robust 
Closes gh-12961
 2018-04-25 11:47:36 +01:00
Stephane Nicoll
080e189d06 Fix broken syntax 2018-04-25 10:40:23 +02:00
Stephane Nicoll
65fda8d3d6 Merge branch '2.0.x' 2018-04-25 09:43:43 +02:00
Stephane Nicoll
11ad9bfebf Upgrade version of gradle-git-properties in doc 
Closes gh-12955
 2018-04-25 09:43:19 +02:00
Stephane Nicoll
fd47b728c1 Properly handle values with spaces 
Closes gh-10741
 2018-04-24 16:26:51 +02:00
Stephane Nicoll
d4729f5389 Polish 2018-04-24 15:52:47 +02:00
Stephane Nicoll
9ed169a70b Merge pull request #12800 from nosan:gh-11065 
* pr/12800:
  Polish "Add support for environment variables"
  Add support for environment variables
 2018-04-24 15:49:38 +02:00
Stephane Nicoll
40b7e02793 Polish "Add support for environment variables" 
Closes gh-12800
 2018-04-24 15:48:54 +02:00
Dmytro Nosan
95f7e3ca37 Add support for environment variables 
See gh-12800
 2018-04-24 14:48:54 +02:00
Stephane Nicoll
5dd4a7e91e Merge branch '2.0.x' 2018-04-24 13:31:36 +02:00
Stephane Nicoll
55ef9e6dc9 Deprecate excludeArtifactIds 
While being able to exclude all artifacts of a given group is a handy
feature, excluding all artifacts with a given artifactId does not make
much sense as it should refer to a single artifact anyway. Also the
general "exclude" mechanism is meant to do the exact same thing.

Closes gh-12885
 2018-04-24 13:25:58 +02:00
Andy Wilkinson
099f61ae6d Merge branch '2.0.x' 2018-04-24 11:04:23 +01:00
Andy Wilkinson
c9f04c3977 Avoid race between container starting and getting mapped port 2018-04-24 11:03:54 +01:00
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