diff --git a/README.adoc b/README.adoc
index 9a3e939..cfa7547 100644
--- a/README.adoc
+++ b/README.adoc
@@ -20,42 +20,30 @@ The multi-release JAR support works in two parts: compilation and testing.
 [id='mr-jar-compilation']
 ==== Compilation
 
-Compilation works by providing extra executions of the compiler plugin in order to build the additional JAR layers.  The
+Compilation works by providing extra executions of the compiler plugin in order to build the additional JAR layers. The
 base layer is built by the standard `default-compile` execution.  After that, Maven profiles are activated based on the
-presence of extra layer source directories (e.g. `src/main/java9`, `src/main/java10` etc.).  These profiles contain
+presence of extra layer source directories (e.g. `src/main/java18`, `src/main/java19` etc.).  These profiles contain
 additional executions of the compiler plugin which compile the sources in the layer directory, while putting the output
 of the previous step on the class path.
 
-Each present layer is in turn compiled with the results of all the previous layers on the classpath in the correct order.
-The additional layer class files are output under the `target/classes` directory in the appropriate location for
+Each present layer is in turn compiled with the results of all the previous layers on the classpath in the correct
+order. The additional layer class files are output under the `target/classes` directory in the appropriate location for
 multi-release JAR layers.
 
 In order to select the correct class files for the given Java version, the `<release>` property is used.
 This prevents accidental usage of APIs which are only present in later versions than the one
-being compiled. However there is a limitation to this strategy: Java 9 and later do not provide runtime information
-for non-standard Java 8 classes such as `sun.misc.Unsafe`.  If your project needs to compile against these classes,
-you must use the dependency plugin as described <<mr-jar-sun-misc,below>>.
-
-Note that by default, building Java 8 sources does not use the `<release>` property.  To enable this feature,
-create a file (which may be empty) in your project root named `build-release-8`.
+being compiled.
 
 [id='mr-jar-testing']
 ==== Testing
 
-Testing using `maven-surefire-plugin` is supported by running the project unit tests on
-every supported Java version.  In order to do so, it is expected that the following system
-property or properties are set as needed:
+Testing using `maven-surefire-plugin` is supported by running the project unit tests on every supported Java version.
+In order to do so, it is expected that the following system property or properties are set as needed:
 
-* `java8.home`: this property must be set to the location of a Java 8 JDK installation
-* `java9.home`: this property must be set to the location of a Java 9 JDK installation
-* `java10.home`: this property must be set to the location of a Java 10 JDK installation
 * `java11.home`: this property must be set to the location of a Java 11 JDK installation
-* `java12.home`: this property must be set to the location of a Java 12 JDK installation
-* `java13.home`: this property must be set to the location of a Java 13 JDK installation
-* `java14.home`: this property must be set to the location of a Java 14 JDK installation
-* `java15.home`: this property must be set to the location of a Java 15 JDK installation
-* `java16.home`: this property must be set to the location of a Java 16 JDK installation
 * `java17.home`: this property must be set to the location of a Java 17 JDK installation
+* `java18.home`: this property must be set to the location of a Java 18 JDK installation
+* `java19.home`: this property must be set to the location of a Java 19 JDK installation
 
 In order to simplify development, it is recommended to project maintainers to set these
 properties in your personal Maven `settings.xml` file.
@@ -73,7 +61,7 @@ To configure a multi-release JAR, you need the following pieces of information:
 [id='mr-jar-base-layer']
 ==== Step 1: Base layer version
 
-Choose your base layer version.  This can be Java 8 or anything later.  Configure the version by configuring the
+Choose your base layer version.  This can be Java 11 or anything later.  Configure the version by configuring the
 `release` property in the `default-compile` execution of `maven-compiler-plugin`:
 
 [source,xml]
@@ -84,17 +72,14 @@ Choose your base layer version.  This can be Java 8 or anything later.  Configur
     <execution>
       <id>default-compile</id>
       <configuration>
-        <release>8</release>
+        <release>11</release>
       </configuration>
     </execution>
   </executions>
 </plugin>
 ----
 
-If the `build-release-8` property is present in the root of your project, then this step is automatically done for you.
-
-Note that a single-layer Java 8 build does not support the `release` element because the
-corresponding `javac` option is only present in JDK 9 and later.
+If the `build-release-11` property is present in the root of your project, then this step is automatically done for you.
 
 [id='mr-jar-highest-layer']
 ==== Step 2: Highest layer version
@@ -113,34 +98,20 @@ able to compile every version of Java sources from oldest to newest.
 The sources for your base layer continue to reside in `src/main/java` and `src/test/java`.
 
 Additional layers are in directories whose names correspond to the version of Java that
-is targeted by that directory.  For example, sources which are specific to Java 9 and later
-would be in `src/main/java9`, whereas sources which are specific to Java 11 and later would
-be in `src/main/java11`.
+is targeted by that directory. For example, sources which are specific to Java 18 and later
+would be in `src/main/java18`, whereas sources which are specific to Java 19 and later would
+be in `src/main/java19`.
 
 If you have a class that needs an alternative version for a given Java version, you only
 need to provide the replacement source file in the directory corresponding to the _oldest_
-version that supports the alternative source.  It is not necessary to copy identical classes into
+version that supports the alternative source. It is not necessary to copy identical classes into
 more than one layer; doing so will increase the size of the resultant artifact needlessly.
 
-There are restrictions on these directories.  You may only provide sources that correspond
+There are restrictions on these directories. You may only provide sources that correspond
 to sources that exist in the base layer - that is, it is a violation of the MR JAR specification to provide
-sources that introduce new APIs only in later Java versions.  The JDK does enforce this at run time.
+sources that introduce new APIs only in later Java versions. The JDK does enforce this at run time.
 In addition, providing additional public members in later versions is generally not recommended.
 
-[id='mr-jar-sun-misc']
-=== Missing JDK APIs
-
-If your project relies on APIs which are not in the Java SE specification (for example,
-classes such as `sun.misc` which are present in the `jdk.unsupported` module in Java 9 and
-later), and your base layer targets Java 8, you must take an additional step.
-
-Since these APIs are not included in the class database that `javac` uses to compile (even
-though they are present at run time), stubs of the extra classes must be included but only during
-compilation.
-
-To automatically perform this step, create a file in your project root named `build-include-jdk-misc`.
-The contents of this file do not matter; it can be empty or it can contain text referring to this document.
-
 [id='mr-jar-gh-actions']
 === Using MR JAR functions with GitHub Actions
 
@@ -150,7 +121,7 @@ version(s) by way of a setup action, and then passing the location of each addit
 At the time of this writing, the commonly-used `actions/setup-java` does not provide useful environment variables
 for multiple JDK installs, so it is recommended to instead use the `AdoptOpenJDK/install-jdk` action instead.
 
-As an example, for a project that is built on Java 11 but must also be tested against JDK 8, 9, and 10, your `build.yml`
+As an example, for a project that is built on Java 17 but must also be tested against JDK 11 your `build.yml`
 might look something like this:
 
 [source,yaml]
@@ -165,33 +136,21 @@ jobs:
         name: Checkout
 
       - uses: AdoptOpenJDK/install-jdk@v1
