Commit Graph

7079 Commits

Author SHA1 Message Date
Andy Wilkinson
af32d6e8ee Allow LOG_FOLDER and PID_FOLDER defaults to be set at build time
This commit enhances the default launch script to allow the default
values for LOG_FOLDER and PID_FOLDER to be set at build time. They
can now be set using the logFolder and pidFolder properties
respectively.

Closes gh-4787
2016-02-25 12:25:41 +00:00
Andy Wilkinson
01b7a7d9d3 Add missing copyright headers 2016-02-25 12:12:57 +00:00
Andy Wilkinson
44ddfcc7fa Upgrade copyright headers of all files changed in 2016 2016-02-25 12:09:42 +00:00
Andy Wilkinson
d9382244d8 Handle mixture of encoded and unencoded chars in JarURLConnection
Previously, JarURLConnection would corrupt a URL that contained a
mixture of encoded and unencoded double-byte characters. URLs that
only contained unencoded double-byte characters were not affected as
they are passed through as-is.

This commit updates JarURLConnection.JarEntryName to correctly handle
characters with a value that won't fit in a single signed byte (a
value greater than 127). Such characters are now URL encoded and then
written to the output stream as multiple bytes.

Closes gh-5194
2016-02-25 11:48:03 +00:00
Andy Wilkinson
4d208c7717 Merge branch '1.3.x' 2016-02-25 10:53:26 +00:00
Andy Wilkinson
b6c509bd75 Merge branch '1.3.x' 2016-02-25 10:51:58 +00:00
Andy Wilkinson
5d1ee87e81 Upgrade to Spring Framework 4.2.5.RELEASE 2016-02-25 10:45:57 +00:00
Andy Wilkinson
6075682e64 Polishing
- Code formatting
 - Javadoc warnings
 - Deprecation warnings
2016-02-24 17:05:54 +00:00
Andy Wilkinson
6bb9eb421f Merge branch '1.3.x' 2016-02-24 16:49:27 +00:00
Andy Wilkinson
1c715ab282 Upgrade to Jetty 9.2.15.v20160210
Upgrade to Jetty 9.2.15 and replace use of API that was deprecated
and changed to throw an UnsupportedOperationException in the same
release.

Closes gh-5218
2016-02-24 16:49:22 +00:00
Andy Wilkinson
7d84273d98 Merge branch '1.3.x' 2016-02-24 16:25:02 +00:00
Andy Wilkinson
1735fac3ab Upgrade to Logback 1.1.5
Closes gh-5212
2016-02-24 16:24:10 +00:00
Andy Wilkinson
c14c0ac152 Merge branch '1.3.x' 2016-02-24 15:39:58 +00:00
Andy Wilkinson
ab96962833 Upgrade to Spring AMQP 1.5.4.RELEASE
Closes gh-5224
2016-02-24 15:15:24 +00:00
Andy Wilkinson
efec3b5607 Upgrade to SLF4J 1.7.16
Closes gh-5223
2016-02-24 15:15:23 +00:00
Andy Wilkinson
3eafec5f83 Upgrade to Postgresql 9.4.1208.jre7
Closes gh-5222
2016-02-24 15:15:23 +00:00
Andy Wilkinson
f5e450ebf7 Upgrade to Jolokia 1.3.3
Closes gh-5221
2016-02-24 15:15:23 +00:00
Andy Wilkinson
a33325e3da Upgrade to Hibernate Validator 5.2.4.Final
Closes gh-5220
2016-02-24 15:15:23 +00:00
Andy Wilkinson
0c389945da Upgrade to Jersey 2.22.2
Closes gh-5219
2016-02-24 15:15:23 +00:00
Andy Wilkinson
f734fd8d17 Upgrade to ActiveMQ 5.12.3
Closes gh-5217
2016-02-24 15:15:22 +00:00
Andy Wilkinson
1b84ccb449 Upgrade to thymeleaf-layout-dialect 1.3.3
Closes gh-5216
2016-02-24 15:15:22 +00:00
Andy Wilkinson
ea34dcdcde Upgrade to HikariCP-java6 2.3.13
Closes gh-5215
2016-02-24 15:15:22 +00:00
Andy Wilkinson
beb5f0bd41 Upgrade to Hazelcast 3.5.5
Closes gh-5214
2016-02-24 15:15:22 +00:00
Andy Wilkinson
d9814bf529 Upgrade to H2 1.4.191
Closes gh-5213
2016-02-24 15:15:22 +00:00
Andy Wilkinson
2429e1a7e8 Merge branch '1.3.x' 2016-02-24 14:18:56 +00:00
Andy Wilkinson
718f509271 Upgrade to Dependency Management Plugin 0.5.6.RELEASE
Closes gh-5211
2016-02-24 14:18:32 +00:00
Andy Wilkinson
d3fc0a4733 Placate javac and its inferior type inferencing
The Eclipse compiler is perfectly happy with the original code, but
javac is not. This commit adds some explicit typing to keep javac
happy.
2016-02-24 13:24:36 +00:00
Stephane Nicoll
0e43f4204f Merge branch '1.3.x' 2016-02-24 14:09:07 +01:00
Stephane Nicoll
5febd497da Support customization of CacheManager
This commit allows to customize the auto-configured `CacheManager` by
exposing a bean of type `CacheManagerCustomizer`. The implementation may
reference the type of a `CacheManager` to determine in which case it has
to be invoked.

