Split bnd files.

diff --git a/cnf/argeo.bnd b/cnf/argeo.bnd
new file mode 100644 (file)
index 0000000..e555724
--- /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 2882286b551c77d4380067c2a9ca8cb809440644..3af83d3b021aa16e59e5098d2dd7118d372cbdf3 100644 (file)
--- 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 (file)
index 0000000..427e7c5
--- /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 (file)
index 0000000..4fefc13
--- /dev/null
+++ b/cnf/unstable.bnd
@@ -0,0 +1 @@
+version.next=2.3.1
\ No newline at end of file