Commit Graph

16947 Commits

Author SHA1 Message Date
Stephane Nicoll
37f1146c31 Fix formatting 2018-07-27 00:45:31 +02:00
Madhura Bhave
c775ff8f60 Fix import 2018-07-26 12:33:52 -07:00
Madhura Bhave
6bd438a737 Document @ConditionalOnProperty limitation with collections
Closes gh-7483
2018-07-26 12:19:06 -07:00
Madhura Bhave
57515dfa78 Fix typo 2018-07-26 11:38:23 -07:00
Stephane Nicoll
c270c42a6d Merge branch '1.5.x' into 2.0.x 2018-07-26 16:20:48 +02:00
Stephane Nicoll
557d5404ac Start building against Spring Data Ingalls snapshots
See gh-13917
2018-07-26 16:19:05 +02:00
Phillip Webb
9a9111af21 Support path discovery for main dispatcher servlet
Add an `DispatcherServletPath` interface which provides a much more
consistent way to discover the path of the main dispatcher servet.

Prior to this commit, auto-configurations would often make use of the
`ServerProperties` class to discover the dispatcher servlet path. This
mechanism isn't very explicit and also makes it hard for us to relocate
that property in Spring Boot 2.1.

This commit also reverts most of fddc9e9c7e since it is now clear that
the supporting multiple dispatcher servlet paths will be much more
involved that we originally anticipated.

Closes gh-13834
2018-07-26 11:35:12 +01:00
Phillip Webb
d37e717500 Polish 2018-07-26 11:35:12 +01:00
Phillip Webb
94ea7d800d Always active default build profile
Update the root build POM so that the default profile is always active.
Prior to this commit the profile was to `activeByDefault` which meant
it was only active if no other profiles were enabled. When running in
Eclipse, the `m2e` profile is active, meaning the default profile was
disabled and `spring-javaformat` setting were not applied.

Closes gh-13900
2018-07-26 11:34:58 +01:00
Phillip Webb
24e873cd7c Move files from /.eclipse into /eclipse
Move the `eclipse.properties` file from `.eclipse` into `eclipse`
since the IDE plugin supports both.
2018-07-26 11:34:58 +01:00
Stephane Nicoll
12f8ef1b6e Upgrade to Spring Web Services 3.0.2.RELEASE
Closes gh-13912
2018-07-26 11:24:47 +02:00
Stephane Nicoll
37f5e69173 Start building against Spring Security 5.0.7 snapshots
See gh-13898
2018-07-25 15:48:09 +02:00
Stephane Nicoll
99f33d5070 Start building against Spring Data Kay snapshots
See gh-13890
2018-07-25 15:34:52 +02:00
Andy Wilkinson
1ab98ca33f Start building against Spring HATEOAS 0.25.0 snapshots
See gh-13742
2018-07-25 15:21:20 +02:00
Stephane Nicoll
21160da9f5 Use SNAPSHOTs for upcoming releases 2018-07-25 14:32:02 +02:00
Stephane Nicoll
1ee0c35631 Merge branch '1.5.x' into 2.0.x 2018-07-25 13:46:54 +02:00
Stephane Nicoll
e30fddfcc2 Use SNAPSHOTs for upcoming releases 2018-07-25 13:46:09 +02:00
Stephane Nicoll
b6f6dca7f8 Remove useless profile 2018-07-25 12:01:57 +02:00
Stephane Nicoll
5ccb19500b Polish 2018-07-25 12:00:38 +02:00
Stephane Nicoll
64c668f766 Polish 2018-07-25 11:48:05 +02:00
Stephane Nicoll
e6cf082dbc Fix typo 2018-07-25 11:44:55 +02:00
Stephane Nicoll
a25b6bd473 Restore support for TransactionAwareCacheDecorator
This commit makes sure to unwrap any transaction aware cache before
collecting metrics for them.

Closes gh-13861
2018-07-25 09:17:49 +02:00
Madhura Bhave
1831f3be16 Fix NPE when Collection contains unbound children
Fixes gh-13636
2018-07-24 17:42:51 -07:00
Madhura Bhave
6032b454b0 Polish 2018-07-24 14:11:01 -07:00
Stephane Nicoll
829ac3fbef Prevent headers to be mutated
This commit rework 1189ccc to prevent a mutate call on the original
headers map.

