Andy Wilkinson
68bfb020aa
Reduce need for bean method proxying and disable where not needed
...
Closes gh-9068
2019-03-12 13:18:42 +00:00
Stephane Nicoll
0f71f22f3c
Polish
2019-03-12 13:57:57 +01:00
Stephane Nicoll
628e44187f
Merge branch '2.1.x'
2019-03-12 11:13:25 +01:00
Stephane Nicoll
d77f69cfa9
Merge pull request #16166 from viktoriya-kutsarova
...
* pr/16166:
Polish "Update ambiguous documentation about ConfigurationProperties"
Update ambiguous documentation about ConfigurationProperties
2019-03-12 11:13:07 +01:00
Stephane Nicoll
f07de1bbe2
Polish "Update ambiguous documentation about ConfigurationProperties"
...
Closes gh-16166
2019-03-12 11:12:45 +01:00
Viktoriya Kutsarova
6b6ac28430
Update ambiguous documentation about ConfigurationProperties
...
See gh-16166
2019-03-12 11:12:21 +01:00
Stephane Nicoll
a44a55e948
Merge branch '2.1.x'
2019-03-12 11:07:53 +01:00
Stephane Nicoll
015de55f58
Merge pull request #16170 from ayudovin
...
* pr/16170:
Polish contribution
Add support for Mustache, FreeMarker and Thymeleaf in WebFluxTest
2019-03-12 11:07:02 +01:00
Stephane Nicoll
161c0b9fad
Polish contribution
...
Closes gh-16170
2019-03-12 11:06:19 +01:00
ayudovin
51013421f2
Add support for Mustache, FreeMarker and Thymeleaf in WebFluxTest
...
See gh-16170
2019-03-12 11:06:18 +01:00
Stephane Nicoll
078bd890a6
Merge branch '2.0.x' into 2.1.x
2019-03-12 11:05:23 +01:00
Andy Wilkinson
28cf63354a
Merge pull request #16106 from Spring Operator
...
* gh-16106:
Drop AnyEdit from Eclipse setup as it is not available over HTTPS
Update build and setup configuration to use HTTPS
Closes gh-16106
2019-03-12 10:05:06 +00:00
Andy Wilkinson
19275fd9d6
Drop AnyEdit from Eclipse setup as it is not available over HTTPS
...
See gh-16106
2019-03-12 10:04:18 +00:00
Stephane Nicoll
50d0b4df46
Polish
2019-03-12 11:04:00 +01:00
Spring Operator
c9c554b834
Update build and setup configuration to use HTTPS
...
See gh-16106
2019-03-12 10:02:44 +00:00
Stephane Nicoll
3831aeeb39
Merge branch '2.1.x'
2019-03-12 10:52:31 +01:00
Stephane Nicoll
7b78367eb9
Merge pull request #16178 from izeye
...
* pr/16178:
Add dependency management for micrometer-registry-stackdriver
2019-03-12 10:52:14 +01:00
Johnny Lim
00bda4dc2a
Add dependency management for micrometer-registry-stackdriver
...
Closes gh-16178
2019-03-12 10:51:54 +01:00
Stephane Nicoll
8ff0a9c5a9
Merge branch '2.1.x'
2019-03-12 10:51:08 +01:00
Stephane Nicoll
7f582cc707
Merge pull request #16193 from izeye
...
* pr/16193:
Polish
2019-03-12 10:50:54 +01:00
Johnny Lim
bcfbabe6cd
Polish
...
Closes gh-16193
2019-03-12 10:50:32 +01:00
Andy Wilkinson
3e9416c2c3
Merge branch '2.1.x'
2019-03-12 09:34:41 +00:00
Andy Wilkinson
8a0dc61c59
Polish prohibited version of Couchbase's client
2019-03-12 09:33:55 +00:00
Andy Wilkinson
72ee0ac20c
Prohibit upgrade to Maven Invoker 3.2.0
...
Closes gh-16205
2019-03-12 09:32:42 +00:00
Andy Wilkinson
4b98fa7d94
Alias proxyBeanMethods on annotations meta-annotated with @Configuration
...
Closes gh-16201
2019-03-12 09:24:20 +00:00
Stephane Nicoll
dfead88599
Merge branch '2.1.x'
2019-03-12 09:16:47 +01:00
Stephane Nicoll
1e2177d45d
Merge pull request #16203 from izeye
...
* pr/16203:
Add more indentation settings to .editorconfig
2019-03-12 09:16:30 +01:00
Johnny Lim
bcec2bbb58
Add more indentation settings to .editorconfig
...
Closes gh-16203
2019-03-12 09:16:04 +01:00
Phillip Webb
50425bd441
Rollback to Maven Invoker 3.1.0
...
Closes gh-16205
2019-03-11 23:59:11 -07:00
Phillip Webb
64a2e8d67f
Update copyright year for changed files
2019-03-11 22:15:36 -07:00
Phillip Webb
dd3e8154d9
Merge branch '2.1.x'
2019-03-11 22:15:19 -07:00
Phillip Webb
fc3aa43cc2
Update copyright year for changed files
2019-03-11 22:14:53 -07:00
Phillip Webb
f02887b6c6
Merge branch '2.0.x' into 2.1.x
2019-03-11 22:14:21 -07:00
Phillip Webb
9c3af103e0
Fix ScheduledTasksEndpointAutoConfigurationTests
...
Update the `CustomEndpointConfiguration` class in
`ScheduledTasksEndpointAutoConfigurationTests` to be package private
so that it can be enhanced by cglib.
Prior to merge commit 361437f4
2019-03-11 22:12:36 -07:00
Phillip Webb
ccfe20d3d3
Merge branch '2.1.x'
2019-03-11 21:10:22 -07:00
Phillip Webb
45ae97a4e9
Merge branch '2.0.x' into 2.1.x
2019-03-11 21:09:35 -07:00
Phillip Webb
03beed603c
Fix ScheduledTasksEndpointTests BaseConfiguration
...
Update the `BaseConfiguration` class in `ScheduledTasksEndpointTests`
to be package private so that it can be enhanced by cglib.
Prior to merge commit 361437f4
2019-03-11 21:07:20 -07:00
Madhura Bhave
d92c2f7023
DefaultProperties profiles shouldn't take precedence over config files
...
Fixes gh-15445
2019-03-11 16:17:46 -07:00
Andy Wilkinson
404f5d33f3
Align Gradle plugin's tests with Kotlin 1.3's restructuring
...
See gh-16195
2019-03-11 21:21:18 +00:00
Stephane Nicoll
fed145e195
Replace manual dependency management by Kotlin's bom
...
Closes gh-9486
2019-03-11 17:44:27 +01:00
Andy Wilkinson
aa2008bc5a
Merge branch '2.1.x'
2019-03-11 16:40:19 +00:00
Andy Wilkinson
f0ef693376
Merge branch '2.0.x' into 2.1.x
2019-03-11 16:28:29 +00:00
Andy Wilkinson
c2eeeb032c
Work around javac bug
2019-03-11 16:27:56 +00:00
Stephane Nicoll
09d51089ba
Polish
2019-03-11 17:24:52 +01:00
Stephane Nicoll
fd0a11b7a7
Reuse Kotlin parameter names if possible
...
This commit detects a Kotlin constructor so that it is not required to
transmit the parameter names information to the Java side.
See gh-8762
2019-03-11 17:23:45 +01:00
Andy Wilkinson
8c3cec8f13
Merge branch '2.0.x' into 2.1.x
2019-03-11 16:14:19 +00:00
Andy Wilkinson
361437f4e2
Merge branch '1.5.x' into 2.0.x
2019-03-11 15:53:34 +00:00
Andy Wilkinson
821ee0cf83
Ensure that @Bean methods are only declared on @Configuration classes
...
Closes gh-16190
2019-03-11 15:01:59 +00:00
Stephane Nicoll
b34b217d1e
Upgrade to Kotlin 1.3.21
...
Closes gh-16195
2019-03-11 15:56:13 +01:00
Stephane Nicoll
341859b5fe
Start building against Spring Framework 5.2 snapshots
...
See gh-16173
2019-03-11 15:22:14 +01:00
