Commit Graph

17850 Commits (2756d87b3f49bb1b613c541d6ba53dd6e2fdf1b3)
 

Author SHA1 Message Date
Stephane Nicoll 737b4a275b Polish 6 years ago
Stephane Nicoll 8fdc9b6403 Merge branch '2.0.x' 6 years ago
Stephane Nicoll 0f095abded Polish 6 years ago
Stephane Nicoll e53ec5c645 Merge pull request #13988 from dreis2211:javadoc-annotations-part1
* pr/13988:
  Include @ in javadoc links for annotations
6 years ago
dreis2211 8440443237 Include @ in javadoc links for annotations
Closes gh-13988
6 years ago
Stephane Nicoll a656513cb8 Merge branch '2.0.x' 6 years ago
Stephane Nicoll 20ea16fe9f Merge branch '1.5.x' into 2.0.x 6 years ago
Stephane Nicoll b6dddcced8 Include @ in javadoc links for annotations
See gh-13988
6 years ago
Stephane Nicoll 0e750f982b Merge branch '2.0.x' 6 years ago
Stephane Nicoll 37be894844 Merge pull request #13991 from izeye:convert-sla
* pr/13991:
  Return null immediately when sla is null in convertSla()
6 years ago
Johnny Lim 7b6b91aae7 Return null immediately when sla is null in convertSla()
Closes gh-13991
6 years ago
Stephane Nicoll e233c32508 Merge pull request #13989 from izeye:scan-package
* pr/13989:
  Update assertion message in AnnotatedClassFinder.scanPackage()
6 years ago
Johnny Lim d92441e53f Update assertion message in AnnotatedClassFinder.scanPackage()
Closes gh-13989
6 years ago
Madhura Bhave b9fcb6a5e5 Merge branch '2.0.x' 6 years ago
Madhura Bhave 16aff4cd2c Refactor PropertySourcesDeducer
Prior to the changes that fixed #12451,
`FilteredPropertySources` and `CompositePropertySources` were required
by the `PropertySourcesDeducer` to ensure that configuration properties binding
could see changes to the environment even when there was a
PropertySourcesPlaceholderConfigurer in the context. #12451 changed the way
property sources are adapted by `SpringConfigurationPropertySources`, removing the
need for `FilteredPropertySources` and `CompositePropertySources`.

Fixes gh-13738
6 years ago
Madhura Bhave c41199bad1 Merge branch '2.0.x' 6 years ago
Madhura Bhave 7e2494ebdd Set environment active profiles according to processing order
Fixes gh-13965
6 years ago
Stephane Nicoll 6c5567afb3 Merge branch '2.0.x' 6 years ago
Stephane Nicoll e4442f4b14 Merge branch '1.5.x' into 2.0.x 6 years ago
Stephane Nicoll b97c188aa3 Merge pull request #13985 from rajadilipkolli:patch-1
* pr/13985:
  Upgrade maven wrapper to Maven 3.5.4
6 years ago
Raja Kolli e4dd7ac959 Upgrade maven wrapper to Maven 3.5.4
Closes gh-13985
6 years ago
Stephane Nicoll 65f43505fe Merge branch '2.0.x' 6 years ago
Stephane Nicoll 2074346447 Merge pull request #13982 from cmakinen:cloudwatch-depManagement
* pr/13982:
  Add dependency management for micrometer-registry-cloudwatch
6 years ago
cmakinen 07d96689c6 Add dependency management for micrometer-registry-cloudwatch
Closes gh-13982
6 years ago
Stephane Nicoll fdfdf2c8f6 Merge pull request #13966 from ayudovin:make-max-swallow-size-easily-configurable
* pr/13966:
  Polish "Make "MaxSwallowSize" more easily configurable"
  Make "MaxSwallowSize" more easily configurable
6 years ago
Stephane Nicoll a8b9718073 Polish "Make "MaxSwallowSize" more easily configurable"
Closes gh-13966
6 years ago
artsiom 0d40c5aecc Make "MaxSwallowSize" more easily configurable
See gh-13966
6 years ago
Stephane Nicoll 1548dd5be9 Merge pull request #13973 from izeye:unused-dependencies
* pr/13973:
  Remove unused dependencies
6 years ago
Johnny Lim 02e82cd22b Remove unused dependencies
Closes gh-13973
6 years ago
Stephane Nicoll 71d26f9ceb Add missing dependency for Javadoc generation 6 years ago
Stephane Nicoll 76d44ca888 Fix formatting 6 years ago
Stephane Nicoll 2d62e9e60f Merge pull request #13963 from izeye:polish-20180801
* pr/13963:
  Polish contribution
  Polish
6 years ago
Stephane Nicoll f7032bd8d3 Polish contribution
Closes gh-13963
6 years ago
Johnny Lim 7b72fe0ffa Polish
See gh-13963
6 years ago
Stephane Nicoll 960817a8c6 Merge branch '2.0.x' 6 years ago
Stephane Nicoll 1f4124b695 Merge pull request #13963 from izeye:polish-20180801
* pr/13963:
  Polish
6 years ago
Johnny Lim 94468e5865 Polish
See gh-13963
6 years ago
Stephane Nicoll 0c1b229764 Merge branch '2.0.x' 6 years ago
Stephane Nicoll 4e45f36bd1 Clean basePath if necessary
This commit makes sure that ServletEndpointRegistrar does not add a
duplicate `/` if the basePath is suffixed with it already

Close gh-13964
6 years ago
Stephane Nicoll 143e4f026f Merge branch '2.0.x' 6 years ago
Stephane Nicoll 9de3d33e65 Merge pull request #13961 from dreis2211:optimize-stringbuilder-appends
* pr/13961:
  Optimize some StringBuilder.append() calls
6 years ago
dreis2211 66b1742f96 Optimize some StringBuilder.append() calls
Closes gh-13961
6 years ago
Stephane Nicoll 8367c57d96 Avoid double binding of Flyway's locations
Closes gh-4995
6 years ago
Stephane Nicoll 14b413bf08 Remove outdated hint 6 years ago
Stephane Nicoll 435c47925e Switch JMS pooling to `pooled-jms`
This commit removes support for `activemq-pool` in benefit of
`pooled-jms`. While the former is not JMS 2 compliant, the latter is and
is independent of the ActiveMQ codebase (so potentially reusable in
custom code).

Closes gh-13927
6 years ago
Stephane Nicoll fbf95b6997 Merge branch '2.0.x' 6 years ago
Stephane Nicoll d31f68380a Deprecate PooledConnectionFactory properties
This commit deprecated the properties of `PooledConnectionFactory` that
are no longer supported by an alternative that is a JMS 2 compliant.

This commit also adds a note to warn users that this pool implementation
is not JMS 2 compliant.

Closes gh-13956
6 years ago
Stephane Nicoll 3aef6016e2 Merge pull request #13930 from ayudovin:make-rabbitTemplate-default-receive-queue-configurable
* pr/13930:
  Polish "Make RabbitTemplate default receive queue configurable"
  Make RabbitTemplate default receive queue configurable
6 years ago
Stephane Nicoll fd85cebfef Polish "Make RabbitTemplate default receive queue configurable"
Closes gh-13930
6 years ago
artsiom d7621261b2 Make RabbitTemplate default receive queue configurable
See gh-13930
6 years ago