-        name: Set up JDK 11
-        with:
-          version: 11
-
-      - uses: AdoptOpenJDK/install-jdk@v1
-        name: Set up JDK 10
-        with:
-          version: 10
-          targets: 'JAVA_HOME_10'
-
-      - uses: AdoptOpenJDK/install-jdk@v1
-        name: Set up JDK 9
+        name: Set up JDK 17
         with:
-          version: 9
-          targets: 'JAVA_HOME_9'
+          version: 17
 
       - uses: AdoptOpenJDK/install-jdk@v1
-        name: Set up JDK 8
+        name: Set up JDK 11
         with:
-          version: 8
-          targets: 'JAVA_HOME_8'
+          version: 11
+          targets: 'JAVA_HOME_11'
 
       - name: Build
-        run: mvn -B verify --file pom.xml -Djava8.home=$JAVA_HOME_8 -Djava9.home=$JAVA_HOME_9 -Djava10.home=$JAVA_HOME_10
+        run: mvn -B verify --file pom.xml -Djava11.home=$JAVA_HOME_11
 ----
 
-Note that this configuration causes the default `JAVA_HOME` environment to be set to JDK 11.
+Note that this configuration causes the default `JAVA_HOME` environment to be set to JDK 17.
 
 [id='build-control-files']
 == Build control files reference
@@ -199,17 +158,10 @@ Note that this configuration causes the default `JAVA_HOME` environment to be se
 [cols="1m,2,1",options="header"]
 |===
 |File name|Purpose|Reference
-|build-release-8|Use the `<release>` option to set Java 8 for the base layer.|<<mr-jar-base-layer>>
-|build-include-jdk-misc|Include the `jdk-misc` dependency for Java 8 builds.|<<mr-jar-sun-misc>>
-|build-test-java8|Run tests for Java 8 when `java8.home` is set and JDK 9 or later is used.|<<mr-jar-testing>>
-|build-test-java9|Run tests for Java 9 when `java9.home` is set and JDK 10 or later is used.|<<mr-jar-testing>>
-|build-test-java10|Run tests for Java 10 when `java10.home` is set and JDK 11 or later is used.|<<mr-jar-testing>>
-|build-test-java11|Run tests for Java 11 when `java11.home` is set and JDK 12 or later is used.|<<mr-jar-testing>>
-|build-test-java12|Run tests for Java 12 when `java12.home` is set and JDK 13 or later is used.|<<mr-jar-testing>>
-|build-test-java13|Run tests for Java 13 when `java13.home` is set and JDK 14 or later is used.|<<mr-jar-testing>>
-|build-test-java14|Run tests for Java 14 when `java14.home` is set and JDK 15 or later is used.|<<mr-jar-testing>>
-|build-test-java15|Run tests for Java 15 when `java15.home` is set and JDK 16 or later is used.|<<mr-jar-testing>>
-|build-test-java16|Run tests for Java 16 when `java16.home` is set and JDK 17 or later is used.|<<mr-jar-testing>>
+|build-release-11|Use the `<release>` option to set Java 11 for the base layer.|<<mr-jar-base-layer>>
+|build-test-java11|Run tests for Java 11 when `java11.home` is set and JDK 17 or later is used.|<<mr-jar-testing>>
 |build-test-java17|Run tests for Java 17 when `java17.home` is set and JDK 18 or later is used.|<<mr-jar-testing>>
+|build-test-java18|Run tests for Java 18 when `java18.home` is set and JDK 19 or later is used.|<<mr-jar-testing>>
+|build-test-java19|Run tests for Java 19 when `java19.home` is set and JDK 20 or later is used.|<<mr-jar-testing>>
 |===
 
diff --git a/pom.xml b/pom.xml
index 4cd6b7c..0b87af9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -254,13 +254,13 @@
             </excludes>
           </configuration>
           <executions>
-              <execution>
-                  <id>prepare-agent</id>
-                  <goals>
-                      <goal>prepare-agent</goal>
-                  </goals>
-                  <phase>generate-test-resources</phase>
-              </execution>
+            <execution>
+              <id>prepare-agent</id>
+              <goals>
+                <goal>prepare-agent</goal>
+              </goals>
+              <phase>generate-test-resources</phase>
+            </execution>
           </executions>
         </plugin>
         <plugin>
@@ -436,12 +436,12 @@
     <!-- MR JAR support starts here-->
 
     <profile>
-      <id>compile-java8-release-flag</id>
+      <id>compile-java11-release-flag</id>
       <activation>
         <file>
-          <exists>${basedir}/build-release-8</exists>
+          <exists>${basedir}/build-release-11</exists>
         </file>
-        <jdk>[9,)</jdk>
+        <jdk>[11,)</jdk>
       </activation>
       <build>
         <plugins>
@@ -456,7 +456,7 @@
                   <goal>compile</goal>
                 </goals>
                 <configuration>
-                  <release>8</release>
+                  <release>11</release>
                 </configuration>
               </execution>
             </executions>
@@ -465,762 +465,244 @@
       </build>
     </profile>
 
