You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by dk...@apache.org on 2021/09/02 13:23:14 UTC

[sling-org-apache-sling-app-cms] branch master updated: SLING-10739 - Updating to the latest composum release

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

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


The following commit(s) were added to refs/heads/master by this push:
     new db5d7cd  SLING-10739 - Updating to the latest composum release
db5d7cd is described below

commit db5d7cd3c6a02aa3d8e6d2cb43ae3e0cdfdea7fb
Author: Dan Klco <kl...@adobe.com>
AuthorDate: Thu Sep 2 09:23:06 2021 -0400

    SLING-10739 - Updating to the latest composum release
---
 feature/pom.xml                             |  2 +-
 feature/src/main/features/cms/composum.json | 13 ++++++-------
 pom.xml                                     |  2 +-
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/feature/pom.xml b/feature/pom.xml
index 81530c6..593f960 100644
--- a/feature/pom.xml
+++ b/feature/pom.xml
@@ -157,7 +157,7 @@
                             <goal>attach-featurearchives</goal>
                         </goals>
                         <configuration>
-                            <replacePropertyVariables>asm-version,org-apache-sling-api-version,org-apache-sling-scripting-jsp-taglib-version,cms-version,composum-version,groovy-version,guava-version,jackrabbit-version,jackson-version,oak-version,slf4j-version,cocoon-serializers-charsets-version,org.apache.felix.webconsole-version,commons-lang3-version,jstl-version,org-apache-sling-models-api-version,org.apache.sling.scripting.jsp.taglib,geronimo-atinject_1-0_spec-version,commons-io-versi [...]
+                            <replacePropertyVariables>asm-version,org-apache-sling-api-version,org-apache-sling-scripting-jsp-taglib-version,cms-version,composum-nodes-version,groovy-version,guava-version,jackrabbit-version,jackson-version,oak-version,slf4j-version,cocoon-serializers-charsets-version,org.apache.felix.webconsole-version,commons-lang3-version,jstl-version,org-apache-sling-models-api-version,org.apache.sling.scripting.jsp.taglib,geronimo-atinject_1-0_spec-version,commons-io [...]
                         </configuration>
                     </execution>
                 </executions>
diff --git a/feature/src/main/features/cms/composum.json b/feature/src/main/features/cms/composum.json
index e17efae..b77803c 100644
--- a/feature/src/main/features/cms/composum.json
+++ b/feature/src/main/features/cms/composum.json
@@ -2,28 +2,27 @@
 {
     "bundles":[
         {
-            "id":"com.composum.sling.core:composum-sling-core-commons:${composum-version}",
+            "id":"com.composum.nodes:composum-nodes-commons:${composum-nodes-version}",
             "start-order":"20"
         },
         {
-            "id":"com.composum.sling.core:composum-sling-core-console:${composum-version}",
+            "id":"com.composum.nodes:composum-nodes-console:${composum-nodes-version}",
             "start-order":"20"
         },
         {
-            "id":"com.composum.sling.core:composum-sling-core-jslibs:${composum-version}",
+            "id":"com.composum.nodes:composum-nodes-jslibs:${composum-nodes-version}",
             "start-order":"20"
         },
         {
-            "id":"com.composum.sling.core:composum-sling-package-manager:${composum-version}",
+            "id":"com.composum.nodes:composum-nodes-pckgmgr:${composum-nodes-version}",
             "start-order":"20"
         }
     ],
     "configurations":{
         "org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment~composum":{
             "whitelist.bundles":[
-                "com.composum.core.commons",
-                "com.composum.core.pckgmgr",
-                "com.composum.core.pckginstall"
+                "com.composum.nodes.commons",
+                "com.composum.nodes.pckgmgr"
             ],
             "whitelist.name":"composum"
         }
diff --git a/pom.xml b/pom.xml
index d12b544..b085250 100644
--- a/pom.xml
+++ b/pom.xml
@@ -38,7 +38,7 @@
         <commons-io-version>2.8.0</commons-io-version>
         <commons-lang3-version>3.12.0</commons-lang3-version>
         <commons-text-version>1.9</commons-text-version>
-        <composum-version>1.12.4</composum-version>
+        <composum-nodes-version>2.6.6</composum-nodes-version>
         <geronimo-atinject_1-0_spec-version>1.2</geronimo-atinject_1-0_spec-version>
         <groovy-version>3.0.7</groovy-version>
         <httpclient-version>4.5.13</httpclient-version>