Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
9,093 Commits 23 Branches 0 Tags
ae4dd0d17e33ed7ceab360b08f3b726c72bc538b
Commit Graph

9093 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Stephane Nicoll
ae4dd0d17e Merge branch '1.4.x' into 1.5.x 2016-10-24 18:08:23 +02:00
Stephane Nicoll
a638dcd51b Remove unnecessary use of System.out.println 2016-10-24 18:07:40 +02:00
Andy Wilkinson
a56bf44b39 Merge branch '1.4.x' into 1.5.x 2016-10-24 14:37:20 +01:00
Andy Wilkinson
8150cbd0d1 Remove commentary on Neo4j's licence 
Closes gh-7214
 2016-10-24 14:36:35 +01:00
Andy Wilkinson
92462a06ad Merge branch '1.4.x' into 1.5.x 2016-10-24 14:11:25 +01:00
Andy Wilkinson
2b46a4876f Start building against Spring Framework 4.3.4 snapshots 
Closes gh-7174
See gh-7213
 2016-10-24 14:10:12 +01:00
Andy Wilkinson
9abafb839b Merge branch '1.4.x' into 1.5.x 2016-10-24 12:20:23 +01:00
Andy Wilkinson
be597d7ce9 Fix handling of cyrillic characters in AsciiBytes hashCode method 
Closes gh-7202
 2016-10-24 12:19:57 +01:00
Stephane Nicoll
eddb10e4c9 Merge branch '1.4.x' into 1.5.x 2016-10-24 11:39:26 +02:00
Stephane Nicoll
713fd51f9c Merge pull request #6954 from vpavic:update-docs 
* pr/6954:
  Improve systemd service documentation
 2016-10-24 11:39:14 +02:00
Vedran Pavic
469a4e3444 Improve systemd service documentation 
Closes gh-6954
 2016-10-24 11:37:53 +02:00
Stephane Nicoll
4603d8259a Make MockitoTestExecutionListener public 
Closes gh-7016
 2016-10-24 11:37:20 +02:00
Stephane Nicoll
beb3074998 Merge branch '1.4.x' into 1.5.x 2016-10-24 11:19:18 +02:00
Stephane Nicoll
2ad3a7f8a3 Merge pull request #7043 from kazuki43zoo:standard-travis-ci 
* pr/7043:
  Speed up Travis build
 2016-10-24 11:19:05 +02:00
Kazuki Shimizu
7c1f9eb1b9 Speed up Travis build 
Modify to use standard mode and directory cache for Travis CI build.

Closes gh-7043
 2016-10-24 11:18:12 +02:00
Stephane Nicoll
4855bfb152 Merge branch '1.4.x' into 1.5.x 2016-10-24 11:11:56 +02:00
Stephane Nicoll
4ec77d4420 Merge pull request #7193 from izeye:patch-22 
* pr/7193:
  Polish contribution
  Add a missing return
 2016-10-24 11:11:38 +02:00
Stephane Nicoll
a03ce0a9d1 Polish contribution 
Add missing test

Closes gh-7193
 2016-10-24 11:11:15 +02:00
Johnny Lim
0b5fbbedf4 Add a missing return 
This commit adds a missing`return` in `getDataSourceBeanDefinition()`.

See gh-7193
 2016-10-24 10:41:20 +02:00
Stephane Nicoll
74d3a6616b Upgrade to liquibase 3.5.3 
Closes gh-7208
 2016-10-24 10:36:16 +02:00
Stephane Nicoll
aec85787d2 Merge branch '1.4.x' into 1.5.x 2016-10-24 10:08:06 +02:00
Stephane Nicoll
f3c43e5e1a Merge pull request #6966 from izeye:unused-20160921 
* pr/6966:
  Remove unused
 2016-10-24 10:07:48 +02:00
Johnny Lim
eb7c0e4dc8 Remove unused 
Closes gh-6966
 2016-10-24 10:07:10 +02:00
Stephane Nicoll
b0474b7c9d Merge branch '1.4.x' into 1.5.x 2016-10-22 13:56:42 +02:00
Stephane Nicoll
120ece726d Merge pull request #7203 from kdombeck:fix-typo 
* pr/7203:
  Correct typo in docs
 2016-10-22 13:56:19 +02:00
Ken Dombeck
4621f82b0e Correct typo in docs 
Closes gh-7203
 2016-10-22 13:56:07 +02:00
Phillip Webb
2ba978b4ad Polish 2016-10-21 10:23:13 -07:00
Madhura Bhave
ab81d993e6 Add CloudFoundryDiscoveryMvcEndpoint 
Update Cloud Foundry support with a discovery endpoint that shows what
endpoints are available.

See gh-7108
 2016-10-21 10:16:09 -07:00
