Merge remote-tracking branch 'origin/unstable' into testing

diff --git a/org.argeo.app.servlet.publish/src/org/argeo/app/servlet/publish/FopServlet.java b/org.argeo.app.servlet.publish/src/org/argeo/app/servlet/publish/FopServlet.java
index b0c2f636d5f63ae39e86112690b98e8ebe3990bb..b389883a23e6de2223cd17c9cc4cd88992502aa3 100644 (file)
--- a/org.argeo.app.servlet.publish/src/org/argeo/app/servlet/publish/FopServlet.java
+++ b/org.argeo.app.servlet.publish/src/org/argeo/app/servlet/publish/FopServlet.java
@@ -81,7 +81,7 @@ public class FopServlet extends HttpServlet {
                Content content = session.get(path);
 
                // dev only
-               final boolean DEV = true;
+               final boolean DEV = false;
                if (DEV) {
                        try (InputStream in = xslUrl.openStream()) {
                                Source xslSource = new StreamSource(in);

diff --git a/sdk/branches/unstable.bnd b/sdk/branches/unstable.bnd
index 97ec6b11854c18a17fe19bedd979e5118f291867..469bafaf087585de7766619251551a3b06f9e8cb 100644 (file)
--- a/sdk/branches/unstable.bnd
+++ b/sdk/branches/unstable.bnd
@@ -1,7 +1,7 @@
 major=2
 minor=3
 micro=14
-qualifier=
+qualifier=.next
 
 Bundle-Copyright= \
 Copyright 2014-2023 Argeo GmbH, \