You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2022/04/10 02:52:03 UTC
[archiva] branch archiva-2.x-gh-actions updated: try to shutdown derby
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 824142ace try to shutdown derby
824142ace is described below
commit 824142ace0fe8f01975ee7f65210ba1bb9c1d3cd
Author: Olivier Lamy <ol...@apache.org>
AuthorDate: Sun Apr 10 12:51:42 2022 +1000
try to shutdown derby
Signed-off-by: Olivier Lamy <ol...@apache.org>
---
.github/workflows/maven.yml | 2 --
.../src/test/java/org/apache/archiva/upload/UploadArtifactsTest.java | 3 +++
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 4fc345c0f..5b6b60aed 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -19,8 +19,6 @@ name: GitHub CI
on:
push:
- branches-ignore:
- - dependabot/**
pull_request:
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 d55f866e7..2eaa36004 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
@@ -76,6 +76,7 @@ import java.nio.file.Files;
import java.nio.file.Path;
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;
@@ -98,6 +99,8 @@ public class UploadArtifactsTest
System.setProperty( "org.apache.tomcat.util.buf.UDecoder.ALLOW_ENCODED_SLASH", "true" );
System.setProperty("appserver.base", Paths.get("target/appserver-base").toAbsolutePath().toString());
Path appServerBase = Paths.get("target/appserver-base");
+ // trying to shutdown derby for file leak
+ DriverManager.getDriver("jdbc:derby:;shutdown=true");
FileUtils.deleteDirectory(appServerBase.toAbsolutePath().toFile());
Path confDir = appServerBase.resolve( "conf" );
if ( !Files.exists(confDir))