Commit Graph

12882 Commits

Author SHA1 Message Date
Stephane Nicoll 74a71b01ad Merge pull request #9608 from izeye:patch-22
* pr/9608:
  Remove redundant hash code for the same field
2017-06-27 08:41:09 +02:00
Johnny Lim 4dee630d36 Remove redundant hash code for the same field
Closes gh-9608
2017-06-27 08:40:50 +02:00
Madhura Bhave 4c29a8cfa2 Fix NPE in NettyWebServer stop
Fixes gh-9542
2017-06-26 14:27:30 -07:00
Andy Wilkinson 9dfa6a8f6a Start building against Spring Security OAuth snapshots
Closes gh-9589
2017-06-26 19:44:42 +01:00
Andy Wilkinson 5a4ef50ef1 Adapt to API changes in Spring Data Commons 2017-06-26 17:21:14 +01:00
Stephane Nicoll c99a222759 Merge branch '1.5.x' 2017-06-26 17:47:09 +02:00
Stephane Nicoll 85c7643638 Remove use of 'javax.annotation.Resource'
This commit removes the only use of the `javax.annotation.Resource`
annotation from the codebase. This ensures that injection point are
only defined with Spring's annotation model.

Closes gh-9441
2017-06-26 17:46:46 +02:00
Stephane Nicoll 8ea38d1cbe Merge branch '1.5.x' 2017-06-26 13:37:18 +02:00
Stephane Nicoll 58a1ed19a9 Polish 2017-06-26 13:36:57 +02:00
Stephane Nicoll 88d16ddf6b Add missing class check
Closes gh-9602
2017-06-26 13:36:34 +02:00
Andy Wilkinson a1ab994e70 Actually build against Spring Security 5.0 snapshots
See gh-9603
2017-06-26 10:30:57 +01:00
Andy Wilkinson 9579500cc7 Start building against Spring Security snapshots
See gh-9603
2017-06-26 10:18:56 +01:00
Stephane Nicoll 352ccbbd9b Merge pull request #9557 from espiegelberg:master
* pr/9557:
  Polish "Add health indicator for Neo4j"
  Add health indicator for Neo4j
  Remove dead code
  Add missing whitespace in log
2017-06-26 11:06:46 +02:00
Stephane Nicoll 01272fa0cc Polish "Add health indicator for Neo4j"
Closes gh-9557
2017-06-26 11:04:34 +02:00
Eric Spiegelberg 4c97dcb53a Add health indicator for Neo4j
See gh-9557
2017-06-26 10:31:02 +02:00
Stephane Nicoll 3b0cbea682 Remove dead code 2017-06-26 10:31:00 +02:00
Misagh Moayyed b39c59e97a Add missing whitespace in log
Closes gh-9597
2017-06-26 10:31:00 +02:00
Stephane Nicoll b465d9d815 Remove dead code 2017-06-26 09:07:07 +02:00
Stephane Nicoll 1b62f664e4 Merge branch '1.5.x' 2017-06-26 08:49:32 +02:00
Stephane Nicoll e008ce2517 Merge pull request #9597 from mmoayyed:patch-1
* pr/9597:
  Add missing whitespace in log
2017-06-26 08:49:14 +02:00
Misagh Moayyed 07d09f3f18 Add missing whitespace in log
Closes gh-9597
2017-06-26 08:48:37 +02:00
Andy Wilkinson dc020ffa6c Merge branch '1.5.x' 2017-06-23 16:59:35 -07:00
Andy Wilkinson 99d53a5980 Polish 2017-06-23 16:59:24 -07:00
Andy Wilkinson 43319a4484 Merge branch '1.5.x' 2017-06-23 14:48:05 -07:00
Andy Wilkinson 0aa0fd0670 Ensure that Jackson and GSON are auto-configured by @AutoConfigureJsonTesters
Previously, @AutoConfigureJsonTesters only imported
JsonTestersAutoConfiguration and relied on something else pulling in
the Jackson and GSON auto-configuration upon which it depends. This
worked with @JsonTest which imported those auto-configurations. It
did not work with @SpringBootTest which would use
@EnableAutoConfiguration and the ordering was then wrong and
JsonTestersAutoConfiguration would be processed before the Jackson
and GSON auto-configurations had a chance to create the beans that
JsonTestersAutoConfiguration needs.

This commit updates the spring.factories configuration for
JsonTestersAutoConfiguration so that it imports
JacksonAutoConfiguration and GsonAutoConfiguration.
Appropriate @AutoConfigureAfter has also been added to
JsonTestersAutoConfiguration to ensure that it is considered after
JacksonAutoConfiguration and GsonAutoConfiguration.

Lastly, ExampleJsonApplication and associated classes have been moved
into an app sub-package to prevent its component scanning from
pulling in JsonTestersAutoConfiguration as if it were user
configuration.

