diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 5777b74a..48b07f90 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -10,7 +10,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        java: [ '8' ]
+        java: [ '8', '11', '17', '21' ]
         os: [ 'ubuntu-latest', 'macos-latest', 'windows-latest' ]
       fail-fast: false
     steps:
diff --git a/OpenICF-dbcommon/src/test/java/org/identityconnectors/dbcommon/PropertiesResolverTest.java b/OpenICF-dbcommon/src/test/java/org/identityconnectors/dbcommon/PropertiesResolverTest.java
index a44c9368..4c0c26be 100644
--- a/OpenICF-dbcommon/src/test/java/org/identityconnectors/dbcommon/PropertiesResolverTest.java
+++ b/OpenICF-dbcommon/src/test/java/org/identityconnectors/dbcommon/PropertiesResolverTest.java
@@ -101,7 +101,9 @@ public void testRecursion() {
         properties.setProperty("key3", "value3 ${key2}");
         properties = PropertiesResolver.resolveProperties(properties);
         System.out.println(properties.get("key3"));
-        Assert.assertEquals("value3 value2 value1 RECURSION", properties.get("key3"));
+        String key3val = properties.get("key3").toString();
+        Assert.assertTrue(key3val.startsWith("value3 value2 value1"));
+        Assert.assertTrue(key3val.endsWith("RECURSION"));
     }
 
 }
diff --git a/OpenICF-groovy-connector/pom.xml b/OpenICF-groovy-connector/pom.xml
index f22da31c..392ab5de 100644
--- a/OpenICF-groovy-connector/pom.xml
+++ b/OpenICF-groovy-connector/pom.xml
@@ -61,7 +61,6 @@
         <dependency>
             <groupId>org.codehaus.groovy</groupId>
             <artifactId>groovy-all</artifactId>
-            <version>2.4.7</version>
             <scope>provided</scope>
         </dependency>
 
@@ -232,11 +231,10 @@
                 </configuration>
             </plugin>
             <plugin>
-                <groupId>org.codehaus.gmaven</groupId>
-                <artifactId>gmaven-plugin</artifactId>
-                <version>1.5</version>
+                <groupId>org.codehaus.gmavenplus</groupId>
+                <artifactId>gmavenplus-plugin</artifactId>
+                <version>3.0.2</version>
                 <configuration>
-                    <providerSelection>2.0</providerSelection>
                     <sourceEncoding>UTF-8</sourceEncoding>
                 </configuration>
                 <executions>
@@ -245,20 +243,15 @@
                             <goal>generateStubs</goal>
                             <goal>compile</goal>
                             <goal>generateTestStubs</goal>
-                            <goal>testCompile</goal>
+                            <goal>compileTests</goal>
                         </goals>
                     </execution>
                 </executions>
                 <dependencies>
-                    <dependency>
-                        <groupId>org.codehaus.gmaven.runtime</groupId>
-                        <artifactId>gmaven-runtime-2.0</artifactId>
-                        <version>1.5</version>
-                    </dependency>
                     <dependency>
                         <groupId>org.codehaus.groovy</groupId>
                         <artifactId>groovy-all</artifactId>
-                        <version>2.2.2</version>
+                        <version>${groovy.version}</version>
                     </dependency>
                 </dependencies>
             </plugin>
diff --git a/OpenICF-java-framework/bundles-parent/pom.xml b/OpenICF-java-framework/bundles-parent/pom.xml
index 2ddb2470..7b8a0792 100644
--- a/OpenICF-java-framework/bundles-parent/pom.xml
+++ b/OpenICF-java-framework/bundles-parent/pom.xml
@@ -188,7 +188,7 @@
                         <links>
                             <link>http://download.oracle.com/javase/8/docs/api/</link>
                             <link>http://docs.groovy-lang.org/latest/html/api/</link>
-                            <link>http://openicf.forgerock.org/apidocs/</link>
+<!--                            <link>http://openicf.forgerock.org/apidocs/</link>-->
                         </links>
                     </configuration>
                 </plugin>
@@ -216,6 +216,7 @@
                     <groupId>org.apache.felix</groupId>
                     <artifactId>maven-bundle-plugin</artifactId>
                     <extensions>true</extensions>
+                    <version>5.1.9</version>
                     <configuration>
                         <excludeDependencies>${openicf.osgi.exclude.dependencies}</excludeDependencies>
                         <instructions>
