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 2020/07/24 20:23:38 UTC

[sling-org-apache-sling-app-cms] branch SLING-8913-multiple-instance-types updated (da0b4d8 -> 3276d19)

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

dklco pushed a change to branch SLING-8913-multiple-instance-types
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-app-cms.git.


    from da0b4d8  Moving codec and post up a level each
     new 673bbbb  Bumping up a few commons bundles:
     new 2671328  Almost all bundle order issues resolved
     new 3276d19  Fixed all bundle start ordering issues

The 3 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.


Summary of changes:
 feature/pom.xml                            |  2 +-
 feature/src/main/features/cms_cms.json     | 24 ++++++++++++------------
 feature/src/main/features/oak_oak.json     |  2 +-
 feature/src/main/features/sling_sling.json | 10 +++++-----
 4 files changed, 19 insertions(+), 19 deletions(-)


[sling-org-apache-sling-app-cms] 01/03: Bumping up a few commons bundles:

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

dklco pushed a commit to branch SLING-8913-multiple-instance-types
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-app-cms.git

commit 673bbbb4ef0cc273801448362d49601f45fb85a2
Author: Dan Klco <dk...@apache.org>
AuthorDate: Fri Jul 24 15:07:43 2020 -0400

    Bumping up a few commons bundles:
---
 feature/src/main/features/sling_sling.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/feature/src/main/features/sling_sling.json b/feature/src/main/features/sling_sling.json
