Commit Graph

16842 Commits

Author SHA1 Message Date
dreis2211
ac8eebfbad Fix typos
Closes gh-13762
2018-07-13 07:54:03 +02:00
Stephane Nicoll
19709f7dea Polish 2018-07-12 16:57:52 +02:00
Stephane Nicoll
510c99cc0e Merge branch '1.5.x' into 2.0.x 2018-07-12 08:55:10 +02:00
Stephane Nicoll
c23c18dc34 Merge pull request #13755 from izeye:patch-49
* pr/13755:
  Fix typo
2018-07-12 08:51:32 +02:00
Johnny Lim
e7cb1c63bb Fix typo
Closes gh-13755
2018-07-12 08:51:11 +02:00
Madhura Bhave
d7822ba135 Update copyright header for modified files 2018-07-11 15:25:39 -07:00
Madhura Bhave
c8c32cfa33 Migrate tests to ApplicationContextRunner 2018-07-11 15:06:36 -07:00
Andy Wilkinson
cced3514a7 Polish 2018-07-11 17:49:10 +01:00
Andy Wilkinson
c489c6c5f6 Polish test following forward merge 2018-07-11 17:13:45 +01:00
Andy Wilkinson
67dfa0a720 Merge branch '1.5.x' into 2.0.x 2018-07-11 16:51:43 +01:00
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
2018-07-11 16:46:37 +01:00
Andy Wilkinson
44273ee093 Merge branch '1.5.x' into 2.0.x 2018-07-11 14:38:49 +01:00
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
2018-07-11 11:47:17 +01:00
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
2018-07-11 11:23:44 +02:00
Stephane Nicoll
331775d6c0 Document latest version of gradle-git-properties plugin
Closes gh-13747
2018-07-11 10:13:41 +02:00
Johnny Lim
f94ce495d8 Fix parameter order for RequestMatcherAssert.doesNotMatch()
Closes gh-13707
2018-07-10 11:36:47 -07:00
Stephane Nicoll
177c54d441 Migrate JdbcTemplateAutoConfiguration tests to context runner 2018-07-10 19:45:20 +02:00
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
2018-07-10 17:06:36 +02:00
Stephane Nicoll
dd2b0eb739 Merge pull request #13545 from izeye:fix-traceable-query-string
* pr/13545:
  Fix query string encoding in TraceableHttpServletRequest
2018-07-10 15:58:26 +02:00
Johnny Lim
46e6aa5963 Fix query string encoding in TraceableHttpServletRequest
Closes gh-13545
2018-07-10 15:56:10 +02:00
Stephane Nicoll
419bf0d1ed Merge pull request #13710 from izeye:get-url-mappings
* pr/13710:
  Separate logging from getUrlMappings()
2018-07-10 15:31:43 +02:00
Johnny Lim
0de8317979 Separate logging from getUrlMappings()
Closes gh-13710
2018-07-10 15:27:43 +02:00
Andy Wilkinson
57e2bb9c6a Merge branch '1.5.x' into 2.0.x 2018-07-10 10:27:28 +01:00
Andy Wilkinson
73a08dd668 Avoid overriding beans and ensure import order is used for DataSource
During processing of a configuration class, the class's complete
hierarchy is processed and during the processing of each class its
member classes are processed. Previously, each pool-specific
inner-class of DataSourceConfiguration extended the abstract outer
class. This meant that when the import from
DataSourceAutoConfiguration.PooledDataSourceConfiguration caused the
first pool-specific inner-class to be  processed,
DataSourceConfiguration would be processed as it was the inner-class's
superclass. In turn all of DataSourceConfiguration's member classes
would then be processed. This caused the first import (of
DataSourceConfiguration.Tomcat) to trigger processing of all of the
other pool-specific inner-classes in whatever order they were found
rather than them being processed in the order in which they are
imported by DataSourceAutoConfiguration.PooledDataSourceConfiguration.

Another part of the problem was that none of the pool-specific
inner-classes were conditional on a missing DataSource bean. This
meant that, when multiple pools were on the classpath, each class
after the first would override the previous class's definition of the
DataSource bean.

This commit updates each of the pool-specific inner-classes so that
they no longer extend DataSourceConfiguration. This ensures that
the inner classes are processed in the order defined in the import
on PooledDataSourceConfiguration. Each of the classes has also been
annotated with @ConditionalOnMissingBean(DataSource.class). This
prevents the DataSource bean definition from being overridden and
ensures that the order of precedence for the pool that will be used
is as defined in the import.