diff --git a/OpenICF-java-framework/connector-framework-internal/pom.xml b/OpenICF-java-framework/connector-framework-internal/pom.xml
index 9d2e4b4d..03f02535 100644
--- a/OpenICF-java-framework/connector-framework-internal/pom.xml
+++ b/OpenICF-java-framework/connector-framework-internal/pom.xml
@@ -36,6 +36,22 @@
         The IdentityConnectors framework provides a container to separate the Connector bundle from the application.
         The framework provides many common features that developers would otherwise need to implement on their own.
     </description>
+    <profiles>
+        <profile>
+            <id>jdk17.options</id>
+            <activation>
+                <jdk>[17,)</jdk>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>org.openjdk.nashorn</groupId>
+                    <artifactId>nashorn-core</artifactId>
+                    <version>15.4</version>
+                    <optional>true</optional>
+                </dependency>
+            </dependencies>
+        </profile>
+    </profiles>
 
     <dependencies>
         <dependency>
diff --git a/OpenICF-java-framework/connector-framework-internal/src/main/java/org/identityconnectors/common/script/javascript/JavaScriptExecutorFactory.java b/OpenICF-java-framework/connector-framework-internal/src/main/java/org/identityconnectors/common/script/javascript/JavaScriptExecutorFactory.java
index 88541b6f..4064ef97 100644
--- a/OpenICF-java-framework/connector-framework-internal/src/main/java/org/identityconnectors/common/script/javascript/JavaScriptExecutorFactory.java
+++ b/OpenICF-java-framework/connector-framework-internal/src/main/java/org/identityconnectors/common/script/javascript/JavaScriptExecutorFactory.java
@@ -44,9 +44,10 @@
  * Creates a new ScriptExecutorFactory for executing JavaScript scripts.
  */
 public class JavaScriptExecutorFactory extends ScriptExecutorFactory {
-
     public static final String JAVA_SCRIPT = "JavaScript";
-    private final ScriptEngineManager manager = new ScriptEngineManager(null);
+    private final ScriptEngineManager manager =
+            Double.parseDouble(System.getProperty("java.specification.version")) < 15
+                    ? new ScriptEngineManager(null) : new ScriptEngineManager();
     private final boolean compilable;
 
     /**
diff --git a/OpenICF-java-framework/connector-server-jetty/pom.xml b/OpenICF-java-framework/connector-server-jetty/pom.xml
index 287d6324..246b15c7 100644
--- a/OpenICF-java-framework/connector-server-jetty/pom.xml
+++ b/OpenICF-java-framework/connector-server-jetty/pom.xml
@@ -38,7 +38,6 @@
     </description>
 
     <properties>
-        <!-- maven-compiler-plugin -->
         <jetty.version>9.4.51.v20230217</jetty.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
diff --git a/OpenICF-java-framework/pom.xml b/OpenICF-java-framework/pom.xml
index ecadbef5..819a162c 100644
--- a/OpenICF-java-framework/pom.xml
+++ b/OpenICF-java-framework/pom.xml
@@ -80,7 +80,7 @@
 
         <slf4j.version>1.7.12</slf4j.version>
         <logback.version>1.1.7</logback.version>
-        <groovy.version>2.2.2</groovy.version>
+        <groovy.version>2.4.21</groovy.version>
         <grizzly.version>2.3.35</grizzly.version>
         <protobuf-java.version>3.0.2</protobuf-java.version>
 
@@ -122,7 +122,26 @@
     </modules>
 
     <profiles>
-
+        <profile>
+            <id>jdk17.options</id>
+            <activation>
+                <jdk>[17,)</jdk>
+            </activation>
+            <properties>
+                <nashorn.version>15.4</nashorn.version>
+            </properties>
+            <dependencyManagement>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.openjdk.nashorn</groupId>
+                        <artifactId>nashorn-core</artifactId>
+                        <version>${nashorn.version}</version>
+                        <scope>provided</scope>
+                        <optional>true</optional>
+                    </dependency>
+                </dependencies>
+            </dependencyManagement>
+        </profile>
     </profiles>
 
     <dependencyManagement>
@@ -134,7 +153,6 @@
                 <version>${groovy.version}</version>
                 <scope>provided</scope>
             </dependency>
-
             <!-- Test Dependencies -->
             <dependency>
                 <groupId>org.openidentityplatform.openicf.framework</groupId>
@@ -202,6 +220,7 @@
                     <groupId>org.apache.felix</groupId>
                     <artifactId>maven-bundle-plugin</artifactId>
                     <extensions>true</extensions>
+                    <version>5.1.9</version>
                     <configuration>
                         <instructions>
                             <!-- OSGi Headers -->
diff --git a/OpenICF-kerberos-connector/pom.xml b/OpenICF-kerberos-connector/pom.xml
index 3c7a52a3..f0b7cd93 100644
--- a/OpenICF-kerberos-connector/pom.xml
+++ b/OpenICF-kerberos-connector/pom.xml
@@ -76,11 +76,10 @@
                 <artifactId>maven-compiler-plugin</artifactId>
             </plugin>
             <plugin>
-                <groupId>org.codehaus.gmaven</groupId>
-                <artifactId>gmaven-plugin</artifactId>
-                <version>1.5</version>
+                <groupId>org.codehaus.gmavenplus</groupId>
+                <artifactId>gmavenplus-plugin</artifactId>
+                <version>3.0.2</version>
                 <configuration>
-                    <providerSelection>2.0</providerSelection>
                     <sourceEncoding>UTF-8</sourceEncoding>
                 </configuration>
                 <executions>
@@ -92,15 +91,10 @@
                     </execution>
                 </executions>
                 <dependencies>
-                    <dependency>
-                        <groupId>org.codehaus.gmaven.runtime</groupId>
-                        <artifactId>gmaven-runtime-2.0</artifactId>
-                        <version>1.5</version>
-                    </dependency>
                     <dependency>
                         <groupId>org.codehaus.groovy</groupId>
                         <artifactId>groovy-all</artifactId>
-                        <version>2.2.2</version>
+                        <version>${groovy.version}</version>
                     </dependency>
                 </dependencies>
             </plugin>
diff --git a/OpenICF-ssh-connector/pom.xml b/OpenICF-ssh-connector/pom.xml
index ac79bad2..cd2b1010 100644
--- a/OpenICF-ssh-connector/pom.xml
+++ b/OpenICF-ssh-connector/pom.xml
@@ -39,8 +39,6 @@
     <name>OpenICF SSH Connector</name>
     <description>Generic SSH connector</description>
     <properties>
-        <maven.compiler.target>1.7</maven.compiler.target>
-        <maven.compiler.source>1.7</maven.compiler.source>
         <connectorPackage>org.forgerock.openicf.connectors.ssh</connectorPackage>
         <connectorClass>SSHConnector</connectorClass>
         <framework.compatibilityVersion>1.5</framework.compatibilityVersion>
@@ -108,11 +106,10 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.codehaus.gmaven</groupId>
-                <artifactId>gmaven-plugin</artifactId>
-                <version>1.5</version>
+                <groupId>org.codehaus.gmavenplus</groupId>
+                <artifactId>gmavenplus-plugin</artifactId>
+                <version>3.0.2</version>
                 <configuration>
-                    <providerSelection>2.0</providerSelection>
                     <sourceEncoding>UTF-8</sourceEncoding>
                 </configuration>
                 <executions>
@@ -121,20 +118,15 @@
                             <goal>generateStubs</goal>
                             <goal>compile</goal>
                             <goal>generateTestStubs</goal>
-                            <goal>testCompile</goal>
+                            <goal>compileTests</goal>
                         </goals>
                     </execution>
                 </executions>
                 <dependencies>
-                    <dependency>
-                        <groupId>org.codehaus.gmaven.runtime</groupId>
-                        <artifactId>gmaven-runtime-2.0</artifactId>
-                        <version>1.5</version>
-                    </dependency>
                     <dependency>
                         <groupId>org.codehaus.groovy</groupId>
                         <artifactId>groovy-all</artifactId>
-                        <version>2.2.2</version>
+                        <version>${groovy.version}</version>
                     </dependency>
                 </dependencies>
             </plugin>
diff --git a/pom.xml b/pom.xml
index d11ae533..83d910d5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,6 +16,7 @@
         <maven.compiler.target>1.8</maven.compiler.target>
         <maven.compiler.source>1.8</maven.compiler.source>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <java.surefire.options></java.surefire.options>
    	</properties>
     <licenses>
         <license>
@@ -141,6 +142,21 @@
                 </plugins>
             </build>
         </profile>
+        <profile>
+            <id>jdk17.options</id>
+            <activation>
+                <jdk>[17,)</jdk>
+            </activation>
+            <properties>
+                <java.surefire.options>
+                    --add-opens java.base/java.lang=ALL-UNNAMED
+                    --add-opens java.base/java.security=ALL-UNNAMED
+                    --add-opens java.base/java.net=ALL-UNNAMED
+                    --add-opens java.base/java.lang.reflect=ALL-UNNAMED
+                    --add-opens java.base/java.util=ALL-UNNAMED
+                </java.surefire.options>
+            </properties>
+        </profile>
     </profiles>
 
     <dependencyManagement>
@@ -249,6 +265,9 @@
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-surefire-plugin</artifactId>
                     <version>3.2.5</version>
+                    <configuration>
+                        <argLine>${java.surefire.options}</argLine>
+                    </configuration>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>