Madhura Bhave
da03d53ac0
Merge branch '2.1.x'
2019-03-18 14:10:58 -07:00
Madhura Bhave
988ba3ff78
Fix author tag
2019-03-18 14:10:28 -07:00
Madhura Bhave
3d0219c315
Merge branch '2.1.x'
2019-03-15 18:09:47 -07:00
Johnny Lim
c5b5f752ed
Polish
...
Closes gh-16219
2019-03-15 17:54:48 -07:00
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
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
Andy Wilkinson
aa2008bc5a
Merge branch '2.1.x'
2019-03-11 16:40:19 +00: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
Andy Wilkinson
d6a869fa98
Switch to Jakarta EE API dependencies where possible
...
Closes gh-16113
Closes gh-16112
Closes gh-16111
Closes gh-15916
Closes gh-15689
2019-03-06 11:20:51 +00:00
Andy Wilkinson
cd13a1685c
Align HATEAOS sample with latest breaking API changes
...
See gh-15939
2019-02-28 19:37:00 +00:00
Madhura Bhave
3d03c01bfc
Merge branch '2.1.x'
2019-02-20 18:41:58 -08:00
Madhura Bhave
f8e5b9ba47
Fix formatting
2019-02-20 18:41:26 -08:00
Madhura Bhave
6f045d8891
Merge branch '2.1.x'
2019-02-20 16:13:20 -08:00
Madhura Bhave
c3e47541ad
EndpointRequest should check that the request is to the mgmt context
...
Fixes gh-15702
2019-02-20 16:08:26 -08:00
Andy Wilkinson
3a4a431eaa
Provide a configuration option to enable lazy initialization
...
Closes gh-15870
2019-02-14 12:41:49 +00:00
Madhura Bhave
a838aac17d
Merge branch '2.1.x'
2019-02-13 18:50:04 -08:00
Madhura Bhave
a34e71c2c8
Fix formatting violations in sample
2019-02-13 18:49:09 -08:00
Madhura Bhave
862ffcbbf4
Merge branch '2.1.x'
2019-02-13 13:33:14 -08:00
Madhura Bhave
bbe555a4f5
Split Jersey management context configuration
...
This commit splits the management context configuration for jersey
into two separate configurations depending on if the type is SAME or
CHILD. The configuration for the SAME context should only kick in if
there is no existing ResourceConfig bean.
Fixes gh-15891
2019-02-13 13:27:54 -08:00
Andy Wilkinson
2ed7cf84e1
Fix up version numbers following release
2019-01-11 16:20:19 +00:00
Spring Buildmaster
b04710d744
Next development version
2019-01-11 15:59:00 +00:00
Andy Wilkinson
3a7406fe3a
Merge branch '2.0.x' into 2.1.x
2018-12-20 15:58:03 +00:00
Andy Wilkinson
0741c90489
Avoid blocking on a Mono indefinitely
...
Closes gh-15535
2018-12-20 15:31:39 +00:00
Andy Wilkinson
9d2d6d5812
Merge branch '2.1.x'
2018-12-20 15:30:51 +00:00
Andy Wilkinson
9a33d1a2f9
Merge branch '2.0.x' into 2.1.x
2018-12-20 15:30:42 +00:00
Andy Wilkinson
8c68da0882
Avoid blocking on a Mono indefinitely
...
Closes gh-15535
2018-12-20 15:24:53 +00:00
Andy Wilkinson
61d04db0d7
Minimize and centralize assumptions about build output
...
Closes gh-15471
2018-12-14 17:50:20 +00:00
Andy Wilkinson
7d0a7a65c8
Merge branch '2.1.x'
2018-12-14 14:58:52 +00:00
Andy Wilkinson
b264b4417d
Reinstate parent-context sample in list of modules
...
Closes gh-15469
2018-12-14 14:56:26 +00:00
Andy Wilkinson
064f6478df
Move back to JUnit 4 until SUREFIRE-1614 has been resolved
...
See gh-14736
See gh-14737
See gh-14738
2018-12-12 16:49:30 +00:00
Madhura Bhave
f863ce32ee
Merge branch '2.1.x'
2018-12-10 16:44:42 -08:00
Madhura Bhave
3cc441c83e
Do not remove trailing slash from OAuth2 Issuer URI
...
Fixes gh-15324
2018-12-10 16:35:52 -08:00
Andy Wilkinson
9a97e1b0f7
Drop use of OutputCapture in SampleKafkaApplicationTests
...
Closes gh-15432
2018-12-10 10:11:50 +00:00
Andy Wilkinson
bbf0932f0f
Exclude jcl-over-slf4j in favour of spring-jcl
...
Closes gh-15392
2018-12-07 15:37:24 +00:00
Madhura Bhave
59d2b0a3fb
Upgrade tests to Junit5
...
See gh-14737
2018-12-05 17:49:09 -08:00
TwinProduction
21da4a5d12
Rename logging.file to logging.file.name
...
See gh-15089
2018-12-03 10:42:30 +01:00
Phillip Webb
ed9468a31a
Update copyright year for changed files
2018-11-29 22:02:45 -08:00
Stephane Nicoll
542b8985ad
Fixup version numbers following release
2018-11-29 11:37:51 +01:00
Spring Buildmaster
9bb64a3493
Next Development Version
2018-11-29 09:52:39 +00:00
Andy Wilkinson
ac77fc9dcf
Ignore .writing files in Integration samples tests
...
Previously, a temporary .writing file could be found and an attempt made to
access its contents. If the temporary file was deleted between it being found
and its contents being read, the test would fail with a FileNotFoundException.
This commit updates the test to ignore .writing files so that it will only
examine the contents of the final file once Integration has finished
writing it an atomically moved it to its final location.
2018-11-27 11:24:25 +00:00
Vedran Pavic
6e967fe860
Upgrade to Hazelcast 3.11
...
Closes gh-14949
2018-10-25 15:57:59 -07:00
Phillip Webb
5a4220c773
Fix logging checkstye violations in samples
...
See gh-14911
2018-10-25 09:28:04 -07:00
Vedran Pavic
4b2f084e28
Use message source in Web UI sample
...
Update the sample application to show how a message source can be
used in the view tier.
Closes gh-14947
See gh-14882
2018-10-24 21:50:40 -07:00
Vedran Pavic
81c7ce1d15
Add starter for OAuth2 resource server
...
Closes gh-14950
2018-10-24 21:37:28 -07:00
Madhura Bhave
06f1a0e6a2
Use oauth2-client starter in reactive sample
2018-10-24 19:56:36 -07:00
Phillip Webb
df16349725
Rename oauth2-oidc-client starter in sample
...
Fixup sample POM following rename of the oauth2-oidc-client starter.
See gh-14951
2018-10-24 19:40:35 -07:00
Andy Wilkinson
22e722d9f9
Polish
2018-10-18 15:51:20 +01:00
