Commit Graph

12900 Commits

Author SHA1 Message Date
Stephane Nicoll f7c070938f Merge pull request #9912 from eddumelendez:jackson_2.9.0
* pr/9912:
  Upgrade to Jackson 2.9.0
2017-07-31 09:39:44 +02:00
Eddú Meléndez 87ba8d2e14 Upgrade to Jackson 2.9.0
Closes gh-9912
2017-07-31 09:39:23 +02:00
Andy Wilkinson 9f75da9a8f Simplify the Actuator's hypermedia support
This commit replaces the Acuator's support for hypermedia with a
single endpoint that returns HAL-formatted links to all of the
available endpoints. This is done without requiring Spring HATEOAS
to be on the classpath in a similar manner to the existing
CloudFoundry discovery endpoint.

Closes gh-9901
2017-07-30 22:43:05 +01:00
Andy Wilkinson 4a61e45644 Require separate management port to use management context path of /
Closes gh-9898
2017-07-30 22:42:01 +01:00
Andy Wilkinson fb3d79c750 Drop support for self-hosted Actuator docs
Closes gh-9899
2017-07-29 09:19:53 +01:00
Madhura Bhave e64090838c Revert "Nested Map should not bind to null"
This reverts commit 5406567783.
2017-07-28 13:40:31 -07:00
Madhura Bhave 5406567783 Nested Map should not bind to null
Fixes gh-9801
2017-07-28 10:16:14 -07:00
Phillip Webb c81106b5e4 Increase JVM memory for Maven 2017-07-28 10:14:47 -07:00
Phillip Webb 2b846ad7b4 Fix typo in Maven plugin integration test 2017-07-28 10:13:49 -07:00
Phillip Webb 30ff329e3d Polish 2017-07-28 10:11:49 -07:00
Andy Wilkinson 71ade559d5 Merge branch '1.5.x' 2017-07-28 15:44:05 +01:00
Andy Wilkinson 362a8ea9bc Merge pull request #9893 from Rostyslav Dudka
* gh-9893:
  Polish "Make JarURLConnection return entry's last modified time"
  Make JarURLConnection return entry's last modified time
2017-07-28 15:42:44 +01:00
Andy Wilkinson b7ac5f2eb2 Polish "Make JarURLConnection return entry's last modified time"
Closes gh-9893
2017-07-28 15:41:34 +01:00
rostislav.dudka 7c7259beec Make JarURLConnection return entry's last modified time
See gh-9893
2017-07-28 15:41:29 +01:00
Andy Wilkinson fb510043a2 Look in the right place for plugin's classes during integration tests
See gh-9516
2017-07-28 14:57:49 +01:00
Andy Wilkinson 36120d729a Ignore mainClassName property when its value is null
Closes gh-9892
2017-07-28 14:44:32 +01:00
Andy Wilkinson c2459fce47 Raise the minimum version of Gradle to 4.0
Closes gh-9516
2017-07-28 14:35:33 +01:00
Stephane Nicoll 32a40673bb Merge pull request #9890 from vpavic:fix-config-metadata
* pr/9890:
  Fix `additional-spring-configuration-metadata.json`
2017-07-28 13:53:07 +02:00
Vedran Pavic f84d90dbe7 Fix `additional-spring-configuration-metadata.json`
This commit fixes invalid references to `LoggingApplicationListener` in
`additional-spring-configuration-metadata.json`.

Closes gh-9890
2017-07-28 13:52:39 +02:00
Stephane Nicoll 92e48f6ee2 Fix build failure
This test definitely doesn't need Aspect processing since the project
doesn't have a dependency on `aspectjweaver`

Closes gh-9880
2017-07-28 13:43:58 +02:00
Stephane Nicoll b9b284d3d0 Merge branch '1.5.x' 2017-07-28 12:02:54 +02:00
Stephane Nicoll 5c13b8bf50 Separate custom schema configuration for Liquibase test
Unfortunately, creating the schema in code did not offer the right
condition to reproduce the error scenario. This commit restore the
initial intent, but separating the configuration and cleaning the
created context properly.

See gh-9862
2017-07-28 11:59:15 +02:00
Stephane Nicoll 7736cb1dc5 Fix test so that it doesn't leave a datasource hanging around
Closes gh-9862
2017-07-28 11:43:28 +02:00
Stephane Nicoll ebbe29cc85 Migrate HazelcastJpaDependencyAutoConfigurationTests to context runner
This commit also makes sure to generate unique embedded data source and
disable datasource initialization as this is not required by those
tests.

See gh-9889
2017-07-28 11:05:09 +02:00
Stephane Nicoll 49d249bdf4 Disable Aop auto-config if aspectjweaver is not present
This commit adds an additional class check to AopAutoConfiguration as
it is main role is to configure `@EnableAspectJAutoProxy` which won't
work properly if `aspectjweaver` is not present.

Closes gh-9880
2017-07-28 10:43:08 +02:00
Stephane Nicoll edee342d80 Merge branch '1.5.x' 2017-07-28 10:24:11 +02:00
Stephane Nicoll 3bc9718cc4 Merge pull request #9862 from candrews:patch-6
* pr/9862:
  Polish "Use configured schema in Liquibase endpoint"
  Use configured schema in Liquibase endpoint
