Commit Graph

11128 Commits

Author SHA1 Message Date
Andy Wilkinson 5a8a86375d Sanitize individual env entry that is matched exactly
Closes gh-9918
See gh-8282
2017-07-31 15:27:55 +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
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 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 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
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 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
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 3c27567e35 Upgrade to Spring Data Ingalls SR6
Closes gh-9871
2017-07-27 07:08:16 +01:00
Johnny Lim fe1eb8b5f3 Polish
See gh-9855
2017-07-26 13:39:00 +02:00
Andy Wilkinson 39b4270b7e Fix up version numbers following release 2017-07-26 10:40:35 +01:00
Spring Buildmaster 41c5c0e7c9 Next development version 2017-07-26 08:30:55 +00:00
Stephane Nicoll 4740b47985 Upgrade to Spring Data Ingalls SR5-1
Closes gh-9834
2017-07-26 08:28:53 +02:00
Andy Wilkinson 853cd2a074 Merge pull request #9758 from Misagh Moayyed
* gh-9758:
  Polish "Locate additional metadata when using Gradle 4"
  Locate additional metadata when using Gradle 4
2017-07-25 16:53:28 +01:00
Andy Wilkinson e0be40cd94 Polish "Locate additional metadata when using Gradle 4"
Closes gh-9732
2017-07-25 16:48:46 +01:00
Misagh Moayyed 980b83c0d8 Locate additional metadata when using Gradle 4
Closes gh-9758
2017-07-25 16:48:27 +01:00
Andy Wilkinson aedeaa943a Upgrade to Mysql 5.1.43
Closes gh-9857
2017-07-25 09:57:11 +01:00
Stephane Nicoll 6c271bb679 Upgrade to Spring Data Ingalls SR5
Closes gh-9834
2017-07-25 08:59:10 +02:00
Phillip Webb dca463c7d9 Polish 2017-07-24 12:54:24 -07:00
Phillip Webb 66619bbe2b Formatting 2017-07-24 12:54:24 -07:00
Phillip Webb 28dad44e2d Be defensive about JUL calls from JAR Handler
Update nested JAR support to only obtain JUL loggers when absolutely
necessary and to defensively deal with failures.

Prior to this commit it was not possible to override
`java.util.logging.manager` to use a nested JAR as the logger
implementation.

Fixes gh-9848
2017-07-24 12:54:24 -07:00
Phillip Webb b9cfe21193 Make @ImportAutoConfiguration not register package
Update `@ImportAutoConfiguration` so that it is no longer annotated with
`@AutoConfigurationPackage` and as such isn't a marker for
`AutoConfigurationPackages`.

Having `@ImportAutoConfiguration` marked as an auto-configuration
package is particularly problematic in tests since it frequently breaks
context caching.

Fixes gh-9282
2017-07-24 12:54:24 -07:00
Andy Wilkinson 2775beb2b7 Revert "Upgrade to Spring Data Ingalls SR5"
This reverts commit 8b2f09d35b.
It's not in Maven Central.
2017-07-24 19:35:42 +01:00
Andy Wilkinson 8b2f09d35b Upgrade to Spring Data Ingalls SR5
Closes gh-9834
2017-07-24 19:27:59 +01:00
Stephane Nicoll 9fd94720f1 Better customization of the auto-configured ActiveMQConnectionFactory
This commit exposes additional properties and a callback interface to
further tune the auto-configured ActiveMQConnectionFactory.

Closes gh-9667
2017-07-24 15:27:17 +02:00
Stephane Nicoll 9a34d952e9 Provide an alternative to `spring.activemq.pool.configuration`
This commit expands the support of PooledConnectionFactory so that
binding the third party object is no longer necessary. All 3rd party
properties are now deprecated in favour of our explicit support.

The main reason behind this change is that a `connection-factory` and
`properties` property were exposed. The former is used to set the
`ConnectionFactory` and makes no sense as a key. The latter is
rebuilding the underlying `ActiveMQConnectionFactory` at each call
without reusing any existing settings.

Closes gh-9837
2017-07-24 13:48:53 +02:00
Stephane Nicoll 0680c4ce2b Add Hiatus for Spring Boot to the list of 3rd party starters
Closes gh-9846
2017-07-24 13:46:14 +02:00
Andy Wilkinson d4ecda9030 Work around javac bug (internal review ID 9050163) 2017-07-24 12:37:14 +01:00
Andy Wilkinson feb964b559 Merge pull request #9534 from Danny Thomas
* gh-9534:
  Polish "Ensure SpringBootDITEL fails with the original failure"
  Ensure SpringBootDITEL fails with the original failure
2017-07-24 11:38:28 +01:00
Andy Wilkinson b7080ddec5 Polish "Ensure SpringBootDITEL fails with the original failure" 2017-07-24 11:37:40 +01:00
Danny Thomas 2c48087604 Ensure SpringBootDITEL fails with the original failure
See gh-9534
2017-07-24 11:23:16 +01:00
Andy Wilkinson 94ea3e8618 Merge pull request #9724 from Gytis Trikleris
* gh-9724:
  Polish "Make NarayanaRecoveryManagerBean conditional on missing bean"
  Make NarayanaRecoveryManagerBean conditional on missing bean
2017-07-24 11:18:33 +01:00
Andy Wilkinson bb35e772c2 Polish "Make NarayanaRecoveryManagerBean conditional on missing bean"
Closes gh-9724
2017-07-24 11:17:39 +01:00
Gytis Trikleris d8a6954744 Make NarayanaRecoveryManagerBean conditional on missing bean
See gh-9724
2017-07-24 11:16:34 +01:00
Andy Wilkinson 8f877dcee2 Disable auto-config of Narayana's JMS support when JMS module absent
Closes gh-9844
2017-07-24 10:42:40 +01:00
Andy Wilkinson be535103a7 Merge pull request #9832 from Johnny Lim
* gh-9832:
  Use currentHealth consistently in getHealth()
2017-07-22 08:22:06 +01:00
Johnny Lim d18e452fcd Use currentHealth consistently in getHealth()
Closes gh-9832
2017-07-22 08:21:43 +01:00
Andy Wilkinson 39b4ecdf63 Adapt to breaking change in Spring Data
See gh-9834
2017-07-22 08:11:26 +01:00
Andy Wilkinson 8207852bcd Ensure that detected request factories are initialized
Closes gh-9797
2017-07-22 08:10:04 +01:00