From 4df262af469ac9aa9b74bc21d049664d743d8d93 Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Wed, 13 Sep 2023 09:58:38 +0200
Subject: [PATCH] Eclipse Parsson JSon generator/parser

---
 repackage/org.argeo.tp/jakarta.json.bnd  |  3 ---
 repackage/org.argeo.tp/parsson/merge.bnd | 10 ++++++++++
 sdk/argeo-build                          |  2 +-
 3 files changed, 11 insertions(+), 4 deletions(-)
 delete mode 100644 repackage/org.argeo.tp/jakarta.json.bnd
 create mode 100644 repackage/org.argeo.tp/parsson/merge.bnd

diff --git a/repackage/org.argeo.tp/jakarta.json.bnd b/repackage/org.argeo.tp/jakarta.json.bnd
deleted file mode 100644
index bedefa0..0000000
--- a/repackage/org.argeo.tp/jakarta.json.bnd
+++ /dev/null
@@ -1,3 +0,0 @@
-SPDX-License-Identifier: GPL-2.0-only WITH Classpath-exception-2.0 OR EPL-2.0
-Argeo-Origin-M2: jakarta.json:jakarta.json-api:2.1.2
-Argeo-Origin-NoMetadataGeneration: true
diff --git a/repackage/org.argeo.tp/parsson/merge.bnd b/repackage/org.argeo.tp/parsson/merge.bnd
new file mode 100644
index 0000000..a3b9d6e
--- /dev/null
+++ b/repackage/org.argeo.tp/parsson/merge.bnd
@@ -0,0 +1,10 @@
+Bundle-SymbolicName: org.eclipse.parsson
+SPDX-License-Identifier: GPL-2.0-only WITH Classpath-exception-2.0 OR EPL-2.0
+Argeo-Origin-M2: :1.1.4
+Export-Package: org.eclipse.*, jakarta.*
+Import-Package:\
+org.glassfish.hk2.osgiresourcelocator;resolution:="optional",\
+*
+Argeo-Origin-M2-Merge: \
+org.eclipse.parsson:parsson,\
+jakarta.json:jakarta.json-api:2.1.2,\
\ No newline at end of file
diff --git a/sdk/argeo-build b/sdk/argeo-build
index cb36c56..f8ec308 160000
--- a/sdk/argeo-build
+++ b/sdk/argeo-build
@@ -1 +1 @@
-Subproject commit cb36c56a9941c7f80159b6357e9954506ff35a7f
+Subproject commit f8ec3083d1046da13faa5fac1f93de3436ef8a35
-- 
2.30.2