root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity
17,796 Commits 23 Branches 356 Tags 278 MiB
Commit Graph

17796 Commits

Author SHA1 Message Date
dreis2211 8440443237 Include @ in javadoc links for annotations 
Closes gh-13988
 2018-08-03 09:40:08 +02:00
Stephane Nicoll a656513cb8 Merge branch '2.0.x' 2018-08-03 09:39:29 +02:00
Stephane Nicoll 20ea16fe9f Merge branch '1.5.x' into 2.0.x 2018-08-03 09:37:01 +02:00
Stephane Nicoll b6dddcced8 Include @ in javadoc links for annotations 
See gh-13988
 2018-08-03 09:35:30 +02:00
Stephane Nicoll 0e750f982b Merge branch '2.0.x' 2018-08-03 09:25:15 +02:00
Stephane Nicoll 37be894844 Merge pull request #13991 from izeye:convert-sla 
* pr/13991:
  Return null immediately when sla is null in convertSla()
 2018-08-03 09:24:19 +02:00
Johnny Lim 7b6b91aae7 Return null immediately when sla is null in convertSla() 
Closes gh-13991
 2018-08-03 09:23:22 +02:00
Stephane Nicoll e233c32508 Merge pull request #13989 from izeye:scan-package 
* pr/13989:
  Update assertion message in AnnotatedClassFinder.scanPackage()
 2018-08-03 09:06:54 +02:00
Johnny Lim d92441e53f Update assertion message in AnnotatedClassFinder.scanPackage() 
Closes gh-13989
 2018-08-03 09:06:38 +02:00
Madhura Bhave b9fcb6a5e5 Merge branch '2.0.x' 2018-08-02 15:19:35 -07:00
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
 2018-08-02 15:00:01 -07:00
Madhura Bhave c41199bad1 Merge branch '2.0.x' 2018-08-02 11:01:47 -07:00
Madhura Bhave 7e2494ebdd Set environment active profiles according to processing order 
Fixes gh-13965
 2018-08-02 11:01:22 -07:00
Stephane Nicoll 6c5567afb3 Merge branch '2.0.x' 2018-08-02 19:17:43 +02:00
Stephane Nicoll e4442f4b14 Merge branch '1.5.x' into 2.0.x 2018-08-02 19:17:18 +02:00
Stephane Nicoll b97c188aa3 Merge pull request #13985 from rajadilipkolli:patch-1 
* pr/13985:
  Upgrade maven wrapper to Maven 3.5.4
 2018-08-02 19:17:00 +02:00
Raja Kolli e4dd7ac959 Upgrade maven wrapper to Maven 3.5.4 
Closes gh-13985
 2018-08-02 19:15:39 +02:00
Stephane Nicoll 65f43505fe Merge branch '2.0.x' 2018-08-02 16:20:07 +02:00
Stephane Nicoll 2074346447 Merge pull request #13982 from cmakinen:cloudwatch-depManagement 
* pr/13982:
  Add dependency management for micrometer-registry-cloudwatch
 2018-08-02 16:19:55 +02:00
cmakinen 07d96689c6 Add dependency management for micrometer-registry-cloudwatch 
Closes gh-13982
 2018-08-02 16:19:15 +02:00
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
 2018-08-02 16:15:44 +02:00
Stephane Nicoll a8b9718073 Polish "Make "MaxSwallowSize" more easily configurable" 
Closes gh-13966
 2018-08-02 16:09:06 +02:00
artsiom 0d40c5aecc Make "MaxSwallowSize" more easily configurable 
See gh-13966
 2018-08-02 15:45:57 +02:00
Stephane Nicoll 1548dd5be9 Merge pull request #13973 from izeye:unused-dependencies 
* pr/13973:
  Remove unused dependencies
 2018-08-02 15:18:05 +02:00
Johnny Lim 02e82cd22b Remove unused dependencies 
Closes gh-13973
 2018-08-02 15:17:45 +02:00
Stephane Nicoll 71d26f9ceb Add missing dependency for Javadoc generation 2018-08-01 14:16:39 +02:00
Stephane Nicoll 76d44ca888 Fix formatting 2018-08-01 13:12:20 +02:00
Stephane Nicoll 2d62e9e60f Merge pull request #13963 from izeye:polish-20180801 
* pr/13963:
  Polish contribution
  Polish
 2018-08-01 11:09:19 +02:00
Stephane Nicoll f7032bd8d3 Polish contribution 
Closes gh-13963
 2018-08-01 11:08:59 +02:00
Johnny Lim 7b72fe0ffa Polish 
See gh-13963
 2018-08-01 11:08:22 +02:00
Stephane Nicoll 960817a8c6 Merge branch '2.0.x' 2018-08-01 11:05:49 +02:00
Stephane Nicoll 1f4124b695 Merge pull request #13963 from izeye:polish-20180801 
* pr/13963:
  Polish
 2018-08-01 11:05:28 +02:00
Johnny Lim 94468e5865 Polish 
See gh-13963
 2018-08-01 11:04:59 +02:00
Stephane Nicoll 0c1b229764 Merge branch '2.0.x' 2018-08-01 10:59:05 +02:00
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
 2018-08-01 10:58:40 +02:00
Stephane Nicoll 143e4f026f Merge branch '2.0.x' 2018-08-01 08:48:09 +02:00
Stephane Nicoll 9de3d33e65 Merge pull request #13961 from dreis2211:optimize-stringbuilder-appends 
* pr/13961:
  Optimize some StringBuilder.append() calls
 2018-08-01 08:45:09 +02:00
dreis2211 66b1742f96 Optimize some StringBuilder.append() calls 
Closes gh-13961
 2018-08-01 08:41:03 +02:00
Stephane Nicoll 8367c57d96 Avoid double binding of Flyway's locations 
Closes gh-4995
 2018-07-31 17:19:07 +02:00
Stephane Nicoll 14b413bf08 Remove outdated hint 2018-07-31 17:00:33 +02:00
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
 2018-07-31 16:55:52 +02:00
Stephane Nicoll fbf95b6997 Merge branch '2.0.x' 2018-07-31 16:25:11 +02:00
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
 2018-07-31 16:17:43 +02:00
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
 2018-07-31 14:33:51 +02:00
Stephane Nicoll fd85cebfef Polish "Make RabbitTemplate default receive queue configurable" 
Closes gh-13930
 2018-07-31 14:32:44 +02:00
artsiom d7621261b2 Make RabbitTemplate default receive queue configurable 
See gh-13930
 2018-07-31 14:32:44 +02:00
Stephane Nicoll f1e2abce2d Merge branch '2.0.x' 2018-07-31 14:29:52 +02:00
Stephane Nicoll be2c7bf6ea Merge pull request #13933 from mhewedy:patch-1 
* pr/13933:
  Add classpath prefix to the flyway location
 2018-07-31 14:29:40 +02:00
Muhammad Hewedy 2f69785c6a Add classpath prefix to the flyway location 
Closes gh-13933
 2018-07-31 14:28:59 +02:00
Stephane Nicoll 3a3e7e31e1 Merge pull request #13937 from dreis2211:fix-deprecation-kafka-tests 
* pr/13937:
  Fix deprecation in KafkaAutoConfigurationIntegrationTests
 2018-07-31 14:28:19 +02:00