Commit Graph

24614 Commits

Author SHA1 Message Date
Andy Wilkinson
aefe52e4d0 Revert "Rework dep management to avoid consumers picking up strict constraints"
This reverts commit b34a311d02 as,
having disabled the publishing of Gradle's module metadata (4f75ab5),
the changes are no longer needed.

See gh-19609
2020-01-14 12:15:53 +00:00
Andy Wilkinson
4f75ab5f89 Disable generation of Gradle's module metadata
The way in which we deploy the artifacts (publishing to a Maven
repository on the filesystem and then using the Concourse artifactory
resource to upload them) is incompatible with Gradle's module metadata
generation.

The metadata contains an entry, url, that contains the name of the
artifact. This will be something like
spring-boot-gradle-plugin-2.3.0.BUILD-20200114.095038-1.jar. The -1 in
the name is derived from the Maven snapshot build number. It's -1 as
the local repository to which the artifact is published is empty and
has no maven-metadata.xml file. When the artifact is uploaded to
Artifactory there is a maven-metadata.xml file so the build number is
different. As a result, the module metadata points to a file that
doesn't exist. This leads to problems like this when trying to consume
the snapshots:

Could not find spring-boot-gradle-plugin-2.3.0.BUILD-20200114.095038-1-2.3.0.BUILD-SNAPSHOT.jar (org.springframework.boot:spring-boot-gradle-plugin:2.3.0.BUILD-SNAPSHOT:20200114.101952-123)

Gradle has used the maven-metadata.xml file on the server to determine
that 2.3.0.BUILD-SNAPSHOT:20200114.101952-123 is the latest version.
It has downloaded the .module file with this version but it points to
spring-boot-gradle-plugin-2.3.0.BUILD-20200114.095038-1.jar. That file
doesn't exist so the build fails.

See gh-19609
2020-01-14 11:42:41 +00:00
Stephane Nicoll
246f5ce8eb Polish Cassandra v4 support 2020-01-14 12:25:44 +01:00
Stephane Nicoll
e5499ca17a Upgrade to Spring Framework 5.2.3
Closes gh-19534
2020-01-14 11:34:54 +01:00
Stephane Nicoll
3b7472a17e Merge branch '2.2.x' 2020-01-14 11:33:53 +01:00
Stephane Nicoll
29163041ae Upgrade to Spring Framework 5.2.3
Closes gh-19531
2020-01-14 11:32:32 +01:00
Stephane Nicoll
efda0850f9 Merge branch '2.1.x' into 2.2.x 2020-01-14 11:31:46 +01:00
Stephane Nicoll
717439d3a0 Upgrade to Spring Framework 5.1.13
Closes gh-19530
2020-01-14 11:30:57 +01:00
Brian Clozel
711391cf2f Move spring.http.* config properties namespace
Closes gh-18827
2020-01-14 10:45:31 +01:00
Stephane Nicoll
7f6b01c3d2 Make sure Redis cache prefix includes cache name
This commit maps 'spring.cache.redis.key-prefix' to the new
'prefixCacheNameWith' method introduced in Spring Data Neumann. This
makes sure that the configured prefix includes the cache name.

Closes gh-16676
2020-01-14 09:09:33 +01:00
Phillip Webb
3fe4245ab6 Disable failing TomcatReactiveWebServerFactoryTests
Temporarily disable some tests in `TomcatReactiveWebServerFactoryTests`
that fail since the Netty upgrade.

See gh-19702
2020-01-13 18:44:04 -08:00
Phillip Webb
862462b791 Update copyright year of changed files 2020-01-13 17:04:19 -08:00
Phillip Webb
1e5ba09a3e Merge branch '2.2.x' 2020-01-13 17:03:51 -08:00
Phillip Webb
15652ae4c1 Update copyright year of changed files 2020-01-13 16:47:17 -08:00
Phillip Webb
f57281340c Merge branch '2.2.x' 2020-01-13 16:46:49 -08:00
Phillip Webb
3cfbfebbb1 Merge branch '2.1.x' into 2.2.x 2020-01-13 16:45:40 -08:00
Madhura Bhave
d1f51e064b Merge branch '2.2.x'
Closes gh-19701
2020-01-13 14:15:01 -08:00
Madhura Bhave
e60194c7d5 Ignore trailing slash when recording Web metrics
Fixes gh-18207
2020-01-13 14:14:28 -08:00
Phillip Webb
9bd49562fe Update copyright year of changed files 2020-01-13 14:09:11 -08:00
Phillip Webb
d0a3270fc6 Merge branch '2.2.x'
Closes gh-19692
2020-01-13 12:25:29 -08:00
Phillip Webb
8edffc8ed7 Merge branch '2.1.x' into 2.2.x
Closes gh-19688
2020-01-13 12:21:54 -08:00
Phillip Webb
faa38c946f Upgrade to Eclipse 2019.12
Closes gh-19281
2020-01-13 12:18:17 -08:00
Andy Wilkinson
abbad9973a Polish smoke tests' Gradle configuration 2020-01-13 20:07:05 +00:00
Brian Clozel
da6fe4aa6c Merge pull request #19681 from scottfrederick
* pr/19681:
  Remove support for deprecated Elasticsearch Jest client

