From: Mathieu Baudier <mbaudier@argeo.org>
Date: Sat, 3 Jun 2023 03:36:57 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/unstable' into testing
X-Git-Tag: v2.1.27~1
X-Git-Url: https://git.argeo.org/?a=commitdiff_plain;h=a98c9d845f870803ffe4ace4a26ad60d7c151ce3;hp=0a1cc542f1954edfccf2a614ee1549ded17f8d34;p=gpl%2Fargeo-suite.git

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 b0c2f63..b389883 100644
--- 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 97ec6b1..469bafa 100644
--- 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, \