From: Mathieu Baudier <mbaudier@argeo.org>
Date: Sun, 27 Feb 2022 08:34:41 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/unstable' into testing
X-Git-Tag: v2.1.24~4
X-Git-Url: http://git.argeo.org/?p=gpl%2Fargeo-suite.git;a=commitdiff_plain;h=6e56ffa34cb02ab04d028423aea342e3dfed4358

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

Conflicts:
	cnf/build.bnd
	dep/org.argeo.suite.dep.e4.rap/pom.xml
	dep/org.argeo.suite.dep.e4.rcp/pom.xml
	dep/org.argeo.suite.dep.ui.rap/pom.xml
	dep/pom.xml
	dist/argeo-suite-standard/pom.xml
	dist/pom.xml
	lib/pom.xml
	org.argeo.entity.api/pom.xml
	org.argeo.entity.core/pom.xml
	org.argeo.entity.ui/pom.xml
	org.argeo.geo.ui/pom.xml
	org.argeo.library.ui/pom.xml
	org.argeo.people.ui/pom.xml
	org.argeo.publishing.ui/pom.xml
	org.argeo.suite.core/pom.xml
	org.argeo.suite.theme.default/pom.xml
	org.argeo.suite.ui.rap/pom.xml
	org.argeo.suite.ui/pom.xml
	org.argeo.support.geonames/pom.xml
	org.argeo.support.odk/pom.xml
	org.argeo.support.xforms/pom.xml
	pom.xml
---

6e56ffa34cb02ab04d028423aea342e3dfed4358
diff --cc .gitmodules
index 0000000,07b10ca..d728334
mode 000000,100644..100644
--- a/.gitmodules
+++ b/.gitmodules
@@@ -1,0 -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 --cc branch.mk
index 0000000,a6f8488..936a675
mode 000000,100644..100644
--- a/branch.mk
+++ b/branch.mk
@@@ -1,0 -1,1 +1,1 @@@
 -include $(SDK_SRC_BASE)/cnf/unstable.bnd
++include $(SDK_SRC_BASE)/cnf/testing.bnd
diff --cc cnf/argeo.bnd
index d1c001a,22ed0df..0000000
deleted file mode 100644,100644
--- a/cnf/argeo.bnd
+++ /dev/null
@@@ -1,13 -1,14 +1,0 @@@
--# Common
--Bundle-Version: ${version.released}${qualifier}
--Private-Package: *.internal.*
--Export-Package: !*.internal.*, *
- -consumer-policy : ${range;[==,=+)}
 -#-consumer-policy : ${range;[==,=+)}
 --contract: !JavaServlet,*
---savemanifest : META-INF/MANIFEST.MF
- -includeresource.default : OSGI-INF/=-OSGI-INF/,e4xmi/=-e4xmi/,icons/=-icons/,img/=-img/
 --includeresource.default : bin,OSGI-INF/=-OSGI-INF/,e4xmi/=-e4xmi/,icons/=-icons/,img/=-img/
---compression STORE
---source true
---removeheaders = Bnd-LastModified,Build-Jdk,Built-By,Tool,Created-By
--Automatic-Module-Name: ${bsn}
--SLC-Category=${category}
---groupid=${category}
diff --cc cnf/build.bnd
index c59a50e,f6e8be2..a464edc
--- a/cnf/build.bnd
+++ b/cnf/build.bnd
@@@ -1,3 -1,3 +1,3 @@@
  -include: \
- ${workspace}/cnf/argeo.bnd, \
- ${workspace}/cnf/testing.bnd
 -${workspace}/cnf/unstable.bnd, \
++${workspace}/cnf/testing.bnd, \
+ ${workspace}/sdk/argeo-build/argeo.bnd, \
diff --cc cnf/maven.bnd
index 1b962bc,f3a6e83..0000000
deleted file mode 100644,100644
--- a/cnf/maven.bnd
+++ /dev/null
@@@ -1,3 -1,3 +1,0 @@@
---include: \
--../cnf/argeo.bnd, \
- ../cnf/testing.bnd
 -../cnf/unstable.bnd
diff --cc cnf/testing.bnd
index b778569,0000000..32c83b0
mode 100644,000000..100644
--- a/cnf/testing.bnd
+++ b/cnf/testing.bnd
@@@ -1,8 -1,0 +1,10 @@@
- version.released=2.1.23
++MAJOR=2
++MINOR=1
++MICRO=23
 +qualifier=.next
 +
 +category=org.argeo.suite
 +Bundle-RequiredExecutionEnvironment=JavaSE-11
 +
 +argeo.rpm.stagingRepository=/srv/rpmfactory/testing/argeo-osgi-2/argeo
 +argeo.rpm.suffix=