diff --git a/pom.xml b/pom.xml
index dd84c06..e32c422 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-		xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+		xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
 	<groupId>com.inteligr8</groupId>
@@ -43,7 +43,7 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<maven.compiler.source>1.8</maven.compiler.source>
 		<maven.compiler.target>1.8</maven.compiler.target>
-		<maven.version>3.6.3</maven.version>
+		<maven.version>3.9.0</maven.version>
 	</properties>
 
 	<dependencies>
@@ -55,7 +55,7 @@
 		<dependency>
 			<groupId>org.apache.maven.shared</groupId>
 			<artifactId>file-management</artifactId>
-			<version>3.0.0</version>
+			<version>3.1.0</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.maven</groupId>
@@ -66,7 +66,7 @@
 		<dependency>
 			<groupId>org.apache.maven.plugin-tools</groupId>
 			<artifactId>maven-plugin-annotations</artifactId>
-			<version>3.6.0</version>
+			<version>3.7.1</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
@@ -239,5 +239,4 @@
 			</build>
 		</profile>
 	</profiles>
-
 </project>
diff --git a/src/it/copy-file/pom.xml b/src/it/copy-file/pom.xml
index ad7a099..c895868 100644
--- a/src/it/copy-file/pom.xml
+++ b/src/it/copy-file/pom.xml
@@ -2,7 +2,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-		xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+		xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
 	<groupId>com.inteligr8</groupId>
diff --git a/src/it/match-file-content/pom.xml b/src/it/match-file-content/pom.xml
index ed3f9b7..76a08eb 100644
--- a/src/it/match-file-content/pom.xml
+++ b/src/it/match-file-content/pom.xml
@@ -2,7 +2,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-		xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+		xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
 	<groupId>com.inteligr8</groupId>
diff --git a/src/it/match-filename/pom.xml b/src/it/match-filename/pom.xml
index 51dfe10..30d4741 100644
--- a/src/it/match-filename/pom.xml
+++ b/src/it/match-filename/pom.xml
@@ -2,7 +2,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-		xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+		xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
 	<groupId>com.inteligr8</groupId>
diff --git a/src/it/match-properties/pom.xml b/src/it/match-properties/pom.xml
index 04260db..03e9b24 100644
--- a/src/it/match-properties/pom.xml
+++ b/src/it/match-properties/pom.xml
@@ -2,7 +2,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-		xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+		xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
 	<groupId>com.inteligr8</groupId>
diff --git a/src/it/match-property/pom.xml b/src/it/match-property/pom.xml
index 5f4da36..bea5f4c 100644
--- a/src/it/match-property/pom.xml
+++ b/src/it/match-property/pom.xml
@@ -2,7 +2,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-		xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+		xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
 	<groupId>com.inteligr8</groupId>
diff --git a/src/it/match-text/pom.xml b/src/it/match-text/pom.xml
index 4232291..5501931 100644
--- a/src/it/match-text/pom.xml
+++ b/src/it/match-text/pom.xml
@@ -2,7 +2,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-		xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+		xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
 	<groupId>com.inteligr8</groupId>
diff --git a/src/it/move-file/pom.xml b/src/it/move-file/pom.xml
index bdaf7c2..7d8c250 100644
--- a/src/it/move-file/pom.xml
+++ b/src/it/move-file/pom.xml
@@ -2,7 +2,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-		xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+		xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
 	<groupId>com.inteligr8</groupId>
diff --git a/src/it/replace-file-content/pom.xml b/src/it/replace-file-content/pom.xml
index ec9d186..8041c62 100644
--- a/src/it/replace-file-content/pom.xml
+++ b/src/it/replace-file-content/pom.xml
@@ -2,7 +2,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
 	<groupId>com.inteligr8</groupId>
diff --git a/src/it/replace-properties/pom.xml b/src/it/replace-properties/pom.xml
index 0e749e7..1e026be 100644
--- a/src/it/replace-properties/pom.xml
+++ b/src/it/replace-properties/pom.xml
@@ -2,7 +2,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-		xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+		xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
 	<groupId>com.inteligr8</groupId>
diff --git a/src/it/replace-property/pom.xml b/src/it/replace-property/pom.xml
index b179130..369202e 100644
--- a/src/it/replace-property/pom.xml
+++ b/src/it/replace-property/pom.xml
@@ -2,7 +2,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-		xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+		xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
 	<groupId>com.inteligr8</groupId>
