Prepare next development cycle

diff --git a/Makefile b/Makefile
index 70a5b02670c68d6c931c47e6457f27b8ab7b882b..4d4c1a4e428a3c9ff1134d5bd57c260603669490 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -26,6 +26,7 @@ org.argeo.tp.httpd \
 org.argeo.tp.sys \
 org.argeo.tp.sdk \
 org.argeo.tp.utils \
 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 \
 osgi/equinox/org.argeo.tp.osgi \
 osgi/equinox/org.argeo.tp.eclipse \
 swt/rap/org.argeo.tp.swt \

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 f3ce912951b5b522c5393151113f2480a76b20ac..527c7ab01ac739b1a2c0b92abddab41aca05e2fc 100644 (file)
--- 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.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;
 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);
                }
 
                        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) {
        }
 
 //     public void setCmsDeployment(CmsDeployment cmsDeployment) {

diff --git a/sdk/argeo-build b/sdk/argeo-build
index 979b11e352bda7d783c921a62e8cb5ed950a7564..028aff5ec9f6fd3ebf94ee074d50406ec6aa5035 160000 (submodule)
--- a/sdk/argeo-build
+++ b/sdk/argeo-build
@@ -1 +1 @@
-Subproject commit 979b11e352bda7d783c921a62e8cb5ed950a7564
+Subproject commit 028aff5ec9f6fd3ebf94ee074d50406ec6aa5035

diff --git a/sdk/branches/testing.bnd b/sdk/branches/testing.bnd
index 85dbd3909d16a1bd6675d056abf6403fc67db4bf..a8ba7826c8e4954814ae85b803881b6d3260109e 100644 (file)
--- a/sdk/branches/testing.bnd
+++ b/sdk/branches/testing.bnd
@@ -1,7 +1,7 @@
 major=2
 minor=1
 major=2
 minor=1

-micro=6
-qualifier=
+micro=7
+qualifier=.next

 
 Bundle-Copyright= \
 Copyright 2009-2023 Mathieu Baudier, \
 
 Bundle-Copyright= \
 Copyright 2009-2023 Mathieu Baudier, \

diff --git a/sdk/branches/unstable.bnd b/sdk/branches/unstable.bnd
index 53dae8858e48f64174b7ee872313bb79276606bf..e7e510116095616e1d0c508cdcd8dbbf7c415c73 100644 (file)
--- a/sdk/branches/unstable.bnd
+++ b/sdk/branches/unstable.bnd
@@ -1,6 +1,6 @@
 major=2
 minor=3
 major=2
 minor=3

-micro=21
+micro=22

 qualifier=
 
 Bundle-Copyright= \
 qualifier=
 
 Bundle-Copyright= \