-    <!-- This profile is manually activated by a property to include jdk-misc.jar in the base layer build. -->
-    <profile>
-        <id>include-jdk-misc</id>
-        <activation>
-            <file>
-                <exists>${basedir}/build-include-jdk-misc</exists>
-            </file>
-            <jdk>[9,)</jdk>
-        </activation>
-        <build>
-            <plugins>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-compiler-plugin</artifactId>
-                    <executions>
-                        <execution>
-                            <id>default-compile</id>
-                            <phase>compile</phase>
-                            <goals>
-                                <goal>compile</goal>
-                            </goals>
-                            <configuration>
-                                <release>8</release>
-                            </configuration>
-                        </execution>
-                    </executions>
-                </plugin>
-            </plugins>
-        </build>
-      <dependencies>
-        <dependency>
-          <groupId>org.jboss</groupId>
-          <artifactId>jdk-misc</artifactId>
-          <version>${version.jdk-misc}</version>
-          <optional>true</optional>
-        </dependency>
-      </dependencies>
-    </profile>
-
-    <!--                -->
-    <!-- Java 9 support -->
-    <!--                -->
-
-    <!-- This profile is activated when the baseline JDK version running tests is Java 9 -->
-    <profile>
-        <id>java9-test-classpath</id>
-        <activation>
-            <jdk>[9,10)</jdk>
-        </activation>
-        <build>
-            <plugins>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-surefire-plugin</artifactId>
-                    <executions>
-                        <execution>
-                            <id>default-test</id>
-                            <configuration>
-                                <classesDirectory>${project.build.outputDirectory}/META-INF/versions/9</classesDirectory>
-                                <additionalClasspathElements>
-                                    <additionalClasspathElement>${project.build.outputDirectory}</additionalClasspathElement>
-                                </additionalClasspathElements>
-                            </configuration>
-                        </execution>
-                    </executions>
-                </plugin>
-            </plugins>
-        </build>
-    </profile>
-
-    <!-- This profile is activated when Java 9 or later is used to test a project that supports Java 8 -->
-    <profile>
-        <id>java8-test</id>
-        <activation>
-            <jdk>[9,)</jdk>
-            <property>
-                <name>java8.home</name>
-            </property>
-            <file>
-                <exists>${basedir}/build-test-java8</exists>
-            </file>
-        </activation>
-        <build>
-            <plugins>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-surefire-plugin</artifactId>
-                    <executions>
-                        <execution>
-                            <id>java8-test</id>
-                            <phase>test</phase>
-                            <goals>
-                                <goal>test</goal>
-                            </goals>
-                            <configuration>
-                                <jvm>${java8.home}/bin/java</jvm>
-                                <additionalClasspathElements>
-                                    <additionalClasspathElement>${java8.home}/lib/tools.jar</additionalClasspathElement>
-                                </additionalClasspathElements>
-                            </configuration>
-                        </execution>
-                    </executions>
-                </plugin>
-            </plugins>
-        </build>
-    </profile>
-
-    <!-- This profile is activated when Java 9 or later is used to build -->
-    <profile>
-        <id>java9-mr-build</id>
-        <activation>
-            <jdk>[9,)</jdk>
-            <file>
-                <exists>${basedir}/src/main/java9</exists>
-            </file>
-        </activation>
-        <build>
-            <plugins>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-compiler-plugin</artifactId>
-                    <executions>
-                        <execution>
-                            <id>compile-java9</id>
-                            <phase>compile</phase>
-                            <goals>
-                                <goal>compile</goal>
-                            </goals>
-                            <configuration>
-                                <release>9</release>
-                              <compileSourceRoots>
-                                <compileSourceRoot>${project.basedir}/src/main/java9</compileSourceRoot>
-                              </compileSourceRoots>
-                              <multiReleaseOutput>true</multiReleaseOutput>
-                            </configuration>
-                        </execution>
-                    </executions>
-                </plugin>
-                <plugin>
-                    <artifactId>maven-jar-plugin</artifactId>
-                    <configuration>
-                        <archive>
-                            <manifestEntries>
-                                <Multi-Release>true</Multi-Release>
-                            </manifestEntries>
-                        </archive>
-                    </configuration>
-                </plugin>
-            </plugins>
-        </build>
-    </profile>
-
-    <!--                 -->
-    <!-- Java 10 support -->
-    <!--                 -->
-
-    <!-- This profile is activated when the baseline JDK version running tests is Java 10 -->
-    <profile>
-        <id>java10-test-classpath</id>
-        <activation>
-            <jdk>[10,11)</jdk>
-        </activation>
-        <build>
-            <plugins>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-surefire-plugin</artifactId>
-                    <executions>
-                        <execution>
-                            <id>default-test</id>
-                            <configuration>
-                                <classesDirectory>${project.build.outputDirectory}/META-INF/versions/10</classesDirectory>
-                                <additionalClasspathElements>
-                                    <additionalClasspathElement>${project.build.outputDirectory}/META-INF/versions/9</additionalClasspathElement>
-                                    <additionalClasspathElement>${project.build.outputDirectory}</additionalClasspathElement>
-                                </additionalClasspathElements>
-                            </configuration>
-                        </execution>
-                    </executions>
-                </plugin>
-            </plugins>
-        </build>
-    </profile>
-
-    <!-- This profile is activated when Java 10 or later is used to test a project that supports Java 9 -->
-    <profile>
-        <id>java9-test</id>
-        <activation>
-            <jdk>[10,)</jdk>
-            <property>
-                <name>java9.home</name>
-            </property>
-            <file>
-                <exists>${basedir}/build-test-java9</exists>
-            </file>
-        </activation>
-        <build>
-            <plugins>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-surefire-plugin</artifactId>
-                    <executions>
-                        <execution>
-                            <id>java9-test</id>
-                            <phase>test</phase>
-                            <goals>
-                                <goal>test</goal>
-                            </goals>
-                            <configuration>
-                                <jvm>${java9.home}/bin/java</jvm>
-                                <classesDirectory>${project.build.outputDirectory}/META-INF/versions/9</classesDirectory>
-                                <additionalClasspathElements>
-                                    <additionalClasspathElement>${project.build.outputDirectory}</additionalClasspathElement>
-                                </additionalClasspathElements>
-                            </configuration>
-                        </execution>
-                    </executions>
-                </plugin>
-            </plugins>
-        </build>
-    </profile>
-
-    <!-- This profile is activated when Java 10 or later is used to build -->
-    <profile>
-        <id>java10-mr-build</id>
-        <activation>
-            <jdk>[10,)</jdk>
-            <file>
-                <exists>${basedir}/src/main/java10</exists>
-            </file>
-        </activation>
-        <build>
-            <plugins>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-compiler-plugin</artifactId>
-                    <executions>
-                        <execution>
-                            <id>compile-java10</id>
-                            <phase>compile</phase>
-                            <goals>
-                                <goal>compile</goal>
-                            </goals>
-                            <configuration>
-                                <release>10</release>
-                              <compileSourceRoots>
-                                <compileSourceRoot>${project.basedir}/src/main/java10</compileSourceRoot>
-                              </compileSourceRoots>
-                              <multiReleaseOutput>true</multiReleaseOutput>
-                            </configuration>
-                        </execution>
-                    </executions>
-                </plugin>
-                <plugin>
-                    <artifactId>maven-jar-plugin</artifactId>
-                    <configuration>
-                        <archive>
-                            <manifestEntries>
-                                <Multi-Release>true</Multi-Release>
-                            </manifestEntries>
-                        </archive>
-                    </configuration>
-                </plugin>
-            </plugins>
-        </build>
-    </profile>
-
-    <!--                 -->
-    <!-- Java 11 support -->
-    <!--                 -->
-
-    <!-- This profile is activated when the baseline JDK version running tests is Java 11 -->
-    <profile>
-        <id>java11-test-classpath</id>
-        <activation>
-            <jdk>[11,12)</jdk>
-        </activation>
-        <build>
-            <plugins>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-surefire-plugin</artifactId>
-                    <executions>
-                        <execution>
-                            <id>default-test</id>
-                            <configuration>
-                                <classesDirectory>${project.build.outputDirectory}/META-INF/versions/11</classesDirectory>
-                                <additionalClasspathElements>
-                                    <additionalClasspathElement>${project.build.outputDirectory}/META-INF/versions/10</additionalClasspathElement>
-                                    <additionalClasspathElement>${project.build.outputDirectory}/META-INF/versions/9</additionalClasspathElement>
-                                    <additionalClasspathElement>${project.build.outputDirectory}</additionalClasspathElement>
-                                </additionalClasspathElements>
-                            </configuration>
-                        </execution>
-                    </executions>
-                </plugin>
-            </plugins>
-        </build>
-    </profile>
-
-    <!-- This profile is activated when Java 11 or later is used to test a project that supports Java 10 -->
-    <profile>
-        <id>java10-test</id>
-        <activation>
-            <jdk>[11,)</jdk>
-            <property>
-                <name>java10.home</name>
-            </property>
-            <file>
-                <exists>${basedir}/build-test-java10</exists>
-            </file>
-        </activation>
-        <build>
-            <plugins>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-surefire-plugin</artifactId>
-                    <executions>
-                        <execution>
-                            <id>java10-test</id>
-                            <phase>test</phase>
-                            <goals>
-                                <goal>test</goal>
-                            </goals>
-                            <configuration>
-                                <jvm>${java10.home}/bin/java</jvm>
-                                <classesDirectory>${project.build.outputDirectory}/META-INF/versions/10</classesDirectory>
-                                <additionalClasspathElements>
-                                    <additionalClasspathElement>${project.build.outputDirectory}/META-INF/versions/9</additionalClasspathElement>
-                                    <additionalClasspathElement>${project.build.outputDirectory}</additionalClasspathElement>
-                                </additionalClasspathElements>
-                            </configuration>
-                        </execution>
-                    </executions>
-                </plugin>
-            </plugins>
-        </build>
-    </profile>
-
-    <!-- This profile is activated when Java 11 or later is used to build -->
-    <profile>
-        <id>java11-mr-build</id>
-        <activation>
-            <jdk>[11,)</jdk>
-            <file>
-                <exists>${basedir}/src/main/java11</exists>
-            </file>
-        </activation>
-        <build>
-            <plugins>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-compiler-plugin</artifactId>
-                    <executions>
-                        <execution>
-                            <id>compile-java11</id>
-                            <phase>compile</phase>
-                            <goals>
-                                <goal>compile</goal>
-                            </goals>
-                            <configuration>
-                                <release>11</release>
-                              <compileSourceRoots>
-                                <compileSourceRoot>${project.basedir}/src/main/java11</compileSourceRoot>
-                              </compileSourceRoots>
-                              <multiReleaseOutput>true</multiReleaseOutput>
-                            </configuration>
-                        </execution>
-                    </executions>
-                </plugin>
-                <plugin>
-                    <artifactId>maven-jar-plugin</artifactId>
-                    <configuration>
-                        <archive>
-                            <manifestEntries>
-                                <Multi-Release>true</Multi-Release>
-                            </manifestEntries>
-                        </archive>
-                    </configuration>
-                </plugin>
-            </plugins>
-        </build>
-    </profile>
-
-    <!--                 -->
-    <!-- Java 12 support -->
-    <!--                 -->
-
-    <!-- This profile is activated when the baseline JDK version running tests is Java 12 -->
-    <profile>
-        <id>java12-test-classpath</id>
-        <activation>
-            <jdk>[12,13)</jdk>
-        </activation>
-        <build>
-            <plugins>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-surefire-plugin</artifactId>
-                    <executions>
-                        <execution>
-                            <id>default-test</id>
-                            <configuration>
-                                <classesDirectory>${project.build.outputDirectory}/META-INF/versions/12</classesDirectory>
-                                <additionalClasspathElements>
-                                    <additionalClasspathElement>${project.build.outputDirectory}/META-INF/versions/11</additionalClasspathElement>
-                                    <additionalClasspathElement>${project.build.outputDirectory}/META-INF/versions/10</additionalClasspathElement>
-                                    <additionalClasspathElement>${project.build.outputDirectory}/META-INF/versions/9</additionalClasspathElement>
-                                    <additionalClasspathElement>${project.build.outputDirectory}</additionalClasspathElement>
-                                </additionalClasspathElements>
-                            </configuration>
-                        </execution>
-                    </executions>
-                </plugin>
-            </plugins>
-        </build>
-    </profile>
-
-    <!-- This profile is activated when Java 12 or later is used to test a project that supports Java 11 -->
-    <profile>
-        <id>java11-test</id>
-        <activation>
-            <jdk>[12,)</jdk>
-            <property>
-                <name>java11.home</name>
-            </property>
-            <file>
-                <exists>${basedir}/build-test-java11</exists>
-            </file>
-        </activation>
-        <build>
-            <plugins>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-surefire-plugin</artifactId>
-                    <executions>
-                        <execution>
-                            <id>java11-test</id>
-                            <phase>test</phase>
-                            <goals>
-                                <goal>test</goal>
-                            </goals>
-                            <configuration>
-                                <jvm>${java11.home}/bin/java</jvm>
-                                <classesDirectory>${project.build.outputDirectory}/META-INF/versions/11</classesDirectory>
-                                <additionalClasspathElements>
-                                    <additionalClasspathElement>${project.build.outputDirectory}/META-INF/versions/10</additionalClasspathElement>
-                                    <additionalClasspathElement>${project.build.outputDirectory}/META-INF/versions/9</additionalClasspathElement>
-                                    <additionalClasspathElement>${project.build.outputDirectory}</additionalClasspathElement>
-                                </additionalClasspathElements>
-                            </configuration>
-                        </execution>
-                    </executions>
-                </plugin>
-            </plugins>
-        </build>
-    </profile>
-
-    <!-- This profile is activated when Java 12 or later is used to build -->
-    <profile>
-        <id>java12-mr-build</id>
-        <activation>
-            <jdk>[12,)</jdk>
-            <file>
-                <exists>${basedir}/src/main/java12</exists>
-            </file>
-        </activation>
-        <build>
-            <plugins>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-compiler-plugin</artifactId>
-                    <executions>
-                        <execution>
-                            <id>compile-java12</id>
-                            <phase>compile</phase>
-                            <goals>
-                                <goal>compile</goal>
-                            </goals>
-                            <configuration>
-                                <release>12</release>
-                              <compileSourceRoots>
-                                <compileSourceRoot>${project.basedir}/src/main/java12</compileSourceRoot>
-                              </compileSourceRoots>
-                              <multiReleaseOutput>true</multiReleaseOutput>
-                            </configuration>
-                        </execution>
-                    </executions>
-                </plugin>
-                <plugin>
-                    <artifactId>maven-jar-plugin</artifactId>
-                    <configuration>
-                        <archive>
-                            <manifestEntries>
-                                <Multi-Release>true</Multi-Release>
-                            </manifestEntries>
-                        </archive>
-                    </configuration>
-                </plugin>
-            </plugins>
-        </build>
-    </profile>
-
     <!--                 -->
