Johnny Lim
4e1cc943f9
Fix typo in bomr.yaml
...
See gh-17342
2019-06-29 21:51:53 +01:00
Andy Wilkinson
8b4b6a32fa
Merge pull request #17358 from izeye
...
* gh-17358:
Remove System.out.println() in a test
Closes gh-17358
2019-06-29 21:19:02 +01:00
Johnny Lim
408035fb3f
Remove System.out.println() in a test
...
See gh-17358
2019-06-29 21:18:44 +01:00
Andy Wilkinson
5030364db7
Merge pull request #17357 from izeye
...
* gh-17357:
Add a missing quote in DebugLogbackConfigurator
Closes gh-17357
2019-06-29 21:15:00 +01:00
Johnny Lim
8dea74a2e9
Add a missing quote in DebugLogbackConfigurator
...
See gh-17357
2019-06-29 21:14:42 +01:00
Andy Wilkinson
f4e7b80651
Merge branch '2.0.x' into 2.1.x
...
See gh-17361
2019-06-29 20:38:18 +01:00
Andy Wilkinson
761856ac70
Merge branch '1.5.x' into 2.0.x
2019-06-29 20:29:16 +01:00
Andy Wilkinson
f9bd472192
Polish upgrade to spring-javaformat 0.0.15
...
See gh-17359
2019-06-29 20:27:47 +01:00
Phillip Webb
92bff3c328
Merge branch '2.0.x' into 2.1.x
2019-06-28 23:42:28 -07:00
Phillip Webb
cfeb0239b7
Merge branch '1.5.x' into 2.0.x
2019-06-28 23:28:34 -07:00
Phillip Webb
d91f27e11f
Fix Javadoc @Since checkstle violations
...
Apply consistent `@Since` tags and retrofit the existing code using a
best guess from the git history.
Closes gh-17360
2019-06-28 22:41:15 -07:00
Phillip Webb
6425fb6ec8
Merge branch '2.0.x' into 2.1.x
...
Closes gh-17361
2019-06-28 21:34:35 -07:00
Phillip Webb
4f079803d2
Merge branch '1.5.x' into 2.0.x
...
Closes gh-17359
2019-06-28 21:29:20 -07:00
Phillip Webb
dc5c5702f8
Enforce stricter javadoc @Since rules
...
See gh-17360
2019-06-28 21:16:27 -07:00
Phillip Webb
9433ad2222
Ignore SpringMethodVisibility check
...
Ignore the new `SpringMethodVisibility` on released versions since
the required changes can introduce subtle bugs.
See gh-17359
2019-06-28 21:15:01 -07:00
Phillip Webb
b0fffbe42e
Upgrade to spring-javaformat 0.0.15
...
Closes gh-17359
2019-06-28 21:14:00 -07:00
Phillip Webb
9aa4887376
Merge branch '2.0.x' into 2.1.x
2019-06-28 14:14:52 -07:00
Phillip Webb
ed3e1e076d
Fix AbstractFilterRegistrationBean merge error
...
Merging 1.5.x accidentally broke `AbstractFilterRegistrationBean`
2019-06-28 14:13:59 -07:00
Phillip Webb
de35efd1ef
Merge branch '2.0.x' into 2.1.x
2019-06-28 12:21:57 -07:00
Phillip Webb
bb34846630
Merge branch '1.5.x' into 2.0.x
2019-06-28 12:19:46 -07:00
Phillip Webb
6d01bc915b
Make intermediate classes of public classes public
...
Backport gh-12590 to 1.5.x and also pick up a few classes that were
missed. This commit also makes a few properties bound classes public.
Closes gh-17337
2019-06-28 12:18:07 -07:00
Andy Wilkinson
91786bc712
Merge branch '2.0.x' into 2.1.x
...
Closes gh-17334
2019-06-27 11:39:17 +01:00
Andy Wilkinson
256a0d636d
Merge branch '1.5.x' into 2.0.x
2019-06-27 11:39:02 +01:00
Andy Wilkinson
1ee8c53b90
Upgrade to spring-javaformat 0.0.14
...
Closes gh-17331
2019-06-27 11:10:13 +01:00
Andy Wilkinson
096951d531
Merge branch '2.0.x' into 2.1.x
...
Closes gh-17305
2019-06-27 10:41:37 +01:00
Andy Wilkinson
57bc03ac57
Merge branch '1.5.x' into 2.0.x
2019-06-27 10:22:02 +01:00
Madhura Bhave
74912ee126
Remove setting.xml from .gitignore
...
Closes gh-17309
2019-06-26 11:50:51 -07:00
Andy Wilkinson
3fb06ee29e
Merge branch '2.0.x' into 2.1.x
...
Closes gh-17320
2019-06-26 17:39:13 +01:00
Andy Wilkinson
4973a2b217
Merge branch '1.5.x' into 2.0.x
2019-06-26 17:37:39 +01:00
Andy Wilkinson
72f7985219
Drop back to Eclipse 2019-03 to avoid m2e regression
...
Closes gh-15200
2019-06-26 17:31:00 +01:00
Andy Wilkinson
0cfcfb104e
Link to Apache Licence in Maven Plugin docs rather than inlining it
...
Closes gh-17317
2019-06-26 17:31:00 +01:00
Madhura Bhave
26b61e6f8d
Fix deprecation warnings in pipeline.yml
...
Closes gh-17310
2019-06-25 17:48:57 -07:00
Phillip Webb
02e705c8e4
Relax nohttp requirement for service.wsdl
...
Unfortunately https references cause eclipse errors so we need to
relax the requirement for this file.
Fixes gh-17307
2019-06-25 11:17:27 -07:00
Andy Wilkinson
7e4111954f
Merge branch '2.0.x' into 2.1.x
...
Closes gh-17305
2019-06-25 16:25:46 +01:00
Andy Wilkinson
23e119c239
Merge branch '1.5.x' into 2.0.x
2019-06-25 16:25:24 +01:00
Andy Wilkinson
1ee7b80162
Update the Oomph setup for Eclipse 2019-06
...
Closes gh-15200
2019-06-25 16:22:53 +01:00
Stephane Nicoll
374e02cac8
Simplify HibernateJpaAutoConfiguration classes check
...
This commit removes the now outdated `HibernateEntityManagerCondition`
in favour of a simple check of `SessionImplementor`. As of
Hibernate 5.2, a single `hibernate-core` jar is required so a single
class check is enough.
Closes gh-17288
2019-06-21 15:26:07 +02:00
Stephane Nicoll
86ace26049
Fix broken link to Spring Integration reference guide
...
Closes gh-17279
2019-06-21 09:09:01 +02:00
Andy Wilkinson
a5ae1de706
Fix spring-boot-loader's tests on Windows
...
Closes gh-17275
2019-06-20 11:08:35 +01:00
Stephane Nicoll
7e5ca6d280
Merge branch '2.0.x' into 2.1.x
...
Closes gh-17268
2019-06-19 15:30:13 +02:00
Stephane Nicoll
11dee3c0d8
Merge branch '1.5.x' into 2.0.x
2019-06-19 15:27:49 +02:00
Stephane Nicoll
29de792148
Merge pull request #17068 from ielatif
...
* pr/17068:
Fix javadoc of management server port
Closes gh-17068
2019-06-19 15:19:34 +02:00
Issam El-atif
fca97ff86c
Fix javadoc of management server port
...
See gh-17068
2019-06-19 15:15:04 +02:00
Phillip Webb
6e5ba8077a
Fix sync-to-maven-central script
2019-06-18 21:04:54 -07:00
Phillip Webb
11b8e7c2de
Don't exit script on error
...
Update CI scripts so that command failures do not cause an immediate
exit. Prior to this commit, some of our looping logic would never run
because the entire script would exit.
2019-06-18 20:41:26 -07:00
Spring Buildmaster
fb90803dbf
Next development version (v2.1.7.BUILD-SNAPSHOT)
2019-06-19 00:55:05 +00:00
Phillip Webb
ffbb23bc6d
Always use credentials in forward merge script
...
Closes gh-17257
2019-06-18 15:08:09 -07:00
Phillip Webb
b0415c4044
Don't ignore images on CI build
...
Closes gh-17255
2019-06-18 14:49:16 -07:00
Phillip Webb
718c1d7204
Upgrade Java 12 version in CI image
...
Closes gh-17246
2019-06-18 10:32:57 -07:00
Phillip Webb
064240266f
Upgrade Java 11 version in CI image
...
Closes gh-17244
2019-06-18 10:31:14 -07:00