Commit Graph

17692 Commits (73fe8d482e69ad08fef1a14c1ddfbe2dcec15726)
 

Author SHA1 Message Date
Stephane Nicoll 04bca3f37f Merge branch '2.0.x' 6 years ago
Stephane Nicoll 19709f7dea Polish 6 years ago
Andy Wilkinson 349b6a8f73 Merge pull request #13757 from Johnny Lim
* gh-13757:
  Remove @since tag from getServlet()
6 years ago
Johnny Lim 1b3fa3ff0d Remove @since tag from getServlet()
Closes gh-13757
6 years ago
Brian Clozel 2e5f0c2873 Fix WebMvc auto-conf tests after Framework change
This commit adapts to a recent Spring Framework change (a40d25a) that
turns no-op Spring MVC beans (infrastructure components that, given
their configuration, won't contribute anything to the application) into
`NullBean` instances.
6 years ago
Stephane Nicoll 2e768c4e93 Merge branch '2.0.x' 6 years ago
Stephane Nicoll 510c99cc0e Merge branch '1.5.x' into 2.0.x 6 years ago
Stephane Nicoll c23c18dc34 Merge pull request #13755 from izeye:patch-49
* pr/13755:
  Fix typo
6 years ago
Johnny Lim e7cb1c63bb Fix typo
Closes gh-13755
6 years ago
Madhura Bhave dba0e1b778 Merge branch '2.0.x' 6 years ago
Madhura Bhave d7822ba135 Update copyright header for modified files 6 years ago
Madhura Bhave 34ebf1a97c Merge branch '2.0.x' 6 years ago
Madhura Bhave c8c32cfa33 Migrate tests to ApplicationContextRunner 6 years ago
Madhura Bhave 6d9fabf5bc Harmonize mongo auto-configuration
Provides a way to easily exclude `MongoAutoConfiguration` or
`MongoReactiveAutoConfiguration` so that multiple mongo clients
are not present.

Fixes gh-12407
6 years ago
Andy Wilkinson 1ea91ece23 Merge branch '2.0.x' 6 years ago
Andy Wilkinson cced3514a7 Polish 6 years ago
Andy Wilkinson 6a48a440b2 Annotate our test annotations with @ExtendWith(SpringExtension.class)
Closes gh-13739
6 years ago
Andy Wilkinson 889f1bce3f Merge branch '2.0.x' 6 years ago
Andy Wilkinson c489c6c5f6 Polish test following forward merge 6 years ago
Andy Wilkinson f32ab6eade Merge branch '2.0.x' 6 years ago
Andy Wilkinson 67dfa0a720 Merge branch '1.5.x' into 2.0.x 6 years ago
Andy Wilkinson 6dc14af92d Update view of bean types when an override is detected
Previously, when a bean was overridden and its type changes,
BeanTypeRegistry could be left with a stale view of the bean's type.
This would lead to incorrect bean condition evaluation as conditions
would match or not match based on the bean's old type.

This commit updates the type registry to refresh its view of a bean's
type when its definition changes.

Closes gh-13588
6 years ago
Andy Wilkinson 7b4096ab50 Merge branch '2.0.x' 6 years ago
Andy Wilkinson 44273ee093 Merge branch '1.5.x' into 2.0.x 6 years ago
Stephane Nicoll 611f2332e6 Polish Flyway keys 6 years ago
Stephane Nicoll 29fcb10f8d Polish 6 years ago
Andy Wilkinson 57ebdab2ab Delay property source initialization till LoggingSystem is initialized
Previously, the initialization of StandardServletEnvironment's
property sources in SpringBootServletInitializer led to debug logging
calls being made before the LoggingSystem had been initialized. As a
result, the system's default configuration was used and, in the case
of Logback at least, the debug logging was output to System.out
in a war deployment.

This commit updates SpringBootServletInitializer to delay the
initialization of StandardServletEnvironment's property sources until
after the LoggingSystem has been initialized, but still in time for
active profiles to be configured via servlet context parameters
(see gh-9972).

Closes gh-13736
6 years ago
Stephane Nicoll 59749d53b8 Merge branch '2.0.x' 6 years ago
Stephane Nicoll 48819253eb Fix dependency order between JdbcTemplate and database migration tools
This commit makes sure that Flyway/Liquibase migrates the schema if
necessary before a `JdbcTemplate` is made available as an injection
point.

This commit also adds a test that validates simple datasource
initialization (spring.datasource.*) happens before a `JdbcTemplate`
bean can be used.

Closes gh-13155
6 years ago
Andy Wilkinson db58654492 Make JAXB API available to Groovy Templates when running on Java 9+
See gh-13670
6 years ago
Stephane Nicoll 42f4f2ded8 Merge branch '2.0.x' 6 years ago
Stephane Nicoll 331775d6c0 Document latest version of gradle-git-properties plugin
Closes gh-13747
6 years ago
Andy Wilkinson d7fcec1ada Remove the use of a bean override form SampleKafkaApplicationTests
See gh-13609
6 years ago
Andy Wilkinson 8cc0d5577e Avoid unwanted bean overrides in spring-boot-test-autoconfigure
See gh-13609
6 years ago
Madhura Bhave cb8e5e5912 Merge branch '2.0.x' 6 years ago
Johnny Lim f94ce495d8 Fix parameter order for RequestMatcherAssert.doesNotMatch()
Closes gh-13707
6 years ago
Stephane Nicoll 8194dc4aea Merge branch '2.0.x' 6 years ago
Stephane Nicoll 177c54d441 Migrate JdbcTemplateAutoConfiguration tests to context runner 6 years ago
Andy Wilkinson 87b72cc981 Polish DevTools auto-configuration tests to avoid bean overrides
See gh-13609
6 years ago
Stephane Nicoll 5fcf45c4d0 Merge branch '2.0.x' 6 years ago
Stephane Nicoll 3423c5dddb Detect DispatcherServlets registered via ServletRegistrationBean
Previously, when a DispatcherServlet was registered via a
ServletRegistrationBean, the mappings endpoint did not expose any
information about it as it wasn't detected.

This commit fixes the detection of available DispatcherServlets in the
context so that the mappings endpoint include them all.

Closes gh-13186
6 years ago
Andy Wilkinson a5b3d549b9 Ignore Data Elasticsearch test that fails due to DATAES-470 6 years ago
Andy Wilkinson 43e2df105c Align with latest changes in Spring Data REST 6 years ago
Andy Wilkinson cf3b1f6653 Start building against Spring HATEOAS 0.25.0 snapshots
See gh-13742
6 years ago
Stephane Nicoll 8426e3c2c9 Merge branch '2.0.x' 6 years ago
Stephane Nicoll dd2b0eb739 Merge pull request #13545 from izeye:fix-traceable-query-string
* pr/13545:
  Fix query string encoding in TraceableHttpServletRequest
6 years ago
Johnny Lim 46e6aa5963 Fix query string encoding in TraceableHttpServletRequest
Closes gh-13545
6 years ago
Stephane Nicoll 6fdc5d0eee Merge pull request #13724 from dreis2211:property-sources-stream
* pr/13724:
  Use PropertySources.stream() where possible
6 years ago
dreis2211 be837ccb4b Use PropertySources.stream() where possible
Closes gh-13724
6 years ago
Stephane Nicoll 8c691273e3 Merge branch '2.0.x' 6 years ago