Madhura Bhave
7afb161fcf Add CloudFoundry EndpointHandlerMapping 
Add a CloudFoundryEndpointHandlerMapping that can expose actuator
endpoints for Cloud Foundry "appsmanager" to use.

See gh-7108
 2016-10-21 10:06:34 -07:00
Andy Wilkinson
570b292df7 Disable JspServlet's development mode by default 
This commit switches off the auto-configured JspServlet's
development mode by default. Development mode is then switched on
when DevTools is on the class path.

Closes gh-7039
 2016-10-20 21:02:21 +01:00
Andy Wilkinson
c2d97c9757 Merge branch '1.4.x' into 1.5.x 2016-10-20 20:32:34 +01:00
Andy Wilkinson
5ebfa4b139 Start building against Spring Integration 4.3.5 snapshots 
See gh-7197
 2016-10-20 20:30:52 +01:00
Andy Wilkinson
d7e2708687 Merge branch '1.4.x' into 1.5.x 2016-10-19 16:51:14 +01:00
Andy Wilkinson
999fa123df Deprecate support for Gradle 2.7 and earlier 2016-10-19 16:50:35 +01:00
Andy Wilkinson
129c20965b Merge branch '1.4.x' into 1.5.x 2016-10-19 14:24:24 +01:00
Andy Wilkinson
943a054b61 Remove ineffective, premature optimisation from ErrorPageFilter 
ErrorPageFilter contained an optimisation for looking up the path
of an error page by exception type. For cases where there was no
mapping for the type of the exception that was thrown but there
was a mapping for one of its super classes, it was intended to
speed up the lookup. Unfortunately, there was a bug in the
implementation which meant that the optimisation had no effect.

Analysis with JMH reveals that for an Exception with a deep type
hierarchy, such as Spring Framework's UnsatisfiedDependencyException,
and an error page mapping for Exception, searching up the hierarchy
until a mapping is found takes 0.0000001s. With the same mapping,
a lookup for Exception takes 0.00000001s, i.e. it's 10x faster.
The optimisation, when correctly implemented, brings the time for
UnsatisfiedDependencyException down to 0.00000001s and into line
with a lookup for Exception. However, the amount of time involved is
so small compared to the overall time spent processing a request that
the added complexity of the optimisation is not justified.

Closes gh-7010
 2016-10-19 14:10:34 +01:00
Andy Wilkinson
3ea09d2e04 Merge branch '1.4.x' into 1.5.x 2016-10-19 12:22:11 +01:00
Andy Wilkinson
02e89acd1e Add managed version for kotlin-runtime to spring-boot-parent 
See gh-7101
 2016-10-19 12:20:37 +01:00
Andy Wilkinson
f942fe4947 Merge branch '1.4.x' into 1.5.x 2016-10-19 12:09:35 +01:00
Andy Wilkinson
64d32191cf Ignore Kotlin annotations when creating test context cache key 
Every classes that's compiled by Kotlin is annotated with
kotlin.Metadata. The attributes of this annotation always differ so
if they are used in the cache key, context caching will effectively
be disabled.

This commit updates the key used by ImportsContextCustomizer to
ignore the kotlin.Metadata annotation. Additionally, to align with
with Java where annotations in java.lang.annotation are ignored,
annotations in kotlin.annotation are also ignored.

Closes gh-7101
 2016-10-19 12:03:33 +01:00
Andy Wilkinson
c9e6aff374 Merge branch '1.4.x' into 1.5.x 2016-10-19 10:51:53 +01:00
Andy Wilkinson
639b0f554d Suggest the use of @AutoConfigureMockMvc when using WebEnvironment.MOCK 
Closes gh-7112
 2016-10-19 10:51:42 +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
Andy Wilkinson
7d68c14d03 Merge branch '1.4.x' into 1.5.x 2016-10-19 10:36:48 +01:00
Andy Wilkinson
a531173691 Merge pull request #7183 from Raja Dilip Kolli 
* gh-7183:
  Update docs on using Thmyeleaf 3 to reference latest version
 2016-10-19 10:36:37 +01:00
Raja Dilip Kolli
4b1ddddea3 Update docs on using Thmyeleaf 3 to reference latest version 
Closes gh-7183
 2016-10-19 10:34:11 +01:00
Andy Wilkinson
de578cb004 Upgrade to Spring Web Services 2.4.0.RELEASE 
Closes gh-7185
 2016-10-19 10:31:53 +01:00
Andy Wilkinson
a416f496c0 Clean up deprecation and unused code warnings 2016-10-18 20:43:05 +01:00
Andy Wilkinson
c58852e05b Start building against Spring Security 4.2.0 snapshots 
See gh-7186
 2016-10-18 20:29:24 +01:00