From 215bb85c6627d217967a1835ffc2738728dae19d Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Mon, 15 Nov 2021 07:32:58 +0100
Subject: [PATCH] Use new build approach.

---
 cms/cnf/maven.bnd                      |  1 +
 cms/pom.xml                            |  4 ++--
 cnf/argeo.bnd                          | 15 +++++++++++++++
 cnf/build.bnd                          |  4 ++++
 cnf/maven.bnd                          |  3 +++
 cnf/unstable.bnd                       |  6 ++++++
 demo/modules/cnf/maven.bnd             |  1 +
 dep/cnf/maven.bnd                      |  1 +
 legacy/argeo-commons/cnf/maven.bnd     |  1 +
 legacy/argeo-commons/dep/cnf/maven.bnd |  1 +
 legacy/cnf/maven.bnd                   |  1 +
 legacy/pom.xml                         |  4 ++--
 lib/cnf/maven.bnd                      |  1 +
 13 files changed, 39 insertions(+), 4 deletions(-)
 create mode 100644 cms/cnf/maven.bnd
 create mode 100644 cnf/argeo.bnd
 create mode 100644 cnf/build.bnd
 create mode 100644 cnf/maven.bnd
 create mode 100644 cnf/unstable.bnd
 create mode 100644 demo/modules/cnf/maven.bnd
 create mode 100644 dep/cnf/maven.bnd
 create mode 100644 legacy/argeo-commons/cnf/maven.bnd
 create mode 100644 legacy/argeo-commons/dep/cnf/maven.bnd
 create mode 100644 legacy/cnf/maven.bnd
 create mode 100644 lib/cnf/maven.bnd

diff --git a/cms/cnf/maven.bnd b/cms/cnf/maven.bnd
new file mode 100644
index 000000000..4bd5c0cfe
--- /dev/null
+++ b/cms/cnf/maven.bnd
@@ -0,0 +1 @@
+-include: ../../cnf/maven.bnd
\ No newline at end of file
diff --git a/cms/pom.xml b/cms/pom.xml
index b5c257b0f..e29940e28 100644
--- a/cms/pom.xml
+++ b/cms/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>org.argeo.maven</groupId>
 		<artifactId>argeo-osgi-parent</artifactId>
-		<version>2.1.3</version>
+		<version>2.1.4-SNAPSHOT</version>
 	</parent>
 	<groupId>org.argeo.slc</groupId>
 	<artifactId>argeo-slc-cms</artifactId>
@@ -13,7 +13,7 @@
 	<properties>
 		<version.argeo-tp>2.1.27</version.argeo-tp>
 		<version.argeo-tp-extras>2.1.13</version.argeo-tp-extras>
-		<version.argeo-commons>2.3.1-SNAPSHOT</version.argeo-commons>
+		<version.argeo-commons>2.3-SNAPSHOT</version.argeo-commons>
 
 		<version.slc>2.3.1-SNAPSHOT</version.slc>
 		<developmentCycle.startDate>2015-02-12</developmentCycle.startDate>
