Merge branch 'master' into socket-connect-timeout

Author: chrjohn

pom.xml

@@ -76,6 +76,7 @@
 		<maven.compiler.target>8</maven.compiler.target>
 		<mainClass/>
 		<maven.version>3.8.7</maven.version>
+		<maven-plugin-api-version>3.9.5</maven-plugin-api-version>
 		<maven-resources-plugin-version>3.3.0</maven-resources-plugin-version>
 		<maven-compiler-plugin-version>3.10.1</maven-compiler-plugin-version>
 		<maven-jar-plugin-version>3.3.0</maven-jar-plugin-version>
@@ -176,7 +177,7 @@
 			<dependency>
 				<groupId>org.apache.maven</groupId>
 				<artifactId>maven-plugin-api</artifactId>
-				<version>${maven.version}</version>
+				<version>${maven-plugin-api-version}</version>
 			</dependency>
 			<dependency>
 			  <groupId>org.apache.maven.shared</groupId>