Commit Graph

166 Commits

Author SHA1 Message Date
Andy Wilkinson
52f398318b Merge branch '2.4.x'
Closes gh-25258
2021-02-12 13:59:56 +00:00
Andy Wilkinson
e763627e86 Merge branch '2.3.x' into 2.4.x
Closes gh-25257
2021-02-12 13:59:42 +00:00
Andy Wilkinson
63402a2984 Truncate files before writing new content to them
Previously, UpgradeApplicator would open build.gradle
using open options that left the fields existing content intact. It
would then write the new content at the beginning of the file. If
the new content was n bytes shorter than the existing content, this
would leave n bytes of the existing content at the end of the file.

This commit updates UpgradeApplicator to truncate the existing file
when it opens it. This ensures that the existing content is
completely replaced by the new content, irrespective of their lengths.

Closes gh-25256
2021-02-12 12:37:23 +00:00
Andy Wilkinson
123111cc7a Merge branch '2.4.x'
Closes gh-25227
2021-02-12 11:52:15 +00:00
Andy Wilkinson
12c3c80744 Merge branch '2.3.x' into 2.4.x
Closes gh-25226
2021-02-12 11:52:07 +00:00
Andy Wilkinson
413256501f Require a milestone when upgrading dependencies
Closes gh-25225
2021-02-12 11:51:39 +00:00
Andy Wilkinson
fc7319fbf6 Merge branch '2.4.x'
Closes gh-25181
2021-02-11 10:09:16 +00:00
Andy Wilkinson
f5176f3569 Merge branch '2.3.x' into 2.4.x
Closes gh-25180
2021-02-11 10:09:03 +00:00
Andy Wilkinson
2ba9a8c211 Polish "Remove duplicate declaration of jackson-databind"
See gh-25178
2021-02-11 10:08:34 +00:00
Vitalii Mahas
a2c491ef43 Remove duplicate declaration of jackson-databind
See gh-25178
2021-02-11 10:08:22 +00:00
Andy Wilkinson
2ff256d759 Merge branch '2.4.x'
Closes gh-25177
2021-02-10 19:43:16 +00:00
Andy Wilkinson
3c8a974558 Merge branch '2.3.x' into 2.4.x
Closes gh-25176
2021-02-10 19:42:54 +00:00
Andy Wilkinson
b6d2da0f84 Stop integer default values from becoming decimals
Fixes gh-25172
2021-02-10 19:05:38 +00:00
Andy Wilkinson
db781a0d84 Merge branch '2.4.x'
See gh-25077
2021-02-02 15:14:18 +00:00
Andy Wilkinson
788a42d694 Merge branch '2.3.x' into 2.4.x
See gh-25076
2021-02-02 15:12:27 +00:00
Andy Wilkinson
67479b6380 Add junit-platform-launcher dependency by convention
Closes gh-25074
2021-02-02 13:03:21 +00:00
Andy Wilkinson
067f5a52cc Merge branch '2.4.x'
Closes gh-24784
2021-01-12 14:17:39 +00:00
Andy Wilkinson
139152ccce Merge branch '2.3.x' into 2.4.x
Closes gh-24783
2021-01-12 14:17:24 +00:00
Andy Wilkinson
5a02996eca Fix release train version's comparison with other version types
Fixes gh-24782
2021-01-12 14:16:13 +00:00
Stephane Nicoll
63444ae957 Merge branch '2.4.x'
Closes gh-24627
2021-01-01 09:18:31 +01:00
Stephane Nicoll
052565ef2b Merge branch '2.3.x' into 2.4.x
Closes gh-24626
2021-01-01 09:18:13 +01:00
dreis2211
261b7a5b18 Update copyrights to 2021
See gh-24625
2021-01-01 09:17:13 +01:00
Stephane Nicoll
08b692581a Prepare 2.4.x branch 2020-12-14 14:22:07 +01:00
Brian Clozel
dc9cdb71f5 Merge branch '2.3.x'
Closes gh-24381
2020-12-07 20:29:14 +01:00
Brian Clozel
d2895e7453 Upgrade to Spring Doc Resources 0.2.5
Fixes gh-24146
2020-12-07 20:28:04 +01:00
Phillip Webb
e0a061707e Fix checkstyle header violation
See gh-24337
2020-12-05 07:51:37 -08:00
Phillip Webb
30c27274e2 Merge branch '2.3.x'
Closes gh-24339
2020-12-04 18:31:55 -08:00
Phillip Webb
5f351a6983 Merge branch '2.2.x' into 2.3.x
Closes gh-24338
2020-12-04 18:21:57 -08:00
Stephane Nicoll
b3165f1b36 Merge branch '2.3.x'
Closes gh-24196
2020-11-18 10:35:39 +01:00
Stephane Nicoll
ac05356427 Merge branch '2.2.x' into 2.3.x
Closes gh-24195
2020-11-18 10:34:17 +01:00
Andy Wilkinson
bce2029bc6 Merge branch '2.3.x'
Closes gh-24132
2020-11-12 08:12:39 +00:00
Andy Wilkinson
189046bd4f Revert "Reduce scope of META-INF customizations to main, source, and javadoc jars"
Closes gh-24131
2020-11-12 08:11:00 +00:00
Brian Clozel
fe359bcbfb Merge branch '2.3.x'
Closes gh-24067
2020-11-06 14:49:42 +01:00
Brian Clozel
e98db484bc Upgrade to spring-doc-resources 0.2.4
Closes gh-24066
2020-11-06 14:48:53 +01:00
Andy Wilkinson
38821c15da Merge branch '2.3.x'
Closes gh-24057
2020-11-05 15:01:49 +00:00
Andy Wilkinson
1e100677c7 Reduce scope of META-INF customizations to main, source, and javadoc jars
Closes gh-23955
2020-11-05 15:01:08 +00:00
Andy Wilkinson
d6f10e16f7 Merge branch '2.3.x'
Closes gh-24056
2020-11-05 14:37:49 +00:00
Andy Wilkinson
49ea023a64 Upgrade to test-retry-gradle-plugin 1.1.9
Closes gh-24055
2020-11-05 14:37:22 +00:00
Andy Wilkinson
b50f8359b5 Merge branch '2.3.x'
Closes gh-24003
2020-11-03 09:51:06 +00:00
Andy Wilkinson
e820400748 Polish manifests of source and javadoc jars
Previously, the main jar file and the source and javadoc jar files all
had the same changes applied to their manifests.

