[archiva] branch archiva-2.x-gh-actions updated: try to help windows cleaning

[ol...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

olamy pushed a commit to branch archiva-2.x-gh-actions
in repository https://gitbox.apache.org/repos/asf/archiva.git


The following commit(s) were added to refs/heads/archiva-2.x-gh-actions by this push:
     new c08c1e998 try to help windows cleaning
c08c1e998 is described below

commit c08c1e998bf76571908024cd30d60fcd3fbb7053
Author: Olivier Lamy <ol...@apache.org>
AuthorDate: Sun Apr 10 14:30:39 2022 +1000

    try to help windows cleaning
    
    Signed-off-by: Olivier Lamy <ol...@apache.org>
---
 .../apache/archiva/upload/UploadArtifactsTest.java | 31 ++++------------------
 1 file changed, 5 insertions(+), 26 deletions(-)

diff --git a/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/upload/UploadArtifactsTest.java b/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/upload/UploadArtifactsTest.java
index 2eaa36004..f3d82cf97 100644
--- a/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/upload/UploadArtifactsTest.java
+++ b/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/upload/UploadArtifactsTest.java
@@ -19,19 +19,13 @@ package org.apache.archiva.upload;
  */
 
 import com.fasterxml.jackson.jaxrs.json.JacksonJaxbJsonProvider;
-import org.apache.archiva.admin.model.beans.RemoteRepository;
 import org.apache.archiva.redback.rest.api.model.User;
-import org.apache.archiva.redback.rest.api.services.RoleManagementService;
 import org.apache.archiva.redback.rest.api.services.UserService;
 import org.apache.archiva.redback.rest.services.AbstractRestServicesTest;
 import org.apache.archiva.redback.rest.services.FakeCreateAdminService;
-import org.apache.archiva.remotedownload.AbstractDownloadTest;
 import org.apache.archiva.rest.api.services.ArchivaRestServiceException;
-import org.apache.archiva.security.common.ArchivaRoleConstants;
 import org.apache.archiva.test.utils.ArchivaBlockJUnit4ClassRunner;
 import org.apache.archiva.web.api.FileUploadService;
-import org.apache.archiva.web.api.RuntimeInfoService;
-import org.apache.archiva.web.model.ApplicationRuntimeInfo;
 import org.apache.archiva.web.model.FileMetadata;
 import org.apache.catalina.Context;
 import org.apache.catalina.LifecycleException;
@@ -48,28 +42,14 @@ import org.apache.cxf.jaxrs.ext.multipart.ContentDisposition;
 import org.apache.cxf.jaxrs.ext.multipart.MultipartBody;
 import org.apache.cxf.message.Message;
 import org.apache.cxf.transport.servlet.CXFServlet;
-import org.apache.maven.wagon.providers.http.HttpWagon;
-import org.apache.maven.wagon.repository.Repository;
-import org.eclipse.jetty.server.Server;
-import org.eclipse.jetty.servlet.ServletContextHandler;
-import org.eclipse.jetty.servlet.ServletHolder;
 import org.junit.After;
-import org.junit.AfterClass;
 import org.junit.Before;
-import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.slf4j.bridge.SLF4JBridgeHandler;
 import org.springframework.web.context.ContextLoaderListener;
 
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import javax.ws.rs.ClientErrorException;
-import java.io.File;
 import java.io.IOException;
 import java.net.URLEncoder;
 import java.nio.file.Files;
@@ -78,9 +58,6 @@ import java.nio.file.Paths;
 import java.nio.file.StandardCopyOption;
 import java.sql.DriverManager;
 import java.util.Collections;
-import java.util.List;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipFile;
 
 /**
  * @author Olivier Lamy
@@ -101,6 +78,8 @@ public class UploadArtifactsTest
         Path appServerBase = Paths.get("target/appserver-base");
         // trying to shutdown derby for file leak
         DriverManager.getDriver("jdbc:derby:;shutdown=true");
+        // to help cleaning files on Windows....
+        System.gc();
         FileUtils.deleteDirectory(appServerBase.toAbsolutePath().toFile());
         Path confDir = appServerBase.resolve( "conf" );
         if ( !Files.exists(confDir))
@@ -157,8 +136,8 @@ public class UploadArtifactsTest
         if (this.tomcat != null) {
             try {
                 this.tomcat.stop();
-            } catch (LifecycleException e) {
-                //
+            } catch (Exception e) {
+                log.info("ignore fail to stop Tomcat: " + e.getMessage(), e);
             }
         }
         System.clearProperty( "org.apache.tomcat.util.buf.UDecoder.ALLOW_ENCODED_SLASH" );
@@ -308,7 +287,7 @@ public class UploadArtifactsTest
             final Attachment fileAttachment = new AttachmentBuilder( ).object( Files.newInputStream( file ) ).contentDisposition( new ContentDisposition( "form-data; filename=\"" + file.getFileName( ).toString( ) + "\"; name=\"files[]\"" ) ).build( );
             MultipartBody body = new MultipartBody( fileAttachment );
             service.post( body );
-            String relativePathEncoded = URLEncoder.encode( "../target/" + relativePath.toString( ), "UTF-8" );
+            String relativePathEncoded = URLEncoder.encode( "../target/" + relativePath, "UTF-8" );
             log.debug( "Trying to delete with path traversal: {}, {}", relativePath, relativePathEncoded );
             try
             {