Commit Graph

50613 Commits

Author SHA1 Message Date
Andy Wilkinson
999fa123df Deprecate support for Gradle 2.7 and earlier 2016-10-19 16:50:35 +01:00
Andy Wilkinson
2017e763c3 Merge branch '1.5.x' 2016-10-19 14:24:37 +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
86034e5c5c Merge branch '1.5.x' 2016-10-19 12:22:23 +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
b1026db330 Merge branch '1.5.x' 2016-10-19 12:09:46 +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
8a547facd1 Merge branch '1.5.x' 2016-10-19 10:52:07 +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
57450042bb Merge branch '1.5.x' 2016-10-19 10:44:27 +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
3dd0b9d59a Merge branch '1.5.x' 2016-10-19 10:37:00 +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
81d8e4ab89 Merge branch '1.5.x' 2016-10-19 10:32:30 +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
a4bc341028 Merge branch '1.5.x' 2016-10-18 20:45:40 +01:00
Andy Wilkinson
a416f496c0 Clean up deprecation and unused code warnings 2016-10-18 20:43:05 +01:00
Andy Wilkinson
f17be6e9f1 Merge branch '1.5.x' 2016-10-18 20:29:55 +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
Andy Wilkinson
2a685a8c15 Merge branch '1.5.x' 2016-10-18 13:47:33 +01:00
Andy Wilkinson
b7c55fb192 Merge branch '1.4.x' into 1.5.x 2016-10-18 13:47:20 +01:00
Andy Wilkinson
a31180dd68 Avoid calling URL.getContent() when defining a package
URL.getContent() is shorthand for URL.openConnection().getContent().
It creates an InputStream that isn't explicitly closed. This means
that a file handle remains open until the URLConnection is garbage
collected. This can lead to the process exceeding the limit for open
files.

Previously, LaunchedURLClassLoader was using getConent() when
proactively defining a package for a class that is about to be loaded.
getContent() was used to access nested jar files to check if they
contained the package and, if so, to retrieve the jar's manifest.

In place of using getContent(), this commit uses JarURLConnection's
getJarFile() method which provides access to the JarFile without the
unwanted side-effect of opening an input stream.

Closes gh-7180
2016-10-18 13:35:33 +01:00
Stephane Nicoll
d79546da74 Merge branch '1.5.x' 2016-10-17 17:52:29 +03:00
Stephane Nicoll
6186262ecc Switch excludeDevtools to true by default
Switch the default value of `excludeDevtools` from `false` to `true` as
it is more sensible to exclude such dependency by default.

Closes gh-7170
2016-10-17 17:52:12 +03:00
Andy Wilkinson
e49b5f241e Merge branch '1.5.x' 2016-10-17 15:30:02 +01:00
Andy Wilkinson
57108a9faa Try to make the tests for the Cassandra sample more robust
Cassandra sometimes takes a long time when dropping the test keyspace.
This results in the test failing due to an exception being thrown.
This commit attempts to make the tests more robust by catching and
logging any exceptions thrown during server cleanup.
2016-10-17 15:28:50 +01:00
Stephane Nicoll
cc14e04b5a Merge branch '1.5.x' 2016-10-15 08:10:30 +03:00
Stephane Nicoll
980fb16d9d Merge pull request #7166 from artembilan:SI_Java_DSL_1.2.GA
* pr/7166:
  Upgrade to Spring Integration Java DSL 1.2.0.RELEASE
2016-10-15 08:09:48 +03:00
Artem Bilan
c9aee66792 Upgrade to Spring Integration Java DSL 1.2.0.RELEASE
Closes gh-7166
2016-10-15 08:09:16 +03:00
Andy Wilkinson
471c13c28d Merge branch '1.5.x' 2016-10-14 14:09:19 +01:00
Andy Wilkinson
18db285ad2 Upgrade to Spring Retry 1.2.0.RC1
Closes gh-7136
2016-10-14 14:08:27 +01:00
Andy Wilkinson
f48545bd57 Merge branch '1.5.x' 2016-10-14 09:20:12 +01:00
Andy Wilkinson
899b8a04cb Merge branch '1.4.x' into 1.5.x 2016-10-14 09:20:02 +01:00
Andy Wilkinson
24f8c737fb Make relative PID_FOLDER and LOG_FOLDER absolute using jar's directory
Closes gh-7092
Closes gh-7093
2016-10-14 09:19:11 +01:00
Andy Wilkinson
84c9c7bd92 Merge branch '1.5.x' 2016-10-13 16:55:33 +01:00
Andy Wilkinson
57b7357be7 Merge branch '1.4.x' into 1.5.x 2016-10-13 16:55:21 +01:00
Andy Wilkinson
03deff9a1c Handle relative pid folder correctly in the launch script
Previously, a relative PID folder was not handled correctly when
running stop, status, or force_reload. This meant that a service
could be started when configured to use a relative pid file, but
then could not be stopped.

The PID folder should be treated as relative to the service's jar
file. This commit updates stop, status, and force_reload to push the
jar file's directory so that this is now the case for those three
commands.

Closes gh-7092
2016-10-13 16:51:54 +01:00
Andy Wilkinson
7c870ea4fb Merge branch '1.5.x' 2016-10-13 12:30:16 +01:00
Andy Wilkinson
29d4a01b30 Merge branch '1.4.x' into 1.5.x 2016-10-13 12:30:05 +01:00
Andy Wilkinson
7968c6b548 Assign on order to OnPropertyCondition
Closes gh-7144
2016-10-13 12:29:35 +01:00
Andy Wilkinson
cc04621dc2 Assign an order to OnResourceCondition
Closes gh-7145
2016-10-13 12:27:47 +01:00
Andy Wilkinson
d1f164e1d3 Merge branch '1.5.x' 2016-10-13 09:56:16 +01:00
Andy Wilkinson
2137491d03 Add dependency management for spring-session-data-geode
Closes gh-7159
2016-10-13 09:55:45 +01:00