Commit Graph

20876 Commits

Author SHA1 Message Date
Stephane Nicoll 465053c11e Merge branch '2.1.x' 2019-03-28 18:09:22 +01:00
Stephane Nicoll 6c3d64a2eb Test Thymeleaf auto-configuration backs off without spring integration
See gh-16341
2019-03-28 17:59:22 +01:00
Stephane Nicoll 29b1b38cc6 Migrate Thymeleaf tests to application runner 2019-03-28 17:58:18 +01:00
Andy Wilkinson ea2eaa1737 Merge branch '2.1.x' 2019-03-28 15:56:43 +00:00
Andy Wilkinson cf0811b0db Merge branch '2.0.x' into 2.1.x 2019-03-28 15:56:22 +00:00
Andy Wilkinson be32421b86 Merge branch '1.5.x' into 2.0.x 2019-03-28 15:55:32 +00:00
Andy Wilkinson f8bd066970 Upgrade to Spring Cloud Connectors 1.2.8.RELEASE
Closes gh-16364
2019-03-28 15:52:34 +00:00
Andy Wilkinson 37f1c6e92c Upgrade to Aspectj 1.8.14
Closes gh-16363
2019-03-28 15:52:33 +00:00
Andy Wilkinson 8cd6ec30e6 Upgrade to Tomcat 8.5.39
Closes gh-16362
2019-03-28 15:52:32 +00:00
Andy Wilkinson 3c3d6d44b5 Upgrade to H2 1.4.199
Closes gh-16361
2019-03-28 15:52:31 +00:00
Stephane Nicoll 4f8b224a99 Merge pull request #16299 from izeye
* pr/16299:
  Polish
2019-03-28 16:43:21 +01:00
Johnny Lim 40d0d6b113 Polish
Closes gh-16299
2019-03-28 16:42:27 +01:00
Stephane Nicoll 89f93b28d7 Merge branch '2.1.x' 2019-03-28 16:37:33 +01:00
Stephane Nicoll c6aaa3b715 Merge pull request #16341 from koziolk
* pr/16341:
  Add missing class condition on thymeleaf-spring5
2019-03-28 16:37:18 +01:00
Krzysztof Koziol 17c0214cc6 Add missing class condition on thymeleaf-spring5
This commit adds an extra check for the presence of thymeleaf-spring5
library on the classpath. ThymeleafAutoConfiguration is now only
considered if both thymeleaf-spring5 and thymeleaf jars are present.

Closes gh-16341
2019-03-28 16:37:09 +01:00
Andy Wilkinson 0b2c527b97 Merge pull request #16276 from Spring Operator
* gh-16276:
  Polish "Use HTTPS for external links wherever possible"
  Use HTTPS for external links wherever possible

Closes gh-16276
2019-03-28 13:56:39 +00:00
Andy Wilkinson 24593f39f8 Polish "Use HTTPS for external links wherever possible"
See gh-16276
2019-03-28 13:55:55 +00:00
Spring Operator fb242c27d2 Use HTTPS for external links wherever possible
See gh-16276
2019-03-28 12:07:01 +00:00
Andy Wilkinson 878a635bfb Merge branch '2.1.x' 2019-03-28 11:48:47 +00:00
Andy Wilkinson b7bca872a6 Merge pull request #16320 from Spring Operator
* gh-16320:
  Polish "Use HTTPS for external links wherever possible"
  Use HTTPS for external links wherever possible

Closes gh-16320
2019-03-28 10:53:37 +00:00
Andy Wilkinson 5a3474c7a8 Polish "Use HTTPS for external links wherever possible"
See gh-16320
2019-03-28 10:53:01 +00:00
Spring Operator 9fc3ac7d49 Use HTTPS for external links wherever possible
See gh-16320
2019-03-28 09:49:30 +00:00
Andy Wilkinson 864942ad4f Merge branch '2.0.x' into 2.1.x 2019-03-28 09:35:53 +00:00
Andy Wilkinson 7f69e410cb Merge pull request #16319 from Spring Operator
* gh-16319:
  Polish "Use HTTPS for external links wherever possible"
  Use HTTPS for external links wherever possible
