Merge branch '4.2.x' into 4.3.x

docs/package.json

@@ -2,7 +2,7 @@
   "dependencies": {
     "antora": "3.2.0-alpha.9",
     "@antora/atlas-extension": "1.0.0-alpha.2",
-    "@antora/collector-extension": "1.0.1",
+    "@antora/collector-extension": "1.0.2",
     "@asciidoctor/tabs": "1.0.0-beta.6",
     "@springio/antora-extensions": "1.14.7",
     "@springio/asciidoctor-extensions": "1.0.0-alpha.17"

spring-cloud-build-tools/src/main/resources/checkstyle-header.txt

@@ -1,5 +1,5 @@
 ^\Q/*\E$
-^\Q * Copyright \E20\d\d\-20\d\d\Q the original author or authors.\E$
+^\Q * Copyright \E20\d\d\-present the original author or authors.\E$
 ^\Q *\E$
 ^\Q * Licensed under the Apache License, Version 2.0 (the "License");\E$
 ^\Q * you may not use this file except in compliance with the License.\E$