Improve bnd build.

diff --git a/cnf/.gitignore b/cnf/.gitignore
new file mode 100644 (file)
index 0000000..12011f0
--- /dev/null
+++ b/cnf/.gitignore
@@ -0,0 +1 @@
+/release.bnd

diff --git a/cnf/argeo.bnd b/cnf/argeo.bnd
index e555724bd19c63ea3a7d2cd655cb1d2bb5c0bce5..25ade707ec5bb5a3aa73cd529dddc77cf31943f8 100644 (file)
--- 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 3af83d3b021aa16e59e5098d2dd7118d372cbdf3..dd0a48c27b467556edbb9ef701cecca5fffd4b9f 100644 (file)
--- 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 4b11ba7f30f2ad0c07eca83290dd8ee26b5c1e98..0719f545ef2dbe75da611ff88c6cd252377f3a0a 100644 (file)
--- 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