From f189ccc4cf9160572702d9caf8018445f55530b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Prante?= <joergprante@gmail.com>
Date: Sun, 21 Apr 2024 10:19:27 +0200
Subject: [PATCH] MockFtpServer is not a JPMS module

---
 files-ftp-fs/build.gradle                   | 12 ++++++++++++
 files-ftp-fs/src/test/java/module-info.java |  3 ++-
 settings.gradle                             |  7 ++++---
 3 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/files-ftp-fs/build.gradle b/files-ftp-fs/build.gradle
index 0b8a33c..8528be1 100644
--- a/files-ftp-fs/build.gradle
+++ b/files-ftp-fs/build.gradle
@@ -5,4 +5,16 @@ dependencies {
     testImplementation testLibs.junit.jupiter.params
     testImplementation testLibs.mockito.core
     testImplementation testLibs.mockito.junit.jupiter
+    testImplementation testLibs.slf4j
+}
+
+def moduleName = 'org.xbib.io.ftp.test'
+def patchArgs = ['--patch-module', "$moduleName=" + files(sourceSets.test.resources.srcDirs).asPath ]
+
+tasks.named('compileTestJava') {
+    options.compilerArgs += patchArgs
+}
+
+tasks.named('test') {
+    jvmArgs += patchArgs
 }
diff --git a/files-ftp-fs/src/test/java/module-info.java b/files-ftp-fs/src/test/java/module-info.java
index 331d9e2..e5b8d8e 100644
--- a/files-ftp-fs/src/test/java/module-info.java
+++ b/files-ftp-fs/src/test/java/module-info.java
@@ -1,9 +1,10 @@
 module org.xbib.files.ftp.fs.test {
-    requires MockFtpServer;
     requires org.hamcrest;
     requires org.junit.jupiter.api;
     requires org.junit.jupiter.params;
     requires org.mockito;
+    requires MockFtpServer;
+    requires org.slf4j;
     requires org.xbib.files.ftp;
     requires org.xbib.files.ftp.fs;
     exports org.xbib.io.ftp.fs.test;
diff --git a/settings.gradle b/settings.gradle
index c069e19..f9349c5 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -28,9 +28,10 @@ dependencyResolutionManagement {
             library('junit-jupiter-platform-launcher', 'org.junit.platform', 'junit-platform-launcher').version('1.10.1')
             library('hamcrest', 'org.hamcrest', 'hamcrest-library').version('2.2')
             library('junit4', 'junit', 'junit').version('4.13.2')
-            library('mockftpserver', 'org.mockftpserver', 'MockFtpServer').version('2.7.1')
-            library('mockito-core', 'org.mockito', 'mockito-core').version('5.6.0')
-            library('mockito-junit-jupiter', 'org.mockito', 'mockito-junit-jupiter').version('5.6.0')
+            library('mockftpserver', 'org.mockftpserver', 'MockFtpServer').version('3.1.0')
+            library('mockito-core', 'org.mockito', 'mockito-core').version('5.11.0')
+            library('mockito-junit-jupiter', 'org.mockito', 'mockito-junit-jupiter').version('5.11.0')
+            library('slf4j', 'org.slf4j', 'slf4j-api').version('2.0.13')
         }
     }
 }