Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
21,208 Commits 23 Branches 0 Tags
5f1bbf8c72da1702081da57226304ccb9008a642
Commit Graph

21208 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Madhura Bhave
a7f148091e Remove binding from ConfigFileApplicationListener 
Closes gh-8101
 2017-01-25 09:19:51 -08:00
Andy Wilkinson
bdf903896f Remove support for module layout 
Closes gh-8107
 2017-01-25 16:49:37 +00:00
Andy Wilkinson
3ce6d8e5b5 Merge branch '1.5.x' 2017-01-25 16:41:13 +00:00
Andy Wilkinson
cd5124005b Deprecate support for module layout 
Closes gh-8008
 2017-01-25 16:40:42 +00:00
Andy Wilkinson
0e4b9b5738 Merge branch '1.5.x' 2017-01-25 15:26:55 +00:00
Andy Wilkinson
a081c96523 Merge branch '1.4.x' into 1.5.x 2017-01-25 15:26:43 +00:00
Andy Wilkinson
daf6be46f6 Revert "Upgrade to Groovy 2.4.8" 
This reverts commit 70cd5c42ed.

See gh-8083
 2017-01-25 15:24:33 +00:00
Andy Wilkinson
05831e4b87 Merge branch '1.5.x' 2017-01-25 14:55:39 +00:00
Andy Wilkinson
37cf31f450 Upgrade to Couchbase Java Client 2.3.7 
In version 2.3.6 and earlier, an attempt to create a Bucket or a
ClusterInfo would fail fast with a ConnectException in the cause of
the Couchbase server was done. In 2.3.7 this remains true for a
Bucket but is no longer the case for ClusterInfo. The latter now
retries for 75 seconds by default and when it eventually fails a
ConnectException is no longer part of the cause chain.

This commit makes the auto-configured ClusterInfo depend on the
auto-configured Bucket. This means that the Bucket is always created
before the ClusterInfo, thereby ensuring that things fail gracefully
with useful diagnostics when the server is unavailable.

Closes gh-8092
 2017-01-25 14:55:28 +00:00
Stephane Nicoll
b6064fff46 Merge branch '1.5.x' 2017-01-25 15:54:06 +01:00
Stephane Nicoll
9a65968cb3 Merge branch '1.4.x' into 1.5.x 2017-01-25 15:53:16 +01:00
Stephane Nicoll
feb496fecd Upgrade to Spring Framework 4.3.6.RELEASE 
Closes gh-7774
 2017-01-25 15:51:29 +01:00
Andy Wilkinson
e8f8556df3 Remove remapping of Thymeleaf's logging as it is no longer necessary 
Thymeleaf 3.0 no longer logs its initialization information at INFO
level so we no longer need to remap its INFO output to DEBUG.

Closes gh-7657
 2017-01-25 14:09:26 +00: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
9c77708fcb Remove Jetty 9.3 sample that was missed in dbd10a8d 
See gh-7985
 2017-01-25 13:54:25 +00:00
Andy Wilkinson
e14c7dadee Merge branch '1.5.x' 2017-01-25 11:27:27 +00:00
Andy Wilkinson
11d13d10c6 Merge branch '1.4.x' into 1.5.x 2017-01-25 11:27:07 +00:00
Andy Wilkinson
bfee21730c Detect path of exploded war correctly on Windows 
Previously, AbstractEmbeddedServletContainerFactory detected an
exploded war by looking for `/WEB-INF/` in the path of its code
source's location. This failed on Windows due to the use of `\` rather
than `/` separators.

This commit updates AbstractEmbeddedServletContainerFactory to
uses the OS's separator rather than hardcoding `/`.

Closes gh-8100
 2017-01-25 11:26:03 +00:00
Stephane Nicoll
661fd848eb Merge branch '1.5.x' 2017-01-25 11:02:32 +01:00
Stephane Nicoll
505e7f75ea Polish contribution 
Closes gh-8089
 2017-01-25 11:01:53 +01:00
dreis
d58f38f6f6 Use String.replace() with single char if possible 
See gh-8089
 2017-01-25 11:01:52 +01:00
Stephane Nicoll
551bfb2c60 Polish contribution 
Closes gh-8103
 2017-01-25 11:01:52 +01:00