-    <!-- Java 13 support -->
+    <!-- Java 17 support -->
     <!--                 -->
 
-    <!-- This profile is activated when the baseline JDK version running tests is Java 13 -->
+    <!-- This profile is activated when the baseline JDK version running tests is Java 17 -->
     <profile>
-        <id>java13-test-classpath</id>
-        <activation>
-            <jdk>[13,14)</jdk>
-        </activation>
-        <build>
-            <plugins>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-surefire-plugin</artifactId>
-                    <executions>
-                        <execution>
-                            <id>default-test</id>
-                            <configuration>
-                                <classesDirectory>${project.build.outputDirectory}/META-INF/versions/13</classesDirectory>
-                                <additionalClasspathElements>
-                                    <additionalClasspathElement>${project.build.outputDirectory}/META-INF/versions/12</additionalClasspathElement>
-                                    <additionalClasspathElement>${project.build.outputDirectory}/META-INF/versions/11</additionalClasspathElement>
-                                    <additionalClasspathElement>${project.build.outputDirectory}/META-INF/versions/10</additionalClasspathElement>
-                                    <additionalClasspathElement>${project.build.outputDirectory}/META-INF/versions/9</additionalClasspathElement>
-                                    <additionalClasspathElement>${project.build.outputDirectory}</additionalClasspathElement>
-                                </additionalClasspathElements>
-                            </configuration>
-                        </execution>
-                    </executions>
-                </plugin>
-            </plugins>
-        </build>
+      <id>java17-test-classpath</id>
+      <activation>
+        <jdk>[17,18)</jdk>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-surefire-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>default-test</id>
+                <configuration>
+                  <classesDirectory>${project.build.outputDirectory}/META-INF/versions/17</classesDirectory>
+                  <additionalClasspathElements>
+                    <additionalClasspathElement>${project.build.outputDirectory}</additionalClasspathElement>
+                  </additionalClasspathElements>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
     </profile>
 
