Commit Graph

50613 Commits

Author SHA1 Message Date
Josh Thornhill
a1e3a5a861 Fix missing space in logging message
Closes gh-3298
2015-06-21 06:40:24 +02:00
Phillip Webb
8fb0441602 Merge pull request #2913 from akonczak/master
* pr/2913:
  Enable non local node Elasticsearch instances
2015-06-19 16:24:12 -07:00
Artur Konczak
2e66f17491 Enable non local node Elasticsearch instances
Update ElasticsearchAutoConfiguration to allow `http.enabled` and
`node.local` settings to be specified by ElasticsearchProperties.

Fixes gh-2805
Closes gh-2913
2015-06-19 16:20:23 -07:00
Phillip Webb
f22c91ac94 Add chkconfig comment to launch script
Update the embedded launch script to include a `chkconfig` comment. This
solves the "Service doesn't support chkconfig" error when executing
the chkconfig command.

Fixes gh-3115
2015-06-19 15:43:05 -07:00
Phillip Webb
f65dfe4bcb Fix javadoc errors and warnings 2015-06-19 14:04:55 -07:00
Phillip Webb
890554e8d6 Exclude commons-logging from infinispan-spring4
Update `spring-boot-dependencies` to exclude `commons-logging` from
`infinispan-spring4`. The version pulled in was very old and included
a transitive dependency to `servlet-api` 2.4.

Fixes gh-3291
2015-06-19 14:02:16 -07:00
Phillip Webb
805263ac62 Add org.json:json to spring-boot-dependencies
Fixes gh-3290
2015-06-19 14:02:16 -07:00
Stephane Nicoll
2ff9299bcf Fix typo 2015-06-19 15:53:17 +02:00
Phillip Webb
8f16ebd059 Use Spring Data Gosling snapshots
Upgrade to Spring Data Gosling snapshot version in preparation for
Gosling-M2.

See gh-3288
2015-06-18 23:51:14 -07:00
Phillip Webb
a48ed907e4 Merge branch '1.2.x' 2015-06-18 23:26:14 -07:00
Phillip Webb
2b13736ae8 Merge pull request #3255 from mbenson/open-files
* gh-3255:
  Ignore failures when closing war files in tests
2015-06-18 23:25:50 -07:00
Matt Benson
38e935ee5e Ignore failures when closing war files in tests
Update WarPackagingTests to ignore any IOExceptions when closing
created war files. Exceptions were sometimes thrown when running on a
Linux NTFS mount.

Fixes gh-3255
2015-06-18 23:23:07 -07:00
Phillip Webb
3458b94612 Merge pull request #3243 from joshiste/init-improvements
* init-improvements:
  Update executable jar documentation
  Improve executable jar launch script
2015-06-18 23:11:35 -07:00
Phillip Webb
c417e90215 Update executable jar documentation
See gh-3243
2015-06-18 23:11:12 -07:00
Johannes Stelzer
f0bb60bf9d Improve executable jar launch script
Update the launch script used in fully executable jars to:

- Include LSB-Header comments
- Source `.conf` files either next to the jar for additional script
  configuration

Fixes gh-3243
2015-06-18 23:11:07 -07:00
Phillip Webb
a0dde9f17d Merge pull request #3246 from eddumelendez/gh-3154
* gh-3154:
  Document Apache Artemis support
  Add Apache Artemis Starter POM
  Add Apache Artemis support
2015-06-18 21:54:03 -07:00
Phillip Webb
3e4bbf05cd Document Apache Artemis support
See gh-3154
2015-06-18 21:00:34 -07:00
Phillip Webb
6877c4c40f Add Apache Artemis Starter POM
See gh-3154
2015-06-18 21:00:33 -07:00
Eddú Meléndez
8859824efc Add Apache Artemis support
Add auto-configuration support for Apache Artemis which was formed when
HornetQ was donated to the Apache Foundation. The majority of this code
is based on the HornetQ auto-configuration.

Fixes gh-3154
Closes gh-3246
2015-06-18 20:23:31 -07:00
Phillip Webb
e6d5d7c7ab Fix failing MongoDataAutoConfigurationTests 2015-06-18 14:44:16 -07:00
Phillip Webb
2f16a01dd5 Polish 2015-06-18 14:11:40 -07:00
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