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
25,512 Commits 24 Branches 369 Tags 281 MiB
Commit Graph

25512 Commits

Author SHA1 Message Date
Stephane Nicoll 799ae61592 Merge branch '2.2.x' 2020-03-04 14:57:18 +01:00
Stephane Nicoll 8f61a4bf39 Merge pull request #20385 from dreis2211 
* pr/20385:
  Test the Gradle Plugin against Gradle 6.2.2

Closes gh-20385
 2020-03-04 14:56:43 +01:00
dreis2211 daa3855fc8 Test the Gradle Plugin against Gradle 6.2.2 
See gh-20385
 2020-03-04 14:56:20 +01:00
Stephane Nicoll ce5658d947 Merge pull request #20223 from fschmager 
* pr/20223:
  Polish "Allow Embedded directory to be used without spring-data-ldap"
  Allow Embedded directory to be used without spring-data-ldap

Closes gh-20223
 2020-03-04 14:49:04 +01:00
Stephane Nicoll aa4dad1d73 Polish "Allow Embedded directory to be used without spring-data-ldap" 
See gh-20223
 2020-03-04 14:46:04 +01:00
Frank Schmager a92c57c07d Allow Embedded directory to be used without spring-data-ldap 
See gh-20223
 2020-03-04 10:09:34 +01:00
Stephane Nicoll 2d5a55fb0d Bind ConnectionPool beans that are exposed as ConnectionFactory 
This commit relaxes the class condition to ConnectionFactory, checking
if the connection factory is a connection pool and bind its metrics to
the registry accordingly.

Closes gh-20349
 2020-03-04 09:58:18 +01:00
Stephane Nicoll 73777af388 Merge pull request #20370 from dreis2211 
* pr/20370:
  Use isEmpty() where possible

Closes gh-20370
 2020-03-03 18:47:20 -05:00
dreis2211 9588188800 Use isEmpty() where possible 
See gh-20370
 2020-03-03 18:33:26 -05:00
Stephane Nicoll 4598680692 Merge pull request #20380 from dreis2211 
* pr/20380:
  Remove unused parameter in AsciidoctorConventions

Closes gh-20380
 2020-03-03 18:32:01 -05:00
dreis2211 fcaede70a9 Remove unused parameter in AsciidoctorConventions 
See gh-20380
 2020-03-03 18:31:37 -05:00
Brian Clozel ea45d8ef25 Fix "spring.integration.rsocket" canonical name 
See gh-18834
 2020-03-03 15:50:43 +01:00
Artem Bilan 3967e76b9b Auto-Configure RSocket support for Spring Integration 
This commit adds a new auto-configuration for RSocket support in Spring
Integration.

Given an application with `spring-messaging`, `spring-integration-rsocket`
and RSocket dependencies, developers are now able to leverage Spring
Integration features with RSocket.