diff --git a/src/it/replace-text/pom.xml b/src/it/replace-text/pom.xml
index 677e52c..5483ba2 100644
--- a/src/it/replace-text/pom.xml
+++ b/src/it/replace-text/pom.xml
@@ -2,7 +2,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-		xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+		xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
 	<groupId>com.inteligr8</groupId>
diff --git a/src/main/java/com/inteligr8/maven/regex/AbstractRegexMojo.java b/src/main/java/com/inteligr8/maven/regex/AbstractRegexMojo.java
index c70872b..e8db16b 100644
--- a/src/main/java/com/inteligr8/maven/regex/AbstractRegexMojo.java
+++ b/src/main/java/com/inteligr8/maven/regex/AbstractRegexMojo.java
@@ -16,8 +16,6 @@ package com.inteligr8.maven.regex;
 
 import java.util.Properties;
 
-import javax.annotation.OverridingMethodsMustInvokeSuper;
-
 import org.apache.maven.execution.MavenSession;
 import org.apache.maven.plugin.AbstractMojo;
 import org.apache.maven.plugin.MojoExecutionException;
@@ -63,17 +61,14 @@ public abstract class AbstractRegexMojo extends AbstractMojo {
     
     protected abstract void go() throws MojoExecutionException, MojoFailureException;
 
-    @OverridingMethodsMustInvokeSuper
     protected void validateParamsPreNormalization() throws MojoFailureException {
     	this.getLog().debug("Validating parameters before their normalization");
     }
 
-    @OverridingMethodsMustInvokeSuper
     protected void normalizeParameters() throws MojoFailureException {
     	this.getLog().debug("Normalizing parameters");
     }
 
-    @OverridingMethodsMustInvokeSuper
     protected void validateParamsPostNormalization() throws MojoFailureException {
     	this.getLog().debug("Validating parameters after their normalization");
     }
diff --git a/src/main/java/com/inteligr8/maven/regex/MatchFileContentMojo.java b/src/main/java/com/inteligr8/maven/regex/MatchFileContentMojo.java
index 1b45d10..bbe438c 100644
--- a/src/main/java/com/inteligr8/maven/regex/MatchFileContentMojo.java
+++ b/src/main/java/com/inteligr8/maven/regex/MatchFileContentMojo.java
@@ -53,7 +53,7 @@ public class MatchFileContentMojo extends AbstractMatchMojo {
     }
     
     private boolean matchesContentInFileSet() throws MojoExecutionException {
-		FileSetManager fsman = new FileSetManager(this.getLog());
+		FileSetManager fsman = new FileSetManager();
 		Path basepath = this.project.getBasedir().toPath();
 		
 		try {
diff --git a/src/main/java/com/inteligr8/maven/regex/ReplaceFileContentMojo.java b/src/main/java/com/inteligr8/maven/regex/ReplaceFileContentMojo.java
index 9487c85..c5530e6 100644
--- a/src/main/java/com/inteligr8/maven/regex/ReplaceFileContentMojo.java
+++ b/src/main/java/com/inteligr8/maven/regex/ReplaceFileContentMojo.java
@@ -47,7 +47,7 @@ public class ReplaceFileContentMojo extends AbstractReplaceMojo {
     
     private boolean replaceContentInFileSet() throws MojoExecutionException {
     	boolean didReplace = false;
-		FileSetManager fsman = new FileSetManager(this.getLog());
+		FileSetManager fsman = new FileSetManager();
 		Path basepath = this.project.getBasedir().toPath();
 		
 		try {
diff --git a/src/main/java/com/inteligr8/nio/DelimitedReadableByteChannel.java b/src/main/java/com/inteligr8/nio/DelimitedReadableByteChannel.java
index 7f90068..77541ea 100644
--- a/src/main/java/com/inteligr8/nio/DelimitedReadableByteChannel.java
+++ b/src/main/java/com/inteligr8/nio/DelimitedReadableByteChannel.java
@@ -23,8 +23,6 @@ import java.nio.charset.CharsetDecoder;
 import java.util.HashSet;
 import java.util.Set;
 
-import javax.annotation.OverridingMethodsMustInvokeSuper;
-
 public class DelimitedReadableByteChannel implements ReadableByteChannel {
 
 	private final CharBuffer buffer;
@@ -50,7 +48,6 @@ public class DelimitedReadableByteChannel implements ReadableByteChannel {
 	}
 	
 	@Override
-	@OverridingMethodsMustInvokeSuper
 	public void close() throws IOException {
 		this.rbchannel.close();
 	}