From: Mathieu Baudier <mbaudier@argeo.org>
Date: Fri, 12 Nov 2021 12:08:07 +0000 (+0100)
Subject: Split bnd files.
X-Git-Tag: argeo-commons-2.3.2~23
X-Git-Url: https://git.argeo.org/?p=lgpl%2Fargeo-commons.git;a=commitdiff_plain;h=9255957d2d979bf9e7919590c4c3b68a78a4c13f

Split bnd files.
---

diff --git a/cnf/argeo.bnd b/cnf/argeo.bnd
new file mode 100644
index 000000000..e555724bd
--- /dev/null
+++ b/cnf/argeo.bnd
@@ -0,0 +1,13 @@
+# Common
+buildId=next
+# for release:
+#buildId: R${tstamp}
+Bundle-Version: ${version.next}.${buildId}
+Private-Package: *.internal.*
+Export-Package: !*.internal.*; *
+-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}
diff --git a/cnf/build.bnd b/cnf/build.bnd
index 2882286b5..3af83d3b0 100644
--- a/cnf/build.bnd
+++ b/cnf/build.bnd
@@ -1,19 +1,4 @@
+-include: ${workspace}/cnf/argeo.bnd,${workspace}/cnf/unstable.bnd,-~${workspace}/cnf/release.bnd
+
 SLC-Category: org.argeo.commons
-version.next=2.3.1
 Bundle-RequiredExecutionEnvironment: JavaSE-11
-
-# Common
-buildId=D${tstamp}
-# for release:
-#buildId: R${tstamp}
-Bundle-Version: ${version.next}.${buildId}
-Private-Package: *.internal.*
-Export-Package: !*.internal.*; *
--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}
-
-
diff --git a/cnf/ext/osgirepo.bnd b/cnf/ext/osgirepo.bnd
new file mode 100644
index 000000000..427e7c558
--- /dev/null
+++ b/cnf/ext/osgirepo.bnd
@@ -0,0 +1,12 @@
+-plugin.osgirepo=aQute.bnd.repository.osgi.OSGiRepository;\
+		locations=file://${workspace}/sdk/target/a2/index.xml;\
+		max.stale=-1;\
+		poll.time=86400;\
+		name=local;\
+		cache=${build}/cache/local,\
+		aQute.bnd.repository.osgi.OSGiRepository;\
+		locations=file://${workspace}/sdk/target/sdk-2.3.1-SNAPSHOT-a2-target/index.xml;\
+		max.stale=-1;\
+		poll.time=86400;\
+		name=local;\
+		cache=${build}/cache/local
\ No newline at end of file
diff --git a/cnf/unstable.bnd b/cnf/unstable.bnd
new file mode 100644
index 000000000..4fefc13cd
--- /dev/null
+++ b/cnf/unstable.bnd
@@ -0,0 +1 @@
+version.next=2.3.1
\ No newline at end of file