Commit Graph

27490 Commits

Author SHA1 Message Date
Andy Wilkinson
c1a81cfca0 Prohibit bean overriding by default and analyze override failures
Closes gh-13609
2018-07-10 12:28:18 +01:00
Andy Wilkinson
cdd9c92ba2 Start building against snapshots for Spring Data Lovelace RC1
See gh-13740
2018-07-10 11:42:37 +01:00
Andy Wilkinson
19a494a94d Merge branch '2.0.x' 2018-07-10 10:27:39 +01: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
0c2c018f19 Merge pull request #13707 from izeye
* gh-13707:
  Fix parameter order for RequestMatcherAssert.doesNotMatch()
2018-07-09 15:21:40 -07:00
Johnny Lim
b87b23a44f Fix parameter order for RequestMatcherAssert.doesNotMatch()
Closes gh-13707
2018-07-09 15:20:18 -07:00
Madhura Bhave
63ae682a95 Merge branch '2.0.x' 2018-07-09 14:16:17 -07: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
063e8e4dc6 Revert "Prohibit bean overriding by default and analyze override failures"
This reverts commit 710cdbab92.
2018-07-09 17:58:49 +01:00
Andy Wilkinson
710cdbab92 Prohibit bean overriding by default and analyze override failures
Closes gh-13609
2018-07-09 13:50:16 +01:00
Andy Wilkinson
918191664a Merge branch '2.0.x' 2018-07-09 13:39:30 +01: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
Brian Clozel
72f74d0b44 Merge pull request #13728 from dreis2211:fix-netty-reactive-tests
* pr/13728:
  Fix API adaptation changes for Reactor Netty
2018-07-09 13:44:49 +02:00
dreis2211
d1acf9a24d Fix API adaptation changes for Reactor Netty 2018-07-09 13:44:08 +02:00
Stephane Nicoll
60457f1d9a Merge branch '2.0.x' 2018-07-09 13:22:14 +02: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
0b48e223f3 Merge branch '2.0.x' 2018-07-09 10:50:18 +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
Stephane Nicoll
f0a31daa57 Merge pull request #13583 from dreis2211:move-conditionals-inside-branch
* pr/13583:
  Polish conditional expressions
2018-07-09 09:15:29 +02:00
dreis2211
5fcba490d2 Polish conditional expressions
Closes gh-13583
2018-07-09 09:15:10 +02:00
Stephane Nicoll
10e05f6503 Merge pull request #13567 from dreis2211:remove-classutils-binder
* pr/13567:
  Optimize checks for java classes in Binder
2018-07-09 08:51:23 +02:00
dreis2211
ba46e77169 Optimize checks for java classes in Binder
Closes gh-13567
2018-07-09 08:51:06 +02:00
Stephane Nicoll
7baa41f148 Merge pull request #13540 from Catalysts:KL/structurizr-starter
* pr/13540:
  Polish "Add reference to structurizr starter"
  Add reference to structurizr starter
2018-07-09 08:39:28 +02:00
Stephane Nicoll
3e24df1794 Polish "Add reference to structurizr starter"
Closes gh-13540
2018-07-09 08:38:58 +02:00
Klaus Lehner
94517b9811 Add reference to structurizr starter
See gh-13540
2018-07-09 08:36:43 +02:00
Andy Wilkinson
fde534c877 Merge branch '2.0.x' 2018-07-06 13:53:08 +01: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
Brian Clozel
68a3c234be Adapt to API changes in Reactor Netty
The following issue changed the SSL configuration API for both client
and server: https://github.com/reactor/reactor-netty/issues/370
2018-07-06 14:45:47 +02:00
Brian Clozel
bdd95f09a4 Polish WebClient metrics support
This commit improves the for Actuator Metrics in WebClient.

Unlike the server couterpart of WebFlux, using a `retry` operator on a
`WebClient` pipeline does resubscribes to the whole chain.
The previous implementation recorded start time at the time of pipeline
build phase, but outside of it. This doesn't work since retrying the
same pipeline doesn't update the recorded start time and the duration of
sequential calls are cumulative.

This is now fixed using the Reactor `Context`, since we're now recording
the start time at subscription time and record metrics on `onNext` and
`onError` signals.

Closes gh-12228
2018-07-05 15:58:34 +02:00
Andy Wilkinson
337d2d8e9a Merge branch '2.0.x' 2018-07-04 15:25:33 +01:00
Andy Wilkinson
58be01a790 Try to make Jest auto-configuration tests more robust 2018-07-04 15:25:10 +01:00
Andy Wilkinson
913872327c Merge branch '2.0.x' 2018-07-04 14:29:15 +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
24dde11bde Merge pull request #13570 from Galder Zamarreño
* gh-13570:
  Update Infinispan dependency management for changes between 9.1 and 9.3
  Upgrade to Infinispan 9.3.0.Final
2018-07-04 14:04:19 +01:00
Andy Wilkinson
bc65c4cb2c Update Infinispan dependency management for changes between 9.1 and 9.3
Closes gh-13570
2018-07-04 14:00:22 +01:00
Galder Zamarreño
79155a5313 Upgrade to Infinispan 9.3.0.Final
See gh-13570
2018-07-04 12:57:59 +01:00
Andy Wilkinson
ed39d0106d Remove dependency management for groovy-all as it doesn't exist in 2.5
See gh-13670
2018-07-04 10:32:38 +01:00
Andy Wilkinson
4799a539fe Stop using groovy-all as it does not exist in Groovy 2.5 2018-07-03 22:12:47 +01:00
Andy Wilkinson
fd624c20cf Upgrade to Hikaricp 3.2.0
Closes gh-13695
2018-07-03 20:04:55 +01:00
Andy Wilkinson
5e6220f040 Upgrade to Versions Maven Plugin 2.5
Closes gh-13694
2018-07-03 20:04:55 +01:00
Andy Wilkinson
27d727b52e Upgrade to Maven Site Plugin 3.7.1
Closes gh-13693
2018-07-03 20:04:55 +01:00