Merge branch '3.1.x' into refactor-integration-tests-2

Author: wind57

docs/package.json

@@ -2,7 +2,7 @@
 	"dependencies": {
 		"antora": "3.2.0-alpha.4",
 		"@antora/atlas-extension": "1.0.0-alpha.2",
-		"@antora/collector-extension": "1.0.0-alpha.3",
+		"@antora/collector-extension": "1.0.0-beta.3",
 		"@asciidoctor/tabs": "1.0.0-beta.6",
 		"@springio/antora-extensions": "1.11.1",
 		"@springio/asciidoctor-extensions": "1.0.0-alpha.14"

scripts/integration-tests.sh

@@ -1,7 +1,9 @@
 #!/usr/bin/env bash
 set -e
 
-rm ~/.testcontainers.properties
+if [ -f "~/.testcontainers.properties" ]; then
+    rm ~/.testcontainers.properties
+fi
 echo 'testcontainers.reuse.enable=true' > ~/.testcontainers.properties
 
 ./mvnw clean install -B -Pdocs ${@}