Johnny Lim
32f9e90de5 Replace 'String.length() == 0' with 'String.isEmpty()' 
See gh-8103
 2017-01-25 11:01:52 +01:00
Stephane Nicoll
79233b019e Fix keys format for embedded mongodb support 
Closes gh-8102
 2017-01-25 11:01:52 +01:00
Dave Syer
50c1e363ad Merge remote-tracking branch 'origin/1.5.x' 2017-01-25 09:44:22 +00:00
Dave Syer
98a4c72c50 Clarify PublicMetrics (uniqueness of metric names) 
See gh-6404
 2017-01-25 09:43:20 +00:00
Stephane Nicoll
265a712294 Fix keys format for embedded mongodb support 
Closes gh-8102
 2017-01-25 10:41:47 +01:00
Andy Wilkinson
55c06fcc15 Merge branch '1.5.x' 2017-01-24 21:28:42 +00:00
Andy Wilkinson
5ee46742be Upgrade to Mariadb 1.5.7 
Closes gh-8098
 2017-01-24 21:27:42 +00:00
Andy Wilkinson
7ae9148caa Upgrade to Jooq 3.9.1 
Closes gh-8097
 2017-01-24 21:27:42 +00:00
Andy Wilkinson
99a48a9a8c Upgrade to Narayana 5.5.1.Final 
Closes gh-8096
 2017-01-24 21:27:42 +00:00
Andy Wilkinson
e42ae87989 Upgrade to Jersey 2.25.1 
Closes gh-8095
 2017-01-24 21:27:42 +00:00
Andy Wilkinson
31f1ad9bb9 Upgrade to Artemis 1.5.2 
Closes gh-8094
 2017-01-24 21:27:41 +00:00
Andy Wilkinson
ac4c29bc9f Upgrade to Hazelcast 3.7.5 
Closes gh-8093
 2017-01-24 21:27:41 +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
386857fd91 Set java.version to 1.8 in spring-boot-starter-parent 
Closes gh-8091
 2017-01-24 20:25:20 +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
0e4763910c Merge pull request #7495 from Eddú Meléndez 
* gh-7495:
  Complete removing support for Tomcat 7
  Start removing support for Tomcat 7
 2017-01-24 18:31:44 +00:00
Andy Wilkinson
0807c27c26 Complete removing support for Tomcat 7 
Closes gh-6416
 2017-01-24 17:26:30 +00:00
Eddú Meléndez
df3e1f0898 Start removing support for Tomcat 7 
See gh-6416
Closes gh-7495
 2017-01-24 17:26:15 +00:00
Andy Wilkinson
5c006d05f8 Merge branch '1.5.x' 2017-01-24 17:14:20 +00:00
Andy Wilkinson
988ad6b911 Merge branch '1.4.x' into 1.5.x 2017-01-24 17:13:31 +00:00
Andy Wilkinson
ce46d99bc8 Merge pull request #7869 from Vedran Pavić 
* gh-7869:
  Replace dep mgmt for hazelcast-hiberate5 with hazelcast-hibernate52
 2017-01-24 17:07:27 +00:00
Vedran Pavic
5e6abd2471 Replace dep mgmt for hazelcast-hiberate5 with hazelcast-hibernate52 
Hibernate 5.2 is now the minimum supported version so providing
dependency management for hazelcast-hiberate5 no longer makes sense.
This commit replaces it with dependency management for
hazelcast-hibernate52.

Closes gh-7869
 2017-01-24 17:07:17 +00:00
Andy Wilkinson
bd58a6de66 Upgrade to Jaybird 2.2.12 
Closes gh-8086
 2017-01-24 16:33:06 +00:00
Andy Wilkinson
f8056f9888 Upgrade to Elasticsearch 2.4.4 
Closes gh-8085
 2017-01-24 16:33:06 +00:00
Andy Wilkinson
96f6f42b32 Upgrade to Jetty 9.3.16.v20170120 
Closes gh-8084
 2017-01-24 16:33:05 +00:00
Andy Wilkinson
70cd5c42ed Upgrade to Groovy 2.4.8 
Closes gh-8083
 2017-01-24 16:33:05 +00:00