From e5c7fa97dd33d38f089b9b2946da21955eb0c454 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Sat, 15 Oct 2022 12:19:28 +0200 Subject: [PATCH] Adapt to changes in build system --- branch.mk | 2 +- cnf/unstable.bnd | 6 ------ sdk/argeo-build | 2 +- sdk/branches/unstable.bnd | 4 ++++ 4 files changed, 6 insertions(+), 8 deletions(-) delete mode 100644 cnf/unstable.bnd create mode 100644 sdk/branches/unstable.bnd diff --git a/branch.mk b/branch.mk index a6f8488..afde0f8 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/unstable.bnd b/cnf/unstable.bnd deleted file mode 100644 index 359edf6..0000000 --- a/cnf/unstable.bnd +++ /dev/null @@ -1,6 +0,0 @@ -MAJOR=2 -MINOR=3 -MICRO=9 -qualifier=.next - -Bundle-RequiredExecutionEnvironment=JavaSE-11 diff --git a/sdk/argeo-build b/sdk/argeo-build index 872f631..a261043 160000 --- a/sdk/argeo-build +++ b/sdk/argeo-build @@ -1 +1 @@ -Subproject commit 872f63170bb639abab6e64d6e3d6a13318d38e32 +Subproject commit a261043de5f9d90373bb1e7f395e3371ba9e67ef diff --git a/sdk/branches/unstable.bnd b/sdk/branches/unstable.bnd new file mode 100644 index 0000000..7ea877e --- /dev/null +++ b/sdk/branches/unstable.bnd @@ -0,0 +1,4 @@ +major=2 +minor=3 +micor=9 +qualifier=.next \ No newline at end of file -- 2.30.2