Commit Graph

38906 Commits

Author SHA1 Message Date
Phillip Webb
7377d85096 Merge branch '2.7.x'
Closes gh-31866
2022-07-26 12:18:14 +01:00
Phillip Webb
a4ef6a7c5c Merge branch '2.6.x' into 2.7.x
Closes gh-31865
2022-07-26 12:13:16 +01:00
Phillip Webb
24c4ba3b53 Merge pull request #31734 from marcwrobel
* pr/31734:
  Update copyright year for "Fix typos in code and documentation"
  Fix typos in code and documentation

Closes gh-31734
2022-07-26 12:09:29 +01:00
Phillip Webb
f8412847dc Update copyright year for "Fix typos in code and documentation"
See gh-31734
2022-07-26 12:08:30 +01:00
Marc Wrobel
dbfc6bded4 Fix typos in code and documentation
See gh-31734
2022-07-26 12:08:07 +01:00
Phillip Webb
b93dbd56e8 Merge branch '2.7.x' 2022-07-26 10:51:17 +01:00
Phillip Webb
3931e82841 Merge branch '2.6.x' into 2.7.x 2022-07-26 10:50:42 +01:00
Phillip Webb
4bcec6e0ee Polish 2022-07-26 10:50:01 +01:00
Phillip Webb
757a0c2664 Update copyright year of changed files 2022-07-26 10:34:18 +01:00
Stephane Nicoll
a0dd6ef3b1 Revert "Merge pull request #31828 from quaff"
This reverts commit 68fc87bc7f.

See gh-31828
2022-07-25 16:16:51 +02:00
Moritz Halbritter
24cf5fff84 Start building against Spring HATEOAS 2.0.0-SNAPSHOT
See gh-31855
2022-07-25 09:34:33 +02:00
Andy Wilkinson
68fc87bc7f Merge pull request #31828 from quaff
* gh-31828:
  Polish "Take MethodType into account to deduce main application class"
  Take MethodType into account to deduce main application class

Closes gh-31828
2022-07-22 19:39:40 +01:00
Andy Wilkinson
b9b25644af Polish "Take MethodType into account to deduce main application class"
See gh-31828
2022-07-22 19:39:14 +01:00
Yanming Zhou
10a2471979 Take MethodType into account to deduce main application class
See gh-31828
2022-07-22 19:36:30 +01:00
Andy Wilkinson
add720594e Merge pull request #31849 from dreis2211
* gh-31849:
  Align Kotlin API and language versions

Closes gh-31849
2022-07-22 19:35:05 +01:00
dreis2211
75f375c68e Align Kotlin API and language versions
See gh-31849
2022-07-22 19:34:41 +01:00
Stephane Nicoll
f962f2a430 Configure NBT so that it works consistently
This commit configures the Native Build Tools plugin to use Maven's
`target/classes` rather than the default generated JAR of the project.
Previously, this would fail with the default repackage option as the
default JAR is the repackaged archive and it has a specific format that
NBT can't understand.

Closes gh-31848
2022-07-22 17:36:25 +02:00
Andy Wilkinson
85c41d6698 Merge branch '2.7.x'
Closes gh-31847
2022-07-22 14:48:29 +01:00
Andy Wilkinson
ac3f552dde Merge branch '2.6.x' into 2.7.x
Closes gh-31846
2022-07-22 14:47:45 +01:00
Andy Wilkinson
dd1d7a1c03 Merge pull request #31845 from dreis2211
* gh-31845:
  Polish

Closes gh-31845
2022-07-22 14:46:20 +01:00
dreis2211
de5834d203 Polish
See gh-31845
2022-07-22 14:46:01 +01:00
Andy Wilkinson
6c28156b29 Avoid config-time creation of AOT source set's tasks
Closes gh-31844
2022-07-22 14:14:03 +01:00
Andy Wilkinson
0980362a88 Merge branch '2.7.x'
Closes gh-31843
2022-07-22 12:20:17 +01:00
Andy Wilkinson
64dcfe520d Merge branch '2.6.x' into 2.7.x
Closes gh-31842
2022-07-22 12:15:39 +01:00
Andy Wilkinson
a1443d1cdc Enforce ordering in additional-spring-configuration-metadata.json files
Closes gh-31575
2022-07-22 12:09:58 +01:00
Moritz Halbritter
35c49afd97 Generate hints for nested generics in configuration properties
See gh-31708
2022-07-21 16:32:40 +02:00
Olga Maciaszek-Sharma
57dc274284 Switch to Spring Framework SNAPSHOTs
Switch to Spring Framework SNAPSHOTs and adapt to updated APIs.

