[sling-org-apache-sling-starter] branch master updated: Update to Settings 1.4.0, JCR Provider 3.3.0 and File Provider 1.3.0

[kwin]

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

kwin 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 dc57258  Update to Settings 1.4.0, JCR Provider 3.3.0 and File 
Provider 1.3.0
dc57258 is described below

commit dc572583de6ec27924ed34ec2b26a46d9ab363df
Author: Konrad Windszus <k...@apache.org>
AuthorDate: Mon Aug 3 10:31:23 2020 +0200

    Update to Settings 1.4.0, JCR Provider 3.3.0 and File Provider 1.3.0
    
    This requires a change of the start order as SCR is needed for Settings
    now
---
 pom.xml                         |  1 +
 src/main/provisioning/boot.txt  | 13 +++++++------
 src/main/provisioning/sling.txt |  3 +--
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/pom.xml b/pom.xml
index a23301b..7fd7dca 100644
--- a/pom.xml
+++ b/pom.xml
@@ -83,6 +83,7 @@
                     </execution>
                 </executions>                
                 <configuration>
+                    
<shouldBlockUntilKeyIsPressed>true</shouldBlockUntilKeyIsPressed>
                     <createWebapp>true</createWebapp>
                     <servers>
                         <server>
diff --git a/src/main/provisioning/boot.txt b/src/main/provisioning/boot.txt
index fccfa6f..45892cb 100644
--- a/src/main/provisioning/boot.txt
+++ b/src/main/provisioning/boot.txt
@@ -53,16 +53,17 @@
     org.apache.sling/org.apache.sling.commons.johnzon/1.2.2
     org.slf4j/jcl-over-slf4j/${slf4j.version}
     org.slf4j/log4j-over-slf4j/${slf4j.version}
-    org.apache.sling/org.apache.sling.settings/1.3.10
-    org.apache.sling/org.apache.sling.launchpad.installer/1.2.2
-    org.apache.sling/org.apache.sling.commons.osgi/2.4.0
-    org.apache.sling/org.apache.sling.installer.core/3.11.2
-    org.apache.sling/org.apache.sling.installer.provider.file/1.2.2
-    org.apache.sling/org.apache.sling.installer.factory.configuration/1.3.2
+    org.apache.felix/org.apache.felix.scr/2.1.20
     org.apache.felix/org.apache.felix.configadmin/1.9.16
     org.apache.felix/org.apache.felix.eventadmin/1.5.0
     org.apache.aries/org.apache.aries.util/1.1.3
     # dependency with javax.inject - required for Sling Models (SLING-4710)
     org.apache.geronimo.specs/geronimo-atinject_1.0_spec/1.1
     org.apache.commons/commons-lang3/3.9
+    org.apache.sling/org.apache.sling.settings/1.4.0
+    org.apache.sling/org.apache.sling.launchpad.installer/1.2.2
+    org.apache.sling/org.apache.sling.commons.osgi/2.4.0
+    org.apache.sling/org.apache.sling.installer.core/3.11.2
+    org.apache.sling/org.apache.sling.installer.provider.file/1.3.0
+    org.apache.sling/org.apache.sling.installer.factory.configuration/1.3.2
     
diff --git a/src/main/provisioning/sling.txt b/src/main/provisioning/sling.txt
index 09b5b79..8584974 100644
--- a/src/main/provisioning/sling.txt
+++ b/src/main/provisioning/sling.txt
@@ -23,7 +23,6 @@
     jackrabbit.version=2.20.0
 
 [artifacts startLevel=4]
-    org.apache.felix/org.apache.felix.scr/2.1.20
     org.apache.felix/org.apache.felix.metatype/1.2.2
 
 [artifacts startLevel=5]
@@ -103,7 +102,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.2.2
+    org.apache.sling/org.apache.sling.installer.provider.jcr/3.3.0
     org.apache.sling/org.apache.sling.installer.hc/2.0.2
     org.apache.jackrabbit.vault/org.apache.jackrabbit.vault/3.4.4
     org.apache.sling/org.apache.sling.installer.factory.packages/1.0.4