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/03/19 19:27:12 UTC

[sling-org-apache-sling-app-cms] 01/04: Minor - Updating dependencies from Starter

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 42538148baf7d041c84a3d6a208ff9379926755a
Author: Dan Klco <dk...@apache.org>
AuthorDate: Thu Mar 19 14:19:04 2020 -0400

    Minor - Updating dependencies from Starter
---
 builder/src/main/provisioning/boot.txt      |  9 +++++----
 builder/src/main/provisioning/cms.txt       | 23 +++++++++++++++++------
 builder/src/main/provisioning/composum.txt  |  2 --
 builder/src/main/provisioning/oak.txt       |  2 --
 builder/src/main/provisioning/repoinit.txt  |  4 ++--
 builder/src/main/provisioning/scripting.txt |  2 +-
 builder/src/main/provisioning/sling.txt     | 20 ++++++++------------
 7 files changed, 33 insertions(+), 29 deletions(-)

diff --git a/builder/src/main/provisioning/boot.txt b/builder/src/main/provisioning/boot.txt
index 2ad0e77..fc0b8a8 100644
--- a/builder/src/main/provisioning/boot.txt
+++ b/builder/src/main/provisioning/boot.txt
@@ -37,6 +37,7 @@
     org.osgi/org.osgi.util.promise/1.1.1
     org.osgi/org.osgi.util.pushstream/1.0.1
     org.osgi/org.osgi.service.log/1.4.0
+    org.osgi/org.osgi.util.converter/1.0.1
     org.apache.sling/org.apache.sling.javax.activation/0.1.0
     org.apache.geronimo.specs/geronimo-annotation_1.3_spec/1.1
     org.apache.servicemix.specs/org.apache.servicemix.specs.jaxws-api-2.2/2.9.0
@@ -53,14 +54,14 @@
     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.installer.core/3.9.0
-    org.apache.sling/org.apache.sling.installer.provider.file/1.1.0
-    org.apache.sling/org.apache.sling.installer.factory.configuration/1.2.4
+    org.apache.sling/org.apache.sling.commons.osgi/2.4.0
+    org.apache.sling/org.apache.sling.installer.core/3.10.2
+    org.apache.sling/org.apache.sling.installer.provider.file/1.2.0
+    org.apache.sling/org.apache.sling.installer.factory.configuration/1.3.0
     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.commons/commons-text/1.8
     
diff --git a/builder/src/main/provisioning/cms.txt b/builder/src/main/provisioning/cms.txt
index d475251..b04c73a 100644
--- a/builder/src/main/provisioning/cms.txt
+++ b/builder/src/main/provisioning/cms.txt
@@ -17,27 +17,38 @@
 #  under the License.
 [feature name=cms]
 
+[variables]
+    oak.version=1.16.0
+
 [artifacts startLevel=5]
     org.apache.sling/org.apache.sling.cms.api/${cms.version}
     org.apache.sling/org.apache.sling.cms.ui/${cms.version}
     com.github.livesense/org.liveSense.fragment.sun.misc/1.0.5
 
 [artifacts startLevel=15]
-    org.apache.cocoon/cocoon-serializers-charsets/1.0.2
-    org.jsoup/jsoup/1.12.1
     com.vladsch.flexmark/flexmark-osgi/0.50.44
-    org.apache.sling/org.apache.sling.fileoptim/0.9.4
-    org.apache.sling/org.apache.sling.resourcemerger/1.3.10
-    org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlbeans/3.0.2_1
-    org.apache.commons/commons-math3/3.6.1
+    org.apache.cocoon/cocoon-serializers-charsets/1.0.2
     org.apache.commons/commons-compress/1.19
     org.apache.commons/commons-email/1.5
