Change the approach for releases

diff --git a/cnf/argeo.bnd b/cnf/argeo.bnd
index 82c8c0801cacb80166f84565764dc675ec4e9912..d1c001a3fef44ea2693407bbc1516ad5122065bc 100644 (file)
--- a/cnf/argeo.bnd
+++ b/cnf/argeo.bnd
@@ -1,6 +1,4 @@
 # Common
-qualifier=.next
-
 Bundle-Version: ${version.released}${qualifier}
 Private-Package: *.internal.*
 Export-Package: !*.internal.*, *

diff --git a/cnf/build.bnd b/cnf/build.bnd
index af9c91be7d16ae6c7acaec7b6fc6bf73060d539f..38f5f286a6df0d08f9ac5298e4ee84bfbf7642ea 100644 (file)
--- a/cnf/build.bnd
+++ b/cnf/build.bnd
@@ -1,4 +1,3 @@
 -include: \
-${workspace}/cnf/unstable.bnd, \
 ${workspace}/cnf/argeo.bnd, \
--${workspace}/cnf/release.bnd
+${workspace}/cnf/unstable.bnd

diff --git a/cnf/maven.bnd b/cnf/maven.bnd
index a90b48b29012536989449e17248bc157e947e99a..f3a6e83cff694e34f205b57c12ac484b31039798 100644 (file)
--- a/cnf/maven.bnd
+++ b/cnf/maven.bnd
@@ -1,4 +1,3 @@
 -include: \
-../cnf/unstable.bnd, \
 ../cnf/argeo.bnd, \
--../cnf/release.bnd
+../cnf/unstable.bnd

diff --git a/cnf/unstable.bnd b/cnf/unstable.bnd
index 3cb5c2ac28672e4402796b7dcf10580ad4e37b3a..f3de6743d9233477d946d72bfc73d89a7696561f 100644 (file)
--- a/cnf/unstable.bnd
+++ b/cnf/unstable.bnd
@@ -1,5 +1,7 @@
-category=org.argeo.commons
 version.released=2.3.3
+qualifier=.next
+
+category=org.argeo.commons
 Bundle-RequiredExecutionEnvironment=JavaSE-11
 
 argeo.rpm.stagingRepository=/srv/rpmfactory/unstable/argeo-osgi-2/argeo