diff --git a/core/pom.xml b/core/pom.xml
index 5dd91572..6dc8bef4 100755
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -31,6 +31,7 @@
         <dependency>
             <groupId>org.codehaus.groovy</groupId>
             <artifactId>groovy-all</artifactId>
+            <type>pom</type>
         </dependency>
 
         <dependency>
@@ -69,6 +70,12 @@
             <artifactId>org.eclipse.jgit</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>javax.xml.bind</groupId>
+            <artifactId>jaxb-api</artifactId>
+            <version>2.3.0</version>
+        </dependency>
+
 
         <!-- JUnit test dependencies -->
         <dependency>
@@ -112,6 +119,9 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
+                <configuration>
+                    <doclint>none</doclint>
+                </configuration>
             </plugin>
 
             <plugin>
diff --git a/core/src/main/groovy/noe/common/utils/Library.groovy b/core/src/main/groovy/noe/common/utils/Library.groovy
index a8f9638a..42f9f67d 100644
--- a/core/src/main/groovy/noe/common/utils/Library.groovy
+++ b/core/src/main/groovy/noe/common/utils/Library.groovy
@@ -826,7 +826,7 @@ class Library {
    * @return generated classpath for groovy with ant
    */
   static String groovyWithAntAsClasspath(File libDir = null) {
-    def groovyAndAntLibs = ["groovy-all-2.2.1.jar", "ant-1.9.2.jar", "ant-launcher-1.9.2.jar"]
+    def groovyAndAntLibs = ["groovy-3.0.9.jar", "groovy-ant-3.0.9.jar", "ant-1.9.2.jar", "ant-launcher-1.9.2.jar"]
     def libDirToUse = (libDir) ?: new File(Library.getRootPath(), "lib")
     def classpath = []
     if (!libDirToUse.exists()) {
diff --git a/core/src/main/resources/lib/groovy-3.0.9.jar b/core/src/main/resources/lib/groovy-3.0.9.jar
new file mode 100644
index 00000000..7ef10469
Binary files /dev/null and b/core/src/main/resources/lib/groovy-3.0.9.jar differ
diff --git a/core/src/main/resources/lib/groovy-all-2.2.1.jar b/core/src/main/resources/lib/groovy-all-2.2.1.jar
deleted file mode 100644
index 98daf6df..00000000
Binary files a/core/src/main/resources/lib/groovy-all-2.2.1.jar and /dev/null differ
diff --git a/core/src/main/resources/lib/groovy-ant-3.0.9.jar b/core/src/main/resources/lib/groovy-ant-3.0.9.jar
new file mode 100644
index 00000000..b4e71cdf
Binary files /dev/null and b/core/src/main/resources/lib/groovy-ant-3.0.9.jar differ
diff --git a/core/src/test/groovy/noe/common/utils/JBFileTest.groovy b/core/src/test/groovy/noe/common/utils/JBFileTest.groovy
index 29fbf122..45be7cf5 100644
--- a/core/src/test/groovy/noe/common/utils/JBFileTest.groovy
+++ b/core/src/test/groovy/noe/common/utils/JBFileTest.groovy
@@ -18,7 +18,7 @@ class JBFileTest {
   static Platform platform = new Platform()
   static String sep = platform.sep
 
-  static File resourceDir = new File(new File(".").getCanonicalFile(), "src${sep}test${sep}resources${sep}" + JBFileTest.class.name.replace('.', sep))
+  static File resourceDir = new File(new File(".").getCanonicalFile(), "src${sep}test${sep}resources${sep}" + JBFileTest.class.name.replace('.', sep)+"Dir")
   static File fileLoremIpsum = new File(resourceDir, "lorem_ipsum.txt")
   static File fileMd5 = new File(resourceDir, "lorem_ipsum.md5")
   static File fileZip = new File(resourceDir, "lorem_ipsum.zip")
diff --git a/core/src/test/groovy/noe/common/utils/OpenSslVersionTest.groovy b/core/src/test/groovy/noe/common/utils/OpenSslVersionTest.groovy
index 1fedf6b7..7b248b2d 100644
--- a/core/src/test/groovy/noe/common/utils/OpenSslVersionTest.groovy
+++ b/core/src/test/groovy/noe/common/utils/OpenSslVersionTest.groovy
@@ -32,7 +32,7 @@ class OpenSslVersionTest {
   @Test
   public void testCompareTo() {
     // <=> calls compareTo(...) explicitly
-    List<Tuple<String, String>> values = new LinkedList<>()
+    List<Tuple> values = new LinkedList<>()
     values.add(new Tuple("0.9.8", "0.9.9"))
     values.add(new Tuple("0.9.8b", "0.9.8c"))
     values.add(new Tuple("1.0.2c", "1.2.3a"))
diff --git a/core/src/test/resources/noe/common/utils/JBFileTest/lorem_ipsum.md5 b/core/src/test/resources/noe/common/utils/JBFileTestDir/lorem_ipsum.md5
similarity index 100%
rename from core/src/test/resources/noe/common/utils/JBFileTest/lorem_ipsum.md5
rename to core/src/test/resources/noe/common/utils/JBFileTestDir/lorem_ipsum.md5
diff --git a/core/src/test/resources/noe/common/utils/JBFileTest/lorem_ipsum.txt b/core/src/test/resources/noe/common/utils/JBFileTestDir/lorem_ipsum.txt
similarity index 100%
rename from core/src/test/resources/noe/common/utils/JBFileTest/lorem_ipsum.txt
rename to core/src/test/resources/noe/common/utils/JBFileTestDir/lorem_ipsum.txt
diff --git a/core/src/test/resources/noe/common/utils/JBFileTest/lorem_ipsum.zip b/core/src/test/resources/noe/common/utils/JBFileTestDir/lorem_ipsum.zip
similarity index 100%
rename from core/src/test/resources/noe/common/utils/JBFileTest/lorem_ipsum.zip
rename to core/src/test/resources/noe/common/utils/JBFileTestDir/lorem_ipsum.zip
diff --git a/core/src/test/resources/noe/common/utils/JBFileTest/testStructure/file1 b/core/src/test/resources/noe/common/utils/JBFileTestDir/testStructure/file1
similarity index 100%
rename from core/src/test/resources/noe/common/utils/JBFileTest/testStructure/file1
rename to core/src/test/resources/noe/common/utils/JBFileTestDir/testStructure/file1
diff --git a/core/src/test/resources/noe/common/utils/JBFileTest/testStructure/oneSubdir/oneFile/file4 b/core/src/test/resources/noe/common/utils/JBFileTestDir/testStructure/oneSubdir/oneFile/file4
similarity index 100%
rename from core/src/test/resources/noe/common/utils/JBFileTest/testStructure/oneSubdir/oneFile/file4
rename to core/src/test/resources/noe/common/utils/JBFileTestDir/testStructure/oneSubdir/oneFile/file4
diff --git a/core/src/test/resources/noe/common/utils/JBFileTest/testStructure/twoFiles/file2 b/core/src/test/resources/noe/common/utils/JBFileTestDir/testStructure/twoFiles/file2
similarity index 100%
rename from core/src/test/resources/noe/common/utils/JBFileTest/testStructure/twoFiles/file2
rename to core/src/test/resources/noe/common/utils/JBFileTestDir/testStructure/twoFiles/file2
diff --git a/core/src/test/resources/noe/common/utils/JBFileTest/testStructure/twoFiles/file3 b/core/src/test/resources/noe/common/utils/JBFileTestDir/testStructure/twoFiles/file3
similarity index 100%
rename from core/src/test/resources/noe/common/utils/JBFileTest/testStructure/twoFiles/file3
rename to core/src/test/resources/noe/common/utils/JBFileTestDir/testStructure/twoFiles/file3
diff --git a/pom.xml b/pom.xml
index 94acd734..c710758d 100755
--- a/pom.xml
+++ b/pom.xml
@@ -89,9 +89,9 @@
         <version.findbugs-plugin>3.0.5</version.findbugs-plugin>
         <version.codenarc-plugin>0.22-1</version.codenarc-plugin>
         <version.source-plugin>3.2.1</version.source-plugin>
-        <version.javadoc-plugin>2.10.4</version.javadoc-plugin>
+        <version.javadoc-plugin>3.3.1</version.javadoc-plugin>
         <version.release-plugin>3.0.0-M1</version.release-plugin>
-        <version.groovy-eclipse-compiler>3.6.0-03</version.groovy-eclipse-compiler>
+        <version.groovy-eclipse-compiler>3.7.0</version.groovy-eclipse-compiler>
         <version.guava>29.0-jre</version.guava>
         <version.jgit>5.8.0.202006091008-r</version.jgit>
 
@@ -101,17 +101,17 @@
         <!-- https://github.com/Karm/okhttp/tree/add_cipher_suites -->
         <com.squareup.okhttp3.okhttp.version>4.8.0</com.squareup.okhttp3.okhttp.version>
         <org.apache.ant.version>1.10.8</org.apache.ant.version>
-        <version.org.apache.maven.plugins.maven-surefire-plugin>2.22.0
+        <version.org.apache.maven.plugins.maven-surefire-plugin>3.0.0-M5
         </version.org.apache.maven.plugins.maven-surefire-plugin>
-        <version.org.apache.maven.plugins.maven-failsafe-plugin>2.22.0
+        <version.org.apache.maven.plugins.maven-failsafe-plugin>3.0.0-M5
         </version.org.apache.maven.plugins.maven-failsafe-plugin>
         <version.org.apache.maven.plugins.maven-deploy-plugin>2.8.2
         </version.org.apache.maven.plugins.maven-deploy-plugin>
         <junit.version>4.13</junit.version>
-        <org.codehaus.groovy.all.version>2.4.19</org.codehaus.groovy.all.version>
+        <org.codehaus.groovy.all.version>3.0.9</org.codehaus.groovy.all.version>
         <maven.compiler.plugin.version>3.8.1</maven.compiler.plugin.version>
-        <org.codehaus.groovy.compiler.version>2.9.2-01</org.codehaus.groovy.compiler.version>
-        <org.codehaus.groovy.batch.compiler.version>2.4.3-01</org.codehaus.groovy.batch.compiler.version>
+        <org.codehaus.groovy.compiler.version>3.6.0-03</org.codehaus.groovy.compiler.version>
+        <org.codehaus.groovy.batch.compiler.version>3.0.8-01</org.codehaus.groovy.batch.compiler.version>
         <org.codehaus.mojo.build.helper.maven.plugin.version>3.2.0</org.codehaus.mojo.build.helper.maven.plugin.version>
 
         <version.slfj-api>1.7.30</version.slfj-api>
@@ -153,7 +153,7 @@
                 <groupId>org.codehaus.groovy</groupId>
                 <artifactId>groovy-all</artifactId>
                 <version>${org.codehaus.groovy.all.version}</version>
-                <type>jar</type>
+                <type>pom</type>
             </dependency>
 
             <dependency>
@@ -357,6 +357,12 @@
                         <systemPropertyVariables combine.children="append">
                             <JDBCLoader.URL>http://exampleurl.com</JDBCLoader.URL>
                         </systemPropertyVariables>
+                        <argLine>
+                     --add-opens java.base/java.lang=ALL-UNNAMED
+                     --add-opens java.base/java.lang.ref=ALL-UNNAMED
+                     --add-opens java.base/java.util=ALL-UNNAMED
+                     --add-opens java.xml/jdk.xml.internal=ALL-UNNAMED
+                        </argLine>
                     </configuration>
                     <dependencies>
                         <dependency>
@@ -447,7 +453,7 @@
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-javadoc-plugin</artifactId>
                         <configuration>
-                            <additionalparam>-Xdoclint:none</additionalparam>
+                            <doclint>none</doclint>
                         </configuration>
                     </plugin>
                 </plugins>