Closes gh-13871
2018-07-24 13:34:49 +02:00
Stephane Nicoll
26cab9aa83 Merge branch '1.5.x' into 2.0.x 2018-07-24 10:40:07 +02:00
Stephane Nicoll
8570b56217 Fix typo 2018-07-24 10:39:52 +02:00
Stephane Nicoll
7d2e25f6f8 Merge branch '1.5.x' into 2.0.x 2018-07-24 10:37:31 +02:00
Stephane Nicoll
7865233b16 Fix Flyway filesystem prefix location check
Co-authored-by: Andy Bell <andyrbell@gmail.com>

Closes gh-13863
2018-07-24 10:31:53 +02:00
Stephane Nicoll
ee0de14e9f Merge pull request #13871 from dreis2211:collections-remove-if
* pr/13871:
  Polish "Use Collection.removeIf() where possible"
  Use Collection.removeIf() where possible
2018-07-24 09:40:27 +02:00
Stephane Nicoll
1a0afc6bbe Polish "Use Collection.removeIf() where possible"
Closes gh-13871
2018-07-24 09:38:51 +02:00
dreis2211
1189ccc936 Use Collection.removeIf() where possible
See gh-13871
2018-07-24 09:38:34 +02:00
Stephane Nicoll
1ec1692381 Merge pull request #13813 from joshiste:issue-13791
* pr/13813:
  Polish "Add metric description and base unit to metrics endpoint"
  Add metric description and base unit to metrics endpoint
2018-07-24 09:32:35 +02:00
Stephane Nicoll
7176c54f5e Polish "Add metric description and base unit to metrics endpoint"
Closes gh-13813
2018-07-24 09:32:22 +02:00
Johannes Edmeier
ab1f8cf77b Add metric description and base unit to metrics endpoint
See gh-13813
2018-07-24 09:32:22 +02:00
Stephane Nicoll
a7b13dbe45 Merge pull request #13819 from jkschneider:micrometer-1.0.6
* pr/13819:
  Polish "Upgrade to Micrometer 1.0.6"
  Upgrade to Micrometer 1.0.6
2018-07-24 09:26:42 +02:00
Stephane Nicoll
ecb8da2536 Polish "Upgrade to Micrometer 1.0.6"
Closes gh-13819
2018-07-24 09:25:54 +02:00
Jon Schneider
f478911c54 Upgrade to Micrometer 1.0.6
See gh-13819
2018-07-24 09:12:06 +02:00
Stephane Nicoll
dcb68d4c64 Deprecate unused property
Closes gh-13836
2018-07-23 09:31:02 +02:00
Andy Wilkinson
daad992c96 Merge branch '1.5.x' into 2.0.x 2018-07-20 17:03:59 +01:00
Andy Wilkinson
f1cf41f544 Merge pull request #13818 from Johnny Lim
* gh-13818:
  Add null guards for getBeanDefinition() in BeanTypeRegistry
2018-07-20 17:03:54 +01:00
Johnny Lim
0fd4e40e6e Add null guards for getBeanDefinition() in BeanTypeRegistry
Closes gh-13818
2018-07-20 17:03:35 +01:00
Andy Wilkinson
136be5916c Upgrade to Postgresql 42.2.4
Closes gh-13845
2018-07-20 16:30:17 +01:00
Andy Wilkinson
8f2a8576a6 Upgrade to Mariadb 2.2.6
Closes gh-13844
2018-07-20 16:30:16 +01:00
Andy Wilkinson
e5a4cfabc3 Upgrade to Hibernate Validator 6.0.11.Final
Closes gh-13843
2018-07-20 16:30:15 +01:00
Andy Wilkinson
1c6e75ff10 Upgrade to Kafka 1.0.2
Closes gh-13842
2018-07-20 16:30:15 +01:00
Andy Wilkinson
4003c3c6e5 Upgrade to Jna 4.5.2
Closes gh-13841
2018-07-20 16:30:14 +01:00
Andy Wilkinson
3fd6f00155 Upgrade to Netty 4.1.27.Final
Closes gh-13840
2018-07-20 16:30:13 +01:00
Andy Wilkinson
478181eb2c Merge branch '1.5.x' into 2.0.x 2018-07-20 16:26:30 +01:00
Andy Wilkinson
9c5330f076 Upgrade to Narayana 5.5.32.Final
Closes gh-13839
2018-07-20 16:23:06 +01:00