Commit Graph

10462 Commits

Author SHA1 Message Date
Andy Wilkinson 13a3f7c0c1 Merge branch '1.4.x' into 1.5.x 2017-04-06 21:47:24 +01:00
Andy Wilkinson 18e112821f Merge branch '1.4.x' into 1.5.x 2017-04-06 21:45:29 +01:00
Andy Wilkinson d45d94520e Upgrade to Jolokia 1.3.6
Closes gh-8841
2017-04-06 20:27:47 +01:00
Andy Wilkinson f8767cc96e Upgrade to Freemarker 2.3.26-incubating
Closes gh-8840
2017-04-06 20:27:47 +01:00
Andy Wilkinson 2300dae88c Upgrade to Jetty 9.3.18.v20170406
Closes gh-8839
2017-04-06 20:27:47 +01:00
Andy Wilkinson 1375dfe102 Upgrade to Aspectj 1.8.10
Closes gh-8838
2017-04-06 20:27:47 +01:00
Andy Wilkinson 408b3c81df Upgrade to Tomcat 8.5.13
Closes gh-8837
2017-04-06 20:27:47 +01:00
Andy Wilkinson fe5e04c963 Upgrade to Hazelcast 3.6.8
Closes gh-8836
2017-04-06 20:27:47 +01:00
Andy Wilkinson d49a41e8cf Upgrade to Appengine 1.9.51
Closes gh-8835
2017-04-06 20:27:47 +01:00
Andy Wilkinson 5f77ef25e4 Upgrade to Jackson 2.8.8
Closes gh-8834
2017-04-06 20:27:47 +01:00
Phillip Webb 3b93bb46e0 Revert accidental call to `.close()`
Remove call to `.close()` which was accidentally left in after some
performance testing.
2017-04-04 09:56:03 -07:00
Phillip Webb ad38776de3 Polish 2017-04-04 09:48:10 -07:00
Phillip Webb ddcb5ee328 Polish 2017-04-04 09:36:27 -07:00
Andy Wilkinson df6167dd71 Merge branch '1.4.x' into 1.5.x 2017-04-04 17:02:58 +01:00
Andy Wilkinson 9374020b0e Stop -> from being replaced with → as the latter renders as # in PDF
Closes gh-8575
2017-04-04 17:00:16 +01:00
Andy Wilkinson 155d55097f Merge branch '1.4.x' into 1.5.x 2017-04-04 12:21:43 +01:00
Andy Wilkinson 47de05b52c Update Devtools to ignore manifest Class-Path entries that do not exist
Closes gh-8623
2017-04-04 12:15:51 +01:00
Andy Wilkinson c55bfb00b1 Merge branch '1.4.x' into 1.5.x 2017-04-04 11:31:34 +01:00
Andy Wilkinson 456327260b Fail fast when a Zip64 jar is encountered
Previously, jars (either top-level or nested) in Zip64 format were
treated as normal jar files. This would lead to a failure later on
when an attempt was made to read an entry from the file.

This commit updates the loader to fail fast when it encounters a
Zip64 jar file. Such files are identified by the number of entries
in the central directory end record being 0xFFFF.

