diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 0aa5090d..b6b58949 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -9,7 +9,7 @@ jobs:
     strategy:
       matrix:
         os: [ ubuntu-latest , windows-latest ]
-        java: [ 8, 11 ]
+        java: [ 11,17 ]
         experimental: [ false ]
 
     steps:
diff --git a/pom.xml b/pom.xml
index 0a6e20be..02607f36 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
   <name>QDox</name>
   <groupId>com.thoughtworks.qdox</groupId>
   <artifactId>qdox</artifactId>
-  <version>2.1.1-SNAPSHOT</version>
+  <version>2.2.0-SNAPSHOT</version>
 
   <url>https://github.com/paul-hammant/qdox</url>
   <description>
@@ -153,13 +153,6 @@
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-jar-plugin</artifactId>
           <version>3.3.0</version>
-          <configuration>
-            <archive>
-              <manifestEntries>
-                <Automatic-Module-Name>com.thoughtworks.qdox</Automatic-Module-Name>
-              </manifestEntries>
-            </archive>
-          </configuration>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
@@ -202,6 +195,9 @@
                 <requireMavenVersion>
                   <version>3.0</version>
                 </requireMavenVersion>
+                <requireJavaVersion>
+                  <version>11</version>
+                </requireJavaVersion>
               </rules>    
             </configuration>
           </execution>
@@ -221,6 +217,33 @@
           </execution>
         </executions>
       </plugin>
+      <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-compiler-plugin</artifactId>
+          <executions>
+            <execution>
+              <id>default-compile</id>
+              <configuration>
+                <release>8</release>
+	            <excludes>
+	              <exclude>module-info.java</exclude>
+	            </excludes>
+              </configuration>
+            </execution>
+            <execution>
+              <id>module-descriptor</id>
+              <goals>
+                <goal>compile</goal>
+              </goals>
+              <configuration>
+                <release>11</release>
+	            <includes>
+	              <include>module-info.java</include>
+	            </includes>
+              </configuration>
+            </execution>
+          </executions>
+        </plugin>
       <plugin>
         <groupId>de.jflex</groupId>
         <artifactId>jflex-maven-plugin</artifactId>
@@ -288,27 +311,6 @@
           </execution>
         </executions>
       </plugin>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>animal-sniffer-maven-plugin</artifactId>
-        <version>1.7</version>
-        <executions>
-          <execution>
-            <id>check-java15</id>
-            <phase>process-classes</phase>
-            <goals>
-              <goal>check</goal>
-            </goals>
-            <configuration>
-              <signature>
-                <groupId>org.codehaus.mojo.signature</groupId>
-                <artifactId>java18</artifactId>
-                <version>1.0</version>
-              </signature>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-failsafe-plugin</artifactId>
diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java
new file mode 100644
index 00000000..0d4b71c2
--- /dev/null
+++ b/src/main/java/module-info.java
@@ -0,0 +1,7 @@
+module com.thoughtworks.qdox {
+	requires java.desktop; // java.beans.Introspector
+	
+	exports com.thoughtworks.qdox;
+	exports com.thoughtworks.qdox.model;
+
+}
\ No newline at end of file