Merge pull request #72 from BorderTech/latest-qa

Latest qa

Author: jonathanaustin

CHANGELOG.md

@@ -1,6 +1,7 @@
 # Change log
 
 ## Release in-progress
+* Update plugin versions
 
 ## 1.0.16
 * Add quick-build profile that skips tests and QA checks #63

build-tools/src/main/resources/bordertech/bt-checkstyle.xml

@@ -3,15 +3,15 @@
 		"-//Checkstyle//DTD Checkstyle Configuration 1.3//EN"
 		"https://checkstyle.org/dtds/configuration_1_3.dtd">
 
-<!-- Based on sun_checks.xml (V8.30) -->
+<!-- Based on sun_checks.xml V8.37 (https://github.com/checkstyle/checkstyle/blob/checkstyle-8.37/src/main/resources/sun_checks.xml) -->
 
 <!--
-  Checkstyle configuration that checks the sun coding conventions from:
+Checkstyle configuration that checks the sun coding conventions from:
 	- the Java Language Specification at
 	  https://docs.oracle.com/javase/specs/jls/se11/html/index.html
-	- the Sun Code Conventions at https://www.oracle.com/technetwork/java/codeconvtoc-136057.html
+	- the Sun Code Conventions at https://www.oracle.com/java/technologies/javase/codeconventions-contents.html
 	- the Javadoc guidelines at
-	  https://www.oracle.com/technetwork/java/javase/documentation/index-137868.html
+	  https://www.oracle.com/technical-resources/articles/java/javadoc-tool.html
 	- the JDK Api documentation https://docs.oracle.com/en/java/javase/11/
 	- some best practices
   Checkstyle is very configurable. Be sure to read the documentation at
@@ -26,7 +26,7 @@
 	<!--
 		If you set the basedir property below, then all reported file
 		names will be relative to the specified directory. See
-		https://checkstyle.org/5.x/config.html#Checker
+		https://checkstyle.org/config.html#Checker
 		<property name="basedir" value="${basedir}"/>
 	-->
 	<property name="severity" value="error"/>
@@ -120,7 +120,11 @@
 
 		<!-- Checks for Javadoc comments.                     -->
 		<!-- See https://checkstyle.org/config_javadoc.html -->
-		<module name="InvalidJavadocPosition"/>
+		<module name="InvalidJavadocPosition">
+			<!-- BorderTech: Override to warning -->
+			<property name="severity" value="warning" />
+		</module>
+
 		<module name="JavadocMethod">
 			<!-- BorderTech: Javadoc not required for methods with these annotations -->
 			<property name="allowedAnnotations" value="Override,Test,Before,After,BeforeClass,AfterClass"/>
@@ -146,7 +150,7 @@
 		<module name="TypeName"/>
 
 		<!-- Checks for imports                              -->
-		<!-- See https://checkstyle.org/config_import.html -->
+		<!-- See https://checkstyle.org/config_imports.html -->
 		<module name="AvoidStarImport"/>
 		<module name="IllegalImport"/> <!-- defaults to sun.* packages -->
 		<module name="RedundantImport"/>

pom.xml

@@ -212,7 +212,7 @@
 					<dependency>
 						<groupId>org.codehaus.mojo</groupId>
 						<artifactId>extra-enforcer-rules</artifactId>
-						<version>1.2</version>
+						<version>1.3</version>
 					</dependency>
 				</dependencies>
 			</plugin>

qa-parent/pom.xml

@@ -65,18 +65,18 @@
 		<assemblyAnalyzerEnabled>false</assemblyAnalyzerEnabled>
 
 		<!-- Versions -->
-		<bt.junit.version>5.6.1</bt.junit.version>
-		<bt.jacoco.plugin.version>0.8.5</bt.jacoco.plugin.version>
+		<bt.junit.version>5.7.0</bt.junit.version>
+		<bt.jacoco.plugin.version>0.8.6</bt.jacoco.plugin.version>
 		<bt.surefire.plugin.version>2.22.2</bt.surefire.plugin.version>
 		<bt.checkstyle.plugin.version>3.1.1</bt.checkstyle.plugin.version>
-		<bt.checkstyle.version>8.30</bt.checkstyle.version>
+		<bt.checkstyle.version>8.37</bt.checkstyle.version>
 		<bt.pmd.plugin.version>3.13.0</bt.pmd.plugin.version>
-		<bt.pmd.version>6.22.0</bt.pmd.version>
-		<bt.spotbugs.plugin.version>4.0.0</bt.spotbugs.plugin.version>
-		<bt.fb-contrib.plugin.version>7.4.7</bt.fb-contrib.plugin.version>
-		<bt.spotbugs.version>4.0.1</bt.spotbugs.version>
-		<bt.findsecbugs.plugin.version>1.10.1</bt.findsecbugs.plugin.version>
-		<bt.owasp.plugin.version>5.2.4</bt.owasp.plugin.version>
+		<bt.pmd.version>6.29.0</bt.pmd.version>
+		<bt.spotbugs.plugin.version>4.1.4</bt.spotbugs.plugin.version>
+		<bt.sb-contrib.plugin.version>7.4.7</bt.sb-contrib.plugin.version>
+		<bt.spotbugs.version>4.1.4</bt.spotbugs.version>
+		<bt.findsecbugs.plugin.version>1.11.0</bt.findsecbugs.plugin.version>
+		<bt.owasp.plugin.version>6.0.2</bt.owasp.plugin.version>
 
 	</properties>
 
@@ -261,9 +261,9 @@
 					<plugins>
 						<!-- Auxilary plugin -->
 						<plugin>
-							<groupId>com.mebigfatguy.fb-contrib</groupId>
-							<artifactId>fb-contrib</artifactId>
-							<version>${bt.fb-contrib.plugin.version}</version>
+							<groupId>com.mebigfatguy.sb-contrib</groupId>
+							<artifactId>sb-contrib</artifactId>
+							<version>${bt.sb-contrib.plugin.version}</version>
 						</plugin>
 						<!-- Security plugin -->
 						<plugin>
@@ -337,7 +337,7 @@
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>versions-maven-plugin</artifactId>
-				<version>2.7</version>
+				<version>2.8.1</version>
 				<executions>
 					<execution>
 						<id>display-version-updates</id>