Several implementations can be provided and ordered using the regular
`Ordered` interface and `@Order` annotation.

Closes gh-5039
2016-02-24 14:00:38 +01:00
Andy Wilkinson
ef44d660bb Merge branch '1.3.x' 2016-02-24 12:55:03 +00:00
Andy Wilkinson
ce71bd997c Remove redundant public modifier 2016-02-24 12:51:33 +00:00
Andy Wilkinson
8f1f12be6a Fix Checkstyle warning introduced in forward merge (852ba546) 2016-02-24 12:37:06 +00:00
Andy Wilkinson
bee651fc17 Merge branch '1.3.x' 2016-02-24 12:37:00 +00:00
Andy Wilkinson
13971692dc Docs and actuator endpoints can be enabled when endpoints.enabled=false
Previously, if endpoints.enabled was false setting
endpoints.docs.enabled=true or endpoints.actuator.enabled=true would
have no effect as their entire configuration class was conditional
on endpoints.enabled being true.

This commit updates the conditions on the configuration class so that
it is conditional on either the actuator or docs endpoint being enabled.

Closes gh-5007
2016-02-24 12:32:09 +00:00
Andy Wilkinson
852ba54613 Merge branch '1.3.x' 2016-02-24 12:09:07 +00:00
Andy Wilkinson
72aae34b67 Merge pull request #5032 from Matt Benson
* gh-5032:
  Fix logic for disabling plugins in CrshAutoConfiguration
2016-02-24 11:56:35 +00:00
Matt Benson
2a9e6c40ed Fix logic for disabling plugins in CrshAutoConfiguration
Plugin disabling logic was broken by e009d3e4. Prior to this change,
a plugin would be disabled if it or any of the implemented interfaces
in its inheritance hierarchy were configured as being disabled. The
offending commit inverted the logic so that the plugin would be
enabled if any part of it was NOT configured as being disabled.

This commit restores the logic such that the early return happens only
in the negative case.

Previously, the tests were written as though
PluginContext#getPlugin(Class) would consider the specified class
against the runtime type of the plugin (not an unreasonable
assumption); rather this method considers the broader 'plugin type'.
This commit rewrites the test to seek by plugin type and assert the
absence of the disabled plugins.

Closes gh-5032
2016-02-24 11:56:15 +00:00
Andy Wilkinson
36cdc81ef4 Merge branch '1.3.x' 2016-02-24 11:39:10 +00:00
Andy Wilkinson
aa17599675 Clarify handling of files specified in spring.config.location
Closes gh-5147
2016-02-24 11:39:02 +00:00
Andy Wilkinson
e04a8ff57d Merge branch '1.3.x' 2016-02-24 11:05:30 +00:00
Andy Wilkinson
70ab613465 Merge pull request #5168 from Vedran Pavic
* gh-5168:
  Tag Docker images created by launch script integration tests
2016-02-24 11:05:07 +00:00
Vedran Pavic
2641fe8f26 Tag Docker images created by launch script integration tests
Closes gh-5168
2016-02-24 11:04:27 +00:00
Andy Wilkinson
f7eec4b3de Merge branch '1.3.x' 2016-02-24 11:00:15 +00:00
Andy Wilkinson
b061aa5d7e Upgrade to Spring Data Gosling SR4
Closes gh-5119
2016-02-24 10:59:30 +00:00
Andy Wilkinson
03ebef58fb Merge branch '1.3.x' 2016-02-24 10:58:02 +00:00
Andy Wilkinson
b1afd091c2 Document log file endpoint's support for using Range header
Closes gh-5062
2016-02-24 10:56:32 +00:00
Andy Wilkinson
64fd322ad1 Merge branch '1.3.x' 2016-02-24 10:32:32 +00:00
Andy Wilkinson
a6b1f4ce63 Add a note about a fully executable jar's working directory
Closes gh-5164
2016-02-24 10:30:41 +00:00
Andy Wilkinson
a3afc859bd Merge branch '1.3.x' 2016-02-23 17:45:28 +00:00
Andy Wilkinson
617c97322d Allow endpoint paths to be configured via endpoint.<name>.path
Support for configuring an endpoint’s path separately from its id was
introduced in 97255785, but it didn’t work for a variety of reasons:

 1. Some custom MVC endpoints did not have configuration properties
    bound to them
 2. Some generic endpoints rejected the path property as they were
    configured not to ignore unknown fields
 3. The property used to configure the path was dependent on the id
    of the endpoint. This meant that the path property’s name would
    change if the endpoint’s id was changed

This commit addresses these problems:

 1. @ConfigurationProperties has been added to custom MvcEndpoints where
    it was missing
 2. Generic endpoints have been updated to ignore unknown fields,
    allowing the path of their MVC adapter to be configured
 3. Rather than using the id of a generic endpoint to determine the name
    of its path property, the prefix or value of the endpoint’s
    @ConfigurationProperties annotation is used instead. Any generic
    endpoint that is not annotated with @ConfigurationProperties is
    ignored, making its path unconfigurable.

Closes gh-5105
2016-02-23 17:06:51 +00:00