2017-07-28 10:21:41 +02:00
Stephane Nicoll 7e21178f63 Polish "Use configured schema in Liquibase endpoint"
Closes gh-9862
2017-07-28 10:21:27 +02:00
Craig Andrews 3e13970fe0 Use configured schema in Liquibase endpoint
This commit makes sure that the Liquibase endpoint uses the configured
schema.

See gh-98£62
2017-07-28 10:21:27 +02:00
Andy Wilkinson c3bc449e34 Merge branch '1.5.x' 2017-07-28 07:35:46 +01:00
Andy Wilkinson ab08cccc21 Merge pull request #9725 from Gytis Trikleris
* gh-9725:
  Polish "Simplify retrieval of Narayana XARecoveryModule"
  Simplify retrieval of Narayana XARecoveryModule
2017-07-28 07:32:52 +01:00
Andy Wilkinson 2925f1b86a Polish "Simplify retrieval of Narayana XARecoveryModule"
Closes gh-9725
2017-07-28 07:32:10 +01:00
Gytis Trikleris 3874196efe Simplify retrieval of Narayana XARecoveryModule
See gh-9725
2017-07-28 07:32:01 +01:00
Phillip Webb 9127c48fb5 Fixup warnings 2017-07-27 16:39:49 -07:00
Phillip Webb a869d25dbb Polish 2017-07-27 16:16:35 -07:00
Arthur Gavlyukovskiy eac4c7e882 Add p6spy, datasource-proxy and flexy-pool starters reference
Closes gh-9828
2017-07-27 16:43:16 +02:00
Stephane Nicoll 22deceb7f2 Migrate tests to ApplicationContextRunner 2017-07-27 14:54:14 +02:00
Andy Wilkinson 62d70dacf0 Upgrade to maven-compiler-plugin 3.6.1
Closes gh-9620
2017-07-27 11:33:42 +01:00
Andy Wilkinson 003fbb6660 Merge branch '1.5.x' 2017-07-27 10:51:27 +01:00
Andy Wilkinson b190a0779d Merge pull request #9678 from Priyanshi Goyal
* gh-9678:
  Polish "Deprecate JsonContent.assertThat()"
  Deprecate JsonContent.assertThat()
2017-07-27 10:51:14 +01:00
Andy Wilkinson 7a4c18eaba Polish "Deprecate JsonContent.assertThat()"
Closes gh-9678
2017-07-27 10:50:09 +01:00
Priyanshi fa57491030 Deprecate JsonContent.assertThat()
See gh-9678
2017-07-27 10:49:55 +01:00
Andy Wilkinson 56b817e8ad Merge branch '1.5.x' 2017-07-27 10:30:23 +01:00
Andy Wilkinson d62c26c971 Ensure that preinitialization has completed before run returns
Previously, background preinitialization was started in response to
an ApplicationEnvironmentPreparedEvent and would complete at an
undetermined time later. This opened a window where SpringApplication
run could return and background preinitialization could still be
in progress. If, within this window, something attempted to configure
the logging system, an IO failure could occur as logging on the
background preinitialization thread would attempt to use resources
that had been closed.

This commit updates BackgroundPreinitializer so that it waits for
preinitialization to have completed when it receives an application
ready or application failed event. This prevents SpringApplication
run from returning while preinitialization is still in progress,
closing the window described above.

With info level logging enabled it appears that background
preinitialization consistently completes before the application ready
event is published. As a result, waiting should have no adverse effect
on performance in normal circumstances. With logging configured such
that background preinitialization outputs a large volume of log
messages (enabling trace logging for the root logger, for example), it
will be slowed down sufficiently for waiting to be necessary.

Closes gh-5669
2017-07-27 10:18:21 +01:00
Andy Wilkinson 42eec50e90 Perform background preinitialization once per class loader
Background preinitialization triggers static initialization of a
number of components that are slow to initialize. As the
initialization is static, it's only necessary once per class loader.

Previously, a new background preinitialization thread would be
created and started for each ApplicationEnvironmentPreparedEvent.
This commit updates the preinitializer to only create and start the
thread if preinitialization has not already been started for the
current class loader.

Closes gh-9869
2017-07-27 10:18:21 +01:00
Stephane Nicoll 579c6feb93 Polish 2017-07-27 11:10:12 +02:00
Stephane Nicoll eacb6b13f3 Fix compatibility with JUnit's ExpectedException
This commit ensures that an exception that is thrown as part of the
`ContextConsumer` callback is thrown as is.

Closes gh-9878
2017-07-27 11:08:01 +02:00
Andy Wilkinson 7532876efc Merge branch '1.5.x' 2017-07-27 09:52:33 +01:00
Andy Wilkinson 6f864c6210 Fix up version numbers following release 2017-07-27 09:52:16 +01:00
Spring Buildmaster 17a5bb0be4 Next development version 2017-07-27 08:00:21 +00:00