From 43dcc5871f9c90945fda51eb781130e5f02204ec Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Fri, 12 Nov 2021 13:42:10 +0100
Subject: [PATCH] Improve bnd build.

---
 cnf/.gitignore   | 1 +
 cnf/argeo.bnd    | 8 ++++----
 cnf/build.bnd    | 4 +++-
 cnf/unstable.bnd | 2 +-
 4 files changed, 9 insertions(+), 6 deletions(-)
 create mode 100644 cnf/.gitignore

diff --git a/cnf/.gitignore b/cnf/.gitignore
new file mode 100644
index 000000000..12011f0d4
--- /dev/null
+++ b/cnf/.gitignore
@@ -0,0 +1 @@
+/release.bnd
diff --git a/cnf/argeo.bnd b/cnf/argeo.bnd
index e555724bd..25ade707e 100644
--- a/cnf/argeo.bnd
+++ b/cnf/argeo.bnd
@@ -1,8 +1,8 @@
 # Common
-buildId=next
-# for release:
-#buildId: R${tstamp}
-Bundle-Version: ${version.next}.${buildId}
+qualifier=.next
+-include: -${workspace}/cnf/release.bnd
+
+Bundle-Version: ${version.released}${qualifier}
 Private-Package: *.internal.*
 Export-Package: !*.internal.*; *
 -savemanifest : META-INF/MANIFEST.MF
diff --git a/cnf/build.bnd b/cnf/build.bnd
index 3af83d3b0..dd0a48c27 100644
--- a/cnf/build.bnd
+++ b/cnf/build.bnd
@@ -1,4 +1,6 @@
--include: ${workspace}/cnf/argeo.bnd,${workspace}/cnf/unstable.bnd,-~${workspace}/cnf/release.bnd
+-include: \
+${workspace}/cnf/unstable.bnd, \
+${workspace}/cnf/argeo.bnd
 
 SLC-Category: org.argeo.commons
 Bundle-RequiredExecutionEnvironment: JavaSE-11
diff --git a/cnf/unstable.bnd b/cnf/unstable.bnd
index 4b11ba7f3..0719f545e 100644
--- a/cnf/unstable.bnd
+++ b/cnf/unstable.bnd
@@ -1 +1 @@
-version.next=2.3.2
\ No newline at end of file
+version.released=2.3.1
\ No newline at end of file
-- 
2.30.2