From: Mathieu Baudier <mbaudier@argeo.org>
Date: Mon, 28 Feb 2022 07:32:19 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/unstable' into testing
X-Git-Tag: v2.1.105~1
X-Git-Url: https://git.argeo.org/?p=lgpl%2Fargeo-commons.git;a=commitdiff_plain;h=b1f9b071170d5cc251d40f5af4d50488a28ba6d3;hp=591fdb24c633be1d9dc5bfc786e9f2f4d752f71e

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

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=
diff --git a/sdk/argeo-build b/sdk/argeo-build
index 90dfe68dd..5029b67ae 160000
--- a/sdk/argeo-build
+++ b/sdk/argeo-build
@@ -1 +1 @@
-Subproject commit 90dfe68dd0a8f9510939b2a276aed3d79e563bb2
+Subproject commit 5029b67ae930b82e822407b64d740173fe2d34c0
diff --git a/sdk/deploy/argeo-init/usr/share/argeo/jvm.args b/sdk/deploy/argeo-init/usr/share/argeo/jvm.args
index 27561e3a2..8d57ecb7e 100644
--- a/sdk/deploy/argeo-init/usr/share/argeo/jvm.args
+++ b/sdk/deploy/argeo-init/usr/share/argeo/jvm.args
@@ -1 +1 @@
--cp /usr/share/a2/org.argeo.tp.eclipse.equinox/org.eclipse.osgi.3.17.jar:/usr/share/a2/org.argeo.cms/org.argeo.init.2.3.jar org.argeo.init.Service
\ No newline at end of file
+-cp /usr/share/a2/org.argeo.tp.eclipse.equinox/org.eclipse.osgi.3.17.jar:/usr/share/a2/org.argeo.cms/org.argeo.init.2.1.jar org.argeo.init.Service
\ No newline at end of file