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=37b18e32849e8e677ab3205e5ad2e7dba0f2857a;p=gpl%2Fargeo-suite.git

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

diff --git a/.gitmodules b/.gitmodules
index 07b10ca..d728334 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,4 +1,4 @@
 [submodule "sdk/argeo-build"]
 	path = sdk/argeo-build
 	url = http://git.argeo.org/cc0/argeo-build.git
-	branch = unstable
+	branch = testing
diff --git a/branch.mk b/branch.mk
index afde0f8..dbecaaa 100644
--- a/branch.mk
+++ b/branch.mk
@@ -1 +1 @@
-BRANCH=unstable
\ No newline at end of file
+BRANCH=testing
\ No newline at end of file
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/argeo-build b/sdk/argeo-build
index 552334a..d9cae87 160000
--- a/sdk/argeo-build
+++ b/sdk/argeo-build
@@ -1 +1 @@
-Subproject commit 552334af25e7afe2d14d51ec2e78332bcbdc948c
+Subproject commit d9cae87d811258d5a13e43eea8492f3792377ce4
diff --git a/sdk/branches/testing.bnd b/sdk/branches/testing.bnd
new file mode 100644
index 0000000..b51d0e0
--- /dev/null
+++ b/sdk/branches/testing.bnd
@@ -0,0 +1,4 @@
+major=2
+minor=1
+micro=26
+qualifier=.next
\ No newline at end of file