Madhura Bhave
fce299c1c1
Merge branch '1.5.x'
2017-06-16 11:38:18 -07:00
Madhura Bhave
e437c4cd67
OAuth2ClientIdCondition should not match if clientId absent
...
Fixes gh-9435
2017-06-16 10:55:49 -07:00
Stephane Nicoll
350c701da3
Polish
2017-06-16 15:48:36 +02:00
Andy Wilkinson
2ffe480490
Polish
2017-06-16 09:24:56 +01:00
Andy Wilkinson
cbae31364f
Suppress deprecation warning from LettuceConnectionFactory
...
See gh-9538
2017-06-16 09:21:59 +01:00
Andy Wilkinson
991314c63d
Merge branch '1.5.x'
2017-06-16 09:13:42 +01:00
Andy Wilkinson
59122358d3
Clean up and format code
2017-06-16 08:58:14 +01:00
Stephane Nicoll
573007166c
Remove version of override for resources plugin
...
Closes gh-9537
2017-06-16 09:54:30 +02:00
Stephane Nicoll
d559f7a5bb
Harmonize key description
...
See gh-9374
2017-06-16 09:38:46 +02:00
Stephane Nicoll
4d6965a147
Polish
2017-06-16 09:26:09 +02:00
Stephane Nicoll
2dcb441745
Upgrade to Spring Integration 5.0.0 M5
...
Closes gh-9287
2017-06-16 09:06:29 +02:00
Stephane Nicoll
fcbd043605
Upgrade to Spring Security 5.0.0 M2
...
Closes gh-9288
2017-06-16 09:05:52 +02:00
Stephane Nicoll
b1db24569c
Upgrade to Spring Session 2.0.0.M2
...
Closes gh-9505
2017-06-16 09:04:43 +02:00
Andy Wilkinson
1fe9066b5b
Use fixed name for SpringApplication command line args property source
...
Closes gh-8680
2017-06-15 21:19:34 +01:00
Andy Wilkinson
4a030d5a7a
Drop support for auto-configuring an embedded Elasticsearch node
...
Elastic have announced [1] that embedded Elasticsearch is no longer
supported. This commit brings us into line with that announcement by
removing the auto-configuration that would create an Elasticsearch
Node and NodeClient.
To use the Elasticsearch auto-configuration, a user must now provide
the address of one or more cluster nodes
(via the spring.elastisearch.cluster-nodes property) which will then
be used to create a TransportClient.
See gh-9374
[1] https://www.elastic.co/blog/elasticsearch-the-server
2017-06-15 19:52:24 +01:00
Stephane Nicoll
dbabfc224c
Add support for Lettuce in RedisTestServer
...
Previously, RedisTestServer only supported Jedis and would blow up if
only Lettuce was on the classpath. This commit defensively checks which
driver is available and chose the appropriate one, defaulting to Jedis.
Closes gh-9524
2017-06-15 14:42:24 +02:00
Stephane Nicoll
865971a540
Merge pull request #9526 from mp911de:set-lettuce-shutdown-timeout-properly
...
* pr/9526:
Polish "Set Lettuce shutdown timeout properly"
Reduce Lettuce shutdown timeout to 100ms
Set Lettuce shutdown timeout properly
2017-06-15 14:00:10 +02:00
Stephane Nicoll
053b8b5853
Polish "Set Lettuce shutdown timeout properly"
...
Closes gh-9526
2017-06-15 13:49:52 +02:00
Mark Paluch
0a9646dbf4
Reduce Lettuce shutdown timeout to 100ms
...
Reducing the default to 100ms is a good compromise to retain a quiet time
in for parallel execution and optimize for default, single-threaded
execution (such as test execution or regular application shutdown). The
shutdown timeout can be adjusted to fit specific application needs.
See gh-9526
2017-06-15 13:46:16 +02:00
Mark Paluch
69d2185618
Set Lettuce shutdown timeout properly
...
We now properly set the Lettuce client shutdown for unpooled and pooled
configuration.
See gh-9526
2017-06-15 13:45:59 +02:00
Stephane Nicoll
eb30fe06ec
Merge branch '1.5.x'
2017-06-15 13:43:44 +02:00
Stephane Nicoll
5d69318e2d
Add reference to SpringBootApplication in EnableAutoConfiguration
...
Closes gh-9521
2017-06-15 13:43:13 +02:00
Stephane Nicoll
5538fbaae2
Merge pull request #9443 from tsachev:gh-9442
...
* pr/9443:
Polish
Polish "Allow abstract serializers/deserializer in @JsonComponent"
Allow abstract serializers/deserializer in @JsonComponent
2017-06-15 13:35:56 +02:00
Stephane Nicoll
31ee45bf36
Polish
2017-06-15 13:35:33 +02:00
Stephane Nicoll
c5c6a526d3
Polish "Allow abstract serializers/deserializer in @JsonComponent"
...
Closes gh-9443
2017-06-15 13:30:25 +02:00
Vladimir Tsanev
6ba7849094
Allow abstract serializers/deserializer in @JsonComponent
...
Previously JsonComponentModule tried to instantiate all
inner classes and failed with InstantiationException when
the class is abstract and extends JsonSerializer/JsonDeserializer.
With this change is now possible to have common logic inner abstract classes.
See gh-9443
2017-06-15 13:27:26 +02:00
Stephane Nicoll
de7b7ac55b
Merge pull request #9224 from jayarampradhan:master
...
* pr/9224:
Polish "Add Slice test annotation for Redis"
Add Slice test annotation for Redis
2017-06-15 11:40:36 +02:00
Stephane Nicoll
dd53ed0aec
Polish "Add Slice test annotation for Redis"
...
Closes gh-9224
2017-06-15 11:38:32 +02:00
Jayaram Pradhan
2d36d2a7e4
Add Slice test annotation for Redis
...
This commit adds new annotation `@DataRedisTest` which provides test
infrastructure for redis.
See gh-9224
2017-06-15 11:12:13 +02:00
Stephane Nicoll
3a63241628
Fix RedisRepositoriesAutoConfiguration condition
...
Rather than checking if Jedis is on the classpath, this commit changes
the conditions of `RedisRepositoriesAutoConfiguration` to check for the
presence of a `RedisConnectionFactory` bean that is going to be
necessary to create the Redis repositories anyway.
Checking for Jedis is no longer correct since we now support Lettuce as
well.
Closes gh-9523
2017-06-15 11:11:48 +02:00
Andy Wilkinson
73b114860c
Configure Derby to write its log in the target directory
2017-06-14 17:34:51 +01:00
Stephane Nicoll
9deda71fd8
Upgrade to Spring Data Kay M4
...
Closes gh-9286
2017-06-14 17:45:08 +02:00
Stephane Nicoll
e60ec39650
Exclude commons-logging from commons-dbcp2
...
Closes gh-9496
2017-06-14 15:58:17 +02:00
Stephane Nicoll
4cb0a5cef3
Add a note about Redis customization
...
See gh-8894
2017-06-14 15:43:39 +02:00
Stephane Nicoll
017eb8e401
Merge pull request #9510 from mp911de:redis-client-config
...
* pr/9510:
Polish "Use Redis client configuration to configure connection factories"
Use Redis client configuration to configure connection factories
2017-06-14 15:35:37 +02:00
Stephane Nicoll
a4688bdb86
Polish "Use Redis client configuration to configure connection factories"
...
In particular, the Lettuce code is not using the new builder API when
pooling is required. This will be fixed in a future milestone.
Closes gh-9510
2017-06-14 15:33:56 +02:00
Mark Paluch
866fdb5d91
Use Redis client configuration to configure connection factories
...
We now use LettuceClientConfiguration and JedisClientConfiguration to
configure connection factories. Client-specific configuration can be
customized by providing LettuceClientConfigurationBuilderCustomizer and
JedisClientConfigurationBuilderCustomizer beans.
See gh-9510, gh-8894, gh-9490
2017-06-14 14:14:07 +02:00
Stephane Nicoll
eb764a715e
Merge pull request #9512 from jeroenheijmans:docs/chocolatey-note
...
* pr/9512:
Adds maven install note for Windows
2017-06-14 14:13:14 +02:00
Jeroen Heijmans
766655916e
Adds maven install note for Windows
...
See also: https://chocolatey.org/packages/maven
Closes gh-9512
2017-06-14 14:12:12 +02:00
Stephane Nicoll
33aca5e9ff
Upgrade to Spring Framework 5.0.0 RC2
...
Closes gh-9285
2017-06-14 14:09:25 +02:00
Stephane Nicoll
7a0e4fe742
Merge pull request #9487 from ihrigb:dev/hcp
...
* pr/9487:
Add SAP Hana Cloud Platform to CloudPlatform
2017-06-14 11:30:38 +02:00
Benjamin Ihrig
6c270f0e5a
Add SAP Hana Cloud Platform to CloudPlatform
...
Closes gh-9487
2017-06-14 11:30:18 +02:00
Stephane Nicoll
303e47f71f
Merge pull request #9448 from mzagar:mzagar-batch-listener-fix
...
* pr/9448:
Polish "Add support for Kafka batch listener"
Add support for Kafka batch listener
2017-06-14 11:15:41 +02:00
Stephane Nicoll
f05f1bcfba
Polish "Add support for Kafka batch listener"
...
This commit reworks the property to be an enum with the list of
supported listener types rather than a boolean that flip to a
batch listener.
Closes gh-9448
2017-06-14 11:15:31 +02:00
mzagar
257f44357e
Add support for Kafka batch listener
...
This commit adds a `spring.kafka.listener.batch-listener` property so
that a batch listener is created automatically.
See gh-9448
2017-06-14 11:15:31 +02:00
Brian Clozel
4282e94c2c
Update GraphQL Community Boot starter URL
...
Notified about this new repository address on Gitter
https://gitter.im/spring-projects/spring-boot?at=5940e54ef31c8ced0c33f7f6
2017-06-14 10:50:00 +02:00
Stephane Nicoll
67ac57bd72
Add jackson-module-parameter-names to json starter
...
Closes gh-9506
2017-06-14 09:51:31 +02:00
Stephane Nicoll
81efd225f9
Merge branch '1.5.x'
2017-06-14 09:30:06 +02:00
Stephane Nicoll
acda4f905f
Add support for deprecation level
...
This commit ensures that deprecation level set in manual metadata is
properly merged in the generated one.
Closes gh-9449
2017-06-14 09:28:59 +02:00
Stephane Nicoll
c5d44cdae4
Fix build failure
...
More change to use the http Neo4j driver
See https://github.com/neo4j/neo4j-java-driver/issues/380
Closes gh-9499
2017-06-13 14:37:37 +02:00