Andy Wilkinson
2f45bc085f
Merge branch '2.1.x' into 2.2.x
2020-07-24 12:08:03 +01:00
Andy Wilkinson
d435c19ab8
Align gradle-enterprise-maven-extension versions
2020-07-24 12:07:32 +01:00
Andy Wilkinson
23abedc1b0
Merge branch '2.2.x' into 2.3.x
2020-07-24 11:54:31 +01:00
Andy Wilkinson
f4508b4059
Merge branch '2.1.x' into 2.2.x
...
Closes gh-22547
2020-07-24 11:54:12 +01:00
Andy Wilkinson
7d825cebbc
Merge pull request #22089 from runningcode
...
* gh-22089:
Polish "Add Gradle Enterprise Extension"
Add Gradle Enterprise Extension
Closes gh-22089
2020-07-24 11:52:07 +01:00
Andy Wilkinson
60ff87155f
Polish "Add Gradle Enterprise Extension"
...
See gh-22089
2020-07-24 11:51:52 +01:00
Nelson Osacky
e41a53cf85
Add Gradle Enterprise Extension
...
This adds build caching and build scans.
The changes required disabling scans when using the maven invoker
plugin in order to not cause duplicate build scans when invoking other
maven builds. There is also an empty `.mvn` folder in the
spring-boot-starters project to prevent duplicate build scans as well
since there is no way to pass properties to the maven-javadoc-plugin.
The checkstyle plugin was causing a cache miss with the
`propertyExpansion` because it contains an absolute path. The absolute
path is now ignored and instead the files are added as inputs to the
checkstyle plugin. This only enables the local build cache. The remote
cache is not yet enabled.
On my local machine:
./mvnw clean install build times go from about 30 minutes to about 10 minutes.
./mvnw clean install -Pfull build times go from about 60 minutes to about 13 minutes.
See gh-22089
2020-07-24 11:47:24 +01:00
Stephane Nicoll
bcf62004f9
Merge branch '2.2.x' into 2.3.x
2020-07-24 11:50:32 +02:00
Andy Wilkinson
c605a6e34b
Override other variant of registerBeanDefintions
...
Fixes gh-22480
2020-07-24 10:33:16 +01:00
Spring Buildmaster
652712b5eb
Next development version (v2.2.10.BUILD-SNAPSHOT)
2020-07-24 08:47:37 +00:00
Phillip Webb
f625d8e701
Merge branch '2.2.x' into 2.3.x
2020-07-23 21:37:16 -07:00
Phillip Webb
e137e3d130
Merge branch '2.1.x' into 2.2.x
2020-07-23 21:36:50 -07:00
Phillip Webb
f68671e1bc
Refine regex
...
See gh-22543
2020-07-23 21:23:42 -07:00
Phillip Webb
7ace6cd450
Move properties to correct file
...
See gh-22543
2020-07-23 21:09:15 -07:00
Phillip Webb
b77dbcd06f
Allow certain artifacts to be optionally deployed
...
Update `DistributeCommand` so that regex patterns can be used to mark
artifacts that are optional and need not fail the release.
Closes gh-22543
2020-07-23 20:45:25 -07:00
Phillip Webb
d69c35a1db
Deal with 404 response when checking for artifacts
2020-07-23 18:23:24 -07:00
Phillip Webb
53296cd161
Backport build script updates
2020-07-23 17:45:55 -07:00
Phillip Webb
c043701dc0
Turn on debug logging
2020-07-23 17:45:49 -07:00
Spring Buildmaster
7ac5cc96c2
Next development version (v2.1.17.BUILD-SNAPSHOT)
2020-07-23 21:53:53 +00:00
Andy Wilkinson
3480db72a5
Merge branch '2.2.x' into 2.3.x
2020-07-23 21:13:16 +01:00
Andy Wilkinson
9c5e59371f
Upgrade to Jackson 2.10.5
...
Closes gh-22432
2020-07-23 21:12:08 +01:00
Andy Wilkinson
39c8898008
Upgrade to MariaDB 2.6.2
...
Closes gh-22541
2020-07-23 21:05:32 +01:00
Andy Wilkinson
44e6cf2e55
Upgrade to AspectJ 1.9.6
...
Closes gh-22540
2020-07-23 21:05:31 +01:00
Andy Wilkinson
1cc941f9c3
Merge branch '2.2.x' into 2.3.x
2020-07-23 21:05:00 +01:00
Andy Wilkinson
2118c73985
Merge branch '2.1.x' into 2.2.x
2020-07-23 21:03:57 +01:00
Andy Wilkinson
f93bae4bd3
Upgrade to Aspectj 1.9.6
...
Closes gh-22539
2020-07-23 21:03:51 +01:00
Andy Wilkinson
ce803cc678
Upgrade to Micrometer 1.3.11
...
Closes gh-22538
2020-07-23 21:03:49 +01:00
Andy Wilkinson
698db27a75
Upgrade to Aspectj 1.9.6
...
Closes gh-22537
2020-07-23 21:02:36 +01:00
Andy Wilkinson
db242794ec
Upgrade to Micrometer 1.1.16
...
Closes gh-22536
2020-07-23 21:02:34 +01:00
Stephane Nicoll
e9a966a0a2
Upgrade to Groovy 2.5.13
...
Closes gh-22526
2020-07-23 11:06:12 +02:00
Stephane Nicoll
a056eb475a
Merge branch '2.2.x' into 2.3.x
2020-07-23 11:02:01 +02:00
Stephane Nicoll
4f3b03afcf
Merge branch '2.1.x' into 2.2.x
...
Closes gh-22525
2020-07-23 11:01:05 +02:00
Stephane Nicoll
0440a9a78c
Upgrade to Groovy 2.5.13
...
Closes gh-22505
2020-07-23 10:55:47 +02:00
Stephane Nicoll
41b7eb158b
Upgrade Java 14 version in CI image
...
Closes gh-22515
2020-07-23 09:35:44 +02:00
Stephane Nicoll
71ec15e851
Upgrade Java 8 version in CI image
...
Closes gh-22514
2020-07-23 09:35:07 +02:00
Stephane Nicoll
32f17645af
Merge branch '2.2.x' into 2.3.x
2020-07-23 09:34:29 +02:00
Stephane Nicoll
458b5690e1
Upgrade Java 14 version in CI image
...
Closes gh-22516
2020-07-23 09:33:30 +02:00
Stephane Nicoll
a2b797f8b7
Upgrade Java 8 version in CI image
...
Closes gh-22518
2020-07-23 09:33:03 +02:00
Stephane Nicoll
3d1181ee96
Merge branch '2.1.x' into 2.2.x
2020-07-23 09:31:42 +02:00
Stephane Nicoll
ee37ddd6c0
Upgrade Java 8 version in CI image
...
Closes gh-22512
2020-07-23 09:31:01 +02:00
Phillip Webb
187d3af7fc
Update copyright year of changed files
2020-07-22 17:25:17 -07:00
Phillip Webb
d2a7808098
Polish
2020-07-22 17:25:04 -07:00
Phillip Webb
217b2eff89
Merge branch '2.2.x' into 2.3.x
2020-07-22 17:03:23 -07:00
Phillip Webb
b5e70157dc
Update copyright year of changed files
2020-07-22 17:01:36 -07:00
Phillip Webb
51a26a4d5a
Polish
2020-07-22 17:01:19 -07:00
Stephane Nicoll
dd615fd9dd
Upgrade to Spring Integration 5.3.2
...
Closes gh-22389
2020-07-22 21:37:39 +02:00
Stephane Nicoll
6e217b4f66
Merge branch '2.2.x' into 2.3.x
2020-07-22 21:36:52 +02:00
Stephane Nicoll
0a756b5337
Merge branch '2.1.x' into 2.2.x
2020-07-22 21:36:21 +02:00
Stephane Nicoll
d9c34d5b84
Upgrade to Spring Integration 5.1.12
...
Closes gh-22511
2020-07-22 21:35:48 +02:00
Stephane Nicoll
68497649b1
Upgrade to Spring Integration 5.2.8
...
Closes gh-22385
2020-07-22 21:32:52 +02:00