Closes gh-9515
2017-06-23 14:44:08 -07:00
Andy Wilkinson 532e0a254f Start building against Spring Integration snapshots
See gh-9586
2017-06-23 10:44:10 -07:00
Stephane Nicoll e418cad752 Merge branch '1.5.x' 2017-06-23 11:48:17 +02:00
Stephane Nicoll 5aa27beb54 Polish 2017-06-23 11:40:16 +02:00
Stephane Nicoll 90c4e7518b Detect Neo4j https driver url
Closes gh-9549
2017-06-23 11:39:39 +02:00
Stephane Nicoll d333bd1a93 Merge pull request #9554 from vpavic:align-session-2.0
* pr/9554:
  Polish "Ensure compatibility with Spring Session module split"
  Ensure compatibility with Spring Session module split
2017-06-23 10:35:33 +02:00
Stephane Nicoll 27f8a63f1c Polish "Ensure compatibility with Spring Session module split"
Closes gh-9554
2017-06-23 10:34:17 +02:00
Vedran Pavic ccb1eaf8ed Ensure compatibility with Spring Session module split
This commit updates Spring Session auto-configuration to ensure
compatibility with extraction of `SessionRepository` implementations into
separate Spring Session modules.

See gh-9554
2017-06-23 10:00:24 +02:00
Andy Wilkinson f26f8176b6 Start building against Spring Session 2.0 snapshots
See gh-9541
2017-06-23 10:00:05 +02:00
Andy Wilkinson c59214792b Verify that bootJar and bootWar handle duplicates gracefully
Closes gh-9573
2017-06-22 11:45:10 -07:00
Andy Wilkinson f0b7e7cf56 Ensure that fat jars and wars do not corrupt UTF-8 entry names
Previously, both Repackager and the Grade plugin used the JRE's
standard ZipOutputStream when creating a fat jar or war file. This
resulted in entry names that needed UTF-8 encoding to become
corrupted.

This commit updates both to use Commons Compress'
ZipArchiveOutputStream and to configure the stream's encoding and
each entry's Unix mode. This ensures that names are encoded using
UTF-8 and can be read back in correctly by common zip tools.

Closes gh-9405
2017-06-22 11:45:10 -07:00
Stephane Nicoll 885e29934b Clean HibernateJpaAutoConfigurationTests
This commit makes sure that each test runs with the proper datasource
auto-configuration and with an isolated embedded database. This allows
to restrict each test to only what it is supposed to do (rather than
disabling initialization to work around the fact that database is not
in a proper state because it is shared).

Closes gh-9579
2017-06-22 17:47:35 +02:00
Stephane Nicoll 235daf839f Merge branch '1.5.x' 2017-06-22 10:49:14 +02:00
Stephane Nicoll d77056639d Add a warning about fully executable archive
Closes gh-9574
2017-06-22 10:49:01 +02:00
Stephane Nicoll 5c9f10b79c Merge pull request #9561 from eddumelendez:gh-8137
* pr/9561:
  Improve sample to use fragment expression by thymeleaf 3
2017-06-22 09:51:40 +02:00
Eddú Meléndez b1f96a4641 Improve sample to use fragment expression by thymeleaf 3
Avoid repeated title text making use of capabilities in thymeleaf 3.

Closes gh-9561
2017-06-22 09:50:28 +02:00
Stephane Nicoll aac80e0b02 Polish
Closes gh-9570
2017-06-22 09:33:45 +02:00
Stephane Nicoll beb72ca8ee Merge branch '1.5.x' 2017-06-22 09:31:04 +02:00
Stephane Nicoll b037d7a4cb Polish 2017-06-22 09:29:47 +02:00
Stephane Nicoll 0aabe38479 Merge pull request #9570 from izeye:polish-20170622
* pr/9570:
  Polish
2017-06-22 09:29:16 +02:00
Johnny Lim 8ca70a7efd Polish
See gh-9570
2017-06-22 09:28:49 +02:00
Stephane Nicoll 0d3a79aaa3 Merge pull request #9567 from eddumelendez:gh-7325
* pr/9567:
  Polish "Add prefix to all properties in maven plugin"
  Add prefix to all properties in maven plugin
2017-06-22 09:14:11 +02:00
Stephane Nicoll e230952dd2 Polish "Add prefix to all properties in maven plugin"
Closes gh-9567
2017-06-22 09:13:44 +02:00
Eddú Meléndez 4510be0f8f Add prefix to all properties in maven plugin
This commit add prefix `spring-boot` to all Mojo's properties.

See gh-9567
2017-06-22 09:13:44 +02:00
Andy Wilkinson 39c1757a96 Merge branch '1.5.x' 2017-06-21 14:31:21 -07:00
Andy Wilkinson 7a04708c41 Make sure the HealthMvcEndpoint is thread-safe
Previously, HealthMvcEndpoint stored the cached Health and its last
access time in two separate fields. Neither field was volatile and
no synchronization was used. This meant that there were potential
visibility problems. In a possible worst case scenario one field may
see the updated access time but an old health so it would incorrectly
believe that the old health was up-to-date and return it.

This commit reworks the endpoint to store the cached health and the
time at which it was created in a single, volatile field. This ensures
that the cached health and its creation time will be visible across
threads. Note that a race between threads when the cache is stale is
still possible. This race may result in multiple calls to the
delegate but these should be harmless.

Closes gh-9454
2017-06-21 14:19:10 -07:00