Closes gh-8735
2017-04-04 11:31:18 +01:00
Andy Wilkinson 94e9c9417d Merge branch '1.4.x' into 1.5.x 2017-04-04 10:22:50 +01:00
Andy Wilkinson b280e3092d Don't forward to welcome page that won't exist due to custom mapping
Previously, WelcomePageHandlerMapping would forward to index.html.
This assumed that the static path pattern was always /**. If it had
been customised to, for example, /foo/**, then the forward would still
be to index.html and a 404 would result as the page is actually
available at /foo/index.html.

At first glance, it would appear that the forward should be made to
foo/index.html. However, as it's a forward rather than a redirect,
any relative URLs in the index.html page would then be resolved using
/ whereas they should be resolved using /foo/. This could be addressed
by using a redirect rather than a forward, but we don't want to do
that as it's more invasive and would require a roundtrip back to the
client. Instead, this commit simply stops performing the forward when
the static path pattern is not /**.

Closes gh-8788
2017-04-04 10:13:24 +01:00
Andy Wilkinson 4d71bfbf5c Merge branch '1.4.x' into 1.5.x 2017-04-04 10:03:19 +01:00
Andy Wilkinson 4b1e5e9c43 Improve diagnostics when loading a property source from a file fails
Closes gh-8294
2017-04-04 10:02:10 +01:00
Andy Wilkinson 6d8846d95b Merge branch '1.4.x' into 1.5.x 2017-04-04 09:27:35 +01:00
Andy Wilkinson 43f34546f6 Add .editorconfig to improve formatting when viewing on GitHub
Closes gh-8497
2017-04-04 09:26:50 +01:00
Stephane Nicoll 5cc2e103f2 Disable unexpected datasource initialization
This commit restore the disabling of datasource initialization that was
accidently removed in db33a75 so that other tests aren't affected by it.
2017-04-03 10:42:12 +03:00
Stephane Nicoll 0163731043 Automatically enable transaction management for Neo4j
This commit makes sure that `@EnableTransactionManagement` is
auto-configured with Neo4j. It actually reuses what was done in #8434,
making sure that the `Neo4jDataAutoConfiguration` is ordered properly.

Closes gh-8587
2017-04-03 09:37:37 +03:00
Stephane Nicoll db33a75484 Enable transaction management consistently
Previously to this commit, transaction management was only enabled when
a `DataSource` is configured. The processing of `@Transactional`
annotations are now enabled as long as a `PlatformTransactionManager` is
present.

Also, the `spring.aop.proxy-target-class` is now honoured if set, still
defaulting to CGLIB mode.

Closes gh-8434
2017-04-03 09:24:15 +03:00
Stephane Nicoll 751cd6e0b2 Merge pull request #8781 from ptamarit:short-commit-id-custom-length
* pr/8781:
  Polish "Use git.commit.id.abbrev if present" contribution
  Use git.commit.id.abbrev if present
2017-03-31 15:09:54 +02:00
Stephane Nicoll 52527c7298 Polish "Use git.commit.id.abbrev if present" contribution
Closes gh-8781
2017-03-31 15:09:43 +02:00
Pablo Tamarit 30b6166bc1 Use git.commit.id.abbrev if present
Currently GitProperties always shortens the property git.commit.id to an
hardcoded length of 7.

However, both the Maven plugin git-commit-id-plugin and the Gradle
plugin gradle-git-properties are now providing the property
git.commit.id.abbrev along with the propery git.commit.id.
Moreover, the Maven plugin allows to customize the length of the
abbreviated commit ID with the configuration abbrevLength. The Gradle
plugin doesn't allow (yet) to configure this length.

Closes gh-8773
2017-03-31 15:09:43 +02:00
Andy Wilkinson 181cfd5ca8 Merge branch '1.4.x' into 1.5.x 2017-03-28 20:00:03 +01:00
Andy Wilkinson 9fa8f2e317 Tweak Checkstyle plugin config so violations are output even with -q
Closes gh-8767
2017-03-28 19:59:08 +01:00
Stephane Nicoll d8e90af3bf Merge branch '1.4.x' into 1.5.x 2017-03-28 10:27:14 +02:00
Stephane Nicoll 595fada2ff Merge pull request #8660 from dreis2211:cleanup-equals-exceptions
* pr/8660:
  Fix test assertions
2017-03-28 10:26:56 +02:00
dreis 1266642aba Fix test assertions
Closes gh-8660
2017-03-28 10:26:25 +02:00
Stephane Nicoll 113279c1bc Merge pull request #8678 from zeldan:patch-1
* pr/8678:
  Fix propdeps-plugin url in doc
2017-03-28 10:25:47 +02:00
Dániel Zelei cc30adf0df Fix propdeps-plugin url in doc
Closes gh-8678
2017-03-28 10:15:43 +02:00
Stephane Nicoll 49b8d8c482 Polish
See gh-8698
2017-03-28 10:05:33 +02:00
Stephane Nicoll c6182d510c Merge branch '1.4.x' into 1.5.x 2017-03-26 12:11:54 +02:00
Stephane Nicoll 22869f78a9 Merge pull request #8718 from andersonkyle:fix-typo
* pr/8718:
  Fix typo
2017-03-26 12:10:32 +02:00
Kyle Anderson 57977a654a Fix typo
Closes gh-8718
2017-03-26 12:10:04 +02:00
Andy Wilkinson e905c96d9d Upgrade to GemFire 8.2.3
Closes gh-8498
2017-03-25 19:59:54 +00:00
Andy Wilkinson bf6e6870ea Upgrade to Neo4j Ogm 2.1.2
Closes gh-8746
2017-03-24 20:48:31 +00:00
Andy Wilkinson 57c16c393b Upgrade to Mariadb 1.5.9
Closes gh-8745
2017-03-24 20:48:31 +00:00
Andy Wilkinson 6ffdc88430 Upgrade to Narayana 5.5.5.Final
Closes gh-8744
2017-03-24 20:48:30 +00:00
Andy Wilkinson 233abb6162 Upgrade to Jboss Transaction Spi 7.5.2.Final
Closes gh-8743
2017-03-24 20:48:30 +00:00
Andy Wilkinson 7ad326992a Upgrade to Hibernate Validator 5.3.5.Final
Closes gh-8742
2017-03-24 20:48:29 +00:00
Andy Wilkinson e60515e88c Upgrade to Jetty 9.4.3.v20170317
Closes gh-8741
2017-03-24 20:48:29 +00:00
Andy Wilkinson 6519fd5e52 Upgrade to Artemis 1.5.4
Closes gh-8740
2017-03-24 20:48:29 +00:00