From 220076728b939a7476ae31a175d3daa6750b8e89 Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Tue, 23 Nov 2021 11:37:00 +0100
Subject: [PATCH] New release approach

---
 cnf/argeo.bnd    | 2 --
 cnf/build.bnd    | 3 +--
 cnf/maven.bnd    | 3 +--
 cnf/unstable.bnd | 4 +++-
 pom.xml          | 2 +-
 5 files changed, 6 insertions(+), 8 deletions(-)

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 0736d1a60..049a8f0fb 100644
--- a/cnf/unstable.bnd
+++ b/cnf/unstable.bnd
@@ -1,5 +1,7 @@
-category=org.argeo.slc
 version.released=2.3.0
+qualifier=.next
+
+category=org.argeo.slc
 Bundle-RequiredExecutionEnvironment=JavaSE-11
 
 argeo.rpm.stagingRepository=/srv/rpmfactory/unstable/argeo-osgi-2/argeo
diff --git a/pom.xml b/pom.xml
index 125524d4d..0917eef5e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>org.argeo.maven</groupId>
 		<artifactId>argeo-osgi-parent</artifactId>
-		<version>2.1.5</version>
+		<version>2.1.6</version>
 	</parent>
 	<groupId>org.argeo.slc</groupId>
 	<artifactId>argeo-slc</artifactId>
-- 
2.39.2