-    <!-- This profile is activated when Java 13 or later is used to test a project that supports Java 12 -->
+    <!-- This profile is activated when Java 17 or later is used to test a project that supports Java 11-->
     <profile>
-        <id>java12-test</id>
-        <activation>
-            <jdk>[13,)</jdk>
-            <property>
-                <name>java12.home</name>
-            </property>
-            <file>
-                <exists>${basedir}/build-test-java12</exists>
-            </file>
-        </activation>
-        <build>
-            <plugins>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-surefire-plugin</artifactId>
-                    <executions>
-                        <execution>
-                            <id>java12-test</id>
-                            <phase>test</phase>
-                            <goals>
-                                <goal>test</goal>
-                            </goals>
-                            <configuration>
-                                <jvm>${java12.home}/bin/java</jvm>
-                                <classesDirectory>${project.build.outputDirectory}/META-INF/versions/12</classesDirectory>
-                                <additionalClasspathElements>
-                                    <additionalClasspathElement>${project.build.outputDirectory}/META-INF/versions/11</additionalClasspathElement>
-                                    <additionalClasspathElement>${project.build.outputDirectory}/META-INF/versions/10</additionalClasspathElement>
-                                    <additionalClasspathElement>${project.build.outputDirectory}/META-INF/versions/9</additionalClasspathElement>
-                                    <additionalClasspathElement>${project.build.outputDirectory}</additionalClasspathElement>
-                                </additionalClasspathElements>
-                            </configuration>
-                        </execution>
-                    </executions>
-                </plugin>
-            </plugins>
-        </build>
+      <id>java11-test</id>
+      <activation>
+        <jdk>[17,)</jdk>
+        <property>
+          <name>java11.home</name>
+        </property>
+        <file>
+          <exists>${basedir}/build-test-java11</exists>
+        </file>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-surefire-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>java11-test</id>
+                <phase>test</phase>
+                <goals>
+                  <goal>test</goal>
+                </goals>
+                <configuration>
+                  <jvm>${java11.home}/bin/java</jvm>
+                  <classesDirectory>${project.build.outputDirectory}/META-INF/versions/11</classesDirectory>
+                  <additionalClasspathElements>
+                    <additionalClasspathElement>${project.build.outputDirectory}</additionalClasspathElement>
+                  </additionalClasspathElements>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
     </profile>
 
-    <!-- This profile is activated when Java 13 or later is used to build -->
+    <!-- This profile is activated when Java 17 or later is used to build -->
     <profile>
-        <id>java13-mr-build</id>
-        <activation>
-            <jdk>[13,)</jdk>
-            <file>
-                <exists>${basedir}/src/main/java13</exists>
-            </file>
-        </activation>
-        <build>
-            <plugins>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-compiler-plugin</artifactId>
-                    <executions>
-                        <execution>
-                            <id>compile-java13</id>
-                            <phase>compile</phase>
-                            <goals>
-                                <goal>compile</goal>
-                            </goals>
-                            <configuration>
-                                <release>13</release>
-                              <compileSourceRoots>
-                                <compileSourceRoot>${project.basedir}/src/main/java13</compileSourceRoot>
-                              </compileSourceRoots>
-                              <multiReleaseOutput>true</multiReleaseOutput>
-                            </configuration>
-                        </execution>
-                    </executions>
-                </plugin>
-                <plugin>
-                    <artifactId>maven-jar-plugin</artifactId>
-                    <configuration>
-                        <archive>
-                            <manifestEntries>
-                                <Multi-Release>true</Multi-Release>
-                            </manifestEntries>
-                        </archive>
-                    </configuration>
-                </plugin>
-            </plugins>
-        </build>
+      <id>java17-mr-build</id>
+      <activation>
+        <jdk>[17,)</jdk>
+        <file>
+          <exists>${basedir}/src/main/java17</exists>
+        </file>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-compiler-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>compile-java17</id>
+                <phase>compile</phase>
+                <goals>
+                  <goal>compile</goal>
+                </goals>
+                <configuration>
+                  <release>17</release>
+                  <compileSourceRoots>
+                    <compileSourceRoot>${project.basedir}/src/main/java17</compileSourceRoot>
+                  </compileSourceRoots>
+                  <multiReleaseOutput>true</multiReleaseOutput>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+          <plugin>
+            <artifactId>maven-jar-plugin</artifactId>
+            <configuration>
+              <archive>
+                <manifestEntries>
+                  <Multi-Release>true</Multi-Release>
+                </manifestEntries>
+              </archive>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
     </profile>
 
     <!--                 -->
-    <!-- Java 14 support -->
+    <!-- Java 18 support -->
     <!--                 -->
 
-    <!-- This profile is activated when the baseline JDK version running tests is Java 14 -->
+    <!-- This profile is activated when the baseline JDK version running tests is Java 18 -->
     <profile>
-        <id>java14-test-classpath</id>
-        <activation>
-            <jdk>[14,15)</jdk>
-        </activation>
-        <build>
-            <plugins>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-surefire-plugin</artifactId>
-                    <executions>
-                        <execution>
-                            <id>default-test</id>
-                            <configuration>
-                                <classesDirectory>${project.build.outputDirectory}/META-INF/versions/14</classesDirectory>
-                                <additionalClasspathElements>
-                                    <additionalClasspathElement>${project.build.outputDirectory}/META-INF/versions/13</additionalClasspathElement>
-                                    <additionalClasspathElement>${project.build.outputDirectory}/META-INF/versions/12</additionalClasspathElement>
-                                    <additionalClasspathElement>${project.build.outputDirectory}/META-INF/versions/11</additionalClasspathElement>
-                                    <additionalClasspathElement>${project.build.outputDirectory}/META-INF/versions/10</additionalClasspathElement>
-                                    <additionalClasspathElement>${project.build.outputDirectory}/META-INF/versions/9</additionalClasspathElement>
-                                    <additionalClasspathElement>${project.build.outputDirectory}</additionalClasspathElement>
-                                </additionalClasspathElements>
-                            </configuration>
-                        </execution>
-                    </executions>
-                </plugin>
-            </plugins>
-        </build>
+      <id>java18-test-classpath</id>
+      <activation>
+        <jdk>[18,19)</jdk>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-surefire-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>default-test</id>
+                <configuration>
+                  <classesDirectory>${project.build.outputDirectory}/META-INF/versions/18</classesDirectory>
+                  <additionalClasspathElements>
+                    <additionalClasspathElement>${project.build.outputDirectory}/META-INF/versions/17</additionalClasspathElement>
+                    <additionalClasspathElement>${project.build.outputDirectory}</additionalClasspathElement>
+                  </additionalClasspathElements>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
     </profile>
 