It is now possible to configure an RSocket server with
`"spring.rsocket.server.*"` properties and let it use
`IntegrationRSocketEndpoint` or `RSocketOutboundGateway` components to
handle incoming RSocket messages. This infrastructure can handle Spring
Integration RSocket channel adapters and `@MessageMapping` handlers
(given `"spring.integration.rsocket.server.message-mapping-enabled"`is
configured.

If the `"spring.integration.rsocket.client.host"` and
`"spring.integration.rsocket.client.port"` (for TCP protocol), or
`"spring.integration.rsocket.client.uri"`  (for WebSocket) is configured
then a `ClientRSocketConnector` will be configured accordingly.

Closes gh-18834

Co-authored-by: Brian Clozel <bclozel@pivotal.io>
 2020-03-03 15:15:24 +01:00
Madhura Bhave 8dd0ef9b39 Merge branch '2.2.x' 
Closes gh-20376
 2020-03-02 14:51:50 -08:00
Madhura Bhave d83ef715a4 Merge branch '2.1.x' into 2.2.x 
Closes gh-20375
 2020-03-02 14:50:49 -08:00
Madhura Bhave bb8e653b3d Merge pull request #20361 from dreis2211 
* pr/20361:
  Upgrade CI images to Ubuntu Bionic 20200219

Closes gh-20361
 2020-03-02 14:48:37 -08:00
dreis2211 cd9879d45a Upgrade CI images to Ubuntu Bionic 20200219 
See gh-20361
 2020-03-02 14:47:40 -08:00
Stephane Nicoll 1a314a1dec Merge branch '2.2.x' 
Closes gh-20359
 2020-03-01 11:19:32 -05:00
Stephane Nicoll 8c6dc8bf22 Merge branch '2.1.x' into 2.2.x 
Closes gh-20358
 2020-03-01 11:18:41 -05:00
Stephane Nicoll d0019cda4a Merge pull request #20355 from dreis2211 
* pr/20355:
  Automate Ubuntu base image upgrade

Closes gh-20355
 2020-03-01 11:15:03 -05:00
dreis2211 4136300235 Automate Ubuntu base image upgrade 
See gh-20355
 2020-03-01 11:14:37 -05:00
Stephane Nicoll 860814b604 Merge pull request #20354 from izeye 
* pr/20354:
  Polish "Add descriptions for data source pool metrics"
  Add descriptions for data source pool metrics

Closes gh-20354
 2020-03-01 11:05:16 -05:00
Stephane Nicoll 925756dae1 Polish "Add descriptions for data source pool metrics" 
See gh-20354
 2020-03-01 11:02:39 -05:00
Johnny Lim 21a0b0544a Add descriptions for data source pool metrics 
See gh-20354
 2020-03-01 10:58:52 -05:00
Stephane Nicoll c71ed407e4 Merge pull request #20318 from izeye 
* pr/20318:
  Polish tests

Closes gh-20318
 2020-02-28 09:36:39 -05:00
Johnny Lim 98738d22f4 Polish tests 
See gh-20318
 2020-02-28 09:36:19 -05:00
Scott Frederick 296a13a479 Fix unit test case formatting 2020-02-27 16:43:56 -06:00
Scott Frederick b00ed5b143 Remove unused imports 2020-02-27 16:17:19 -06:00
Scott Frederick ce03f501c4 Merge pull request #20297 from mikesmithson 2020-02-27 16:10:56 -06:00
Scott Frederick ada0741e10 Polish Docker client exception handling 2020-02-27 16:09:30 -06:00
Mike Smithson 6f095d6fec Improve error message from image building 
Translate IOException to DockerException for a more meaningful error
message when the Docker daemon is not available.

Fixes gh-20151
 2020-02-27 15:51:58 -06:00
Madhura Bhave 7634bfb179 Merge branch '2.2.x' 
Closes gh-20340
 2020-02-27 13:02:40 -08:00
Madhura Bhave 8469b62cb3 Merge pull request #20339 from dreis2211 
* pr/20339:
  Remove redundant code

Closes gh-20339
 2020-02-27 13:01:36 -08:00
dreis2211 4eaaf88b2d Remove redundant code 
See gh-20339
 2020-02-27 12:56:43 -08:00
Andy Wilkinson 30a618bb75 Merge branch '2.2.x' 2020-02-27 14:12:23 +00:00
Spring Buildmaster f483459548 Next development version (v2.2.6.BUILD-SNAPSHOT) 2020-02-27 12:59:33 +00:00
Andy Wilkinson 039f059223 Merge branch '2.2.x' 2020-02-27 11:19:58 +00:00
Andy Wilkinson a7b3ed0a09 Merge branch '2.1.x' into 2.2.x 2020-02-27 11:19:34 +00:00
Spring Buildmaster 3df446227e Next development version (v2.1.14.BUILD-SNAPSHOT) 2020-02-27 10:28:52 +00:00
Madhura Bhave 5bf1f7641b Merge branch '2.2.x' 2020-02-26 17:08:59 -08:00
Madhura Bhave ea8f2a7276 Fix tests following changes to EndpointRequest 
See gh-20329
 2020-02-26 17:05:16 -08:00
Madhura Bhave 250493d681 Merge branch '2.2.x' 
Closes gh-20331
 2020-02-26 15:00:49 -08:00
Madhura Bhave cdae79dad9 Cache management port type in EndpointRequestMatcher 
Closes gh-20329
 2020-02-26 14:59:54 -08:00
Scott Frederick e60a7ea8d6 Fix Maven plugins tests on Windows 
This commit fixes problems with file path separators and command
line argument quoting in Maven plug integration tests when run on
Windows.

Fixes gh-20244
 2020-02-26 16:50:15 -06:00
Stephane Nicoll 06d98c6b58 Merge branch '2.2.x' 2020-02-26 17:07:20 -05:00
Stephane Nicoll 421fe77b04 Upgrade to Neo4j Ogm 3.2.9 
Closes gh-20330
 2020-02-26 17:06:54 -05:00
Stephane Nicoll 533a20a574 Merge branch '2.2.x' 2020-02-26 16:00:36 -05:00
Stephane Nicoll ef67ad7a35 Upgrade to Liquibase 3.8.7 
Closes gh-20328
 2020-02-26 15:52:07 -05:00
Stephane Nicoll fa6f8f80b5 Upgrade to Rxjava2 2.2.18 
Closes gh-20327
 2020-02-26 15:52:06 -05:00
Stephane Nicoll a838537487 Upgrade to Dropwizard Metrics 4.1.3 
Closes gh-20326
 2020-02-26 15:52:05 -05:00