+    org.apache.commons/commons-math3/3.6.1
+    org.apache.jackrabbit/oak-auth-external/${oak.version}
+    org.apache.jackrabbit/oak-auth-ldap/${oak.version}
+    org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlbeans/3.0.2_1
+    org.apache.sling/org.apache.sling.fileoptim/0.9.4
+    org.apache.sling/org.apache.sling.resourcemerger/1.3.10
+    org.jsoup/jsoup/1.12.1
 
 [artifacts startLevel=20]
+    com.sun.mail/javax.mail/1.6.2
+    org.apache.commons/commons-text/1.8
+    org.apache.servicemix.bundles/org.apache.servicemix.bundles.jasypt/1.9.3_1
     org.apache.servicemix.bundles/org.apache.servicemix.bundles.poi/4.1.1_1
     org.apache.sling/org.apache.sling.cms.core/${cms.version}
     org.apache.sling/org.apache.sling.cms.reference/${cms.version}
     org.apache.sling/org.apache.sling.cms.transformer/${cms.version}
+    org.apache.sling/org.apache.sling.commons.crypto/1.0.0
+    org.apache.sling/org.apache.sling.commons.messaging.mail/1.0.0
+    org.apache.sling/org.apache.sling.commons.messaging/1.0.0
     org.apache.tika/tika-bundle/1.22
 
 [:repoinit]
diff --git a/builder/src/main/provisioning/composum.txt b/builder/src/main/provisioning/composum.txt
index 24ddb95..fab1e7a 100644
--- a/builder/src/main/provisioning/composum.txt
+++ b/builder/src/main/provisioning/composum.txt
@@ -25,8 +25,6 @@
   com.composum.sling.core/composum-sling-core-console/${composum.nodes.version}
   com.composum.sling.core/composum-sling-core-jslibs/${composum.nodes.version}
   com.composum.sling.core/composum-sling-package-manager/${composum.nodes.version}
-  com.composum.sling.core.osgi/composum-sling-osgi-package-installer/${composum.nodes.version}
-  org.apache.jackrabbit.vault/org.apache.jackrabbit.vault/3.4.0
 
 [configurations]
 
diff --git a/builder/src/main/provisioning/oak.txt b/builder/src/main/provisioning/oak.txt
index 6fa2399..2f4b9ce 100644
--- a/builder/src/main/provisioning/oak.txt
+++ b/builder/src/main/provisioning/oak.txt
@@ -42,8 +42,6 @@
     # OAK-7263 - oak-store-document should be in oak_mongo runmode
     org.apache.jackrabbit/oak-store-document/${oak.version}
     org.apache.jackrabbit/oak-store-spi/${oak.version}
-    org.apache.jackrabbit/oak-auth-external/${oak.version}
-    org.apache.jackrabbit/oak-auth-ldap/${oak.version}
 
 [artifacts startLevel=15 runModes=oak_tar]
     org.apache.jackrabbit/oak-segment-tar/${oak.version}
diff --git a/builder/src/main/provisioning/repoinit.txt b/builder/src/main/provisioning/repoinit.txt
index 8fe0940..91726cd 100644
--- a/builder/src/main/provisioning/repoinit.txt
+++ b/builder/src/main/provisioning/repoinit.txt
@@ -19,8 +19,8 @@
 [feature name=repoinit]
 
 [artifacts]
-  org.apache.sling/org.apache.sling.repoinit.parser/1.3.2
-  org.apache.sling/org.apache.sling.jcr.repoinit/1.1.16
+  org.apache.sling/org.apache.sling.repoinit.parser/1.4.2
+  org.apache.sling/org.apache.sling.jcr.repoinit/1.1.20
   org.apache.sling/org.apache.sling.provisioning.model/1.8.4
 
 [:repoinit]
diff --git a/builder/src/main/provisioning/scripting.txt b/builder/src/main/provisioning/scripting.txt
index 003223c..e513051 100644
--- a/builder/src/main/provisioning/scripting.txt
+++ b/builder/src/main/provisioning/scripting.txt
@@ -21,7 +21,7 @@
 
 [artifacts]
     org.apache.sling/org.apache.sling.scripting.api/2.2.0