-    <!-- This profile is activated when Java 14 or later is used to test a project that supports Java 13 -->
+    <!-- This profile is activated when Java 18 or later is used to test a project that supports Java 17-->
     <profile>
-        <id>java13-test</id>
-        <activation>
-            <jdk>[14,)</jdk>
-            <property>
-                <name>java13.home</name>
-            </property>
-            <file>
-                <exists>${basedir}/build-test-java13</exists>
-            </file>
-        </activation>
-        <build>
-            <plugins>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-surefire-plugin</artifactId>
-                    <executions>
-                        <execution>
-                            <id>java13-test</id>
-                            <phase>test</phase>
-                            <goals>
-                                <goal>test</goal>
-                            </goals>
-                            <configuration>
-                                <jvm>${java13.home}/bin/java</jvm>
-                                <classesDirectory>${project.build.outputDirectory}/META-INF/versions/13</classesDirectory>
-                                <additionalClasspathElements>
-                                    <additionalClasspathElement>${project.build.outputDirectory}/META-INF/versions/12</additionalClasspathElement>
-                                    <additionalClasspathElement>${project.build.outputDirectory}/META-INF/versions/11</additionalClasspathElement>
-                                    <additionalClasspathElement>${project.build.outputDirectory}/META-INF/versions/10</additionalClasspathElement>
-                                    <additionalClasspathElement>${project.build.outputDirectory}/META-INF/versions/9</additionalClasspathElement>
-                                    <additionalClasspathElement>${project.build.outputDirectory}</additionalClasspathElement>
-                                </additionalClasspathElements>
-                            </configuration>
-                        </execution>
-                    </executions>
-                </plugin>
-            </plugins>
-        </build>
+      <id>java17-test</id>
+      <activation>
+        <jdk>[18,)</jdk>
+        <property>
+          <name>java17.home</name>
+        </property>
+        <file>
+          <exists>${basedir}/build-test-java17</exists>
+        </file>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-surefire-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>java17-test</id>
+                <phase>test</phase>
+                <goals>
+                  <goal>test</goal>
+                </goals>
+                <configuration>
+                  <jvm>${java17.home}/bin/java</jvm>
+                  <classesDirectory>${project.build.outputDirectory}/META-INF/versions/17</classesDirectory>
+                  <additionalClasspathElements>
+                    <additionalClasspathElement>${project.build.outputDirectory}</additionalClasspathElement>
+                  </additionalClasspathElements>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
     </profile>
 
-    <!-- This profile is activated when Java 14 or later is used to build -->
+    <!-- This profile is activated when Java 18 or later is used to build -->
     <profile>
-        <id>java14-mr-build</id>
-        <activation>
-            <jdk>[14,)</jdk>
-            <file>
-                <exists>${basedir}/src/main/java14</exists>
-            </file>
-        </activation>
-        <build>
-            <plugins>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-compiler-plugin</artifactId>
-                    <executions>
-                        <execution>
-                            <id>compile-java14</id>
-                            <phase>compile</phase>
-                            <goals>
-                                <goal>compile</goal>
-                            </goals>
-                            <configuration>
-                                <release>14</release>
-                              <compileSourceRoots>
-                                <compileSourceRoot>${project.basedir}/src/main/java14</compileSourceRoot>
-                              </compileSourceRoots>
-                              <multiReleaseOutput>true</multiReleaseOutput>
-                            </configuration>
-                        </execution>
-                    </executions>
-                </plugin>
-                <plugin>
-                    <artifactId>maven-jar-plugin</artifactId>
-                    <configuration>
-                        <archive>
-                            <manifestEntries>
-                                <Multi-Release>true</Multi-Release>
-                            </manifestEntries>
-                        </archive>
-                    </configuration>
-                </plugin>
-            </plugins>
-        </build>
+      <id>java18-mr-build</id>
+      <activation>
+        <jdk>[18,)</jdk>
+        <file>
+          <exists>${basedir}/src/main/java18</exists>
+        </file>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-compiler-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>compile-java18</id>
+                <phase>compile</phase>
+                <goals>
+                  <goal>compile</goal>
+                </goals>
+                <configuration>
+                  <release>18</release>
+                  <compileSourceRoots>
+                    <compileSourceRoot>${project.basedir}/src/main/java18</compileSourceRoot>
+                  </compileSourceRoots>
+                  <multiReleaseOutput>true</multiReleaseOutput>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+          <plugin>
+            <artifactId>maven-jar-plugin</artifactId>
+            <configuration>
+              <archive>
+                <manifestEntries>
+                  <Multi-Release>true</Multi-Release>
+                </manifestEntries>
+              </archive>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
     </profile>
 
     <!--                 -->
-    <!-- Java 15 support -->
+    <!-- Java 19 support -->
     <!--                 -->
 
-    <!-- This profile is activated when the baseline JDK version running tests is Java 15 -->
+    <!-- This profile is activated when the baseline JDK version running tests is Java 19 -->
     <profile>
-      <id>java15-test-classpath</id>
+      <id>java19-test-classpath</id>
       <activation>
-        <jdk>[15,16)</jdk>
+        <jdk>[19,20)</jdk>
       </activation>
       <build>
         <plugins>
@@ -1231,14 +713,10 @@
               <execution>
                 <id>default-test</id>
                 <configuration>
-                  <classesDirectory>${project.build.outputDirectory}/META-INF/versions/15</classesDirectory>
+                  <classesDirectory>${project.build.outputDirectory}/META-INF/versions/19</classesDirectory>
                   <additionalClasspathElements>
-                    <additionalClasspathElement>${project.build.outputDirectory}/META-INF/versions/14</additionalClasspathElement>
-                    <additionalClasspathElement>${project.build.outputDirectory}/META-INF/versions/13</additionalClasspathElement>
-                    <additionalClasspathElement>${project.build.outputDirectory}/META-INF/versions/12</additionalClasspathElement>
-                    <additionalClasspathElement>${project.build.outputDirectory}/META-INF/versions/11</additionalClasspathElement>
-                    <additionalClasspathElement>${project.build.outputDirectory}/META-INF/versions/10</additionalClasspathElement>
-                    <additionalClasspathElement>${project.build.outputDirectory}/META-INF/versions/9</additionalClasspathElement>
+                    <additionalClasspathElement>${project.build.outputDirectory}/META-INF/versions/18</additionalClasspathElement>
+                    <additionalClasspathElement>${project.build.outputDirectory}/META-INF/versions/17</additionalClasspathElement>
                     <additionalClasspathElement>${project.build.outputDirectory}</additionalClasspathElement>
                   </additionalClasspathElements>
                 </configuration>
@@ -1249,16 +727,16 @@
       </build>
     </profile>
 
-    <!-- This profile is activated when Java 15 or later is used to test a project that supports Java 14-->
+    <!-- This profile is activated when Java 19 or later is used to test a project that supports Java 18-->
     <profile>
