Commit Graph

12882 Commits

Author SHA1 Message Date
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
Andy Wilkinson bc50790e16 Merge branch '1.5.x' 2017-07-27 07:09:39 +01:00
Andy Wilkinson 3c27567e35 Upgrade to Spring Data Ingalls SR6
Closes gh-9871
2017-07-27 07:08:16 +01:00
Phillip Webb 6823c2ad10 Merge branch 'gh-9875'
Closes gh-9875
2017-07-26 17:51:56 -07:00
Phillip Webb 89ad0660d1 Make ApplicationContextRunner immutable
Update `ApplicationContextRunner` so that it is totally immutable.
Methods now return new instances rather than changing existing state.

See gh-9875
2017-07-26 17:50:34 -07:00
Phillip Webb ad9f28110c Make TestPropertyValues immutable
Update `TestPropertyValues` so that it is totally immutable. Methods
now return a new instance rather than changing existing state.

See gh-9875
2017-07-26 17:49:31 -07:00
Phillip Webb 07556cda51 Restructure `boot.test.context` package
Split up `org.springframework.boot.test.context` into distinct packages
for `runner` and `assertj`.

See gh-9875
2017-07-26 17:47:59 -07:00
Phillip Webb 497457c397 Rename ApplicationContextTester -> Runner
Rename `ApplicationContextTester` and related classes to
`ApplicationContextRunner` and refactor existing tests to use correctly
named variables.

See gh-9875
2017-07-26 17:46:06 -07:00
Andy Wilkinson 5616915621 Polishing 2017-07-26 17:40:29 +01:00
Stephane Nicoll 0fc3e3d166 Merge pull request #9763 from thombergs:naming-strategy-docs-gh-3035
* pr/9763:
  Polish "Polish Hibernate naming strategy doc"
  Polish Hibernate naming strategy doc
2017-07-26 14:50:03 +02:00
Stephane Nicoll 9575b4b723 Polish "Polish Hibernate naming strategy doc"
Closes gh-9763
2017-07-26 14:49:42 +02:00
Tom Hombergs eeee1bdae5 Polish Hibernate naming strategy doc
See gh-9763
2017-07-26 14:33:22 +02:00
Stephane Nicoll 8d3d16b235 Merge pull request #9855 from izeye:polish-20170725-update
* pr/9855:
  Polish
2017-07-26 13:40:10 +02:00
Johnny Lim 9b15389009 Polish
Closes gh-9855
2017-07-26 13:39:47 +02:00
Stephane Nicoll 75fc0c38c8 Merge branch '1.5.x' 2017-07-26 13:39:25 +02:00
Johnny Lim fe1eb8b5f3 Polish
See gh-9855
2017-07-26 13:39:00 +02:00
Andy Wilkinson 5091221095 Merge branch '1.5.x' 2017-07-26 10:41:08 +01:00
Andy Wilkinson 39b4270b7e Fix up version numbers following release 2017-07-26 10:40:35 +01:00
Stephane Nicoll 9891462ac4 Migrate test to WebApplicationContextTester 2017-07-26 11:25:04 +02:00