Commit Graph

11340 Commits

Author SHA1 Message Date
Andy Wilkinson a9a31107cf Align with API changes in latest Spring Data Kay snapshots
See gh-7461
2017-03-24 11:26:27 +00:00
Andy Wilkinson a88c56dfdc Start building against Spring Integration 4.3.9 snapshots
See gh-8713
2017-03-24 10:44:06 +00:00
Andy Wilkinson 2b6bcfd738 Start building against Spring Framework 4.3.8 snapshots
Closes gh-7949
See gh-8712
2017-03-24 10:42:45 +00:00
Andy Wilkinson 83df8e47fe Merge branch '1.5.x' 2017-03-24 10:34:02 +00:00
Andy Wilkinson e6cfb4e5fb Improve diagnostics when reading a nested jar throws a runtime exception
Previously, only IOExceptions were caught and wrapped in a new
IOException that included the name of the nested entry that was
being read.

Following this commit, any Exception is caught and wrapped so that the
problematic entry can be identified in more failure scenarios.

Closes gh-8711
2017-03-24 10:32:16 +00:00
Madhura Bhave 30eae8a47d Merge branch '1.5.x' 2017-03-23 16:14:32 -07:00
Madhura Bhave aa25bfb0e0 Clarify the effect that management.context-path has on endpoint paths
Fixes gh-8586
2017-03-23 16:12:48 -07:00
Madhura Bhave 6ad46db944 Merge branch '1.5.x' 2017-03-23 16:10:35 -07:00
Madhura Bhave cb38546d8a Document default trace includes
Closes gh-8654
2017-03-23 15:36:27 -07:00
Madhura Bhave 9bacca7aa0 Merge branch '1.5.x' 2017-03-23 15:23:44 -07:00
Madhura Bhave f73714bdcc Do not filter HttpMessageConverters in WebMvcTest
Closes gh-8617
2017-03-23 14:21:04 -07:00
Andy Wilkinson 87ebec6838 Upgrade to Jackson 2.9.0.pr2
As part of the upgrade, this commit removes the use of any API that
has been deprecated in 2.9. This includes the config props endpoint's
use of SerializationFeature.WRITE_NULL_MAP_VALUES. This has been
replaced with configuring serialization inclusion to only include
properties with non-null values. This means that all null-valued
properties will no longer be serialized, not just those that are an
entry in a map.

Closes gh-8604
Closes gh-8537
Closes gh-7695
2017-03-23 15:22:20 +00:00
Andy Wilkinson 3024ed8316 Remove dependency management for neo4j-ogm-compiler
neo4j-ogm-compiler does not exist in OGM 3.0 snapshots

See gh-8687
2017-03-23 10:07:11 +00:00
Andy Wilkinson 0396ac415c Make Neo4j snapshots available to full CI builds
See gh-8687
2017-03-22 16:43:16 +00:00
Andy Wilkinson 51a2d9b103 Add dep mgmt for fast-classpath-scanner while Neo4j uses LATEST
neo4j-ogm-core uses LATEST for the version of its dependency upon
fast-classpath-scanner. This leads to unrepeatable builds and also
appears to be destabilising our CI.

Hopefull we will be able to revert this commit once
neo4j/neo4j-ogm#341 has been fixed.

See gh-8687
2017-03-22 16:12:56 +00:00
Andy Wilkinson 937681af65 Avoid problem caused by new mime mappings in Framework snapshots 2017-03-22 15:25:32 +00:00
Andy Wilkinson 25bf4a14cd Start building against Neo4j OGM 3.0.0 snapshots
This commit our Neo4j OGM dependency with the Spring Data Neo4j
snapshots that are currently included in snapshots of Spring Data Kay.

It switches to using Neo4j's Bolt driver by default, aligning it with
the default of the latest Spring Data Neo4j 5 snapshots.

It also contains a workaround for a Neo4j OGM issue [1] and a change
to Neo4jDataAutoConfigurationTests that prevents the entire classpath
from being scanned.

See gh-8687

[1] https://github.com/neo4j/neo4j-ogm/issues/340
2017-03-22 15:24:49 +00:00
Stephane Nicoll b8527d7060 Merge branch '1.5.x' 2017-03-18 07:40:11 +01:00
Stephane Nicoll dfe26aace8 Merge pull request #8658 from SolaKun:SolaKun-patch-1
* pr/8658:
  Fix typo in doc