-      <id>java14-test</id>
+      <id>java18-test</id>
       <activation>
-        <jdk>[15,)</jdk>
+        <jdk>[19,)</jdk>
         <property>
-          <name>java14.home</name>
+          <name>java18.home</name>
         </property>
         <file>
-          <exists>${basedir}/build-test-java14</exists>
+          <exists>${basedir}/build-test-java18</exists>
         </file>
       </activation>
       <build>
@@ -1268,20 +746,16 @@
             <artifactId>maven-surefire-plugin</artifactId>
             <executions>
               <execution>
-                <id>java14-test</id>
+                <id>java18-test</id>
                 <phase>test</phase>
                 <goals>
                   <goal>test</goal>
                 </goals>
                 <configuration>
-                  <jvm>${java14.home}/bin/java</jvm>
-                  <classesDirectory>${project.build.outputDirectory}/META-INF/versions/14</classesDirectory>
+                  <jvm>${java18.home}/bin/java</jvm>
+                  <classesDirectory>${project.build.outputDirectory}/META-INF/versions/18</classesDirectory>
                   <additionalClasspathElements>
-                    <additionalClasspathElement>${project.build.outputDirectory}/META-INF/versions/13</additionalClasspathElement>
-                    <additionalClasspathElement>${project.build.outputDirectory}/META-INF/versions/12</additionalClasspathElement>
-                    <additionalClasspathElement>${project.build.outputDirectory}/META-INF/versions/11</additionalClasspathElement>
-                    <additionalClasspathElement>${project.build.outputDirectory}/META-INF/versions/10</additionalClasspathElement>
-                    <additionalClasspathElement>${project.build.outputDirectory}/META-INF/versions/9</additionalClasspathElement>
+                    <additionalClasspathElement>${project.build.outputDirectory}/META-INF/versions/17</additionalClasspathElement>
                     <additionalClasspathElement>${project.build.outputDirectory}</additionalClasspathElement>
                   </additionalClasspathElements>
                 </configuration>
@@ -1292,13 +766,13 @@
       </build>
     </profile>
 
-    <!-- This profile is activated when Java 15 or later is used to build -->
+    <!-- This profile is activated when Java 18 or later is used to build -->
     <profile>
-      <id>java15-mr-build</id>
+      <id>java19-mr-build</id>
       <activation>
-        <jdk>[15,)</jdk>
+        <jdk>[19,)</jdk>
         <file>
-          <exists>${basedir}/src/main/java15</exists>
+          <exists>${basedir}/src/main/java19</exists>
         </file>
       </activation>
       <build>
@@ -1308,15 +782,15 @@
             <artifactId>maven-compiler-plugin</artifactId>
             <executions>
               <execution>
-                <id>compile-java15</id>
+                <id>compile-java19</id>
                 <phase>compile</phase>
                 <goals>
                   <goal>compile</goal>
                 </goals>
                 <configuration>
-                  <release>15</release>
+                  <release>19</release>
                   <compileSourceRoots>
-                    <compileSourceRoot>${project.basedir}/src/main/java15</compileSourceRoot>
+                    <compileSourceRoot>${project.basedir}/src/main/java19</compileSourceRoot>
                   </compileSourceRoots>
                   <multiReleaseOutput>true</multiReleaseOutput>
                 </configuration>
@@ -1336,262 +810,6 @@
         </plugins>
       </build>
     </profile>
