Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
18,163 Commits 23 Branches 0 Tags
314cd34716b0deb673ba9afccbfa5ea4e899ae57
Commit Graph

18163 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Stephane Nicoll
314cd34716 Merge branch '2.0.x' 2018-09-02 09:04:08 +02:00
Stephane Nicoll
00233cd57e Merge branch '1.5.x' into 2.0.x 2018-09-02 09:03:42 +02:00
Stephane Nicoll
0960f796fa Merge pull request #14274 from EddieOlson:fix-typo 
* pr/14274:
  Fix typo
 2018-09-02 09:03:08 +02:00
Eddie Olson
7398b7dfa0 Fix typo 
Closes gh-14274
 2018-09-02 09:02:47 +02:00
Madhura Bhave
f3dbd946de Document how to test secure mockmvc tests 
See gh-14227
 2018-08-31 12:47:25 -07:00
Stephane Nicoll
8b753297c3 Merge branch '2.0.x' 2018-08-31 15:24:11 +02:00
Stephane Nicoll
ea2fb620b4 Clarify structure of prefixes 
Closes gh-14258
 2018-08-31 15:23:53 +02:00
Stephane Nicoll
4634811c7c Polish 2018-08-31 14:45:17 +02:00
Stephane Nicoll
7bee9dfc22 Harmonize HTTP client metrics 
This commit harmonizes the auto-configurations for RestTemplate and
WebClient in a single `HttpClientMetricsAutoConfiguration`. Doing so
allows to give a better scope for the shared `MeterFilter`.

As a result`WebClientMetricsAutoConfiguration` has moved to the `client`
package.

Closes gh-14269
 2018-08-31 14:45:03 +02:00
Stephane Nicoll
2fc557a5a9 Improve WebSocket documentation for reactive applications 
Closes gh-14069
 2018-08-31 11:53:51 +02:00
Stephane Nicoll
374cf2c781 Merge branch '2.0.x' 2018-08-31 11:35:03 +02:00
Stephane Nicoll
6d637bc53b Add missing condition 
Closes gh-14264
 2018-08-31 11:34:32 +02:00
Madhura Bhave
b16927ce91 Add @WithMockUser to tests 
See gh-14227
 2018-08-30 18:55:02 -07:00
Madhura Bhave
8f946260d2 Update copyright year for changed files 2018-08-30 16:56:37 -07:00
Madhura Bhave
0384a88b57 Include web security config classes in @WebMvcTest 
Security config classes are not included when the
secure flag is set to false.

Closes gh-6514
 2018-08-30 16:47:31 -07:00
Madhura Bhave
d91c71b508 Deprecate secure flag on @WebMvcTest 
Closes gh-14227
 2018-08-30 16:47:31 -07:00
Phillip Webb
174f53e1cf Merge branch '2.0.x' 2018-08-30 16:02:25 -07:00
Phillip Webb
b6301712e9 Merge branch '1.5.x' into 2.0.x 2018-08-30 16:00:13 -07:00
Phillip Webb
9543fcf44d Upgrade to spring-javaformat 0.0.6 2018-08-30 15:59:27 -07:00
Phillip Webb
2e2f91d4a0 Merge branch '1.5.x' into 2.0.x 2018-08-30 15:59:02 -07:00
Phillip Webb
17de1571f5 Update copyright year 2018-08-30 15:52:58 -07:00
Phillip Webb
a085541d26 Polish 2018-08-30 15:52:58 -07:00
Stephane Nicoll
6c26315cd1 Merge branch '2.0.x' 2018-08-30 13:08:42 +02:00
Stephane Nicoll
385216ad45 Merge pull request #14173 from nosan:gh-13913 
* pr/14173:
  Polish "Limit metrics collection of incoming requests"
  Limit metrics collection of incoming requests
 2018-08-30 13:03:55 +02:00
Stephane Nicoll
0625443d27 Polish "Limit metrics collection of incoming requests" 
Closes gh-14173
 2018-08-30 12:59:07 +02:00
Dmytro Nosan
81a6701914 Limit metrics collection of incoming requests 
See gh-14173
 2018-08-30 12:26:06 +02:00
Stephane Nicoll
1399c2cb3c Merge pull request #14224 from asomov:update-snakeyaml-to-1-23 
* pr/14224:
  Upgrade to SnakeYAML 1.23
 2018-08-30 11:33:48 +02:00
asomov
46c30d01e9 Upgrade to SnakeYAML 1.23 
Closes gh-14224
 2018-08-30 11:31:11 +02:00
