You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ro...@apache.org on 2023/04/27 09:57:57 UTC

[sling-org-apache-sling-starter] branch issue/SLING-11836-spifly created (now 0c2c397)

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

rombert pushed a change to branch issue/SLING-11836-spifly
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-starter.git


      at 0c2c397  SLING-11836 - Add Jakarta JSON support to the Sling Starter

This branch includes the following new commits:

     new 0c2c397  SLING-11836 - Add Jakarta JSON support to the Sling Starter

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.



[sling-org-apache-sling-starter] 01/01: SLING-11836 - Add Jakarta JSON support to the Sling Starter

Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit 0c2c3972d34982a7d7cc3216a0a8170e346da3df
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Thu Apr 27 11:56:49 2023 +0200

    SLING-11836 - Add Jakarta JSON support to the Sling Starter
    
    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"