The commit changes the Implementation-Title of source and javadoc jars
so that the title indicates that's what they are. Rather than using
the project's description as the title (as is done for the main jar),
the titles for source and javadoc jars will now be "Source for
${project.name}" and "Javadoc for ${project.name}" respectively.

Closes gh-23974
2020-11-03 09:50:36 +00:00
Phillip Webb
fe28ad88db Merge branch '2.3.x' 2020-10-29 09:17:42 -07:00
Phillip Webb
33d66b7f82 Fix to spring-doc-resources version
See gh-23824
2020-10-29 09:16:37 -07:00
Phillip Webb
98dbfd572f Merge branch '2.3.x'
Closes gh-23971
2020-10-29 09:06:59 -07:00
Phillip Webb
2992f40222 Upgrade to spring-doc-resources 0.2.3.RELEASE
Closes gh-23824
2020-10-29 09:06:23 -07:00
Andy Wilkinson
dcb42c36f9 Ensure that additional metadata is available to annotation processor
Fixes gh-23934
2020-10-29 09:07:05 +00:00
Andy Wilkinson
3be4e225e7 Merge branch '2.3.x'
Closes gh-23954
2020-10-28 20:19:43 +00:00
Andy Wilkinson
9b12d2d7cb Ensure that additional metadata is available to annotation processor
Fixes gh-23934
2020-10-28 20:18:36 +00:00
Andy Wilkinson
1c4b4cb0cd Provide config properties for configuring WebFlux's locale resolution
Previously, the locale context resolver used with WebFlux could only be
configured by provided a custom LocaleContextResolver bean. By
constrast, when using Spring MVC, the spring.mvc.locale and
spring.mvc.locale-resolver properties could be used to configure the
locale and the resolver (fixed or Accept header) respectively.

This commit introduces spring.web.locale and spring.web.locale-resolver
properties and deprecates their spring.mvc equivalents. The new
properties can be used to configure locale resolution with either
Spring MVC or WebFlux.

Closes gh-23449
2020-10-27 11:12:00 +00:00
Phillip Webb
79b98c9edd Add ConfigurationProperty.toString() for debugging
Update `ConfigurationProperty` with a sensible `toString()` to help
debug task failures.
2020-10-26 23:47:13 -07:00
Scott Frederick
d44ecf5086 Merge branch '2.3.x'
Closes gh-23731
2020-10-16 18:00:09 -05:00