From: Mathieu Baudier <mbaudier@argeo.org>
Date: Sun, 27 Feb 2022 08:29:12 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/unstable' into testing
X-Git-Tag: v2.1.105~4
X-Git-Url: https://git.argeo.org/?a=commitdiff_plain;h=fba42be03bc7ec07d464f8942f7dfa2e5f0d6f17;hp=7252d82e4b9b6cf30265b77fb3485a23a1ac53fd;p=lgpl%2Fargeo-commons.git

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

Conflicts:
	cnf/build.bnd
	cnf/maven.bnd
	demo/pom.xml
	dep/org.argeo.dep.cms.client/pom.xml
	dep/org.argeo.dep.cms.e4.rap/pom.xml
	dep/org.argeo.dep.cms.ext/pom.xml
	dep/org.argeo.dep.cms.node/pom.xml
	dep/org.argeo.dep.cms.ui.rap/pom.xml
	dep/pom.xml
	dist/argeo-cli/pom.xml
	dist/argeo-node/pom.xml
	dist/containers/pom.xml
	dist/osgi-boot/pom.xml
	dist/pom.xml
	org.argeo.api/pom.xml
	org.argeo.cms.e4.rap/pom.xml
	org.argeo.cms.e4/pom.xml
	org.argeo.cms.ui.rap/pom.xml
	org.argeo.cms.ui.theme/pom.xml
	org.argeo.cms.ui/pom.xml
	org.argeo.cms/pom.xml
	org.argeo.core/pom.xml
	org.argeo.eclipse.ui.rap/pom.xml
	org.argeo.eclipse.ui/pom.xml
	org.argeo.enterprise/pom.xml
	org.argeo.jcr/pom.xml
	org.argeo.maintenance/pom.xml
	org.argeo.osgi.boot/pom.xml
	pom.xml
	sdk/pom.xml
---

diff --git a/.gitmodules b/.gitmodules
index 07b10cacb..d7283346a 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/.project b/.project
index c006088ca..2bb4833a3 100644
--- a/.project
+++ b/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>argeo-commons-unstable</name>
+	<name>argeo-commons</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/branch.mk b/branch.mk
index a6f848887..936a67569 100644
--- a/branch.mk
+++ b/branch.mk
@@ -1 +1 @@
-include $(SDK_SRC_BASE)/cnf/unstable.bnd
+include $(SDK_SRC_BASE)/cnf/testing.bnd
diff --git a/cnf/build.bnd b/cnf/build.bnd
index f6e8be272..a464edc1f 100644
--- a/cnf/build.bnd
+++ b/cnf/build.bnd
@@ -1,3 +1,3 @@
 -include: \
-${workspace}/cnf/unstable.bnd, \
+${workspace}/cnf/testing.bnd, \
 ${workspace}/sdk/argeo-build/argeo.bnd, \
diff --git a/cnf/testing.bnd b/cnf/testing.bnd
new file mode 100644
index 000000000..25289aaa0
--- /dev/null
+++ b/cnf/testing.bnd
@@ -0,0 +1,10 @@
+MAJOR=2
+MINOR=1
+MICRO=104
+qualifier=.next
+
+category=org.argeo.commons
+Bundle-RequiredExecutionEnvironment=JavaSE-11
+
+argeo.rpm.stagingRepository=/srv/rpmfactory/testing/argeo-osgi-2/argeo
+argeo.rpm.suffix=