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

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/.project b/.project
index 3fcd2fd54a7d1ed9902e9eac326fe6d0a2d25231..ff418936f2de03c4250f3d5a808862b33bc3faf5 100644 (file)
--- a/.project
+++ b/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-       <name>argeo-suite-unstable</name>
+       <name>argeo-suite</name>
        <comment></comment>
        <projects>
        </projects>

diff --git a/branch.mk b/branch.mk
index a6f848887ccc40bb5bdd3db46d37140d94f544eb..936a67569f072bfad1eeb935aca211a0e0530e86 100644 (file)
--- 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/argeo.bnd b/cnf/argeo.bnd
deleted file mode 100644 (file)
index 22ed0df..0000000
--- a/cnf/argeo.bnd
+++ /dev/null
@@ -1,14 +0,0 @@
-# Common
-Bundle-Version: ${version.released}${qualifier}
-Private-Package: *.internal.*
-Export-Package: !*.internal.*, *
-#-consumer-policy : ${range;[==,=+)}
--contract: !JavaServlet,*
--savemanifest : META-INF/MANIFEST.MF
--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 --git a/cnf/build.bnd b/cnf/build.bnd
index f6e8be27226265627e5d7817893fdd08eb4d901e..a464edc1fa01eafdc3a058a9630ed2a1de22b625 100644 (file)
--- 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/maven.bnd b/cnf/maven.bnd
deleted file mode 100644 (file)
index f3a6e83..0000000
--- a/cnf/maven.bnd
+++ /dev/null
@@ -1,3 +0,0 @@
--include: \
-../cnf/argeo.bnd, \
-../cnf/unstable.bnd

diff --git a/cnf/testing.bnd b/cnf/testing.bnd
new file mode 100644 (file)
index 0000000..32c83b0
--- /dev/null
+++ b/cnf/testing.bnd
@@ -0,0 +1,10 @@
+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=