From 7f5ef29353668b20d1e9f271feaeef5c88a1e005 Mon Sep 17 00:00:00 2001
From: Nick Holloway <nick.holloway@pyrites.org.uk>
Date: Sun, 4 Oct 2020 17:38:20 +0100
Subject: [PATCH 1/3] Update plugins to current version

---
 pom.xml | 29 ++++++++++++++---------------
 1 file changed, 14 insertions(+), 15 deletions(-)

diff --git a/pom.xml b/pom.xml
index d257f12..e795dce 100644
--- a/pom.xml
+++ b/pom.xml
@@ -89,14 +89,13 @@
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-clean-plugin</artifactId>
-					<version>2.5</version>
+					<version>3.1.0</version>
 				</plugin>
 				
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-compiler-plugin</artifactId>
-					<!-- TODO: upgrade when MCOMPILER-205 fixed -->
-					<version>2.5.1</version>
+					<version>3.8.1</version>
 					<configuration>
 						<source>1.7</source>
 						<target>1.7</target>
@@ -106,13 +105,13 @@
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-deploy-plugin</artifactId>
-					<version>2.7</version>
+					<version>3.0.0-M1</version>
 				</plugin>
 				
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-enforcer-plugin</artifactId>
-					<version>1.3.1</version>
+					<version>3.0.0-M3</version>
 				</plugin>
 				
 				<plugin>
@@ -124,25 +123,25 @@
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-install-plugin</artifactId>
-					<version>2.4</version>
+					<version>3.0.0-M1</version>
 				</plugin>
 				
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-jar-plugin</artifactId>
-					<version>2.4</version>
+					<version>3.2.0</version>
 				</plugin>
 				
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-javadoc-plugin</artifactId>
-					<version>2.9</version>
+					<version>3.2.0</version>
 				</plugin>
 				
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-release-plugin</artifactId>
-					<version>2.5</version>
+					<version>3.0.0-M1</version>
 					<configuration>
 						<tagNameFormat>@{project.version}</tagNameFormat>
 					</configuration>
@@ -151,31 +150,31 @@
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-resources-plugin</artifactId>
-					<version>2.6</version>
+					<version>3.2.0</version>
 				</plugin>
 				
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-site-plugin</artifactId>
-					<version>3.3</version>
+					<version>3.9.1</version>
 				</plugin>
 				
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-source-plugin</artifactId>
-					<version>2.2.1</version>
+					<version>3.2.1</version>
 				</plugin>
 				
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-surefire-plugin</artifactId>
-					<version>2.15</version>
+					<version>3.0.0-M5</version>
 				</plugin>
 
 				<plugin>
 					<groupId>org.sonatype.plugins</groupId>
 					<artifactId>nexus-staging-maven-plugin</artifactId>
-					<version>1.6.6</version>
+					<version>1.6.8</version>
 					<configuration>
 						<serverId>sonatype-nexus-staging</serverId>
 						<nexusUrl>https://oss.sonatype.org/</nexusUrl>
@@ -203,7 +202,7 @@
 									<version>1.7.0-45</version>
 								</requireJavaVersion>
 								<requireMavenVersion>
-									<version>3.1.1</version>
+									<version>3.6.0</version>
 								</requireMavenVersion>
 								<requireNoRepositories />
 								<requirePluginVersions />

From 95f027055915b1b772e38378ce71ebc8bba1228b Mon Sep 17 00:00:00 2001
From: Nick Holloway <nick.holloway@pyrites.org.uk>
Date: Sun, 4 Oct 2020 17:38:48 +0100
Subject: [PATCH 2/3] Target JDK 11

---
 pom.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index e795dce..49b28d3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -97,8 +97,8 @@
 					<artifactId>maven-compiler-plugin</artifactId>
 					<version>3.8.1</version>
 					<configuration>
-						<source>1.7</source>
-						<target>1.7</target>
+						<source>11</source>
+						<target>11</target>
 					</configuration>
 				</plugin>
 				
@@ -199,7 +199,7 @@
 						<configuration>
 							<rules>
 								<requireJavaVersion>
-									<version>1.7.0-45</version>
+									<version>11.0</version>
 								</requireJavaVersion>
 								<requireMavenVersion>
 									<version>3.6.0</version>

From 34917a4580e399d7a1d17e07c2f9a30bab589e2c Mon Sep 17 00:00:00 2001
From: Nick Holloway <nick.holloway@pyrites.org.uk>
Date: Sun, 4 Oct 2020 17:50:28 +0100
Subject: [PATCH 3/3] Move Checkstyle LineLength check

Release 8.24 changed the parent from TreeWalker to Checker
---
 src/main/resources/checkstyle.xml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/main/resources/checkstyle.xml b/src/main/resources/checkstyle.xml
index cd6c767..02f1b8e 100644
--- a/src/main/resources/checkstyle.xml
+++ b/src/main/resources/checkstyle.xml
@@ -88,7 +88,12 @@
 	<!-- Whitespace -->
 	
 	<!-- <module name="FileTabCharacter"/> -->
-	
+
+	<module name="LineLength">
+		<property name="ignorePattern" value="^import .*;$"/>
+		<property name="max" value="120"/>
+	</module>
+
 	<module name="TreeWalker">
 		<property name="tabWidth" value="4"/>
 		
@@ -418,12 +423,7 @@
 		<!-- Size Violations -->
 		
 		<module name="ExecutableStatementCount"/>
-		
-		<module name="LineLength">
-			<property name="ignorePattern" value="^import .*;$"/>
-			<property name="max" value="120"/>
-		</module>
-		
+
 		<module name="MethodLength"/>
 		
 		<!-- <module name="AnonInnerLength"/> -->