New release approach

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 0736d1a6042f2cfe8841e9628b67729c0a9902b3..049a8f0fb01bfe2a109be2d2315d7afb2d293d79 100644 (file)
--- 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 125524d4d6cff2f1f99980079fb27f3cffe7540e..0917eef5e2bd1b39eb06e70f74e24778175cc113 100644 (file)
--- 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>