Stephane Nicoll
132811796d
Merge branch '2.0.x'
2018-07-27 01:39:20 +02:00
Stephane Nicoll
8603fdddb1
Upgrade to Spring Amqp 2.0.5.RELEASE
...
Closes gh-3884
2018-07-27 01:38:20 +02:00
Stephane Nicoll
275174d60d
Merge branch '2.0.x'
2018-07-27 01:31:37 +02:00
Stephane Nicoll
d98b23bdd9
Upgrade to Spring Framework 5.0.8
...
Closes gh-13704
2018-07-27 01:30:47 +02:00
Stephane Nicoll
ec2e3c4c0e
Merge branch '2.0.x'
2018-07-27 01:03:37 +02:00
Stephane Nicoll
c3eb3668ef
Merge pull request #13919 from dreis2211:fix-typo-importselector
...
* pr/13919:
Fix typo
2018-07-27 01:03:21 +02:00
dreis2211
bfbf57b0eb
Fix typo
...
Closes gh-13919
2018-07-27 01:03:01 +02:00
Stephane Nicoll
d3918c4b05
Merge branch '2.0.x'
2018-07-27 01:01:58 +02:00
Stephane Nicoll
0f15b72fab
Upgrade to Spring Security 5.0.7.RELEASE
...
Closes gh-13898
2018-07-27 01:01:08 +02:00
Stephane Nicoll
4b3c40ff10
Merge branch '2.0.x'
2018-07-27 00:47:09 +02:00
Stephane Nicoll
85cffd1ab5
Upgrade to Spring Web Services 3.0.3.RELEASE
...
Closes gh-13912
2018-07-27 00:46:19 +02:00
Stephane Nicoll
37f1146c31
Fix formatting
2018-07-27 00:45:31 +02:00
Madhura Bhave
db1d3fa282
Merge branch '2.0.x'
2018-07-26 12:36:40 -07:00
Madhura Bhave
c775ff8f60
Fix import
2018-07-26 12:33:52 -07:00
Madhura Bhave
6fe366bd64
Merge branch '2.0.x'
2018-07-26 12:19:57 -07:00
Madhura Bhave
6bd438a737
Document @ConditionalOnProperty limitation with collections
...
Closes gh-7483
2018-07-26 12:19:06 -07:00
Madhura Bhave
78cb802f98
Merge branch '2.0.x'
2018-07-26 11:39:42 -07:00
Madhura Bhave
57515dfa78
Fix typo
2018-07-26 11:38:23 -07:00
Stephane Nicoll
b7a9b6be19
Merge pull request #13904 from ayudovin:make-springbootconfigurationfinder-public-and-usable-with-annotation
...
* pr/13904:
Polish contribution
Make SpringBootConfigurationFinder public and usable with other annotations
2018-07-26 17:23:18 +02:00
Stephane Nicoll
f780179777
Polish contribution
...
Closes gh-13904
2018-07-26 17:22:58 +02:00
artsiom
df6feb3e2a
Make SpringBootConfigurationFinder public and usable with other annotations
...
See gh-13904
2018-07-26 17:07:55 +02:00
Stephane Nicoll
e60af7240d
Merge pull request #13908 from dreis2211:unchecked-assignment-fixes
...
* pr/13908:
Fix unchecked assignment in AutoConfigurationImportSelector
2018-07-26 17:06:29 +02:00
dreis2211
4bb78d5a48
Fix unchecked assignment in AutoConfigurationImportSelector
...
Closes gh-13908
2018-07-26 17:06:04 +02:00
Stephane Nicoll
2b712bea5f
Merge branch '2.0.x'
2018-07-26 16:21:05 +02: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
b5b60c2053
Merge branch '2.0.x'
2018-07-26 13:23:07 +01:00
Stephane Nicoll
276f978261
Upgrade to Spring Data Lovelace RC1
...
Closes gh-13740
2018-07-26 13:19:16 +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
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
406d848406
Merge branch '2.0.x'
2018-07-26 11:30:00 +02: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
787927ba81
Upgrade to Spring Framework 5.1.0.RC1
...
Closes gh-13911
2018-07-26 11:11:58 +02:00
Stephane Nicoll
1e7aa7c4bc
Fix Spring Integration imports
2018-07-25 16:25:06 +02:00
Stephane Nicoll
cd34b2c193
Merge branch '2.0.x'
2018-07-25 15:48:31 +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
bdf028a2e6
Merge branch '2.0.x'
2018-07-25 15:39:01 +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
56542ef809
Start building against Spring Integration 2.1.0 snapshots
...
See gh-13891
2018-07-25 14:50:14 +02:00
Stephane Nicoll
9e34938ce0
Start building against Spring Amqp 2.1.0 snapshots
...
See gh-13885
2018-07-25 14:43:25 +02:00
Stephane Nicoll
2bf2e9809e
Merge branch '2.0.x'
2018-07-25 14:36:08 +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
e26f743e82
Merge branch '2.0.x'
2018-07-25 12:02:11 +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