See gh-31834
2022-07-21 13:42:48 +01:00
Andy Wilkinson
8f660b32c9 Merge branch '2.7.x' 2022-07-21 12:16:24 +01:00
Andy Wilkinson
86db9091cf Merge branch '2.6.x' into 2.7.x 2022-07-21 12:16:03 +01:00
Spring Builds
0cf561a759 Next development version (v2.7.3-SNAPSHOT) 2022-07-21 09:24:22 +00:00
Spring Builds
75359a2bce Next development version (v2.6.11-SNAPSHOT) 2022-07-21 07:55:44 +00:00
Stephane Nicoll
3dde83b07a Merge branch '2.7.x' 2022-07-21 08:06:49 +02:00
Stephane Nicoll
16f63afd0b Merge branch '2.6.x' into 2.7.x 2022-07-21 08:06:31 +02:00
Stephane Nicoll
e18398236f Upgrade to Maven Install Plugin 3.0.0
Closes gh-31833
2022-07-21 08:04:30 +02:00
Stephane Nicoll
a98c30866a Upgrade to Maven Deploy Plugin 3.0.0
Closes gh-31832
2022-07-21 08:04:27 +02:00
Stephane Nicoll
c8e44372b2 Upgrade to Tomcat 9.0.65
Closes gh-31831
2022-07-21 07:50:53 +02:00
Stephane Nicoll
aa93b2153a Upgrade to Embedded Mongo 3.4.7
Closes gh-31830
2022-07-21 07:50:49 +02:00
Stephane Nicoll
07f332ad96 Upgrade to Tomcat 9.0.65
Closes gh-31829
2022-07-21 07:48:24 +02:00
Stephane Nicoll
939481b9d7 Upgrade to Spring Batch 5.0.0-M4
Closes gh-31623
2022-07-21 07:43:45 +02:00
Stephane Nicoll
dfda08fd0d Upgrade to Spring Integration 6.0.0-M4
Closes gh-31624
2022-07-21 07:43:24 +02:00
Madhura Bhave
4057dd198b Change preference of session store implementations
The order has been determined based on usage statistics.

Closes gh-27756
2022-07-20 15:36:52 -07:00
Scott Frederick
6f65777035 Merge branch '2.7.x'
Closes gh-31827
2022-07-20 17:31:37 -05:00
Scott Frederick
9da38c8d2d Merge branch '2.6.x' into 2.7.x
Closes gh-31826
2022-07-20 17:29:58 -05:00
Scott Frederick
4e0b3aad9f Clarify how docker image publishing registry is determined
Closes gh-31820
2022-07-20 17:29:40 -05:00
Scott Frederick
cf7a163c6d Merge branch '2.7.x' 2022-07-20 16:07:32 -05:00
Scott Frederick
f9cf31e59e Fix compile errors
See gh-28844
2022-07-20 16:07:19 -05:00
Scott Frederick
36d6106bb0 Merge branch '2.7.x'
Closes gh-31825
2022-07-20 15:11:30 -05:00
Scott Frederick
09c7ce6dab Merge branch '2.6.x' into 2.7.x
Closes gh-31824
2022-07-20 15:10:43 -05:00
Scott Frederick
a7dfeae09c Merge branch 'gh-28844' into 2.6.x
Closes gh-31823
2022-07-20 15:10:27 -05:00
Scott Frederick
9b0cdac58a Simplify support for pushing images to unauthenticated registries
This commit removes the requirement that `docker.publishRegistry`
configuration must be provided when an image is published by the Gradle
or Maven plugin.

Fixes gh-28844
2022-07-20 15:06:05 -05:00