From: Mathieu Baudier <mbaudier@argeo.org>
Date: Tue, 23 Nov 2021 10:01:58 +0000 (+0100)
Subject: Change the approach for releases
X-Git-Tag: v2.3.4~2
X-Git-Url: https://git.argeo.org/?p=lgpl%2Fargeo-commons.git;a=commitdiff_plain;h=35ba2254032b9ba0cf54fa542127818d235ac557

Change the approach for releases
---

diff --git a/cnf/argeo.bnd b/cnf/argeo.bnd
index 82c8c0801..d1c001a3f 100644
--- 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 af9c91be7..38f5f286a 100644
--- 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 a90b48b29..f3a6e83cf 100644
--- 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 3cb5c2ac2..f3de6743d 100644
--- 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