Closes gh-13737
2018-07-10 09:45:15 +01:00
Madhura Bhave
4e7719f1c7 Fix typo 2018-07-09 14:15:19 -07:00
Madhura Bhave
7bda971971 Merge branch '1.5.x' into 2.0.x 2018-07-09 14:13:36 -07:00
Madhura Bhave
8b2cb32ae7 Fix typo 2018-07-09 14:10:31 -07:00
Andy Wilkinson
9eb5c9bd18 Merge branch '1.5.x' into 2.0.x 2018-07-09 13:39:11 +01:00
Andy Wilkinson
a50646b7cc Fix repackaging of jars with non-default compression configuration
Previously, if a jar that used custom compression configuration was
repackaged, a failure may occur if an entry in the repackaged jar had
a different compressed size to the entry in the source jar.

This commit updates JarWriter to clear the input entry's compressed
size (by setting it to -1) so that the repackaged entry's compressed
size does not have to match that of the input entry.

Closes gh-13720
2018-07-09 13:16:41 +01:00
Stephane Nicoll
44ebeb8a6f Merge pull request #13619 from 72MiguelGomes:small-documentation-improve
* pr/13619:
  Polish "Improve description of Endpoint exclude"
  Improve description of Endpoint exclude
2018-07-09 13:21:57 +02:00
Stephane Nicoll
44b9aa168e Polish "Improve description of Endpoint exclude"
Closes gh-13619
2018-07-09 13:20:43 +02:00
Miguel Gomes
838e6cdbbb Improve description of Endpoint exclude
See gh-13619
2018-07-09 13:12:13 +02:00
Stephane Nicoll
00883a4eac Merge pull request #13616 from izeye:polish-20180630
* pr/13616:
  Polish
2018-07-09 10:49:55 +02:00
Johnny Lim
ab6adc8265 Polish
Closes gh-13616
2018-07-09 10:45:01 +02:00
Andy Wilkinson
809e30506f Merge branch '1.5.x' into 2.0.x 2018-07-06 13:52:53 +01:00
Andy Wilkinson
9a49e8ef73 Format Jackson property table so it fits within default page width
Closes gh-13709
2018-07-06 13:48:50 +01:00
Andy Wilkinson
58be01a790 Try to make Jest auto-configuration tests more robust 2018-07-04 15:25:10 +01:00
Andy Wilkinson
468453b66e Upgrade to Kotlin 1.2.51
Closes gh-13705
2018-07-04 14:22:39 +01:00
Andy Wilkinson
0e8206cdf4 Start building against Spring Framework 5.0.8 snapshots
See gh-13704
2018-07-04 14:18:32 +01:00
Andy Wilkinson
f173429327 Upgrade to Flatten Maven Plugin 1.0.1
Closes gh-13650
2018-07-03 13:33:04 +01:00
Andy Wilkinson
5220a08228 Upgrade to Xml Maven Plugin 1.0.2
Closes gh-13649
2018-07-03 13:33:03 +01:00
Andy Wilkinson
573f736374 Upgrade to Maven Resources Plugin 3.0.2
Closes gh-13648
2018-07-03 13:33:02 +01:00
Andy Wilkinson
83a56bac60 Upgrade to Maven Javadoc Plugin 3.0.1
Closes gh-13647
2018-07-03 13:33:01 +01:00
Andy Wilkinson
d3ef9fd2ba Upgrade to Maven Enforcer Plugin 3.0.0-M2
Closes gh-13646
2018-07-03 13:33:00 +01:00
Andy Wilkinson
1c64496470 Upgrade to Jooq 3.10.8
Closes gh-13645
2018-07-03 13:32:59 +01:00
Andy Wilkinson
797efbd259 Upgrade to Solr 6.6.5
Closes gh-13644
2018-07-03 13:32:58 +01:00
Andy Wilkinson
c6dae8f305 Upgrade to Johnzon Jsonb 1.1.8
Closes gh-13643
2018-07-03 13:32:57 +01:00
Andy Wilkinson
aa5b70c43c Upgrade to Rxjava2 2.1.16
Closes gh-13642
2018-07-03 13:32:57 +01:00
Andy Wilkinson
9120f49721 Merge branch '1.5.x' into 2.0.x 2018-07-03 13:24:19 +01:00
Andy Wilkinson
2dd744dfed Upgrade to Git Commit Id Plugin 2.2.4
Closes gh-13640
2018-07-03 13:00:57 +01:00