Commit Graph

7124 Commits

Author SHA1 Message Date
Andy Wilkinson
2c619f8d93 Make launch script integration tests compatible with Spring Framework 4.3
Previously, the launch script integration tests used Jackson 2.1 to
align with the requirements of docker-java 2.x. This stopped working
when we upgraded to Spring Framework 4.3 which requires Jackson 2.6+.

This commit updates the launch script integration tests to use
docker-java 3.0.0-RC1 which is compatible with Jackson 2.6.x. An added
benefit is that 3.0 also adds support for copying an archive to a
container, allowing the custom command that performs this function to
be removed.

Closes gh-5278
2016-02-29 11:26:42 +00:00
Stephane Nicoll
1ca9cdabf7 Merge pull request #5204 from uweschaefer/master
* pr/5204:
  Polish contribution
  Add CONF_FOLDER property
2016-02-29 11:42:38 +01:00
Stephane Nicoll
d93b09f497 Polish contribution
Closes gh-5204
2016-02-29 11:42:27 +01:00
Uwe Schaefer
9c3003071b Add CONF_FOLDER property
Closes gh-5203
2016-02-29 11:36:59 +01:00
Andy Wilkinson
0232bef85d Merge branch 'sfw-4.3' 2016-02-26 18:25:06 +00:00
Andy Wilkinson
fa7dfb5109 Ignore tests that are broken by UNDERTOW-639 2016-02-26 18:24:56 +00:00
Andy Wilkinson
65234ce4a1 Start building against Spring Framework 4.3 snapshots
See gh-4900
2016-02-26 18:24:56 +00:00
Stephane Nicoll
9bf95c4215 Merge pull request #5254 from kdombeck/fix-logger-class
* pr/5254:
  Fix logger classname
