From 3ffba3d55630d7b08ef25863352e6cad2dad6c39 Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Sat, 15 Oct 2022 12:08:23 +0200
Subject: [PATCH] Adapt to changes in build system

---
 branch.mk                     |  2 +-
 cnf/build.bnd                 |  3 ---
 cnf/ext/osgirepo.bnd          | 12 ------------
 cnf/unstable.bnd              | 10 ----------
 sdk/argeo-build               |  2 +-
 sdk/branches/unstable.bnd     |  4 ++++
 swt/org.argeo.cms.swt/bnd.bnd |  2 --
 7 files changed, 6 insertions(+), 29 deletions(-)
 delete mode 100644 cnf/build.bnd
 delete mode 100644 cnf/ext/osgirepo.bnd
 delete mode 100644 cnf/unstable.bnd
 create mode 100644 sdk/branches/unstable.bnd

diff --git a/branch.mk b/branch.mk
index a6f848887..7dc44b0ed 100644
--- a/branch.mk
+++ b/branch.mk
@@ -1 +1 @@
-include $(SDK_SRC_BASE)/cnf/unstable.bnd
+BRANCH:=unstable
\ No newline at end of file
diff --git a/cnf/build.bnd b/cnf/build.bnd
deleted file mode 100644
index f6e8be272..000000000
--- a/cnf/build.bnd
+++ /dev/null
@@ -1,3 +0,0 @@
--include: \
-${workspace}/cnf/unstable.bnd, \
-${workspace}/sdk/argeo-build/argeo.bnd, \
diff --git a/cnf/ext/osgirepo.bnd b/cnf/ext/osgirepo.bnd
deleted file mode 100644
index 427e7c558..000000000
--- a/cnf/ext/osgirepo.bnd
+++ /dev/null
@@ -1,12 +0,0 @@
--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
deleted file mode 100644
index d9a6a9ad5..000000000
--- a/cnf/unstable.bnd
+++ /dev/null
@@ -1,10 +0,0 @@
-MAJOR=2
-MINOR=3
-MICRO=9
-qualifier=.next
-
-category=org.argeo.commons
-Bundle-RequiredExecutionEnvironment=JavaSE-11
-
-argeo.rpm.stagingRepository=/srv/rpmfactory/unstable/argeo-osgi-2/argeo
-argeo.rpm.suffix=-unstable
diff --git a/sdk/argeo-build b/sdk/argeo-build
index 872f63170..430e8302b 160000
--- a/sdk/argeo-build
+++ b/sdk/argeo-build
@@ -1 +1 @@
-Subproject commit 872f63170bb639abab6e64d6e3d6a13318d38e32
+Subproject commit 430e8302bbbe7856ed3223a4966c61382c5d5075
diff --git a/sdk/branches/unstable.bnd b/sdk/branches/unstable.bnd
new file mode 100644
index 000000000..4146cb099
--- /dev/null
+++ b/sdk/branches/unstable.bnd
@@ -0,0 +1,4 @@
+major=2
+minor=3
+micro=9
+qualifier=.next
\ No newline at end of file
diff --git a/swt/org.argeo.cms.swt/bnd.bnd b/swt/org.argeo.cms.swt/bnd.bnd
index 322d269e3..2dda08b2a 100644
--- a/swt/org.argeo.cms.swt/bnd.bnd
+++ b/swt/org.argeo.cms.swt/bnd.bnd
@@ -4,8 +4,6 @@ org.eclipse.core.commands.common,\
 javax.servlet.*;version="[3,5)",\
 *
 
-Private-Package: *.internal.*, config.*, icons.*
-
 Bundle-ActivationPolicy: lazy
 			
 Service-Component: \
-- 
2.30.2