Commit Graph

5742 Commits

Author SHA1 Message Date
Phillip Webb
fffc6f5dd2 Merge branch '1.2.x' 2015-06-18 12:52:56 -07:00
Phillip Webb
1e40bff174 Polish 2015-06-18 12:52:41 -07:00
Andy Wilkinson
c60d65823b Merge branch '1.2.x' 2015-06-18 17:02:49 +01:00
Andy Wilkinson
a21b48a95c Upgrade to GemFire 8.1.0
This commit aligns our dependency management for GemFire with the
version used by the version of Spring Data GemFire that we currently
depend upon.

Previously, some dependency management that was added (see #2884) to
work around problems with GemFire 8.0’s dependencies; specifically it
depended on different versions of org.eclipse.jdt.core.compiler:ecj and
xml-apis:xml-apis. The different dependency versions appear to no
longer be a problem with 8.1 so this dependency management is now
redundant and has been removed.

Closes gh-3284
2015-06-18 17:02:28 +01:00
Andy Wilkinson
7d80f0efea Update tests so that they also work on Windows
See gh-3274
2015-06-18 17:01:09 +01:00
Stephane Nicoll
c64da5d1d6 Merge pull request #3283 from izeye/mbeanserver
* mbeanserver:
  Fix default MBeanServer bean name in doc
2015-06-18 17:46:27 +02:00
izeye
436054053c Fix default MBeanServer bean name in doc
Closes gh-3283
2015-06-18 17:46:05 +02:00
Stephane Nicoll
b2960a7221 Fix typo 2015-06-18 16:55:59 +02:00
Stephane Nicoll
df4e08834b Fix inconsistency in doc
See gh-3280
2015-06-18 16:55:28 +02:00
Andy Wilkinson
fd6d61e8b4 Add auto-configuration support for Spring Session
This commit adds support for automatically configuring Spring Session.
In a web application when both Spring Session and Spring Data Redis
are on the classpath, Spring Session's Redis Http Session support
will be auto-configured. The max inactive interval for Redis-backed
sessions can be configured via the environment using the existing
server.session-timeout property.

Closes gh-2318
2015-06-18 14:52:59 +01:00
Stephane Nicoll
dc6a2f057c Merge pull request #3069 from eddumelendez/gh-3031
* gh-3031:
  Add support for FieldNamingStrategy
2015-06-18 15:45:13 +02:00
Eddú Meléndez
58ca6cdc76 Add support for FieldNamingStrategy
Closes gh-3031
Closes gh-3069
2015-06-18 15:44:32 +02:00
Andy Wilkinson
b31c995b7a Merge branch 'gh-2843' 2015-06-18 14:14:32 +01:00
Andy Wilkinson
3c9535f26b Add dependency management for Jaybird, Firebird's JDBC driver
Closes gh-2843
2015-06-18 14:13:35 +01:00
Kamil Szymanski
008dee5dce Add JDBC url to Driver class name mappings for DB2, Teradata and Firebird
See gh-2843
2015-06-18 14:10:09 +01:00
Andy Wilkinson
b27510f898 Merge branch '1.2.x' 2015-06-18 13:34:40 +01:00
Andy Wilkinson
4d0996b1bd Start building against Spring 4.1.7 snapshots
See gh-3276
2015-06-18 13:34:21 +01:00
Andy Wilkinson
a6a8d0b221 Merge branch '1.2.x' 2015-06-18 13:31:29 +01:00
Andy Wilkinson
af067ae28b Add files that were accidentally omitted from 5e743fb2
See gh-3274
2015-06-18 13:30:20 +01:00
Stephane Nicoll
67fe14eca2 Merge pull request #3272 from dgomesbr/master
* pull3272:
  Upgrade to Hazelcast 3.5
2015-06-18 14:17:42 +02:00
dgomesbr
1ebbf8ac4d Upgrade to Hazelcast 3.5
Closes gh-3267
Closes gh-3272
2015-06-18 14:12:28 +02:00
Stephane Nicoll
be5e30b409 Migrate spring.view properties
Migrate `spring.view.prefix` and `spring.view.suffix` to
`spring.mvc.view.prefix` and `spring.mvc.view.suffix` respectively. The
former properties are still handled in a backward compatible way and are
defined as deprecated in the meta-data.

Closes gh-3250
2015-06-18 13:55:44 +02:00
Andy Wilkinson
77f303b42c Merge branch '1.2.x' 2015-06-18 12:38:33 +01:00
Andy Wilkinson
5e743fb299 Fully honour local repository location configured in settings.xml
Previously, DefaultRepositorySystemSessionAutoConfiguration would
read the local repository configuration from settings.xml, but did
not perform any property interpolation. This would leave placeholders
such as ${user.home} as-is and result in the use of the wrong
location. To address this, the code that reads settings.xml has been
updated to provide the current System properties as a property
interpolation source.

RepositoryConfigurationFactory configures the local repository as a
"remote" repository when the local repository location has been
overridden. This allows spring grab to copy dependencies from the
local repository into the grab output location (configured via the
grape.root system property) rather than having to download them again.
This logic did not consider the customization of the local repository
location via settings.xml so the dependencies would be downloaded again.
To address this, RepositoryConfigurationFactory has been updated to
attempt to use the location configured in settings.xml, before falling
back to the default location.

The logic that reads settings.xml has deliberately been duplicated. It
could have been extracted into a separate class, but this is only a
temporary measure until gh-3275 is tackled. Duplication was deemed
preferable to adding a new public class in 1.2.x that we’d then want to
remove in 1.3.

Closes gh-3274
2015-06-18 12:37:19 +01:00
Stephane Nicoll
e026c7a8a3 Merge branch '1.2.x' 2015-06-18 13:08:47 +02:00
Stephane Nicoll
bbb0b7a80b Allow equal or colon in property value
Closes gh-3273
2015-06-18 12:54:53 +02:00
Stephane Nicoll
7ed1aa279a Add Informix specific health query
Closes gh-1287
2015-06-18 10:13:32 +02:00
Stephane Nicoll
9250d7835c Merge pull request #2565 from joshiste/db2-health
* db2-health:
  Add DB2 specific health query
2015-06-18 10:11:46 +02:00
Johannes Stelzer
ea2a09cbf6 Add DB2 specific health query
Closes gh-2565
2015-06-18 10:11:02 +02:00
Stephane Nicoll
2801f6a848 Merge pull request #2792 from jazir1979/master
* pull2792:
  Add useTestClassPath to run/start maven goals
2015-06-18 09:37:50 +02:00
Daniel Young and Mathew Johnson
e3c2fb7287 Add useTestClassPath to run/start maven goals
Add `useTestClasspath` flag to add test dependencies to the classpath of
the application. Works with both the `start` and `run` goals.

Closes gh-2792
2015-06-18 09:33:44 +02:00
Stephane Nicoll
8230d2cb8f Merge pull request #3266 from lejeunen/master
* pull3266:
  Polish
  Better sanitizer default for sensitive keys
2015-06-18 08:52:59 +02:00
Stephane Nicoll
fd5d6ef303 Polish 2015-06-18 08:52:47 +02:00
nlejeune
205c86f54c Better sanitizer default for sensitive keys
Add the CloudFoundry vcap_services key, as well as a regular expression
to sanitize any key containing the word 'credentials'.

Fixes gh-3248
Closes gh-3266
2015-06-18 08:11:39 +02:00
Phillip Webb
c3b344fdc2 Polish 2015-06-17 12:42:06 -07:00
Stephane Nicoll
b5d49b3099 Expose additional admin features
Improve SpringApplicationAdminMXBean to expose additional information:

* Whether the application uses an embedded container
* The properties exposed by the `Environment`

This allows to know if the application is web-based and the HTTP port
on which it is running.

Closes gh-3067
2015-06-17 11:52:18 +02:00
Stephane Nicoll
c177a774a5 Provide seamless support for local.server.port
Previously, the actual HTTP port on which a web application is running on
was only exposed in tests. This commit makes sure to provide that feature
regardless of the environment so that applications can know on which port
they are actually running on.

If there are several containers, each is exposed via the namespace of
their respective application context.

Closes gh-3259
2015-06-17 11:47:05 +02:00
Stephane Nicoll
cb98ee25ff Polish
See gh-2900
2015-06-17 09:27:44 +02:00
Phillip Webb
8b9c38085a Merge pull request #3117 from izeye/metrics
* metrics2:
  Remove duplicate code in new metrics code
2015-06-16 22:03:43 -07:00
izeye
b47634176f Remove duplicate code in new metrics code
Refactor BufferMetricReader, CounterBuffers and GaugeBuffers to reduce
duplicate code.

Closes gh-3117
2015-06-16 22:03:22 -07:00
Phillip Webb
7e5b08e0cd Merge pull request #3119 from izeye/codahale
* codahale:
  Change Codahale to Dropwizard in Javadoc.
2015-06-16 21:40:39 -07:00
izeye
de91dc0de7 Change Codahale to Dropwizard in Javadoc. 2015-06-16 21:39:00 -07:00
Phillip Webb
93e6a7171b Merge pull request #3126 from eddumelendez/gh-3105
* gh-3105:
  Remove deprecated SimpleMongoDbFactory call
2015-06-16 21:38:15 -07:00
Eddú Meléndez
4883a5240a Remove deprecated SimpleMongoDbFactory call
Update MongoAutoConfiguration to create a `MongoClient` bean rather than
`Mongo` and update `MongoDataAutoConfiguration` to remove the call to
the deprecated `SimpleMongoDbFactory`.

Fixes gh-3105
Closes gh-3126
2015-06-16 21:33:36 -07:00
Phillip Webb
73d5a858c5 Polish 2015-06-16 21:01:37 -07:00
Sebastien Deleuze
78a7b6ed66 Add async request timeout property
Add a new `spring.mvc.async.request-timeout` property which can be used
to configure AsyncSupportConfigurer.setDefaultTimeout(..).

Fixes gh-2900
Closes gh-3236
2015-06-16 21:00:43 -07:00
Phillip Webb
295f9c6296 Merge pull request #3245 from dgomesbr/master
* pull3245:
  Upgrade joda-time to 2.8.1
2015-06-16 20:50:25 -07:00
Diego Magalhães
1875192dad Upgrade joda-time to 2.8.1
Fixes gh-3238
Closes gh-3245
2015-06-16 20:49:21 -07:00
Phillip Webb
4db23f69e8 Switch to Spring Framework 4.2 SNAPSHOT 2015-06-16 17:27:00 -07:00
Phillip Webb
af5338f26e Formatting 2015-06-16 17:26:26 -07:00