Commit Graph

37611 Commits

Author SHA1 Message Date
Andy Wilkinson
936998647e Work around Gradle changing line endings during property expansion
There's a known issue [1] where property expansion changes the input
files line endings to the operating system's default. This causes
problems for us on Windows as the line endings become \r\n which
breaks our formatting checks.

This commit tunes the checkFormatMain task to exclude the generated
source files from checking. In their place, the original templates
are added. This ensures that the inputs are correctly formatted and,
therefore, that the output should be too (other than the line endings
on Windows).

Closes gh-30039

[1] https://github.com/gradle/gradle/issues/1151
2022-03-02 20:26:15 +00:00
Andy Wilkinson
1db1ef49c6 Merge branch '2.7.x' 2022-03-02 15:57:12 +00:00
Andy Wilkinson
2f7a0c4e8d Merge branch '2.6.x' into 2.7.x 2022-03-02 15:57:00 +00:00
Andy Wilkinson
0ca64d3b64 Merge branch '2.5.x' into 2.6.x
Closes gh-30038
2022-03-02 15:56:04 +00:00
Andy Wilkinson
35e5b4329e Provide complete dependency management for Netty tcNative
Closes gh-30010
2022-03-02 15:55:15 +00:00
Andy Wilkinson
a5ec85bede Merge branch '2.7.x' 2022-03-02 15:24:23 +00:00
Andy Wilkinson
b89c29f29c Merge branch '2.6.x' into 2.7.x
Closes gh-30037
2022-03-02 15:24:10 +00:00
Andy Wilkinson
ea729fc1c6 Merge branch '2.5.x' into 2.6.x
Closes gh-30036
2022-03-02 15:21:43 +00:00
Andy Wilkinson
4073cf8334 Only apply special handling of META-INF to jar files
The changes for gh-28562 attempted to align the Gradle plugin's
handling of META-INF with the Maven plugin's behavior. Unfortunately,
they want too far, applying the handling to both jar and war files
when the Maven plugin only applies it to jar files.

This commit reworks the changes so that they only apply to jar files.

Closes gh-30026
2022-03-02 15:19:09 +00:00
Andy Wilkinson
f95e5b9b8a Merge branch '2.7.x' 2022-03-02 12:21:39 +00:00
Andy Wilkinson
324c4310a4 Merge branch '2.6.x' into 2.7.x
Closes gh-30034
2022-03-02 12:21:29 +00:00
Andy Wilkinson
8a4a639734 Merge branch '2.5.x' into 2.6.x
Closes gh-30033
2022-03-02 12:21:20 +00:00
Andy Wilkinson
b43715c70b Merge pull request #29983 from izeye
* gh-29983:
  Remove redundant ConditionalOnMissingFilterBean

Closes gh-29983
2022-03-02 12:21:12 +00:00
izeye
140d24d567 Remove redundant ConditionalOnMissingFilterBean
See gh-29983
2022-03-02 11:40:44 +00:00
Andy Wilkinson
81b8b6a24c Merge branch '2.7.x' 2022-03-02 11:22:57 +00:00
Andy Wilkinson
a33dd254c8 Merge branch '2.6.x' into 2.7.x
Closes gh-30032
2022-03-02 11:22:12 +00:00
Andy Wilkinson
1ac1782e21 Merge branch '2.5.x' into 2.6.x
Closes gh-30031
2022-03-02 11:21:56 +00:00
Andy Wilkinson
1547bad452 Merge branch '2.7.x' 2022-03-02 11:07:40 +00:00
Andy Wilkinson
1f8c5942cf Merge branch '2.6.x' into 2.7.x
Closes gh-30030
2022-03-02 11:07:27 +00:00
Andy Wilkinson
35f9358eb2 Manage more of Kafka's modules
Closes gh-29023
2022-03-02 11:06:25 +00:00
Andy Wilkinson
4ac884ee2d Merge branch '2.5.x' into 2.6.x
Closes gh-30029
2022-03-02 10:28:50 +00:00
Andy Wilkinson
69ce392c34 Add support for classifiers when defining a bom
Closes gh-29298
2022-03-02 10:17:45 +00:00
Andy Wilkinson
89b2015adf Merge branch '2.7.x' 2022-03-01 17:49:48 +00:00
Andy Wilkinson
07b87668a4 Merge branch '2.6.x' into 2.7.x
Closes gh-30023
2022-03-01 17:49:31 +00:00
Andy Wilkinson
3630952f7b Merge branch '2.5.x' into 2.6.x
Closes gh-30022
2022-03-01 17:49:14 +00:00
Andy Wilkinson
a265f150ac Improve parsing of numeric default values
Previously, all integral numbers were parsed as integers. This
caused two problems:

1. Compilation would fail if the default value for a long wasn't a
   valid integer.
2. The default value for a byte or short could be out of range,
   resulting in the generation of invalid metadata and an error
   that could have been caught at compile time not being caught
   until runtime.

This commit updates the parsing of all numeric values to use the
parse method of the target primitive type. For example,
Short.parseShort(String) is now used to parse a short.

Fixes gh-30020
2022-03-01 17:38:19 +00:00
Moritz Halbritter
16c828b4d0 Merge branch '2.7.x' 2022-03-01 14:00:52 +01:00
Moritz Halbritter
0072cc807c Suppress deprecation warnings caused by micrometer backwards compatability 2022-03-01 14:00:27 +01:00
Andy Wilkinson
3eb61c3203 Merge branch '2.7.x' 2022-03-01 12:37:36 +00:00
Andy Wilkinson
97c47123d5 Merge branch '2.6.x' into 2.7.x
Closes gh-30019
2022-03-01 12:35:57 +00:00
Andy Wilkinson
c8b849e2f6 Merge branch '2.5.x' into 2.6.x
Closes gh-30018
2022-03-01 12:32:07 +00:00
Andy Wilkinson
355f80ab98 Add links to Spring Boot for Apache Geode and its documentation
Closes gh-29697
2022-03-01 12:13:58 +00:00
Moritz Halbritter
e58ba15249 Merge branch '2.7.x' 2022-03-01 11:57:03 +01:00
Moritz Halbritter
9c958669f4 Add io.micrometer:micrometer-binders as dependency to the test suite 2022-03-01 11:56:43 +01:00
Moritz Halbritter
790171c0be Merge branch '2.7.x' 2022-03-01 10:25:31 +01:00
Moritz Halbritter
7897a913a7 Start building against Micrometer 1.9.0-M4 snapshots
Micrometer duplicated the binders in a separate module named
micrometer-binders, and marked the binders in the core module as
deprecated. This commit changes the imports to use the new binders in
the micrometer-binders module. Additionally, the auto-configurations
honor user-supplied beans which use the old binders in the
micrometer-core module.

See gh-30014
2022-03-01 09:20:07 +01:00
Andy Wilkinson
0837083800 Merge branch '2.7.x' 2022-02-28 11:27:21 +00:00
Andy Wilkinson
74726bddcf Merge pull request #29976 from dugenkui03
* gh-29976:
  Polish "Remove redundant ResourceLoaders from GraphQL auto-configuration"
  Remove redundant ResourceLoaders from GraphQL auto-configuration

Closes gh-29976
2022-02-28 11:27:03 +00:00
Andy Wilkinson
19b5431ba4 Polish "Remove redundant ResourceLoaders from GraphQL auto-configuration"
See gh-29976
2022-02-28 11:16:04 +00:00
dugenkui03
5a52b36ec7 Remove redundant ResourceLoaders from GraphQL auto-configuration
See gh-29976
2022-02-28 11:16:04 +00:00
Andy Wilkinson
cce48a75fc Merge branch '2.7.x' 2022-02-28 11:15:38 +00:00
Andy Wilkinson
73d0d5bccf Merge branch '2.6.x' into 2.7.x
Closes gh-30009
2022-02-28 11:15:24 +00:00
Andy Wilkinson
b379eea885 Merge branch '2.5.x' into 2.6.x
Closes gh-30008
2022-02-28 11:15:02 +00:00
Andy Wilkinson
7bc336cdc6 Use an ephemeral port to avoid potential port clash
Closes gh-30007
2022-02-28 10:54:31 +00:00
Madhura Bhave
7a4960d4ca Merge branch '2.7.x' into main 2022-02-24 11:01:23 -08:00
Madhura Bhave
e24f5b7efd Revert "Upgrade to Embedded Mongo 3.4.1"
This reverts to Embedded Mongo 3.3.1 due to some breaking
changes in 3.4.1 and 3.4.2
2022-02-24 11:00:00 -08:00
Stephane Nicoll
8a7e40ce91 Merge branch '2.7.x' 2022-02-24 15:55:55 +01:00
Stephane Nicoll
90c2bf192e Upgrade to Liquibase 4.8.0
Closes gh-29987
2022-02-24 15:36:07 +01:00
Stephane Nicoll
1bb498b03c Upgrade to Flyway 8.5.1
Closes gh-29986
2022-02-24 15:36:00 +01:00
Stephane Nicoll
0c7f4d8307 Merge branch '2.7.x' 2022-02-24 15:13:32 +01:00