index 3d0e4f8..dd0fe86 100644
--- a/feature/src/main/features/sling_sling.json
+++ b/feature/src/main/features/sling_sling.json
@@ -64,7 +64,7 @@
         },
         {
             "id":"org.apache.sling:org.apache.sling.commons.mime:2.2.2",
-            "start-order":"20"
+            "start-order":"15"
         },
         {
             "id":"org.apache.sling:org.apache.sling.commons.scheduler:2.7.6",
@@ -72,7 +72,7 @@
         },
         {
             "id":"org.apache.sling:org.apache.sling.commons.threads:3.2.20",
-            "start-order":"20"
+            "start-order":"15"
         },
         {
             "id":"org.apache.sling:org.apache.sling.engine:2.7.2",


[sling-org-apache-sling-app-cms] 03/03: Fixed all bundle start ordering issues

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

dklco pushed a commit to branch SLING-8913-multiple-instance-types
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-app-cms.git

commit 3276d193a002771edfbc7c79dfe3affe241a2142
Author: Dan Klco <dk...@apache.org>
AuthorDate: Fri Jul 24 16:23:27 2020 -0400

    Fixed all bundle start ordering issues
---
 feature/pom.xml                        |  2 +-
 feature/src/main/features/cms_cms.json | 24 ++++++++++++------------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/feature/pom.xml b/feature/pom.xml
index 6c70994..2add139 100644
--- a/feature/pom.xml
+++ b/feature/pom.xml
@@ -97,7 +97,7 @@
                         <phase>prepare-package</phase>
                         <goals>
                             <goal>aggregate-features</goal>
-                            <!-- <goal>analyse-features</goal> -->
+                            <goal>analyse-features</goal>
                             <goal>attach-features</goal>
                             <goal>attach-featurearchives</goal>
                         </goals>
diff --git a/feature/src/main/features/cms_cms.json b/feature/src/main/features/cms_cms.json
index 552c56c..25697c2 100644
--- a/feature/src/main/features/cms_cms.json
+++ b/feature/src/main/features/cms_cms.json
@@ -8,11 +8,11 @@
         },
         {
             "id":"org.apache.sling:org.apache.sling.cms.api:${cms.version}",
-            "start-order":"5"
+            "start-order":"20"
         },
         {
             "id":"org.apache.sling:org.apache.sling.cms.ui:${cms.version}",
-            "start-order":"5"
+            "start-order":"20"
         },
         {
             "id":"com.vladsch.flexmark:flexmark-osgi:0.61.24",
@@ -68,15 +68,15 @@
         },
         {
             "id":"org.apache.commons:commons-text:1.8",
-            "start-order":"20"
+            "start-order":"15"
         },
         {
             "id":"org.apache.servicemix.bundles:org.apache.servicemix.bundles.jasypt:1.9.3_1",
-            "start-order":"20"
+            "start-order":"15"
         },
         {
             "id":"org.apache.servicemix.bundles:org.apache.servicemix.bundles.poi:4.1.1_1",
-            "start-order":"20"
+            "start-order":"15"
         },
         {
             "id":"org.apache.sling:org.apache.sling.cms.core:${cms.version}",
@@ -92,31 +92,31 @@
         },
         {
             "id":"org.apache.sling:org.apache.sling.commons.crypto:1.0.0",
-            "start-order":"20"
+            "start-order":"15"
         },
         {
             "id":"org.apache.sling:org.apache.sling.commons.html:1.1.0",
-            "start-order":"20"
+            "start-order":"15"
         },
         {
             "id":"org.apache.sling:org.apache.sling.commons.messaging.mail:1.0.0",
-            "start-order":"20"
+            "start-order":"15"
         },
         {
             "id":"org.apache.sling:org.apache.sling.commons.messaging:1.0.0",
-            "start-order":"20"
+            "start-order":"15"
         },
         {
             "id":"org.apache.sling:org.apache.sling.rewriter:1.2.2",
-            "start-order":"20"
+            "start-order":"15"
         },
         {
             "id":"org.apache.tika:tika-bundle:1.22",
-            "start-order":"20"
+            "start-order":"15"
         },
         {
             "id":"org.codehaus.groovy:groovy-all:2.4.19",
-            "start-order":"20"
+            "start-order":"15"
         }
     ],
     "configurations":{


[sling-org-apache-sling-app-cms] 02/03: Almost all bundle order issues resolved

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

dklco pushed a commit to branch SLING-8913-multiple-instance-types
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-app-cms.git

commit 2671328d9f91d3d0f17ba1b80f63c1e0bb14b734
Author: Dan Klco <dk...@apache.org>
AuthorDate: Fri Jul 24 16:20:11 2020 -0400

    Almost all bundle order issues resolved
---
 feature/src/main/features/oak_oak.json     | 2 +-
 feature/src/main/features/sling_sling.json | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/feature/src/main/features/oak_oak.json b/feature/src/main/features/oak_oak.json
index 37aa1d7..6bc504b 100644
--- a/feature/src/main/features/oak_oak.json
+++ b/feature/src/main/features/oak_oak.json
@@ -64,7 +64,7 @@
         },
         {
             "id":"org.apache.sling:org.apache.sling.jcr.oak.server:1.2.4",
-            "start-order":"16"
+            "start-order":"20"
         },
         {
             "id":"org.apache.jackrabbit:oak-segment-tar:${oak.version}",
diff --git a/feature/src/main/features/sling_sling.json b/feature/src/main/features/sling_sling.json
index dd0fe86..844fa5b 100644
--- a/feature/src/main/features/sling_sling.json
+++ b/feature/src/main/features/sling_sling.json
@@ -300,7 +300,7 @@
         },
         {
             "id":"org.apache.sling:org.apache.sling.jcr.base:3.1.0",
-            "start-order":"15"
+            "start-order":"20"
         },
         {
             "id":"org.apache.sling:org.apache.sling.jcr.davex:1.3.10",
@@ -308,11 +308,11 @@
         },
         {
             "id":"org.apache.sling:org.apache.sling.jcr.jackrabbit.accessmanager:3.0.4",
-            "start-order":"15"
+            "start-order":"20"
         },
         {
             "id":"org.apache.sling:org.apache.sling.jcr.jackrabbit.usermanager:2.2.8",
-            "start-order":"15"
+            "start-order":"20"
         },
         {
             "id":"org.apache.sling:org.apache.sling.jcr.jcr-wrapper:2.0.0",