Stephane Nicoll
a31a792192
Merge branch '1.5.x'
2017-02-07 16:35:59 +01:00
Stephane Nicoll
130e0808d0
Merge branch '1.4.x' into 1.5.x
2017-02-07 16:31:02 +01:00
Stephane Nicoll
008aef6142
Document @LiquibaseDataSource feature
...
Closes gh-8214
2017-02-07 16:16:19 +01:00
Brian Clozel
8619d6a229
Rename EmbeddedServletContainer -> EmbeddedWebServer
...
This contract is not specific to servlet containers and should be
reused by all web server implementations (including reactive variants).
Fixes gh-8208
2017-02-06 17:44:26 +01:00
Stephane Nicoll
5c663a9ece
Merge branch '1.5.x'
2017-02-01 09:08:33 +01:00
Johnny Lim
846994e498
Polish
...
Closes gh-8148
2017-02-01 09:07:47 +01:00
Andy Wilkinson
4ea7dc6f31
Polish "Upgrade to Flyway 4.0"
...
See gh-5344
2017-01-30 10:48:36 +00:00
Phillip Webb
17451c5e7a
Merge branch '1.5.x'
2017-01-25 22:24:07 -08:00
Phillip Webb
71601c3b96
Merge branch '1.4.x' into 1.5.x
2017-01-25 16:48:33 -08:00
Phillip Webb
2cf93f89f5
Polish
2017-01-25 16:45:59 -08:00
Andy Wilkinson
9bba73a1a9
Upgrade to Thymeleaf 3 and drop support for Thymleaf 2
...
This commit raises the minimum supported version of Thymeleaf to
3.0.x. It also upgrades Spring Social to a version that is compatible
with Thymeleaf 3.
Closes gh-7450
Closes gh-6258
See gh-7885
2017-01-25 13:59:09 +00:00
Andy Wilkinson
ef4f83e7b1
Update reference guide to reflect Java 8 requirement
...
Closes gh-8090
2017-01-24 20:25:54 +00:00
Andy Wilkinson
dbd10a8daa
Remove support for Jetty 9.3 and earlier
...
Closes gh-7985
2017-01-24 20:00:50 +00:00
Andy Wilkinson
0807c27c26
Complete removing support for Tomcat 7
...
Closes gh-6416
2017-01-24 17:26:30 +00:00
Stephane Nicoll
d67ce78e8b
Merge branch '1.5.x'
2017-01-24 13:23:06 +01:00
Johnny Lim
e0de28a1f7
Polish
...
Closes gh-8076
2017-01-24 13:22:22 +01:00
Stephane Nicoll
1f164906dc
Merge branch '1.5.x'
2017-01-24 09:56:47 +01:00
Stephane Nicoll
4a60de78ff
Merge branch '1.4.x' into 1.5.x
2017-01-24 09:56:26 +01:00
Stephane Nicoll
4efa4590f8
Review doc on advanced datasource customization
...
Closes gh-7652
2017-01-24 09:55:13 +01:00
Andy Wilkinson
d5a4058862
Merge branch '1.5.x'
2017-01-20 15:45:34 +00:00
Andy Wilkinson
bfd319755c
Merge branch '1.4.x' into 1.5.x
2017-01-20 15:45:23 +00:00
Andy Wilkinson
0ce7c9516a
Document how to configure test- and profile-specific Flyway migrations
...
Closes gh-2753
2017-01-20 15:44:42 +00:00
Stephane Nicoll
87cf236aae
Merge branch '1.5.x'
2017-01-16 10:41:56 +01:00
Stephane Nicoll
3e05329fd7
Order internal RepositoryRestConfigurer
...
This commit provides an order of zero for the RepositoryRestConfigurer
that is used internally to configure the `RepositoryRestConfiguration`. In
practice, an unordered `RepositoryRestConfigurer` will run after ours.
Closes gh-7981
2017-01-16 10:41:44 +01:00
Andy Wilkinson
ce2256d7dc
Merge branch '1.5.x'
2017-01-10 09:13:37 -05:00
Andy Wilkinson
db56e1cd00
Merge branch '1.4.x' into 1.5.x
2017-01-10 09:13:27 -05:00
Michael J. Simons
3c291150d6
Update springloaded version to 1.2.6.RELEASE in Maven-related docs
...
Closes gh-7937
2017-01-10 09:13:00 -05:00
Andy Wilkinson
891045880d
Merge branch '1.5.x'
2017-01-10 09:10:36 -05:00
Andy Wilkinson
8934dfaecf
Merge branch '1.4.x' into 1.5.x
2017-01-10 09:10:26 -05:00
Michael J. Simons
ddca9a1687
Update springloaded version to 1.2.6.RELEASE in Gradle-related docs
...
Closes gh-7937
2017-01-10 09:08:35 -05:00
Stephane Nicoll
506f6497c0
Merge branch '1.5.x'
2017-01-04 09:56:19 +01:00
Johnny Lim
f915ae197a
Polish
2017-01-04 09:53:45 +01:00
Phillip Webb
24f5125a8b
Merge branch '1.5.x'
2017-01-03 19:01:17 -08:00
Phillip Webb
18dcf31aa6
Polish documentation formatting
2017-01-03 17:24:37 -08:00
Stephane Nicoll
85f176da08
Merge branch '1.5.x'
2017-01-03 11:39:33 +01:00
Stephane Nicoll
fe89af5e82
Polish contribution
...
Closes gh-7796
2017-01-03 11:33:57 +01:00
Stephane Nicoll
219e0baa58
Merge branch '1.5.x'
2016-12-22 15:40:02 +01:00
Stephane Nicoll
449043bf21
Polish contribution
...
Closes gh-6900
2016-12-22 15:39:31 +01:00
Andy Wilkinson
943262bb97
Raise the minimum supported version of Hibernate to 5.2.x
...
Closes gh-7586
2016-12-15 21:31:53 +00:00
Stephane Nicoll
0568afc6cb
Merge branch '1.5.x'
2016-11-30 08:31:41 +01:00
Johnny Lim
423f8037ce
Polish
...
Closes gh-7530
2016-11-30 08:31:13 +01:00
Stephane Nicoll
e8d476dbca
Fix use of `forceCreation` flag in `maven-jar-plugin`
2016-11-29 11:28:14 +01:00
Stephane Nicoll
c9fa1a1f70
Merge branch '1.4.x' into 1.5.x
2016-11-24 10:39:51 +01:00
Stephane Nicoll
0359b2f6f5
Document how to disable JMS transacted session
...
Closes gh-7463
2016-11-24 10:39:40 +01:00
Stephane Nicoll
2b8801a6b5
Merge branch '1.4.x' into 1.5.x
2016-11-12 11:16:30 +01:00
Emanuel Rabina
6b681ddfab
Upgrade Thymeleaf 3 layout dialect in doc
...
Closes gh-7370
2016-11-12 11:15:00 +01:00
Stephane Nicoll
389acb094b
Merge branch '1.4.x' into 1.5.x
2016-11-05 07:43:09 +01:00
Johnny Lim
ec9f0ab6b4
Polish
...
Closes gh-7322
2016-11-05 07:42:37 +01:00
Andy Wilkinson
7962818294
Merge branch '1.4.x' into 1.5.x
2016-10-19 10:44:20 +01:00
Andy Wilkinson
6ac041c43b
Update Thymeleaf 3 related versions in docs and sample
...
See gh-6991
Closes gh-7183
2016-10-19 10:43:38 +01:00