2019-03-28 09:19:09 +00:00
Andy Wilkinson 14b21026bf Polish "Use HTTPS for external links wherever possible"
See gh-16319
2019-03-28 09:17:50 +00:00
Spring Operator 1a4c6f2dac Use HTTPS for external links wherever possible
See gh-16319
2019-03-27 20:06:52 +00:00
Andy Wilkinson e2de2c8238 Merge branch '1.5.x' into 2.0.x 2019-03-27 20:06:35 +00:00
Andy Wilkinson 1a674ab702 Merge branch '1.4.x' into 1.5.x 2019-03-27 20:06:24 +00:00
Andy Wilkinson 3a5a087b1f Merge branch '1.3.x' into 1.4.x 2019-03-27 20:06:16 +00:00
Andy Wilkinson c4d44574b2 Correct link to Groovy MarkupTemplateEngine documentation
See gh-16316
2019-03-27 20:05:29 +00:00
Andy Wilkinson ba4671f0ab Merge branch '1.5.x' into 2.0.x 2019-03-27 19:59:36 +00:00
Andy Wilkinson e036bc4e6d Merge pull request #16318 from Spring Operator
* gh-16318:
  Polish "Use HTTPS for external links wherever possible"
  Use HTTPS for external links wherever possible
2019-03-27 15:02:23 +00:00
Andy Wilkinson 365fed59ca Polish "Use HTTPS for external links wherever possible"
See gh-16381
2019-03-27 15:01:48 +00:00
Spring Operator bbbfee6480 Use HTTPS for external links wherever possible
See gh-16318
2019-03-27 15:01:19 +00:00
Andy Wilkinson 94633cfd89 Merge branch '1.4.x' into 1.5.x 2019-03-27 14:04:32 +00:00
Andy Wilkinson f05f858286 Merge pull request #16317 from Spring Operator
* gh-16317:
  Polish "Use HTTPS for external links wherever possible"
  Use HTTPS for external links wherever possible

Closes gh-16317
2019-03-27 13:33:09 +00:00
Andy Wilkinson 5bc43ae76b Polish "Use HTTPS for external links wherever possible"
See gh-16317
2019-03-27 12:53:15 +00:00
Spring Operator 189eeefbb1 Use HTTPS for external links wherever possible
See gh-16317
2019-03-27 12:30:55 +00:00
Andy Wilkinson 8059dceee4 Merge branch '1.3.x' into 1.4.x 2019-03-27 12:29:38 +00:00
Andy Wilkinson cf2b0bc8c2 Use HTTPS in YAML exmaple
See gh-16316
2019-03-27 12:23:55 +00:00
Andy Wilkinson baec3d6e8e Merge branch '1.3.x' into 1.4.x 2019-03-27 12:22:40 +00:00
Andy Wilkinson 35572b6aae Merge pull request #16316 from Spring Operator
* gh-16316:
  Polish "Use HTTPS for external links wherever possible"
  Use HTTPS for external links wherever possible

Closes gh-16316
2019-03-27 11:44:31 +00:00
Andy Wilkinson 9be96c49e2 Polish "Use HTTPS for external links wherever possible"
See gh-16316
2019-03-27 11:44:18 +00:00
Spring Operator e401d02ced Use HTTPS for external links wherever possible
See gh-16316
2019-03-27 11:35:54 +00:00
Stephane Nicoll 3e3353e0e9 Merge branch '2.1.x' 2019-03-27 11:40:49 +01:00
Stephane Nicoll f417fa5c5b Add jaxb API to jersey starter
Closes gh-16268
2019-03-27 11:38:55 +01:00
Stephane Nicoll e57c0c0657 Do not attempt to add Jaxb customization if Jaxb is not present
See gh-16268
2019-03-27 11:38:55 +01:00
Stephane Nicoll bece962711 Merge branch '2.1.x' 2019-03-27 10:18:23 +01:00
Stephane Nicoll c2f9e7dd43 Fix StreamsBuilderFactoryBean injection definition
Closes gh-16329
2019-03-27 10:17:49 +01:00
Stephane Nicoll a2c5a79883 Merge pull request #16325 from izeye
* pr/16325:
  Restore setExtractBareNamePropertyMethods() for AssertJ
2019-03-27 07:04:01 +01:00