Attempt of using java.nio.file for extension removal

* fix bad github merge

Author: tmortagne

xwiki-commons-core/xwiki-commons-extension/xwiki-commons-extension-api/src/main/java/org/xwiki/extension/repository/internal/local/LocalExtensionStorage.java

@@ -339,7 +339,7 @@ public void removeExtension(DefaultLocalExtension extension) throws IOException
             deleteExtensionFolderIfEmpty(extensionVersionFolderPath.getParent());
         } catch (DirectoryNotEmptyException e) {
             LOGGER.warn("Extension version folder [{}] was not empty after removing the extension [{}]. Keeping it.",
-                extensionDescriptorFilePath, extension.getId().getId());
+                extensionDescriptorFilePath.toString(), extension.getId().getId());
         }
     }
 
@@ -356,14 +356,7 @@ private static void deleteExtensionFolderIfEmpty(Path extensionFolderPath) throw
         } catch (DirectoryNotEmptyException e) {
             // Folder not being empty is a valid scenario if some version of the extension are still installed
             LOGGER.debug("Extension folder [{}] was not empty after removing the extension. Keeping it.",
-                extensionFolderPath);
+                extensionFolderPath.toString());
         }
-
-        // Delete extension version folder if empty
-        File extensionVersionFolder = descriptorFile.getParentFile();
-        extensionVersionFolder.delete();
-
-        // Delete extension folder if empty
-        extensionVersionFolder.getParentFile().delete();
     }
 }