2016-02-26 16:54:12 +01:00
Ken Dombeck
9f93559d44 Fix logger classname
Closes gh-5254
2016-02-26 16:53:48 +01:00
Stephane Nicoll
2e08502c4d Merge branch '1.3.x' 2016-02-26 11:01:09 +01:00
Stephane Nicoll
5680ffdedb Fixup version numbers following release 2016-02-26 11:00:36 +01:00
Spring Buildmaster
225d877ab9 Next Development Version 2016-02-26 01:06:16 -08:00
Stephane Nicoll
ebf82e4c20 Fix hazelcast schema location
Closes gh-5237
2016-02-26 09:11:37 +01:00
Phillip Webb
023a09bcf6 Merge branch '1.3.x' 2016-02-25 22:13:32 -08:00
Phillip Webb
936a96746a Fix missing Javadoc @param 2016-02-25 22:13:03 -08:00
Phillip Webb
17c9fc585f Polish 2016-02-25 21:32:09 -08:00
Phillip Webb
c93ea54ea3 Merge branch '1.3.x' 2016-02-25 21:26:13 -08:00
Phillip Webb
4fd778fed8 Polish CacheManagerCustomizers 2016-02-25 20:05:16 -08:00
Andy Wilkinson
8b587a87ef Upgrade to Spring Session 1.1.0.RELEASE
Closes gh-5252
2016-02-25 20:55:49 +00:00
Andy Wilkinson
3a5bb3391f Upgrade to Jedis 2.8.0
Closes gh-5251
2016-02-25 20:55:49 +00:00
Andy Wilkinson
cf2d57a5db Upgrade to SnakeYAML 1.17
Closes gh-5250
2016-02-25 20:55:48 +00:00
Andy Wilkinson
83db70197e Upgrade to webjars-locator 0.30
Closes gh-5249
2016-02-25 20:55:48 +00:00
Andy Wilkinson
fd4b126159 Upgrade to Json Assert 1.3.0
Closes gh-5248
2016-02-25 20:55:48 +00:00
Andy Wilkinson
33cca0fed1 Upgrade to mongo-java-driver 2.14.1
Closes gh-5247
2016-02-25 20:55:47 +00:00
Andy Wilkinson
8c11142cd8 Upgrade to mariadb-java-client 1.3.6
Closes gh-5246
2016-02-25 20:55:47 +00:00
Andy Wilkinson
ccf7de904c Upgrade to Infinispan 8.1.2.Final
Closes gh-5245
2016-02-25 20:55:47 +00:00
Andy Wilkinson
a3c118f76b Upgrade to Elasticsearch 1.7.5
Closes gh-5244
2016-02-25 20:40:42 +00:00
Andy Wilkinson
4bbf209c14 Upgrade to SolrJ 5.3.2
Closes gh-5243
2016-02-25 20:40:42 +00:00
Andy Wilkinson
06fb2d6d3e Upgrade to Log4j2 2.5
Closes gh-5242
2016-02-25 20:40:42 +00:00
Andy Wilkinson
dd37ca8a81 Upgrade to ActiveMQ 5.13.1
Closes gh-5241
2016-02-25 20:17:03 +00:00
Andy Wilkinson
e07330ef5f Upgrade to Joda Time 2.9.2
Closes gh-5240
2016-02-25 20:16:33 +00:00
Andy Wilkinson
d5758ee3aa Upgrade to JMustache 1.12
Closes gh-5239
2016-02-25 20:16:09 +00:00
Andy Wilkinson
43b7771bf1 Upgrade to JsonPath 2.1.0
Closes gh-5238
2016-02-25 20:15:35 +00:00
Andy Wilkinson
fcb5f03146 Upgrade to Hazelcast 3.6
Closes gh-5237
2016-02-25 20:15:02 +00:00
Andy Wilkinson
dd2edee89a Upgrade to Gson 2.6.1
Closes gh-5236
2016-02-25 20:13:07 +00:00
Andy Wilkinson
8ae6ea0a06 Upgrade to appengine-api-1.0-sdk 1.9.32
Closes gh-5235
2016-02-25 20:12:31 +00:00
Andy Wilkinson
13ffaf878a Merge pull request #5197 from Charlie Harvey
* gh-5197:
  Add nifty-spring-boot-starter to list of third-party starters
2016-02-25 20:10:28 +00:00
Charles Harvey III
31c0f558ec Add nifty-spring-boot-starter to list of third-party starters
Closes gh-5197
2016-02-25 20:09:08 +00:00
Andy Wilkinson
56487d23d6 Merge branch '1.3.x' 2016-02-25 20:00:34 +00:00
Andy Wilkinson
7ba16e37e8 Merge pull request #5205 from Vedran Pavić
* gh-5205:
  Fix namespace declarations in Hazelcast xml's and make them consistent
2016-02-25 20:00:21 +00:00
Vedran Pavic
6801e8208d Fix namespace declarations in Hazelcast xml's and make them consistent 2016-02-25 19:59:28 +00:00
Stephane Nicoll
78f19ef852 Polish 2016-02-25 15:15:16 +01:00
Stephane Nicoll
7457596b15 Merge branch '1.3.x' 2016-02-25 14:27:59 +01:00
Stephane Nicoll
ad57d99fe5 Cleanup HazelcastInstance in test
If a JCache provider is started with hazelcast and the default settings,
the underlying `HazelcastInstance` is disposed at the end of the
process, not when the `CacheManager` is closed.

This commit fixes the only test that use such setup.

See also https://github.com/hazelcast/hazelcast/issues/7606

Closes gh-5209
2016-02-25 14:25:28 +01:00
Stephane Nicoll
416b689359 Enable prefix by default on RedisCacheManager
An overhaul of the `RedisCacheManager` is expected in Hopper (to be
consumed by Spring Boot 1.4). One of those changes is to make sure every
key have a decent prefix by default.

This commit enables the use of prefix as it is disabled by default.

Closes gh-5175
2016-02-25 13:51:59 +01:00
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