Stephane Nicoll
6f38b54800
Merge pull request #2997 from Riggs333/patch-1
...
* patch-1:
Fix typo in javadoc
2015-05-18 15:29:16 +02:00
Thomas Traude
8b7f318d6b
Fix typo in javadoc
...
Closes gh-2997
2015-05-18 15:28:37 +02:00
Andy Wilkinson
5cd18e121b
Merge branch '1.2.x'
2015-05-18 13:51:34 +01:00
Andy Wilkinson
c5b5932c0c
Upgrade to thymeleaf-extras-springsecurity3 2.1.2.RELEASE
...
Closes gh-2975
2015-05-18 13:47:30 +01:00
Andy Wilkinson
615e1afe80
Upgrade to Spring Loaded 1.2.3.RELEASE
...
Closes gh-2974
2015-05-18 13:47:30 +01:00
Andy Wilkinson
3d68216bf7
Upgrade to Liquibase 3.3.3
...
Closes gh-2973
2015-05-18 13:47:30 +01:00
Andy Wilkinson
83d718de79
Upgrade to HornetQ 2.4.7.Final
...
Closes gh-2972
2015-05-18 13:47:29 +01:00
Andy Wilkinson
f9b8c85de1
Upgrade to Hibernate 4.3.10.Final
...
Closes gh-2971
2015-05-18 13:47:29 +01:00
Andy Wilkinson
fc2b4ea8c3
Upgrade to Jetty 9.2.10
...
Closes gh-2970
2015-05-18 13:47:29 +01:00
Andy Wilkinson
28bfdef325
Upgrade to ActiveMQ 5.10.2
...
Closes gh-2969
2015-05-18 13:47:24 +01:00
Andy Wilkinson
cdac992ff5
Upgrade to thymeleaf-layout-dialect 1.2.8
...
Closes gh-2968
2015-05-18 13:42:27 +01:00
Andy Wilkinson
b2f5b1ed46
Upgrade to mysql-connector-java 5.1.35
...
Closes gh-2967
2015-05-18 13:41:57 +01:00
Andy Wilkinson
ffabf16a02
Upgrade to Jackson 2.4.6
...
Closes gh-2966
2015-05-18 13:41:29 +01:00
Andy Wilkinson
c2476e039f
Fix SpringApplicationTests.customBannerWithProperties on Windows
...
Closes gh-2964
2015-05-18 10:03:59 +01:00
Andy Wilkinson
f1266130fa
Remove dependency management for spring-erlang
...
spring-erlang is no longer part of Spring AMQP so the dependency
management for it is no longer required.
Closes gh-2946
2015-05-15 22:12:03 +01:00
Andy Wilkinson
8fcc66939c
Merge branch '1.2.x'
2015-05-15 21:25:07 +01:00
Andy Wilkinson
b7d27145e8
Upgrade to Spring Integration 4.1.4.RELEASE
...
Fixes gh-2811
2015-05-15 21:17:32 +01:00
Andy Wilkinson
e5451ab4fe
Upgrade to Tomcat 8.0.22
...
Closes gh-2955
2015-05-15 21:17:04 +01:00
Andy Wilkinson
18d8564d85
Upgrade to Spring Social 1.1.1.RELEASE
...
Closes gh-2954
2015-05-15 21:16:11 +01:00
Stephane Nicoll
b96e878305
Switch to Apache US mirror
2015-05-15 17:38:05 +02:00
Stephane Nicoll
9a15d0533c
Upgrade to Tomcat 8.0.22
...
Closes gh-2955
2015-05-15 17:37:45 +02:00
Stephane Nicoll
80ecb8220d
Add explicit dependency to CacheAutoConfiguration
...
Make sure that the cache statistics auto-configuration is evaluated after
the cache auto-configuration itself.
See gh-2633
2015-05-15 16:57:45 +02:00
Stephane Nicoll
62a2dd659b
Add display-name option
...
Allow the display-name of the application to be customized when deployed
in an embedded container via the `server.display-name` property.
Closes gh-2600
2015-05-15 16:27:43 +02:00
Stephane Nicoll
0a9b8cbb41
Polish Infinispan support
...
Updated to the `EmbeddedCacheManager` interface and added support for
default cache configuration.
Added dependencies management for the JCache support with tests
Fixes gh-2906, see gh-2633
2015-05-15 15:21:05 +02:00
Eddú Meléndez
76ac781a65
Add support for Infinispan
...
Include auto-configuration support for Infinispan. It is possible
to specify the caches to create via `spring.cache.cache-names`.
Provider also allow to set configuration file via `spring.cache.config`.
See gh-2633
2015-05-15 15:18:49 +02:00
Stephane Nicoll
d63d2dded8
polish
...
Improve documentation of cors settings.
See gh-2936
2015-05-15 08:45:15 +02:00
Andy Wilkinson
b45a2bcfc0
Update javadoc following removal of deprecated APIs
...
See gh-2697
2015-05-14 19:43:57 +01:00
Andy Wilkinson
e3a53cb087
Remove classes and methods deprecated since 1.2 and earlier
...
Closes gh-2697
2015-05-14 19:00:12 +01:00
Andy Wilkinson
9243faa354
Upgrade to Reactor and Reactor Spring 2.0.1.RELEASE
...
Closes gh-2719
2015-05-14 17:09:58 +01:00
Andy Wilkinson
5b8a9bbe90
Upgrade to Spock 1.0
...
Closes gh-2951
2015-05-14 17:04:10 +01:00
Andy Wilkinson
04c68427d8
Upgrade to Spring Plugin 1.2.0.RELEASE
...
Closes gh-2605
2015-05-14 17:00:53 +01:00
Andy Wilkinson
3abac59e9c
Add dependency management for jackson-dataformat-csv
...
Closes gh-2760
2015-05-14 15:00:51 +01:00
Andy Wilkinson
f3af9a81c7
Upgrade to HikariCP 2.3.7
...
Closes gh-2863
2015-05-14 14:56:03 +01:00
Andy Wilkinson
aa1f84d037
Make OnBeanCondition package private again
...
It was accidentally made public in 45b579c .
Closes gh-2741
2015-05-14 14:42:43 +01:00
Andy Wilkinson
296a9d6cf0
Upgrade to Spring AMQP 1.5.0.M1
...
Closes gh-2946
2015-05-14 14:06:29 +01:00
Andy Wilkinson
291173ddc6
Upgrade to JsonPath 2.0.0
...
Closes gh-2720
2015-05-14 13:40:54 +01:00
Andy Wilkinson
84d3a34c49
Add CORS support to the actuator’s endpoints
...
This commit adds CORS support to the Actuator’s MVC endpoints. CORS
support is disabled by default and is only enabled once the
endpoints.cors.allowed-origins property has been set.
The new properties to control the endpoints’ CORS configuration are:
endpoints.cors.allow-credentials
endpoints.cors.allowed-origins
endpoints.cors.allowed-methods
endpoints.cors.allowed-headers
endpoints.cors.exposed-headers
The changes to enable Jolokia-specific CORS support (57a51ed ) have been
reverted as part of this commit. This provides a consistent approach
to CORS configuration across all endpoints, rather than Jolokia using
its own configuration.
See gh-1987
Closes gh-2936
2015-05-14 11:39:53 +01:00
Stephane Nicoll
b466229231
Restore proper customization of JCache CacheManager
...
Work in 1b3efd4 actually introduced a regression: if a CacheManager is
created via a custom configuration file, it is no longer post-processed.
This commit makes sure to also customize a CacheManager that was
created that way.
See gh-2848
2015-05-13 18:18:15 +02:00
Stephane Nicoll
c0e9ed1e34
Fix typo
2015-05-13 18:11:42 +02:00
Andy Wilkinson
7a47c4b594
Add dependency management for org.apache.httpcomponents:httpcore
...
Without dependency management for org.apache.httpcomponents:httpcore,
it’s possible to get mismatched versions of httpcore and httpclient.
Closes gh-2941
2015-05-13 16:25:48 +01:00
Tommy Ludwig
a88be00b6c
Upgrade to Log4j2 version 2.2
...
Closes gh-2938
2015-05-13 14:18:57 +01:00
Davide Angelocola
c82224831a
Add dependency management for slf4j-simple
...
Closes gh-2934
2015-05-13 14:16:32 +01:00
Andy Wilkinson
5717c38c63
Upgrade to Apache HTTP Client 4.4.1
...
Closes gh-2941
2015-05-13 14:02:03 +01:00
Andy Wilkinson
a012538955
Merge branch 'feature/metrics'
2015-05-13 13:56:10 +01:00
Dave Syer
64af3272a1
Extract metric export into a separate autoconfig class
...
This avoids a potential problems with ordering between Dropwizard and
normal repository configuration. A Dropwizard sample has been added to
verify the behaviour.
2015-05-13 13:56:03 +01:00
Dave Syer
7be13b28bd
Add tests for new features
2015-05-13 13:56:03 +01:00
Dave Syer
270d5e3205
Add @ActuatorMetricRepository to qualify the "native" repository
...
Primarily when it is needed for metric export.
2015-05-13 13:56:02 +01:00
Dave Syer
2f2750e713
Extract metric writers into a MetricExporters composite
...
Adds a separate exporter per MetricWriter and allows individual
configuration of exporters for fine-grained control of schedules
and patterns etc.
2015-05-13 13:56:02 +01:00
Dave Syer
0ce72105b9
Add JMX to Redis sample
2015-05-13 13:56:02 +01:00
Dave Syer
089b1d05dc
Add support for sendLatest=true/false in exporter
...
Also fix bug in includes/excludes
2015-05-13 13:56:02 +01:00