diff --git a/cnf/argeo.bnd b/cnf/argeo.bnd
new file mode 100644
index 000000000..82c8c0801
--- /dev/null
+++ b/cnf/argeo.bnd
@@ -0,0 +1,15 @@
+# Common
+qualifier=.next
+
+Bundle-Version: ${version.released}${qualifier}
+Private-Package: *.internal.*
+Export-Package: !*.internal.*, *
+-consumer-policy : ${range;[==,=+)}
+-savemanifest : META-INF/MANIFEST.MF
+-includeresource.default : OSGI-INF/=-OSGI-INF/,e4xmi/=-e4xmi/,icons/=-icons/,img/=-img/
+-compression STORE
+-source true
+-removeheaders = Bnd-LastModified,Build-Jdk,Built-By,Tool,Created-By
+Automatic-Module-Name: ${bsn}
+SLC-Category=${category}
+-groupid=${category}
diff --git a/cnf/build.bnd b/cnf/build.bnd
new file mode 100644
index 000000000..af9c91be7
--- /dev/null
+++ b/cnf/build.bnd
@@ -0,0 +1,4 @@
+-include: \
+${workspace}/cnf/unstable.bnd, \
+${workspace}/cnf/argeo.bnd, \
+-${workspace}/cnf/release.bnd
diff --git a/cnf/maven.bnd b/cnf/maven.bnd
new file mode 100644
index 000000000..bbd72adec
--- /dev/null
+++ b/cnf/maven.bnd
@@ -0,0 +1,3 @@
+-include: \
+../cnf/unstable.bnd, \
+../cnf/argeo.bnd
diff --git a/cnf/unstable.bnd b/cnf/unstable.bnd
new file mode 100644
index 000000000..0736d1a60
--- /dev/null
+++ b/cnf/unstable.bnd
@@ -0,0 +1,6 @@
+category=org.argeo.slc
+version.released=2.3.0
+Bundle-RequiredExecutionEnvironment=JavaSE-11
+
+argeo.rpm.stagingRepository=/srv/rpmfactory/unstable/argeo-osgi-2/argeo
+argeo.rpm.suffix=-unstable
diff --git a/demo/modules/cnf/maven.bnd b/demo/modules/cnf/maven.bnd
new file mode 100644
index 000000000..a3fca92bc
--- /dev/null
+++ b/demo/modules/cnf/maven.bnd
@@ -0,0 +1 @@
+-include: ../../../cnf/maven.bnd
\ No newline at end of file
diff --git a/dep/cnf/maven.bnd b/dep/cnf/maven.bnd
new file mode 100644
index 000000000..4bd5c0cfe
--- /dev/null
+++ b/dep/cnf/maven.bnd
@@ -0,0 +1 @@
+-include: ../../cnf/maven.bnd
\ No newline at end of file
diff --git a/legacy/argeo-commons/cnf/maven.bnd b/legacy/argeo-commons/cnf/maven.bnd
new file mode 100644
index 000000000..4bd5c0cfe
--- /dev/null
+++ b/legacy/argeo-commons/cnf/maven.bnd
@@ -0,0 +1 @@
+-include: ../../cnf/maven.bnd
\ No newline at end of file
diff --git a/legacy/argeo-commons/dep/cnf/maven.bnd b/legacy/argeo-commons/dep/cnf/maven.bnd
new file mode 100644
index 000000000..4bd5c0cfe
--- /dev/null
+++ b/legacy/argeo-commons/dep/cnf/maven.bnd
@@ -0,0 +1 @@
+-include: ../../cnf/maven.bnd
\ No newline at end of file
diff --git a/legacy/cnf/maven.bnd b/legacy/cnf/maven.bnd
new file mode 100644
index 000000000..4bd5c0cfe
--- /dev/null
+++ b/legacy/cnf/maven.bnd
@@ -0,0 +1 @@
+-include: ../../cnf/maven.bnd
\ No newline at end of file
diff --git a/legacy/pom.xml b/legacy/pom.xml
index e6c9c6b07..8a3c7a125 100644
--- a/legacy/pom.xml
+++ b/legacy/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>org.argeo.maven</groupId>
 		<artifactId>argeo-osgi-parent</artifactId>
-		<version>2.1.3</version>
+		<version>2.1.4-SNAPSHOT</version>
 	</parent>
 	<groupId>org.argeo.slc</groupId>
 	<artifactId>legacy</artifactId>
@@ -13,7 +13,7 @@
 	<properties>
 		<version.argeo-tp>2.1.27</version.argeo-tp>
 		<version.argeo-tp-extras>2.1.13</version.argeo-tp-extras>
-		<version.argeo-commons>2.1.104-SNAPSHOT</version.argeo-commons>
+		<version.argeo-commons>2.3-SNAPSHOT</version.argeo-commons>
 
 		<argeo.rpm.stagingRepository>/srv/rpmfactory/legacy/argeo-osgi-2/argeo</argeo.rpm.stagingRepository>
 	</properties>
diff --git a/lib/cnf/maven.bnd b/lib/cnf/maven.bnd
new file mode 100644
index 000000000..4bd5c0cfe
--- /dev/null
+++ b/lib/cnf/maven.bnd
@@ -0,0 +1 @@
+-include: ../../cnf/maven.bnd
\ No newline at end of file
-- 
2.30.2