2017-03-18 07:39:54 +01:00
Sola ddd8d03a2a Fix typo in doc
Closes gh-8658
2017-03-18 07:39:16 +01:00
Madhura Bhave f32f7c51e1 Merge branch '1.5.x' 2017-03-17 16:19:02 -07:00
Madhura Bhave e6f4d84618 Support setting log level ALL in logback
Fixes gh-8639
2017-03-17 15:51:30 -07:00
Madhura Bhave 52d992701d Merge branch '1.5.x' 2017-03-17 14:09:27 -07:00
Madhura Bhave 8ac22fc2fd Add elapsed time to the Trace Actuator output
Closes gh-8654
2017-03-17 12:04:55 -07:00
Madhura Bhave 356b78b77f Stop autoconfiguration from being scanned in tests
These tests used to pass even without explicitly adding the autoconfigure
annotation. Moving them to a subpackage prevents scanning of the
autoconfiguration by component scanning.

Closes gh-8645
2017-03-17 10:33:44 -07:00
Stephane Nicoll 2f8f400a63 Merge branch '1.5.x' 2017-03-17 09:58:09 +01:00
Stephane Nicoll 84dea5264f Merge branch '1.4.x' into 1.5.x 2017-03-17 09:57:52 +01:00
Stephane Nicoll 1624370986 Merge pull request #8594 from lexandro:master
* pr/8594:
  Polish contribution
  Fix invalid security example in doc
2017-03-17 09:57:35 +01:00
Stephane Nicoll 0ca07fbdc3 Polish contribution
Closes gh-8594
2017-03-17 09:56:45 +01:00
lexandro 36b28540ee Fix invalid security example in doc
Closes gh-8580
2017-03-17 09:51:08 +01:00
Stephane Nicoll 78431478e8 Remove System.out
Closes gh-8647
2017-03-17 09:15:55 +01:00
Madhura Bhave 7d90bbe839 Fix typo 2017-03-16 16:16:36 -07:00
Dave Syer fe8fa2831a Fix properties parsing for comment chars
Update `OriginTrackedPropertiesLoader` to correctly deal with property
values that happen to contain comment characters.

Prior this this commit, values of the following form would not be
parsed correctly:

	foo=bar!
	bar=spam

Closes gh-8647
2017-03-16 13:43:18 -07:00
Phillip Webb 34de119eba Polish 2017-03-16 13:04:03 -07:00
Stephane Nicoll 698aa94cb4 Fix import 2017-03-16 14:53:38 +01:00
Stephane Nicoll da7287322b Polish 2017-03-16 12:44:06 +01:00
Stephane Nicoll b7d3aad54b Merge branch '1.5.x' 2017-03-16 12:43:47 +01:00
Stephane Nicoll fa3679af71 Merge branch '1.4.x' into 1.5.x 2017-03-16 12:40:12 +01:00
Stephane Nicoll cd76da9a4c Avoid using immutable collections for configuration proprerties
Closes gh-8620
2017-03-16 12:39:48 +01:00
Stephane Nicoll 0c4c2f4bf4 Harmonize webflux sample test 2017-03-16 11:36:41 +01:00
Stephane Nicoll 6d6d76ca06 Polish
See gh-8543
2017-03-16 09:54:06 +01:00
Madhura Bhave 0b1d32e762 Add tests for TestRestTemplate in reactive env
Closes gh-8543
2017-03-15 14:46:44 -07:00
Andy Wilkinson 1893fdab0d Revert "Upgrade to Jackson 2.9.0.pr1"
This reverts commit 10ae5e8f3f. Health
serialization fails with Jackson 2.9.0 (gh-7695).

See gh-8537
2017-03-15 17:01:12 +00:00
Andy Wilkinson 10ae5e8f3f Upgrade to Jackson 2.9.0.pr1
As part of the upgrade, this commit removes the use of any API that
has been deprecated in 2.9.0.pr1. This includes the config props
endpoint's use of SerializationFeature.WRITE_NULL_MAP_VALUES. This
has been replaced with configuring serialization inclusion to only
include properties with non-null values. This means that all
null-valued properties will no longer be serialized, not just those
that are an entry in a map.

Closes gh-8604
Closes gh-8537
2017-03-15 16:38:08 +00:00
Stephane Nicoll 7ee5e43109 Merge branch '1.5.x' 2017-03-15 15:11:02 +01:00
Stephane Nicoll 22934e097d Merge branch '1.4.x' into 1.5.x 2017-03-15 15:10:37 +01:00
Stephane Nicoll ed2164b97b Merge pull request #8582 from vpavic:improve-redis-session-config
* pr/8582:
  Improve `RedisSessionConfiguration` conditions
2017-03-15 15:10:02 +01:00
Vedran Pavic 17aad4f00c Improve `RedisSessionConfiguration` conditions
Closes gh-8582
2017-03-15 15:09:31 +01:00
Stephane Nicoll 883dd5802b Merge branch '1.5.x' 2017-03-15 14:52:37 +01:00
Stephane Nicoll cc79f6d83d Merge branch '1.4.x' into 1.5.x 2017-03-15 14:52:19 +01:00