Commit Graph

16971 Commits (9ca9a491ca79d1018436466ea5ee9cb93dc7bb32)
 

Author SHA1 Message Date
Johnny Lim 0de8317979 Separate logging from getUrlMappings()
Closes gh-13710
6 years ago
Andy Wilkinson 57e2bb9c6a Merge branch '1.5.x' into 2.0.x 6 years ago
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
6 years ago
Madhura Bhave 4e7719f1c7 Fix typo 6 years ago
Madhura Bhave 7bda971971 Merge branch '1.5.x' into 2.0.x 6 years ago
Madhura Bhave 8b2cb32ae7 Fix typo 6 years ago
Andy Wilkinson 9eb5c9bd18 Merge branch '1.5.x' into 2.0.x 6 years ago
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
6 years ago
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
6 years ago
Stephane Nicoll 44b9aa168e Polish "Improve description of Endpoint exclude"
Closes gh-13619
6 years ago
Miguel Gomes 838e6cdbbb Improve description of Endpoint exclude
See gh-13619
6 years ago
Stephane Nicoll 00883a4eac Merge pull request #13616 from izeye:polish-20180630
* pr/13616:
  Polish
6 years ago
Johnny Lim ab6adc8265 Polish
Closes gh-13616
6 years ago
Andy Wilkinson 809e30506f Merge branch '1.5.x' into 2.0.x 6 years ago
Andy Wilkinson 9a49e8ef73 Format Jackson property table so it fits within default page width
Closes gh-13709
6 years ago
Andy Wilkinson 58be01a790 Try to make Jest auto-configuration tests more robust 6 years ago
Andy Wilkinson 468453b66e Upgrade to Kotlin 1.2.51
Closes gh-13705
6 years ago
Andy Wilkinson 0e8206cdf4 Start building against Spring Framework 5.0.8 snapshots
See gh-13704
6 years ago
Andy Wilkinson f173429327 Upgrade to Flatten Maven Plugin 1.0.1
Closes gh-13650
6 years ago
Andy Wilkinson 5220a08228 Upgrade to Xml Maven Plugin 1.0.2
Closes gh-13649
6 years ago
Andy Wilkinson 573f736374 Upgrade to Maven Resources Plugin 3.0.2
Closes gh-13648
6 years ago
Andy Wilkinson 83a56bac60 Upgrade to Maven Javadoc Plugin 3.0.1
Closes gh-13647
6 years ago
Andy Wilkinson d3ef9fd2ba Upgrade to Maven Enforcer Plugin 3.0.0-M2
Closes gh-13646
6 years ago
Andy Wilkinson 1c64496470 Upgrade to Jooq 3.10.8
Closes gh-13645
6 years ago
Andy Wilkinson 797efbd259 Upgrade to Solr 6.6.5
Closes gh-13644
6 years ago
Andy Wilkinson c6dae8f305 Upgrade to Johnzon Jsonb 1.1.8
Closes gh-13643
6 years ago
Andy Wilkinson aa5b70c43c Upgrade to Rxjava2 2.1.16
Closes gh-13642
6 years ago
Andy Wilkinson 9120f49721 Merge branch '1.5.x' into 2.0.x 6 years ago
Andy Wilkinson 2dd744dfed Upgrade to Git Commit Id Plugin 2.2.4
Closes gh-13640
6 years ago
Andy Wilkinson ada3d325c3 Upgrade to Maven Enforcer Plugin 1.4.1
Closes gh-13639
6 years ago
Andy Wilkinson 25824a202f Upgrade to Tomcat 8.5.32
Closes gh-13638
6 years ago
Andy Wilkinson 3a793c655a Upgrade to Httpcore 4.4.10
Closes gh-13637
6 years ago
Madhura Bhave d15ca6e0de Update sync-to-maven-central CI job
Closes gh-13296
6 years ago
Madhura Bhave 673a08d228 Support microseconds in Duration conversions
Closes gh-13624
6 years ago
Andy Wilkinson 06a8c41943 Preserve trailing whitespace in origin-tracked property values
Closes gh-13602
6 years ago
Andy Wilkinson 032d5488cd Tolerate non-existent source folders in DevTools
Closes gh-13620
6 years ago
Madhura Bhave fddc9e9c7e Support multiple paths in DispatcherServletPathProvider
Closes gh-13603
6 years ago
Andy Wilkinson 43ea78f2ce Merge branch '1.5.x' into 2.0.x 6 years ago
Andy Wilkinson 6219ea27e8 Remove unwanted override of resource plugin's version
Closes gh-13607
6 years ago
Andy Wilkinson a5d20ffed7 Avoid NPE when creating method tag for WebFlux req with non-standard method
Previously, a NullPointerException would occur when WebFluxTags
attempted to create a method Tag for a request with a non-standard
method.

This commit updates WebFluxTags to use getMethodValue(), which will
never return null, rather than getMethod(), which may return null,
when determining the tag's value for the given request.

Closes gh-13596
6 years ago
Madhura Bhave 5fd30a9dc2 Merge pull request #13572 from Christoph Dreis
* gh-13572:
  Fix typo
6 years ago
dreis2211 17edf0e2fe Fix typo 6 years ago
Madhura Bhave a1491be636 Refine DispatcherServletPathProvider creation
Closes gh-13527
6 years ago
Andy Wilkinson 04119585e8 Merge branch '1.5.x' into 2.0.x 6 years ago
Andy Wilkinson 205bb764d5 Specify ID for cache providers section in reference docs
Closes gh-13551
6 years ago
Andy Wilkinson 74b8836da4 Merge branch '1.5.x' into 2.0.x 6 years ago
Andy Wilkinson 2f952fde6c Polish 6 years ago
Andy Wilkinson 02ad1893a2 Merge branch '1.5.x' into 2.0.x 6 years ago
Andy Wilkinson 454de0bfd7 Polish 6 years ago
Andy Wilkinson 911453d478 Merge branch '1.5.x' into 2.0.x 6 years ago