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/04/14 15:08:48 UTC

[sling-org-apache-sling-app-cms] branch master updated (8602d24 -> 5008eb3)

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

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


    from 8602d24  Adding a license header
     new 9e747a9  Minor - updating release versions
     new 5008eb3  Fixes SLING-9368: Making the policy option greedy

The 2 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:
 builder/src/main/provisioning/sling.txt                                | 3 ++-
 .../apache/sling/cms/core/internal/models/InternalCMSJobManager.java   | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)


[sling-org-apache-sling-app-cms] 02/02: Fixes SLING-9368: Making the policy option greedy

Posted by dk...@apache.org.
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

commit 5008eb3c136f2ff68f958986b8b442d4cd013b21
Author: Dan Klco <dk...@apache.org>
AuthorDate: Tue Apr 14 11:08:33 2020 -0400

    Fixes SLING-9368: Making the policy option greedy
---
 .../apache/sling/cms/core/internal/models/InternalCMSJobManager.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/src/main/java/org/apache/sling/cms/core/internal/models/InternalCMSJobManager.java b/core/src/main/java/org/apache/sling/cms/core/internal/models/InternalCMSJobManager.java
index 3669a9a..bcbce55 100644
--- a/core/src/main/java/org/apache/sling/cms/core/internal/models/InternalCMSJobManager.java
+++ b/core/src/main/java/org/apache/sling/cms/core/internal/models/InternalCMSJobManager.java
@@ -22,11 +22,12 @@ import org.apache.sling.cms.ConfigurableJobExecutor;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Reference;
 import org.osgi.service.component.annotations.ReferenceCardinality;
+import org.osgi.service.component.annotations.ReferencePolicyOption;
 
 @Component(service = InternalCMSJobManager.class)
 public class InternalCMSJobManager {
 
-    @Reference(cardinality = ReferenceCardinality.MULTIPLE)
+    @Reference(cardinality = ReferenceCardinality.MULTIPLE, policyOption = ReferencePolicyOption.GREEDY)
     private List<ConfigurableJobExecutor> jobs;
 
     public List<ConfigurableJobExecutor> getJobs() {


[sling-org-apache-sling-app-cms] 01/02: Minor - updating release versions

Posted by dk...@apache.org.
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

commit 9e747a908dcd5e1bc1f0ec0367126b8271ad3342
Author: Dan Klco <dk...@apache.org>
AuthorDate: Tue Apr 14 11:06:38 2020 -0400

    Minor - updating release versions
---
 builder/src/main/provisioning/sling.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/builder/src/main/provisioning/sling.txt b/builder/src/main/provisioning/sling.txt
index 4effab4..babd554 100644
--- a/builder/src/main/provisioning/sling.txt
+++ b/builder/src/main/provisioning/sling.txt
@@ -100,7 +100,7 @@
     org.apache.sling/org.apache.sling.fsresource/2.1.16
     org.apache.sling/org.apache.sling.i18n/2.5.14
     org.apache.sling/org.apache.sling.installer.console/1.1.0
-    org.apache.sling/org.apache.sling.installer.provider.jcr/3.1.26
+    org.apache.sling/org.apache.sling.installer.provider.jcr/3.2.0
     org.apache.sling/org.apache.sling.installer.hc/2.0.2
     org.apache.jackrabbit.vault/org.apache.jackrabbit.vault/3.4.0
     org.apache.sling/org.apache.sling.installer.factory.packages/1.0.0
@@ -215,3 +215,4 @@
     user.mapping=[
       "org.apache.sling.jcr.resource:validation\=sling-readall"
     ]
+