From 2e56510cc7f111e13ba96350de598460f2931b49 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Wed, 8 May 2024 09:00:32 +0200 Subject: [PATCH 1/4] Shutdown Jackrabbit transient file reaper --- .../src/org/argeo/cms/jcr/internal/CmsJcrDeployment.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/org.argeo.cms.jcr/src/org/argeo/cms/jcr/internal/CmsJcrDeployment.java b/org.argeo.cms.jcr/src/org/argeo/cms/jcr/internal/CmsJcrDeployment.java index f3ce912..527c7ab 100644 --- a/org.argeo.cms.jcr/src/org/argeo/cms/jcr/internal/CmsJcrDeployment.java +++ b/org.argeo.cms.jcr/src/org/argeo/cms/jcr/internal/CmsJcrDeployment.java @@ -26,6 +26,7 @@ import javax.servlet.Servlet; import org.apache.jackrabbit.commons.cnd.CndImporter; import org.apache.jackrabbit.core.RepositoryContext; import org.apache.jackrabbit.core.RepositoryImpl; +import org.apache.jackrabbit.util.TransientFileFactory; import org.argeo.api.acr.spi.ProvidedRepository; import org.argeo.api.cms.CmsConstants; import org.argeo.api.cms.CmsLog; @@ -107,6 +108,8 @@ public class CmsJcrDeployment { log.error("Cannot clean repositories", e1); } + // If not called a daemon thread is kept, which is a problem with multi runtimes + TransientFileFactory.shutdown(); } // public void setCmsDeployment(CmsDeployment cmsDeployment) { -- 2.39.2 From 41541ff6ae5f6788318c3b6ce5a76b27927f7f41 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Thu, 27 Jun 2024 09:23:27 +0200 Subject: [PATCH 2/4] Update Argeo Build --- Makefile | 1 + sdk/argeo-build | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 70a5b02..4d4c1a4 100644 --- a/Makefile +++ b/Makefile @@ -26,6 +26,7 @@ org.argeo.tp.httpd \ org.argeo.tp.sys \ org.argeo.tp.sdk \ org.argeo.tp.utils \ +osgi/equinox/org.argeo.tp.osgi.framework \ osgi/equinox/org.argeo.tp.osgi \ osgi/equinox/org.argeo.tp.eclipse \ swt/rap/org.argeo.tp.swt \ diff --git a/sdk/argeo-build b/sdk/argeo-build index ec9a0b6..41680d0 160000 --- a/sdk/argeo-build +++ b/sdk/argeo-build @@ -1 +1 @@ -Subproject commit ec9a0b67c92105fc42ec14cdbec7ff9464c6cc3c +Subproject commit 41680d087920a1994af93eb851d77116d0f7f933 -- 2.39.2 From d8950c9cfa09849d0679809b891513cb4a6c5dc5 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Thu, 27 Jun 2024 10:05:26 +0200 Subject: [PATCH 3/4] Releasing --- sdk/branches/unstable.bnd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk/branches/unstable.bnd b/sdk/branches/unstable.bnd index 2325845..e7e5101 100644 --- a/sdk/branches/unstable.bnd +++ b/sdk/branches/unstable.bnd @@ -1,7 +1,7 @@ major=2 minor=3 -micro=21 -qualifier=.next +micro=22 +qualifier= Bundle-Copyright= \ Copyright 2009-2023 Mathieu Baudier, \ -- 2.39.2 From e4faf6dda1daa59f4a5a8c8513f2e25ea9c47772 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Fri, 28 Jun 2024 07:44:56 +0200 Subject: [PATCH 4/4] Prepare next development cycle --- sdk/branches/unstable.bnd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/branches/unstable.bnd b/sdk/branches/unstable.bnd index e7e5101..4c75e00 100644 --- a/sdk/branches/unstable.bnd +++ b/sdk/branches/unstable.bnd @@ -1,7 +1,7 @@ major=2 minor=3 micro=22 -qualifier= +qualifier=.next Bundle-Copyright= \ Copyright 2009-2023 Mathieu Baudier, \ -- 2.39.2