-    org.apache.sling/org.apache.sling.scripting.core/2.1.0
+    org.apache.sling/org.apache.sling.scripting.core/2.2.0
     org.apache.sling/org.apache.sling.scripting.javascript/3.1.2
     org.apache.sling/org.apache.sling.scripting.jsp/2.4.2
     org.apache.sling/org.apache.sling.scripting.jsp-api/1.0.2
diff --git a/builder/src/main/provisioning/sling.txt b/builder/src/main/provisioning/sling.txt
index a712659..4effab4 100644
--- a/builder/src/main/provisioning/sling.txt
+++ b/builder/src/main/provisioning/sling.txt
@@ -39,7 +39,7 @@
     org.apache.felix/org.apache.felix.webconsole.plugins.packageadmin/1.0.4
     org.apache.felix/org.apache.felix.webconsole.plugins.event/1.1.8
     org.apache.felix/org.apache.felix.webconsole.plugins.memoryusage/1.0.10
-    org.apache.sling/org.apache.sling.commons.johnzon/1.1.2
+    org.apache.sling/org.apache.sling.commons.johnzon/1.2.0
     org.apache.felix/org.apache.felix.bundlerepository/2.0.10
     org.apache.sling/org.apache.sling.extensions.threaddump/0.2.2
     org.apache.aries.jmx/org.apache.aries.jmx.api/1.1.5
@@ -48,7 +48,7 @@
     commons-io/commons-io/2.6
     commons-fileupload/commons-fileupload/1.3.3
     org.apache.sling/org.apache.sling.commons.log.webconsole/1.0.0
-    org.apache.sling/org.apache.sling.api/2.21.0
+    org.apache.sling/org.apache.sling.api/2.22.0
     org.apache.sling/org.apache.sling.auth.core/1.4.4
     
 [artifacts startLevel=10]
@@ -93,21 +93,17 @@
     org.apache.sling/org.apache.sling.commons.classloader/1.4.4
     org.apache.sling/org.apache.sling.commons.compiler/2.3.6
     org.apache.sling/org.apache.sling.commons.fsclassloader/1.0.12
-    org.apache.servicemix.bundles/org.apache.servicemix.bundles.jasypt/1.9.3_1
-    org.apache.sling/org.apache.sling.commons.crypto/1.0.0
-    com.sun.mail/javax.mail/1.6.2
-    org.apache.sling/org.apache.sling.commons.messaging/1.0.0
-    org.apache.sling/org.apache.sling.commons.messaging.mail/1.0.0
     org.apache.sling/org.apache.sling.commons.mime/2.2.2
-    org.apache.sling/org.apache.sling.commons.osgi/2.4.0
-    org.apache.sling/org.apache.sling.commons.scheduler/2.7.4
+    org.apache.sling/org.apache.sling.commons.scheduler/2.7.6
     org.apache.sling/org.apache.sling.commons.threads/3.2.20
     org.apache.sling/org.apache.sling.engine/2.6.22
     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.0.2
+    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.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
     org.apache.sling/org.apache.sling.jcr.contentloader/2.3.0
     org.apache.sling/org.apache.sling.jcr.resource/3.0.20
     org.apache.sling/org.apache.sling.models.api/1.3.8
@@ -117,8 +113,8 @@
     org.apache.sling/org.apache.sling.serviceuser.webconsole/1.0.2
     org.apache.sling/org.apache.sling.servlets.get/2.1.40
     org.apache.sling/org.apache.sling.servlets.post/2.3.36
-    org.apache.sling/org.apache.sling.servlets.resolver/2.5.8
-    org.apache.sling/org.apache.sling.xss/2.2.0
+    org.apache.sling/org.apache.sling.servlets.resolver/2.6.4
+    org.apache.sling/org.apache.sling.xss/2.2.2
     javax.mail/mail/1.5.0-b01
     org.apache.geronimo.bundles/jstl/1.2_1