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

diff --git a/.gitmodules b/.gitmodules
index 07b10cacb00393eff6d61e695fefe2acf9ab0577..d7283346ae7927fcd3fe8c032c443556a3fd661a 100644 (file)
--- 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 afde0f838e8e39e2e2b5abe863169d7891a97131..dbecaaa4bb30c9a334af654716d6bb4acc1dfbf0 100644 (file)
--- 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 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/argeo-build b/sdk/argeo-build
index 552334af25e7afe2d14d51ec2e78332bcbdc948c..d9cae87d811258d5a13e43eea8492f3792377ce4 160000 (submodule)
--- 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 (file)
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