Closes gh-19681
2020-01-13 21:05:33 +01:00
Scott Frederick
c789592e26 Remove support for deprecated Elasticsearch Jest client
Closes #19676
2020-01-13 21:03:12 +01:00
Andy Wilkinson
b34a311d02 Rework dep management to avoid consumers picking up strict constraints
Previously, enforcedPlatform dependencies were using to pull in the
constraints defined in spring-boot-dependencies and
spring-boot-parent and applied them strictly so that the constrained
version had to be used. This worked as intended in Spring Boot's own
build but incorrectly enforced those same strict version requirements
on external consumers of Spring Boot's modules.

This commit reworks how Spring Boot defines its internal dependency
management so that platform dependencies are exposed to external
consumers while enforced platform dependencies are using internally.

See gh-19609
2020-01-13 19:59:56 +00:00
Stephane Nicoll
be79252fbd Upgrade to Reactor Dysprosium-SR3
Closes gh-19653
2020-01-13 20:27:57 +01:00
Stephane Nicoll
32d6c4fda0 Merge branch '2.2.x' 2020-01-13 20:26:52 +01:00
Stephane Nicoll
b3d32c7214 Upgrade to Reactor Dysprosium-SR3
Closes gh-19643
2020-01-13 20:25:59 +01:00
Stephane Nicoll
405b9b7f93 Merge branch '2.2.x'
Closes gh-19693
2020-01-13 18:50:46 +01:00
Stephane Nicoll
3acf7b993f Merge pull request #19690 from dreis2211
* pr/19690:
  Fix typo in NoSuchBeanDefinitionFailureAnalyzer exception

Closes gh-19690
2020-01-13 18:50:35 +01:00
dreis2211
852659684b Fix typo in NoSuchBeanDefinitionFailureAnalyzer exception
See gh-19690
2020-01-13 18:48:35 +01:00
Andy Wilkinson
550e042ff0 Merge branch '2.2.x'
Closes gh-19691
2020-01-13 17:13:58 +00:00
Andy Wilkinson
30e9ba4659 Upgrade to Jakarta Validation 2.0.2
Closes gh-19687
2020-01-13 17:11:48 +00:00
Andy Wilkinson
2256aab375 Merge branch '2.2.x' 2020-01-13 17:11:16 +00:00
Andy Wilkinson
4a76bc8b46 Cope with different exception messages in ValidationException failure analyzer
Fixes gh-19671
2020-01-13 17:11:11 +00:00
Andy Wilkinson
9ca588631e Merge branch '2.2.x'
Closes gh-19689
2020-01-13 17:10:16 +00:00
Andy Wilkinson
27306369c5 Cope with different exception messages in ValidationException failure analyzer
Fixes gh-19671
2020-01-13 17:10:03 +00:00
Andy Wilkinson
5c0b7b7e67 Merge pull request #19680 from dreis2211
* gh-19680:
  Disable tests on Java 13 that require an incompatible Gradle version

Closes gh-19680
2020-01-13 16:52:00 +00:00
dreis2211
d454c9653c Disable tests on Java 13 that require an incompatible Gradle version
See gh-19680
2020-01-13 16:51:55 +00:00
Stephane Nicoll
f13ff3b939 Merge branch '2.2.x'
Closes gh-19686
2020-01-13 17:45:06 +01:00
Stephane Nicoll
101fd14286 Merge branch '2.1.x' into 2.2.x
Closes gh-19685
2020-01-13 17:44:45 +01:00
Stephane Nicoll
91fff91025 Merge pull request #19540 from jason-liu475
* pr/19540:
  Polish "Make equality checks defensive to null reference"
  Make equality checks defensive to null reference

Closes gh-19540
2020-01-13 17:42:06 +01:00
Stephane Nicoll
8b8a4ee65e Polish "Make equality checks defensive to null reference"
See gh-19540
2020-01-13 17:38:38 +01:00
liuhuan
6d8b849361 Make equality checks defensive to null reference
See gh-19540
2020-01-13 17:38:26 +01:00
Stephane Nicoll
4796701337 Merge branch '2.2.x'
Closes gh-19683
2020-01-13 17:24:08 +01:00
Stephane Nicoll
66755105ea Merge branch '2.1.x' into 2.2.x
Closes gh-19682
2020-01-13 17:21:24 +01:00
Stephane Nicoll
e87ed08ef4 Merge pull request #19637 from nosan
* pr/19637:
  Fix retrieval of parent logger in PoolingDataSourceBean

Closes gh-19637
2020-01-13 17:20:31 +01:00
Dmytro Nosan
b7e69890f3 Fix retrieval of parent logger in PoolingDataSourceBean
See gh-19637
2020-01-13 17:16:57 +01:00
Stephane Nicoll
738ba15d0c Merge branch '2.2.x'
Closes gh-19679
2020-01-13 17:01:17 +01:00