Andy Wilkinson
8b84f66132
Merge branch '2.2.x' into 2.3.x
2020-07-25 10:28:52 +01:00
Andy Wilkinson
1dfa21c99f
Merge branch '2.1.x' into 2.2.x
2020-07-25 10:28:35 +01:00
Andy Wilkinson
141c59e348
Set BRANCH env var so it's available to Gradle Enterprise
2020-07-25 10:26:53 +01:00
Andy Wilkinson
43316fa6b6
Merge branch '2.2.x' into 2.3.x
2020-07-25 09:14:12 +01:00
Andy Wilkinson
4a828c7db1
Merge branch '2.1.x' into 2.2.x
2020-07-25 09:10:50 +01:00
Andy Wilkinson
45d50e279e
Disable build scans in custom layout sample's tests
2020-07-25 09:10:31 +01:00
Andy Wilkinson
8eca4d9d8d
Merge branch '2.2.x' into 2.3.x
2020-07-25 09:07:43 +01:00
Andy Wilkinson
ce7210c4f0
Merge branch '2.1.x' into 2.2.x
...
Closes gh-22563
2020-07-25 09:06:11 +01:00
Andy Wilkinson
ebfa26e3ac
Merge pull request #22555 from runningcode
...
* gh-22555:
Polish "Add generated-snippets as output to test goal"
Add generated-snippets as output to test goal
Closes gh-22555
2020-07-25 09:05:05 +01:00
Andy Wilkinson
d1ea5befea
Polish "Add generated-snippets as output to test goal"
...
See gh-22555
2020-07-25 08:27:05 +01:00
Nelson Osacky
585aed8f8f
Add generated-snippets as output to test goal
...
The generated snippets were not declared as an output to the
`spring-boot-actuator-autoconfigure` test goal so when the test was
pulled from the cache, it did not contain the `generated-snippets`
directory. This directory is required as an input to the Asciidoctor
plugin.
See gh-22555
2020-07-25 08:26:15 +01:00
Stephane Nicoll
7ed54bda96
Fix typo for management.health.readinessstate.enabled
...
Closes gh-22560
2020-07-25 07:20:06 +02:00
Spring Buildmaster
90809f266e
Next development version (v2.3.3.BUILD-SNAPSHOT)
2020-07-24 17:46:53 +00:00
Andy Wilkinson
2e1366f61f
Make spring-boot-dependencies available when building test app
2020-07-24 18:30:52 +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
63cac4bedd
Upgrade to Micrometer 1.5.3
...
Closes gh-22553
2020-07-24 15:53:35 +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
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
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
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