diff --git a/README.md b/README.md
index 6ef7bf5..37e3f17 100644
--- a/README.md
+++ b/README.md
@@ -20,10 +20,10 @@ This project provides a [Java 6 Annotation processor](http://docs.oracle.com/jav
   <dependencies>
       <dependency>
         <groupId>com.github.pellaton.config-validation-processor</groupId>
-        <artifactId>config-validation-processor-java11</artifactId>
+        <artifactId>config-validation-processor-java17</artifactId>
+        <!-- For Java 11: <artifactId>config-validation-processor-java11</artifactId> -->
         <!-- For Java 8: <artifactId>config-validation-processor-java8</artifactId> -->
         <!-- For Java 7: <artifactId>config-validation-processor-java7</artifactId> -->
-        <!-- For Java 6: <artifactId>config-validation-processor-java6</artifactId> -->
         <version>3.0.7</version>
       </dependency>
   </dependencies>
@@ -37,16 +37,14 @@ This project provides a [Java 6 Annotation processor](http://docs.oracle.com/jav
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-compiler-plugin</artifactId>
-            <version>2.3.2</version>
+            <version>3.11.0</version>
             <configuration>
-              <source>1.8</source>
-              <target>1.8</target>
-              <encoding>UTF-8</encoding>
+              <release>17</release>
               <annotationProcessors>
-                <annotationProcessor>com.github.pellaton.springconfigvalidation.SpringConfigurationValidationProcessorJava11</annotationProcessor>
+                <annotationProcessor>com.github.pellaton.springconfigvalidation.SpringConfigurationValidationProcessorJava17</annotationProcessor>
+                <!-- For Java 11: <annotationProcessor>com.github.pellaton.springconfigvalidation.SpringConfigurationValidationProcessorJava11</annotationProcessor> -->
                 <!-- For Java 8: <annotationProcessor>com.github.pellaton.springconfigvalidation.SpringConfigurationValidationProcessorJava8</annotationProcessor> -->
                 <!-- For Java 7: <annotationProcessor>com.github.pellaton.springconfigvalidation.SpringConfigurationValidationProcessorJava7</annotationProcessor> -->
-                <!-- For Java 6: <annotationProcessor>com.github.pellaton.springconfigvalidation.SpringConfigurationValidationProcessorJava6</annotationProcessor> -->
               </annotationProcessors>
             </configuration>
           </plugin>
diff --git a/config-validation-processor-core/pom.xml b/config-validation-processor-core/pom.xml
index 556a279..477c017 100644
--- a/config-validation-processor-core/pom.xml
+++ b/config-validation-processor-core/pom.xml
@@ -12,4 +12,43 @@
 	<name>Spring Configuration Validation Processor Core</name>
 	<description>A Java 6 annotation processor to validate Spring @Configuration classes</description>
 
+	<dependencies>
+		<!-- COMPILE scoped dependencies -->
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-context</artifactId>
+		</dependency>
+
+		<!-- TEST scoped dependencies -->
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>${junit.version}</version>
+			<scope>test</scope>
+			<exclusions>
+				<exclusion>
+					<groupId>org.hamcrest</groupId>
+					<artifactId>hamcrest-core</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
+			<groupId>org.hamcrest</groupId>
+			<artifactId>hamcrest-all</artifactId>
+			<version>${hamcrest.version}</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.mockito</groupId>
+			<artifactId>mockito-all</artifactId>
+			<version>${mockito.version}</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-test</artifactId>
+			<scope>test</scope>
+		</dependency>
+	</dependencies>
+
 </project>
diff --git a/config-validation-processor-core/src/test/java/com/github/pellaton/springconfigvalidation/TestSpringConfigurationValidationProcessor.java b/config-validation-processor-core/src/test/java/com/github/pellaton/springconfigvalidation/TestSpringConfigurationValidationProcessor.java
index 07d013d..5106e6b 100644
--- a/config-validation-processor-core/src/test/java/com/github/pellaton/springconfigvalidation/TestSpringConfigurationValidationProcessor.java
+++ b/config-validation-processor-core/src/test/java/com/github/pellaton/springconfigvalidation/TestSpringConfigurationValidationProcessor.java
@@ -25,7 +25,7 @@
  * Test variant of {@link SpringConfigurationValidationProcessor}.
  */
 @SupportedAnnotationTypes({"org.springframework.context.annotation.Configuration", "org.springframework.context.annotation.Bean"})
-@SupportedSourceVersion(SourceVersion.RELEASE_11)
+@SupportedSourceVersion(SourceVersion.RELEASE_17)
 public class TestSpringConfigurationValidationProcessor extends SpringConfigurationValidationProcessor {
 
 }
diff --git a/config-validation-processor-core/src/test/java/com/github/pellaton/springconfigvalidation/util/AnnotationProcessorTestCompiler.java b/config-validation-processor-core/src/test/java/com/github/pellaton/springconfigvalidation/util/AnnotationProcessorTestCompiler.java
index e6e712f..a24ba11 100644
--- a/config-validation-processor-core/src/test/java/com/github/pellaton/springconfigvalidation/util/AnnotationProcessorTestCompiler.java
+++ b/config-validation-processor-core/src/test/java/com/github/pellaton/springconfigvalidation/util/AnnotationProcessorTestCompiler.java
@@ -35,7 +35,7 @@
 import org.springframework.core.io.ClassPathResource;
 
 /**
- * Utility class that compiles a Java class using the {@link Compiler} and an annotation {@link Processor}. This class
+ * Utility class that compiles a Java class using the {@link JavaCompiler} and an annotation {@link Processor}. This class
  * is intended to be used for tests of annotation processors.
  *
  * @author Michael Pellaton
diff --git a/config-validation-processor-core/src/test/java/com/github/pellaton/springconfigvalidation/util/DiagnosticsAssert.java b/config-validation-processor-core/src/test/java/com/github/pellaton/springconfigvalidation/util/DiagnosticsAssert.java
index a0e793a..a219d51 100644
--- a/config-validation-processor-core/src/test/java/com/github/pellaton/springconfigvalidation/util/DiagnosticsAssert.java
+++ b/config-validation-processor-core/src/test/java/com/github/pellaton/springconfigvalidation/util/DiagnosticsAssert.java
@@ -21,6 +21,7 @@
 import java.util.Locale;
 
 import javax.tools.Diagnostic;
+import javax.tools.JavaCompiler;
 import javax.tools.JavaFileObject;
 
 import junit.framework.AssertionFailedError;
@@ -28,7 +29,7 @@
 import com.github.pellaton.springconfigvalidation.SpringConfigurationMessage;
 
 /**
- * Set of assert methods used on the {@link Diagnostic}s emitted by the Java {@link Compiler}.
+ * Set of assert methods used on the {@link Diagnostic}s emitted by the {@link JavaCompiler}.
  *
  * @author Michael Pellaton
  */
@@ -65,7 +66,7 @@ public static void assertContainsSingleMessage(SpringConfigurationMessage expect
       List<Diagnostic<? extends JavaFileObject>> diagnostics) {
 
     if (diagnostics.size() != 1) {
-      throw new AssertionFailedError("Number of diagnostic messages expected <1> but was <" + diagnostics.size() + ">");
+      throw new AssertionFailedError("Number of diagnostic messages expected <1> but was <" + diagnostics.size() + ">, diagnostic messages: " + diagnostics);
     }
 
     Diagnostic<? extends JavaFileObject> diagnostic = diagnostics.get(0);
diff --git a/config-validation-processor-java11/pom.xml b/config-validation-processor-java11/pom.xml
index 67f33a1..a784d47 100644
--- a/config-validation-processor-java11/pom.xml
+++ b/config-validation-processor-java11/pom.xml
@@ -24,9 +24,7 @@
 	<build>
 		<plugins>
 			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-dependency-plugin</artifactId>
-				<version>3.1.2</version>
 				<executions>
 					<execution>
 						<id>unpack-dependencies</id>
diff --git a/config-validation-processor-java6/.settings/org.eclipse.core.resources.prefs b/config-validation-processor-java17/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from config-validation-processor-java6/.settings/org.eclipse.core.resources.prefs
rename to config-validation-processor-java17/.settings/org.eclipse.core.resources.prefs
diff --git a/config-validation-processor-java17/.settings/org.eclipse.jdt.core.prefs b/config-validation-processor-java17/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..3fc7e86
--- /dev/null
+++ b/config-validation-processor-java17/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,9 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
+org.eclipse.jdt.core.compiler.processAnnotations=disabled
+org.eclipse.jdt.core.compiler.release=disabled
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/config-validation-processor-java6/pom.xml b/config-validation-processor-java17/pom.xml
similarity index 88%
rename from config-validation-processor-java6/pom.xml
rename to config-validation-processor-java17/pom.xml
index 5727871..90aa4ff 100644
--- a/config-validation-processor-java6/pom.xml
+++ b/config-validation-processor-java17/pom.xml
@@ -7,10 +7,10 @@
 		<version>3.0.9-SNAPSHOT</version>
 	</parent>
 
-	<artifactId>config-validation-processor-java6</artifactId>
+	<artifactId>config-validation-processor-java17</artifactId>
 
-	<name>Spring Configuration Validation Processor for Java 6 Runtimes</name>
-	<description>A Java 6 annotation processor to validate Spring @Configuration classes</description>
+	<name>Spring Configuration Validation Processor for Java 17 Runtimes</name>
+	<description>A Java 17 annotation processor to validate Spring @Configuration classes</description>
 
 	<dependencies>
 		<dependency>
@@ -24,9 +24,7 @@
 	<build>
 		<plugins>
 			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-dependency-plugin</artifactId>
-				<version>2.4</version>
 				<executions>
 					<execution>
 						<id>unpack-dependencies</id>
diff --git a/config-validation-processor-java6/src/main/java/com/github/pellaton/springconfigvalidation/SpringConfigurationValidationProcessorJava6.java b/config-validation-processor-java17/src/main/java/com/github/pellaton/springconfigvalidation/SpringConfigurationValidationProcessorJava17.java
similarity index 74%
rename from config-validation-processor-java6/src/main/java/com/github/pellaton/springconfigvalidation/SpringConfigurationValidationProcessorJava6.java
rename to config-validation-processor-java17/src/main/java/com/github/pellaton/springconfigvalidation/SpringConfigurationValidationProcessorJava17.java
index f6d2823..e96bd8c 100644
--- a/config-validation-processor-java6/src/main/java/com/github/pellaton/springconfigvalidation/SpringConfigurationValidationProcessorJava6.java
+++ b/config-validation-processor-java17/src/main/java/com/github/pellaton/springconfigvalidation/SpringConfigurationValidationProcessorJava17.java
@@ -1,6 +1,6 @@
 /*
  * *****************************************************************************************************************
- * Copyright 2012 Michael Pellaton
+ * Copyright 2014 Michael Pellaton
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance
  * with the License. You may obtain a copy of the License at
@@ -21,17 +21,15 @@
 import javax.annotation.processing.SupportedSourceVersion;
 import javax.lang.model.SourceVersion;
 
-
 /**
- * {@link SpringConfigurationValidationProcessor} for Java 6 runtimes.
+ * {@link SpringConfigurationValidationProcessor} for Java 17 runtimes.
  *
  * @author Michael Pellaton
  *
  * @see SpringConfigurationValidationProcessor
  */
-@SupportedAnnotationTypes({
-  "org.springframework.context.annotation.Configuration", "org.springframework.context.annotation.Bean"})
-@SupportedSourceVersion(SourceVersion.RELEASE_6)
-public class SpringConfigurationValidationProcessorJava6 extends SpringConfigurationValidationProcessor {
+@SupportedAnnotationTypes({"org.springframework.context.annotation.Configuration", "org.springframework.context.annotation.Bean"})
+@SupportedSourceVersion(SourceVersion.RELEASE_17)
+public class SpringConfigurationValidationProcessorJava17 extends SpringConfigurationValidationProcessor {
 
 }
diff --git a/config-validation-processor-java6/src/main/resources/META-INF/services/javax.annotation.processing.Processor b/config-validation-processor-java17/src/main/resources/META-INF/services/javax.annotation.processing.Processor
similarity index 71%
rename from config-validation-processor-java6/src/main/resources/META-INF/services/javax.annotation.processing.Processor
rename to config-validation-processor-java17/src/main/resources/META-INF/services/javax.annotation.processing.Processor
index 7783585..372bdbd 100644
--- a/config-validation-processor-java6/src/main/resources/META-INF/services/javax.annotation.processing.Processor
+++ b/config-validation-processor-java17/src/main/resources/META-INF/services/javax.annotation.processing.Processor
@@ -1 +1 @@
-com.github.pellaton.springconfigvalidation.SpringConfigurationValidationProcessorJava6
\ No newline at end of file
+com.github.pellaton.springconfigvalidation.SpringConfigurationValidationProcessorJava17
diff --git a/config-validation-processor-java6/.checkstyle.xml b/config-validation-processor-java6/.checkstyle.xml
deleted file mode 100644
index f304ba8..0000000
--- a/config-validation-processor-java6/.checkstyle.xml
+++ /dev/null
@@ -1,167 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.3//EN" "http://www.puppycrawl.com/dtds/configuration_1_3.dtd">
-
-<!--
-    This configuration file was written by the eclipse-cs plugin configuration editor
--->
-<!--
-    Checkstyle-Configuration: checkstyle-checks
-    Description: 
-Checkstyle config
--->
-<module name="Checker">
-  <property name="severity" value="warning"/>
-  <module name="TreeWalker">
-    <module name="FileContentsHolder"/>
-    <module name="JavadocMethod">
-      <property name="scope" value="package"/>
-      <property name="allowUndeclaredRTE" value="true"/>
-      <property name="allowMissingThrowsTags" value="true"/>
-      <property name="allowMissingReturnTag" value="true"/>
-      <property name="allowMissingPropertyJavadoc" value="true"/>
-      <property name="suppressLoadErrors" value="true"/>
-    </module>
-    <module name="JavadocStyle">
-      <property name="scope" value="package"/>
-    </module>
-    <module name="JavadocType">
-      <property name="scope" value="package"/>
-    </module>
-    <module name="ConstantName"/>
-    <module name="LocalFinalVariableName"/>
-    <module name="LocalVariableName"/>
-    <module name="MemberName"/>
-    <module name="MethodName"/>
-    <module name="MethodTypeParameterName"/>
-    <module name="PackageName"/>
-    <module name="ParameterName"/>
-    <module name="StaticVariableName"/>
-    <module name="TypeName"/>
-    <module name="AvoidStarImport"/>
-    <module name="IllegalImport">
-      <property name="illegalPkgs" value="sun,com.sun,sunw"/>
-    </module>
-    <module name="RedundantImport"/>
-    <module name="AnonInnerLength">
-      <property name="max" value="100"/>
-    </module>
-    <module name="LineLength">
-      <property name="ignorePattern" value="^$|@see"/>
-      <property name="max" value="120"/>
-      <property name="tabWidth" value="2"/>
-    </module>
-    <module name="MethodLength">
-      <property name="max" value="300"/>
-    </module>
-    <module name="ParameterNumber"/>
-    <module name="EmptyForInitializerPad"/>
-    <module name="EmptyForIteratorPad"/>
-    <module name="NoWhitespaceAfter">
-      <property name="tokens" value="BNOT,DEC,DOT,INC,LNOT,UNARY_MINUS,UNARY_PLUS"/>
-    </module>
-    <module name="NoWhitespaceBefore"/>
-    <module name="OperatorWrap"/>
-    <module name="MethodParamPad"/>
-    <module name="ParenPad"/>
-    <module name="TypecastParenPad">
-      <property name="tokens" value="RPAREN,TYPECAST"/>
-    </module>
-    <module name="WhitespaceAfter"/>
-    <module name="WhitespaceAround"/>
-    <module name="GenericWhitespace"/>
-    <module name="ModifierOrder"/>
-    <module name="RedundantModifier"/>
-    <module name="AvoidNestedBlocks"/>
-    <module name="EmptyBlock">
-      <property name="option" value="text"/>
-    </module>
-    <module name="LeftCurly">
-      <property name="maxLineLength" value="120"/>
-    </module>
-    <module name="NeedBraces"/>
-    <module name="RightCurly"/>
-    <module name="DoubleCheckedLocking"/>
-    <module name="IllegalInstantiation">
-      <metadata name="net.sf.eclipsecs.core.comment" value="Netcetera: The class Boolean should not be instantiated"/>
-      <property name="classes" value="Boolean"/>
-    </module>
-    <module name="InnerAssignment">
-      <property name="tokens" value="BAND_ASSIGN,BOR_ASSIGN,BSR_ASSIGN,BXOR_ASSIGN,DIV_ASSIGN,MINUS_ASSIGN,MOD_ASSIGN,PLUS_ASSIGN,SL_ASSIGN,SR_ASSIGN,STAR_ASSIGN"/>
-    </module>
-    <module name="EqualsHashCode"/>
-    <module name="RedundantThrows">
-      <property name="allowUnchecked" value="true"/>
-      <property name="allowSubclasses" value="true"/>
-    </module>
-    <module name="SimplifyBooleanExpression"/>
-    <module name="SimplifyBooleanReturn"/>
-    <module name="StringLiteralEquality"/>
-    <module name="NestedIfDepth">
-      <property name="max" value="6"/>
-    </module>
-    <module name="DefaultComesLast"/>
-    <module name="IllegalTokenText">
-      <metadata name="net.sf.eclipsecs.core.comment" value="Netcetera: The usage of labels is discourraged."/>
-      <property name="tokens" value="LABELED_STAT"/>
-      <property name="format" value=".*"/>
-      <property name="message" value="Netcetera: The usage of labels is discourraged."/>
-    </module>
-    <module name="CovariantEquals"/>
-    <module name="ModifiedControlVariable"/>
-    <module name="MultipleVariableDeclarations"/>
-    <module name="SuperFinalize"/>
-    <module name="FinalClass"/>
-    <module name="HideUtilityClassConstructor"/>
-    <module name="InterfaceIsType"/>
-    <module name="VisibilityModifier"/>
-    <module name="ArrayTypeStyle"/>
-    <module name="UpperEll"/>
-    <module name="RegexpSinglelineJava">
-      <property name="format" value="(.*)\/\/\$NON-NLS-(.+)\$"/>
-      <property name="message" value="Netcetera: Do not use Eclipse's string externalisation"/>
-    </module>
-    <module name="RegexpSinglelineJava">
-      <property name="format" value="new\s+String\s*[(]\s*&quot;"/>
-      <property name="message" value="Netcetera: Possible redundant String object"/>
-      <property name="ignoreComments" value="true"/>
-    </module>
-    <module name="RegexpSinglelineJava">
-      <property name="format" value="new\s+BigDecimal\s*[(]\s*\d"/>
-      <property name="message" value="Netcetera: Avoid non-String BigDecimal constructors"/>
-      <property name="ignoreComments" value="true"/>
-    </module>
-    <module name="UnusedImports"/>
-    <module name="OuterTypeNumber"/>
-    <module name="ParameterAssignment"/>
-    <module name="SuperClone"/>
-    <module name="MutableException"/>
-    <module name="AnnotationUseStyle"/>
-    <module name="ClassTypeParameterName"/>
-    <module name="MissingDeprecated"/>
-    <module name="EmptyStatement"/>
-    <module name="IllegalCatch">
-      <property name="illegalClassNames" value="java.lang.Exception,java.lang.Error"/>
-    </module>
-    <module name="IllegalThrows">
-      <property name="illegalClassNames" value="java.lang.Throwable, java.lang.Error"/>
-    </module>
-    <module name="PackageDeclaration"/>
-    <module name="PackageAnnotation"/>
-    <module name="NoFinalizer"/>
-    <module name="UnnecessaryParentheses"/>
-  </module>
-  <module name="FileLength"/>
-  <module name="SuppressionCommentFilter">
-    <property name="checkC" value="false"/>
-  </module>
-  <module name="FileTabCharacter">
-    <property name="eachLine" value="true"/>
-  </module>
-  <module name="RegexpSingleline">
-    <property name="format" value="select[ ]*\*"/>
-    <property name="message" value="Netcetera: &quot;select *&quot; is considered harmful and must not be used"/>
-  </module>
-  <module name="NewlineAtEndOfFile">
-    <property name="fileExtensions" value="*.java"/>
-  </module>
-</module>
diff --git a/config-validation-processor-java6/.classpath b/config-validation-processor-java6/.classpath
deleted file mode 100644
index 8b8ac5b..0000000
--- a/config-validation-processor-java6/.classpath
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" output="target/classes" path="src/main/java">
-		<attributes>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
-		<attributes>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="output" path="target/classes"/>
-</classpath>
diff --git a/config-validation-processor-java6/.project b/config-validation-processor-java6/.project
deleted file mode 100644
index f08f4cf..0000000
--- a/config-validation-processor-java6/.project
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>config-validation-processor-java6</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.m2e.core.maven2Nature</nature>
-	</natures>
-</projectDescription>
diff --git a/config-validation-processor-java6/.settings/org.eclipse.jdt.core.prefs b/config-validation-processor-java6/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 60105c1..0000000
--- a/config-validation-processor-java6/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,5 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.6
diff --git a/config-validation-processor-java6/.settings/org.eclipse.m2e.core.prefs b/config-validation-processor-java6/.settings/org.eclipse.m2e.core.prefs
deleted file mode 100644
index f897a7f..0000000
--- a/config-validation-processor-java6/.settings/org.eclipse.m2e.core.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-activeProfiles=
-eclipse.preferences.version=1
-resolveWorkspaceProjects=true
-version=1
diff --git a/config-validation-processor-java7/pom.xml b/config-validation-processor-java7/pom.xml
index 438c459..dc54304 100644
--- a/config-validation-processor-java7/pom.xml
+++ b/config-validation-processor-java7/pom.xml
@@ -24,9 +24,7 @@
 	<build>
 		<plugins>
 			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-dependency-plugin</artifactId>
-				<version>2.4</version>
 				<executions>
 					<execution>
 						<id>unpack-dependencies</id>
diff --git a/config-validation-processor-java8/pom.xml b/config-validation-processor-java8/pom.xml
index 403a292..50edd50 100644
--- a/config-validation-processor-java8/pom.xml
+++ b/config-validation-processor-java8/pom.xml
@@ -24,9 +24,7 @@
 	<build>
 		<plugins>
 			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-dependency-plugin</artifactId>
-				<version>2.4</version>
 				<executions>
 					<execution>
 						<id>unpack-dependencies</id>
diff --git a/pom.xml b/pom.xml
index 50b63d7..2389f2a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -41,62 +41,32 @@
 
   <properties>
     <hamcrest.version>1.3</hamcrest.version>
-    <java.version>1.6</java.version>
-    <junit.version>4.13.1</junit.version>
+    <java.version>1.7</java.version>
+    <junit.version>4.13.2</junit.version>
     <mockito.version>1.10.19</mockito.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    <spring.framwork.version>5.3.2</spring.framwork.version>
   </properties>
 
   <modules>
     <module>config-validation-processor-core</module>
-    <module>config-validation-processor-java6</module>
     <module>config-validation-processor-java7</module>
     <module>config-validation-processor-java8</module>
     <module>config-validation-processor-java11</module>
+    <module>config-validation-processor-java17</module>
   </modules>
 
-  <dependencies>
-    <!-- COMPILE scoped dependencies -->
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-context</artifactId>
-      <version>${spring.framwork.version}</version>
-    </dependency>
-
-    <!-- TEST scoped dependencies -->
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>${junit.version}</version>
-      <scope>test</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>org.hamcrest</groupId>
-          <artifactId>hamcrest-core</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.hamcrest</groupId>
-      <artifactId>hamcrest-all</artifactId>
-      <version>${hamcrest.version}</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-all</artifactId>
-      <version>${mockito.version}</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-test</artifactId>
-      <version>${spring.framwork.version}</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>org.springframework</groupId>
+        <artifactId>spring-framework-bom</artifactId>
+        <version>5.3.26</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
 
   <distributionManagement>
     <snapshotRepository>
@@ -114,46 +84,49 @@
       <plugins>
         <plugin>
           <artifactId>maven-clean-plugin</artifactId>
-          <version>3.1.0</version>
+          <version>3.2.0</version>
         </plugin>
         <plugin>
           <artifactId>maven-compiler-plugin</artifactId>
-          <version>3.8.1</version>
+          <version>3.11.0</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-dependency-plugin</artifactId>
+          <version>3.5.0</version>
         </plugin>
         <plugin>
           <artifactId>maven-gpg-plugin</artifactId>
-          <version>1.6</version>
+          <version>3.0.1</version>
         </plugin>
         <plugin>
           <artifactId>maven-javadoc-plugin</artifactId>
-          <version>3.2.0</version>
+          <version>3.5.0</version>
         </plugin>
         <plugin>
           <artifactId>maven-release-plugin</artifactId>
-          <version>2.5.3</version>
+          <version>3.0.0</version>
         </plugin>
         <plugin>
           <artifactId>maven-resources-plugin</artifactId>
-          <version>3.2.0</version>
+          <version>3.3.1</version>
         </plugin>
         <plugin>
           <artifactId>maven-scm-plugin</artifactId>
-          <version>1.11.2</version>
+          <version>2.0.0</version>
         </plugin>
         <plugin>
           <artifactId>maven-source-plugin</artifactId>
-          <version>3.2.0</version>
+          <version>3.2.1</version>
         </plugin>
         <plugin>
           <artifactId>maven-surefire-plugin</artifactId>
-          <version>2.22.2</version>
+          <version>3.0.0</version>
         </plugin>
       </plugins>
     </pluginManagement>
 
     <plugins>
       <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
           <source>${java.version}</source>
@@ -195,13 +168,12 @@
       </plugin>
 
       <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-release-plugin</artifactId>
         <configuration>
           <autoVersionSubmodules>true</autoVersionSubmodules>
           <useReleaseProfile>false</useReleaseProfile>
           <releaseProfiles>deploy-to-sonatype-oss</releaseProfiles>
-	  <goals>deploy</goals>
+          <goals>deploy</goals>
         </configuration>
       </plugin>
     </plugins>
@@ -213,7 +185,6 @@
       <build>
         <plugins>
           <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-gpg-plugin</artifactId>
             <executions>
               <execution>