-
-      <!--                 -->
-      <!-- Java 16 support -->
-      <!--                 -->
-
-      <!-- This profile is activated when the baseline JDK version running tests is Java 16 -->
-      <profile>
-          <id>java16-test-classpath</id>
-          <activation>
-              <jdk>[16,17)</jdk>
-          </activation>
-          <build>
-              <plugins>
-                  <plugin>
-                      <groupId>org.apache.maven.plugins</groupId>
-                      <artifactId>maven-surefire-plugin</artifactId>
-                      <executions>
-                          <execution>
-                              <id>default-test</id>
-                              <configuration>
-                                  <classesDirectory>${project.build.outputDirectory}/META-INF/versions/16</classesDirectory>
-                                  <additionalClasspathElements>
-                                      <additionalClasspathElement>${project.build.outputDirectory}/META-INF/versions/15</additionalClasspathElement>
-                                      <additionalClasspathElement>${project.build.outputDirectory}/META-INF/versions/14</additionalClasspathElement>
-                                      <additionalClasspathElement>${project.build.outputDirectory}/META-INF/versions/13</additionalClasspathElement>
-                                      <additionalClasspathElement>${project.build.outputDirectory}/META-INF/versions/12</additionalClasspathElement>
-                                      <additionalClasspathElement>${project.build.outputDirectory}/META-INF/versions/11</additionalClasspathElement>
-                                      <additionalClasspathElement>${project.build.outputDirectory}/META-INF/versions/10</additionalClasspathElement>
-                                      <additionalClasspathElement>${project.build.outputDirectory}/META-INF/versions/9</additionalClasspathElement>
-                                      <additionalClasspathElement>${project.build.outputDirectory}</additionalClasspathElement>
-                                  </additionalClasspathElements>
-                              </configuration>
-                          </execution>
-                      </executions>
-                  </plugin>
-              </plugins>
-          </build>
-      </profile>
-
-      <!-- This profile is activated when Java 16 or later is used to test a project that supports Java 14-->
-      <profile>
-          <id>java15-test</id>
-          <activation>
-              <jdk>[16,)</jdk>
-              <property>
-                  <name>java15.home</name>
-              </property>
-              <file>
-                  <exists>${basedir}/build-test-java15</exists>
-              </file>
-          </activation>
-          <build>
-              <plugins>
-                  <plugin>
-                      <groupId>org.apache.maven.plugins</groupId>
-                      <artifactId>maven-surefire-plugin</artifactId>
-                      <executions>
-                          <execution>
-                              <id>java15-test</id>
-                              <phase>test</phase>
-                              <goals>
-                                  <goal>test</goal>
-                              </goals>
-                              <configuration>
-                                  <jvm>${java15.home}/bin/java</jvm>
-                                  <classesDirectory>${project.build.outputDirectory}/META-INF/versions/15</classesDirectory>
-                                  <additionalClasspathElements>
-                                      <additionalClasspathElement>${project.build.outputDirectory}/META-INF/versions/14</additionalClasspathElement>
-                                      <additionalClasspathElement>${project.build.outputDirectory}/META-INF/versions/13</additionalClasspathElement>
-                                      <additionalClasspathElement>${project.build.outputDirectory}/META-INF/versions/12</additionalClasspathElement>
-                                      <additionalClasspathElement>${project.build.outputDirectory}/META-INF/versions/11</additionalClasspathElement>
-                                      <additionalClasspathElement>${project.build.outputDirectory}/META-INF/versions/10</additionalClasspathElement>
-                                      <additionalClasspathElement>${project.build.outputDirectory}/META-INF/versions/9</additionalClasspathElement>
-                                      <additionalClasspathElement>${project.build.outputDirectory}</additionalClasspathElement>
-                                  </additionalClasspathElements>
-                              </configuration>
-                          </execution>
-                      </executions>
-                  </plugin>
-              </plugins>
-          </build>
-      </profile>
-
-      <!-- This profile is activated when Java 16 or later is used to build -->
-      <profile>
-          <id>java16-mr-build</id>
-          <activation>
-              <jdk>[16,)</jdk>
-              <file>
-                  <exists>${basedir}/src/main/java16</exists>
-              </file>
-          </activation>
-          <build>
-              <plugins>
-                  <plugin>
-                      <groupId>org.apache.maven.plugins</groupId>
-                      <artifactId>maven-compiler-plugin</artifactId>
-                      <executions>
-                          <execution>
-                              <id>compile-java16</id>
-                              <phase>compile</phase>
-                              <goals>
-                                  <goal>compile</goal>
-                              </goals>
-                              <configuration>
-                                  <release>16</release>
-                                  <compileSourceRoots>
-                                      <compileSourceRoot>${project.basedir}/src/main/java16</compileSourceRoot>
-                                  </compileSourceRoots>
-                                  <multiReleaseOutput>true</multiReleaseOutput>
-                              </configuration>
-                          </execution>
-                      </executions>
-                  </plugin>
-                  <plugin>
-                      <artifactId>maven-jar-plugin</artifactId>
-                      <configuration>
-                          <archive>
-                              <manifestEntries>
-                                  <Multi-Release>true</Multi-Release>
-                              </manifestEntries>
-                          </archive>
-                      </configuration>
-                  </plugin>
-              </plugins>
-          </build>
-      </profile>
-
-      <!--                 -->
-      <!-- Java 17 support -->
-      <!--                 -->
-
-      <!-- This profile is activated when the baseline JDK version running tests is Java 17 -->
-      <profile>
-          <id>java17-test-classpath</id>
-          <activation>
-              <jdk>[17,18)</jdk>
-          </activation>
-          <build>
-              <plugins>
-                  <plugin>
-                      <groupId>org.apache.maven.plugins</groupId>
-                      <artifactId>maven-surefire-plugin</artifactId>
-                      <executions>
-                          <execution>
-                              <id>default-test</id>
-                              <configuration>
-                                  <classesDirectory>${project.build.outputDirectory}/META-INF/versions/17</classesDirectory>
-                                  <additionalClasspathElements>
-                                      <additionalClasspathElement>${project.build.outputDirectory}/META-INF/versions/16</additionalClasspathElement>
-                                      <additionalClasspathElement>${project.build.outputDirectory}/META-INF/versions/15</additionalClasspathElement>
-                                      <additionalClasspathElement>${project.build.outputDirectory}/META-INF/versions/14</additionalClasspathElement>
-                                      <additionalClasspathElement>${project.build.outputDirectory}/META-INF/versions/13</additionalClasspathElement>
-                                      <additionalClasspathElement>${project.build.outputDirectory}/META-INF/versions/12</additionalClasspathElement>
-                                      <additionalClasspathElement>${project.build.outputDirectory}/META-INF/versions/11</additionalClasspathElement>
-                                      <additionalClasspathElement>${project.build.outputDirectory}/META-INF/versions/10</additionalClasspathElement>
-                                      <additionalClasspathElement>${project.build.outputDirectory}/META-INF/versions/9</additionalClasspathElement>
-                                      <additionalClasspathElement>${project.build.outputDirectory}</additionalClasspathElement>
-                                  </additionalClasspathElements>
-                              </configuration>
-                          </execution>
-                      </executions>
-                  </plugin>
-              </plugins>
-          </build>
-      </profile>
-
-      <!-- This profile is activated when Java 17 or later is used to test a project that supports Java 14-->
-      <profile>
-          <id>java16-test</id>
-          <activation>
-              <jdk>[17,)</jdk>
-              <property>
-                  <name>java16.home</name>
-              </property>
-              <file>
-                  <exists>${basedir}/build-test-java16</exists>
-              </file>
-          </activation>
-          <build>
-              <plugins>
-                  <plugin>
-                      <groupId>org.apache.maven.plugins</groupId>
-                      <artifactId>maven-surefire-plugin</artifactId>
-                      <executions>
-                          <execution>
-                              <id>java16-test</id>
-                              <phase>test</phase>
-                              <goals>
-                                  <goal>test</goal>
-                              </goals>
-                              <configuration>
-                                  <jvm>${java16.home}/bin/java</jvm>
-                                  <classesDirectory>${project.build.outputDirectory}/META-INF/versions/16</classesDirectory>
-                                  <additionalClasspathElements>
-                                      <additionalClasspathElement>${project.build.outputDirectory}/META-INF/versions/15</additionalClasspathElement>
-                                      <additionalClasspathElement>${project.build.outputDirectory}/META-INF/versions/14</additionalClasspathElement>
-                                      <additionalClasspathElement>${project.build.outputDirectory}/META-INF/versions/13</additionalClasspathElement>
-                                      <additionalClasspathElement>${project.build.outputDirectory}/META-INF/versions/12</additionalClasspathElement>
-                                      <additionalClasspathElement>${project.build.outputDirectory}/META-INF/versions/11</additionalClasspathElement>
-                                      <additionalClasspathElement>${project.build.outputDirectory}/META-INF/versions/10</additionalClasspathElement>
-                                      <additionalClasspathElement>${project.build.outputDirectory}/META-INF/versions/9</additionalClasspathElement>
-                                      <additionalClasspathElement>${project.build.outputDirectory}</additionalClasspathElement>
-                                  </additionalClasspathElements>
-                              </configuration>
-                          </execution>
-                      </executions>
-                  </plugin>
-              </plugins>
-          </build>
-      </profile>
-
-      <!-- This profile is activated when Java 17 or later is used to build -->
-      <profile>
-          <id>java17-mr-build</id>
-          <activation>
-              <jdk>[17,)</jdk>
-              <file>
-                  <exists>${basedir}/src/main/java17</exists>
-              </file>
-          </activation>
-          <build>
-              <plugins>
-                  <plugin>
-                      <groupId>org.apache.maven.plugins</groupId>
-                      <artifactId>maven-compiler-plugin</artifactId>
-                      <executions>
-                          <execution>
-                              <id>compile-java17</id>
-                              <phase>compile</phase>
-                              <goals>
-                                  <goal>compile</goal>
-                              </goals>
-                              <configuration>
-                                  <release>17</release>
-                                  <compileSourceRoots>
-                                      <compileSourceRoot>${project.basedir}/src/main/java17</compileSourceRoot>
-                                  </compileSourceRoots>
-                                  <multiReleaseOutput>true</multiReleaseOutput>
-                              </configuration>
-                          </execution>
-                      </executions>
-                  </plugin>
-                  <plugin>
-                      <artifactId>maven-jar-plugin</artifactId>
-                      <configuration>
-                          <archive>
-                              <manifestEntries>
-                                  <Multi-Release>true</Multi-Release>
-                              </manifestEntries>
-                          </archive>
-                      </configuration>
-                  </plugin>
-              </plugins>
-          </build>
-      </profile>
-      <!-- MR JAR support ends here-->
+    <!-- MR JAR support ends here-->
   </profiles>
 </project>