[sling-org-apache-sling-starter] branch master updated: SLING-11836 - Add Jakarta JSON support to the Sling Starter (#156)

[rombert]

This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-starter.git


The following commit(s) were added to refs/heads/master by this push:
     new 7977319  SLING-11836 - Add Jakarta JSON support to the Sling Starter 
(#156)
7977319 is described below

commit 7977319614a57ad87c03cab277bb88c4e9c532c2
Author: Robert Munteanu <romb...@apache.org>
AuthorDate: Fri Apr 28 13:31:27 2023 +0200

    SLING-11836 - Add Jakarta JSON support to the Sling Starter (#156)
    
    Move the spifly dynamic bundle to the boot feature and configure weaving as 
needed by the
    Jakarta JSON bundles.
---
 src/main/features/boot.json   | 28 +++++++++++++++++++++++++++-
 src/main/features/groovy.json | 24 ------------------------
 2 files changed, 27 insertions(+), 25 deletions(-)

diff --git a/src/main/features/boot.json b/src/main/features/boot.json
index fa62734..a27629c 100644
--- a/src/main/features/boot.json
+++ b/src/main/features/boot.json
@@ -84,6 +84,30 @@
             "id":"org.apache.felix:org.apache.felix.log:1.2.6",
             "start-order":"1"
         },
+        {
+            "id": "org.ow2.asm:asm:${asm.version}",
+            "start-order": "1"
+        },
+        {
+            "id": "org.ow2.asm:asm-analysis:${asm.version}",
+            "start-order": "1"
+        },
+        {
+            "id": "org.ow2.asm:asm-commons:${asm.version}",
+            "start-order": "1"
+        },
+        {
+            "id": "org.ow2.asm:asm-tree:${asm.version}",
+            "start-order": "1"
+        },
+        {
+            "id": "org.ow2.asm:asm-util:${asm.version}",
+            "start-order": "1"
+        },
+        {
+            "id": 
"org.apache.aries.spifly:org.apache.aries.spifly.dynamic.bundle:1.3.6",
+            "start-order": "1"
+        },
         {
             "id":"jakarta.json:jakarta.json-api:2.1.1",
             "start-order":"1"
@@ -170,6 +194,8 @@
         "felix.systempackages.substitution":"true",
         "sling.fileinstall.dir":"${sling.home}/install",
         "sling.fileinstall.dir.autocreate":"true",
-        "felix.cm.config.plugins": 
"org.apache.felix.configadmin.plugin.interpolation"
+        "felix.cm.config.plugins": 
"org.apache.felix.configadmin.plugin.interpolation",
+        "org.apache.aries.spifly.auto.consumers":"jakarta.json-api",
+        "org.apache.aries.spifly.auto.providers": "org.eclipse.parsson"
     }
 }
diff --git a/src/main/features/groovy.json b/src/main/features/groovy.json
index e0afd84..559cb0b 100644
--- a/src/main/features/groovy.json
+++ b/src/main/features/groovy.json
@@ -1,29 +1,5 @@
 {
     "bundles": [
-        {
-            "id": "org.ow2.asm:asm:${asm.version}",
-            "start-order": "15"
-        },
-        {
-            "id": "org.ow2.asm:asm-analysis:${asm.version}",
-            "start-order": "15"
-        },
-        {
-            "id": "org.ow2.asm:asm-commons:${asm.version}",
-            "start-order": "15"
-        },
-        {
-            "id": "org.ow2.asm:asm-tree:${asm.version}",
-            "start-order": "15"
-        },
-        {
-            "id": "org.ow2.asm:asm-util:${asm.version}",
-            "start-order": "15"
-        },
-        {
-            "id": 
"org.apache.aries.spifly:org.apache.aries.spifly.dynamic.bundle:1.3.6",
-            "start-order": "15"
-        },
         {
             "id": "org.apache.groovy:groovy:${groovy.version}",
             "start-order": "20"