From 92298ba9e5dc344a5e467cc6affa03cd2ec54b5b Mon Sep 17 00:00:00 2001
From: Martin Severin Steffensen <maritim@gmail.com>
Date: Tue, 26 Apr 2022 21:46:24 +0200
Subject: [PATCH 1/2] Attempt at fixing some of the errors reported by Sonatype
 Lift.

---
 pom.xml                                           | 15 +++++++++++++--
 .../java/io/github/maritims/node/NodeWrapper.java |  5 +++--
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index cb6e7b8..5e2a4a3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -112,13 +112,24 @@
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <groupId>org.sonatype.plugins</groupId>
+        <artifactId>nexus-staging-maven-plugin</artifactId>
+        <version>1.6.7</version>
+        <extensions>true</extensions>
+        <configuration>
+          <serverId>ossrh</serverId>
+          <nexusUrl>https://s01.oss.sonatype.org/</nexusUrl>
+          <autoReleaseAfterClose>true</autoReleaseAfterClose>
+        </configuration>
+      </plugin>
     </plugins>
   </build>
 
   <properties>
     <maven.compiler.target>1.8</maven.compiler.target>
     <maven.compiler.source>1.8</maven.compiler.source>
-    <maven.version>3.8.4</maven.version>
+    <maven.version>3.8.5</maven.version>
   </properties>
 
   <dependencies>
@@ -180,7 +191,7 @@
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-core</artifactId>
-      <version>4.4.0</version>
+      <version>4.5.1</version>
       <scope>test</scope>
     </dependency>
     <!-- endregion -->
diff --git a/src/main/java/io/github/maritims/node/NodeWrapper.java b/src/main/java/io/github/maritims/node/NodeWrapper.java
index 2c27d8a..3416008 100644
--- a/src/main/java/io/github/maritims/node/NodeWrapper.java
+++ b/src/main/java/io/github/maritims/node/NodeWrapper.java
@@ -5,6 +5,7 @@
 import org.apache.commons.compress.archivers.tar.TarArchiveInputStream;
 import org.apache.commons.compress.compressors.gzip.GzipCompressorInputStream;
 import org.apache.commons.compress.utils.IOUtils;
+import org.apache.commons.io.FilenameUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -131,7 +132,7 @@ public boolean extract() {
 
         String destinationDirectory;
         try {
-            destinationDirectory = new File(nodeConfiguration.getExtractionDirectory().toString()).getCanonicalPath();
+            destinationDirectory = new File(FilenameUtils.getName(nodeConfiguration.getExtractionDirectory().toString())).getCanonicalPath();
         } catch (IOException e) {
             log.error("Unable to get canonical path for extraction destination", e);
             return false;
@@ -139,7 +140,7 @@ public boolean extract() {
 
         while(tarEntry != null) {
             Path path = Paths.get(destinationDirectory, tarEntry.getName());
-            File file = new File(path.toString());
+            File file = new File(FilenameUtils.getName(path.toString()));
 
             if(tarEntry.isDirectory() && !file.exists() && !file.mkdirs()) {
                 log.error("Unable to create directory: " + path + ". Aborting.");

From e93231164970972eee2f70a9e4fa38db1c22ac13 Mon Sep 17 00:00:00 2001
From: Martin Severin Steffensen <maritim@gmail.com>
Date: Tue, 26 Apr 2022 22:14:10 +0200
Subject: [PATCH 2/2] Started using Path.toFile()

---
 src/main/java/io/github/maritims/node/NodeWrapper.java | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/main/java/io/github/maritims/node/NodeWrapper.java b/src/main/java/io/github/maritims/node/NodeWrapper.java
index 3416008..7be375d 100644
--- a/src/main/java/io/github/maritims/node/NodeWrapper.java
+++ b/src/main/java/io/github/maritims/node/NodeWrapper.java
@@ -5,7 +5,6 @@
 import org.apache.commons.compress.archivers.tar.TarArchiveInputStream;
 import org.apache.commons.compress.compressors.gzip.GzipCompressorInputStream;
 import org.apache.commons.compress.utils.IOUtils;
-import org.apache.commons.io.FilenameUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -132,7 +131,7 @@ public boolean extract() {
 
         String destinationDirectory;
         try {
-            destinationDirectory = new File(FilenameUtils.getName(nodeConfiguration.getExtractionDirectory().toString())).getCanonicalPath();
+            destinationDirectory = nodeConfiguration.getExtractionDirectory().toFile().getCanonicalPath();
         } catch (IOException e) {
             log.error("Unable to get canonical path for extraction destination", e);
             return false;
@@ -140,7 +139,7 @@ public boolean extract() {
 
         while(tarEntry != null) {
             Path path = Paths.get(destinationDirectory, tarEntry.getName());
-            File file = new File(FilenameUtils.getName(path.toString()));
+            File file = path.toFile();
 
             if(tarEntry.isDirectory() && !file.exists() && !file.mkdirs()) {
                 log.error("Unable to create directory: " + path + ". Aborting.");