Andy Wilkinson
a1bfe217c9
Merge branch '2.3.x'
2020-07-24 21:14:00 +01:00
Spring Buildmaster
90809f266e
Next development version (v2.3.3.BUILD-SNAPSHOT)
2020-07-24 17:46:53 +00:00
Andy Wilkinson
120db242a0
Merge branch '2.3.x'
2020-07-24 18:32:12 +01:00
Andy Wilkinson
2e1366f61f
Make spring-boot-dependencies available when building test app
2020-07-24 18:30:52 +01:00
Andy Wilkinson
e712d9a662
Merge branch '2.3.x'
2020-07-24 16:45:42 +01:00
Andy Wilkinson
98115239b3
Only create effective bom artifact when needed
...
Closes gh-22143
2020-07-24 16:44:46 +01:00
Andy Wilkinson
d7c5956a7a
Merge branch '2.3.x'
2020-07-24 15:54:06 +01:00
Andy Wilkinson
63cac4bedd
Upgrade to Micrometer 1.5.3
...
Closes gh-22553
2020-07-24 15:53:35 +01:00
Andy Wilkinson
71f48e38c4
Merge branch '2.3.x'
2020-07-24 14:57:26 +01:00
Andy Wilkinson
fb34fd31e9
Upgrade to Micrometer 1.5.3
...
Closes gh-22553
2020-07-24 14:55:30 +01:00
Stephane Nicoll
db462c4a03
Merge pull request #21658 from bono007
...
* pr/21658:
Polish "Disable metrics export in integration tests"
Disable metrics export in integration tests
Closes gh-21658
2020-07-24 15:43:56 +02:00
Stephane Nicoll
3530ac9b0c
Polish "Disable metrics export in integration tests"
...
See gh-21658
2020-07-24 15:43:17 +02:00
bono007
b1830da0da
Disable metrics export in integration tests
...
This commit introduces a new property to globally disable metrics
export. In integration tests, this property is automatically set to
disable everything but in-memory metrics.
This commit also introduces a `@AutoConfigureMetrics` annotation that
can be used for integration tests that require metrics export to operate
as they would in an application.
See gh-21658
2020-07-24 15:43:17 +02:00
Andy Wilkinson
9242ef430a
Merge branch '2.2.x' into 2.3.x
2020-07-24 14:28:22 +01:00
Andy Wilkinson
1a43cd1c8e
Merge branch '2.1.x' into 2.2.x
...
Closes gh-22551
2020-07-24 14:28:11 +01:00
Andy Wilkinson
843a618c83
Merge pull request #22550 from runningcode
...
* gh-22550:
Disable extra scans for full profile.
Closes gh-22550
2020-07-24 14:28:06 +01:00
Nelson Osacky
0494007893
Disable extra scans for full profile.
...
The extra scans were not disabled for the full profile, only the
regular profile.
See gh-22550
2020-07-24 14:27:32 +01:00
Andy Wilkinson
c05b9750b6
Merge branch '2.2.x' into 2.3.x
2020-07-24 14:25:43 +01:00
Andy Wilkinson
051d3f2a2e
Merge branch '2.1.x' into 2.2.x
2020-07-24 14:24:46 +01:00
Andy Wilkinson
6215052c5b
Polish integration of Gradle Enterprise in CI builds
2020-07-24 14:22:25 +01:00
Andy Wilkinson
ff0aa6c2c8
Merge branch '2.2.x' into 2.3.x
2020-07-24 14:16:16 +01:00
Andy Wilkinson
afa14efa46
Merge branch '2.1.x' into 2.2.x
2020-07-24 14:15:37 +01:00
Andy Wilkinson
f1019e82ab
Polish integration of Gradle Enterprise in CI builds
2020-07-24 12:53:41 +01:00
Andy Wilkinson
14620cac7c
Merge branch '2.3.x'
2020-07-24 12:09:16 +01:00
Andy Wilkinson
85294a9a74
Merge branch '2.2.x' into 2.3.x
2020-07-24 12:08:21 +01:00
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
Stephane Nicoll
6b96a8de7f
Merge pull request #22535 from dreis2211
...
* pr/22535:
Polish
Closes gh-22535
2020-07-24 12:58:27 +02:00
dreis2211
923474fa48
Polish
...
See gh-22535
2020-07-24 12:58:12 +02:00
Andy Wilkinson
35a011d906
Merge branch '2.3.x'
2020-07-24 11:54:46 +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
4e14f2a9ff
Merge branch '2.3.x'
2020-07-24 11:50:59 +02:00
Stephane Nicoll
bcf62004f9
Merge branch '2.2.x' into 2.3.x
2020-07-24 11:50:32 +02:00
Andy Wilkinson
793d266b7e
Merge branch '2.3.x'
...
Closes gh-22546
2020-07-24 10:41:40 +01: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
Andy Wilkinson
51eeec7122
Merge pull request #22544 from dsyer
...
* gh-22544:
Restore missing EnvironmentPostProcessors
Closes gh-22544
2020-07-24 08:46:37 +01:00
Dave Syer
48f49f2120
Restore missing EnvironmentPostProcessors
...
See gh-22544
2020-07-24 08:46:04 +01:00
Phillip Webb
6e569c75cf
Merge branch '2.3.x'
2020-07-23 21:38:01 -07: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