Stephane Nicoll
0590c4de32 Merge branch '2.0.x' 2018-08-29 17:38:15 +02:00
Stephane Nicoll
f9081a2c23 Revert "Polish some joining collectors" 
See gh-14221
 2018-08-29 17:37:33 +02:00
Stephane Nicoll
cfd0ab7646 Remove spring.cloud.enabled property 
This commit removes an undocumented property and rename the Spring
Cloud Service Connectors auto-configuration.

Closes gh-14219
 2018-08-29 15:46:03 +02:00
Madhura Bhave
ae413c718d Reinstate placeholders 2018-08-28 15:45:08 -07:00
Madhura Bhave
a33e58fc45 Deprecate OAuth2 login redirect-uri-template 
This property is deprecated in favor of
`spring.security.oauth2.client.registration.login.*.redirect-uri

Closes gh-14226
 2018-08-28 15:40:54 -07:00
Madhura Bhave
a54898b8f5 Remove explicit call to authorizationCodeGrant 
See gh-13812
 2018-08-28 13:56:03 -07:00
Madhura Bhave
f5deebf0cb Support authorization_code grant for OAuth2 client 
This commit also refactors OAuth2 client properties. With
the added support for authorization_code clients, client
registrations are now divided into `login` and `authorization_code`.
An environment post processor is used for backward compatibility with
old Open ID Connect login clients.

Closes gh-13812
 2018-08-28 13:49:07 -07:00
Stephane Nicoll
5af7835e83 Merge branch '2.0.x' 2018-08-28 17:18:20 +02:00
Stephane Nicoll
3155abae5a Merge pull request #14221 from dreis2211:polish-joining-collectors 
* pr/14221:
  Polish some joining collectors
 2018-08-28 17:18:04 +02:00
dreis2211
afda71e419 Polish some joining collectors 
Closes gh-14221
 2018-08-28 17:17:46 +02:00
Stephane Nicoll
76c6f05586 Merge pull request #14215 from garyrussell:kafka 
* pr/14215:
  Polish "Improve Kafka Auto-configuration"
  Improve Kafka Auto-configuration
 2018-08-28 17:14:58 +02:00
Stephane Nicoll
b7ae55866e Polish "Improve Kafka Auto-configuration" 
Closes gh-14215
 2018-08-28 17:10:49 +02:00
Gary Russell
59c6dc5c7a Improve Kafka Auto-configuration 
- transaction manager
- error handler
- after rollback processor

See gh-14215
 2018-08-28 16:22:12 +02:00
Stephane Nicoll
e8d21fc964 Merge branch '2.0.x' 2018-08-28 16:21:33 +02:00
Stephane Nicoll
3997b3ae5e Polish 2018-08-28 16:21:17 +02:00
Stephane Nicoll
90b8578e0a Merge pull request #14176 from christophstrobl 
* pr/14176:
  Polish "Add support for com.mongodb.client.MongoClient"
  Add support for com.mongodb.client.MongoClient
 2018-08-28 15:27:59 +02:00
Stephane Nicoll
56329e67d7 Polish "Add support for com.mongodb.client.MongoClient" 
Closes gh-14176
 2018-08-28 15:24:31 +02:00
Christoph Strobl
d549e6001a Add support for com.mongodb.client.MongoClient 
Next to com.mongodb.MongoClient the MongoDB Java driver offers the
com.mongodb.client.MongoClient as entry point for database and
collection operations. Spring Data MongoDB supports
c.m.client.MongoClient via its MongoDbFactory using
SimpleMongoClientDbFactory.

The MongoAutoConfiguration now backs off if any of those two clients is
already defined in the Application context allowing
MongoDataAutoConfiguration to pick up the users driver implementation of
choice.

See gh-14176
 2018-08-28 14:52:24 +02:00
Stephane Nicoll
19d17e7ec9 Merge pull request #14220 from izeye:patch-50 
* pr/14220:
  Add Spring Boot starter for Narayana in doc
 2018-08-28 14:45:11 +02:00
Johnny Lim
46415cb859 Add Spring Boot starter for Narayana in doc 
Closes gh-14220
 2018-08-28 14:44:45 +02:00
Stephane Nicoll
dd94adbc11 Merge branch '2.0.x' 2018-08-28 09:14:35 +02:00
Stephane Nicoll
ff11166af8 Restore RabbitMQ advanced starter as it is compatible with Spring Boot 2 2018-08-28 09:14:20 +02:00