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/06/09 04:09:13 UTC

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

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 6716c951e8639ff4e9b0b78d1bbdf17c070a015a
Author: Dan Klco <dk...@apache.org>
AuthorDate: Tue Jun 9 00:08:03 2020 -0400

    Minor - updating dependencies
---
 builder/src/main/provisioning/boot.txt       |  7 ++++---
 builder/src/main/provisioning/cms.txt        | 15 +++++----------
 builder/src/main/provisioning/composum.txt   |  2 +-
 builder/src/main/provisioning/oak.txt        |  5 +++--
 builder/src/main/provisioning/sling.txt      | 25 +++++++++++--------------
 builder/src/main/provisioning/standalone.txt |  2 +-
 builder/src/main/provisioning/webapp.txt     |  2 +-
 7 files changed, 26 insertions(+), 32 deletions(-)

diff --git a/builder/src/main/provisioning/boot.txt b/builder/src/main/provisioning/boot.txt
index fc0b8a8..81008e1 100644
--- a/builder/src/main/provisioning/boot.txt
+++ b/builder/src/main/provisioning/boot.txt
@@ -37,7 +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.felix/org.apache.felix.converter/1.0.14
     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
@@ -50,13 +50,14 @@
     org.slf4j/slf4j-api/${slf4j.version}
     org.apache.sling/org.apache.sling.commons.log/5.1.10
     org.apache.sling/org.apache.sling.commons.logservice/1.1.0
+    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.10.2
-    org.apache.sling/org.apache.sling.installer.provider.file/1.2.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.0
     org.apache.felix/org.apache.felix.configadmin/1.9.16
     org.apache.felix/org.apache.felix.eventadmin/1.5.0
diff --git a/builder/src/main/provisioning/cms.txt b/builder/src/main/provisioning/cms.txt
index b04c73a..ce7725d 100644
--- a/builder/src/main/provisioning/cms.txt
+++ b/builder/src/main/provisioning/cms.txt
@@ -18,7 +18,7 @@
 [feature name=cms]
 
 [variables]
-    oak.version=1.16.0
+    oak.version=1.26.0
 
 [artifacts startLevel=5]
     org.apache.sling/org.apache.sling.cms.api/${cms.version}
@@ -26,9 +26,10 @@
     com.github.livesense/org.liveSense.fragment.sun.misc/1.0.5
 
 [artifacts startLevel=15]
-    com.vladsch.flexmark/flexmark-osgi/0.50.44
+    com.vladsch.flexmark/flexmark-osgi/0.61.24
     org.apache.cocoon/cocoon-serializers-charsets/1.0.2
-    org.apache.commons/commons-compress/1.19
+    org.apache.commons/commons-compress/1.20
+    org.apache.commons/commons-csv/1.8
     org.apache.commons/commons-email/1.5
     org.apache.commons/commons-math3/3.6.1
     org.apache.jackrabbit/oak-auth-external/${oak.version}
@@ -36,7 +37,7 @@
     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
+    org.jsoup/jsoup/1.13.1
 
 [artifacts startLevel=20]
     com.sun.mail/javax.mail/1.6.2
@@ -163,12 +164,6 @@
         "org.apache.sling.rewriter\=sling-rewriter"
     ]
 
-  org.apache.felix.hc.generalchecks.ServicesCheck-securityfilterconfigured
-    hc.name="Sling CMS - Security Filter Configured"
-    hc.tags=["configuration"]
-    statusForMissing="WARN"
-    services.list=["(component.name\=org.apache.sling.cms.core.internal.filters.CMSSecurityFilter)"]
-
   org.apache.sling.hc.support.DefaultLoginsHealthCheck-slingcms
     logins=["admin:admin"]
     hc.name="Sling CMS - Default Logins Check"
diff --git a/builder/src/main/provisioning/composum.txt b/builder/src/main/provisioning/composum.txt
index fab1e7a..8e85e85 100644
--- a/builder/src/main/provisioning/composum.txt
+++ b/builder/src/main/provisioning/composum.txt
@@ -20,7 +20,7 @@
     composum.nodes.version=1.12.0
 
 [artifacts startLevel=20]
-
+  org.codehaus.groovy/groovy-all/2.4.19
   com.composum.sling.core/composum-sling-core-commons/${composum.nodes.version}
   com.composum.sling.core/composum-sling-core-console/${composum.nodes.version}
   com.composum.sling.core/composum-sling-core-jslibs/${composum.nodes.version}
diff --git a/builder/src/main/provisioning/oak.txt b/builder/src/main/provisioning/oak.txt
index 2f4b9ce..d3532f3 100644
--- a/builder/src/main/provisioning/oak.txt
+++ b/builder/src/main/provisioning/oak.txt
@@ -20,7 +20,7 @@
 [feature name=oak]
 
 [variables]
-    oak.version=1.16.0
+    oak.version=1.26.0
 
 # The segment node store is used via a configuration
 [artifacts startLevel=10]
@@ -28,6 +28,7 @@
 
 [artifacts startLevel=15]
     org.apache.jackrabbit/oak-api/${oak.version}
+    org.apache.jackrabbit/oak-jackrabbit-api/${oak.version}
     org.apache.jackrabbit/oak-blob/${oak.version}
     org.apache.jackrabbit/oak-blob-plugins/${oak.version}
     org.apache.jackrabbit/oak-commons/${oak.version}
@@ -53,7 +54,7 @@
 # start the Oak server instance after all components have been configured
 # and started to avoid restarting that component ( see SLING-4556 )
 [artifacts startLevel=16]
-    org.apache.sling/org.apache.sling.jcr.oak.server/1.2.2
+    org.apache.sling/org.apache.sling.jcr.oak.server/1.2.4
 
 [configurations]
   org.apache.felix.jaas.Configuration.factory-GuestLoginModule
diff --git a/builder/src/main/provisioning/sling.txt b/builder/src/main/provisioning/sling.txt
index babd554..4ba0b95 100644
--- a/builder/src/main/provisioning/sling.txt
+++ b/builder/src/main/provisioning/sling.txt
@@ -20,12 +20,11 @@
 [feature name=sling]
 
 [variables]
-    jackrabbit.version=2.18.2
+    jackrabbit.version=2.20.0
 
 [artifacts startLevel=4]
-    org.apache.felix/org.apache.felix.scr/2.1.16
+    org.apache.felix/org.apache.felix.scr/2.1.20
     org.apache.felix/org.apache.felix.metatype/1.2.2
-    org.osgi/org.osgi.util.converter/1.0.0
 
 [artifacts startLevel=5]
     org.apache.felix/org.apache.felix.http.whiteboard/4.0.0
@@ -33,37 +32,35 @@
     org.apache.sling/org.apache.sling.extensions.webconsolesecurityprovider/1.2.4
     org.apache.felix/org.apache.felix.inventory/1.0.6
     org.apache.felix/org.apache.felix.prefs/1.1.0
-    org.apache.felix/org.apache.felix.webconsole/4.3.16
+    org.apache.felix/org.apache.felix.webconsole/4.5.0
     org.apache.felix/org.apache.felix.webconsole.plugins.ds/2.1.0
     org.apache.felix/org.apache.felix.webconsole.plugins.obr/1.0.4
     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.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
     org.apache.aries.jmx/org.apache.aries.jmx.core/1.1.8
     org.apache.aries.jmx/org.apache.aries.jmx.whiteboard/1.2.0
     commons-io/commons-io/2.6
-    commons-fileupload/commons-fileupload/1.3.3
+    commons-fileupload/commons-fileupload/1.4
     org.apache.sling/org.apache.sling.commons.log.webconsole/1.0.0
     org.apache.sling/org.apache.sling.api/2.22.0
-    org.apache.sling/org.apache.sling.auth.core/1.4.4
+    org.apache.sling/org.apache.sling.auth.core/1.4.6
     
 [artifacts startLevel=10]
     org.apache.felix/org.apache.felix.http.sslfilter/1.2.6
     org.apache.pdfbox/pdfbox/2.0.17
     org.apache.pdfbox/fontbox/2.0.17
     org.apache.pdfbox/jempbox/1.8.16
-    org.apache.tika/tika-core/1.22
+    org.apache.tika/tika-core/1.24
 
 [artifacts startLevel=15]
     org.apache.sling/org.apache.sling.jcr.jcr-wrapper/2.0.0
     org.apache.sling/org.apache.sling.jcr.api/2.4.0
     org.apache.sling/org.apache.sling.jcr.base/3.1.0
     org.apache.sling/org.apache.sling.jcr.registration/1.0.6
-    org.apache.jackrabbit/jackrabbit-api/${jackrabbit.version}
     org.apache.jackrabbit/jackrabbit-jcr-commons/${jackrabbit.version}
     org.apache.jackrabbit/jackrabbit-spi/${jackrabbit.version}
     org.apache.jackrabbit/jackrabbit-spi-commons/${jackrabbit.version}
@@ -83,7 +80,7 @@
 [artifacts]
     commons-collections/commons-collections/3.2.2
     org.apache.commons/commons-collections4/4.4
-    commons-codec/commons-codec/1.13
+    commons-codec/commons-codec/1.14
     org.apache.commons/commons-math/2.2
     org.apache.httpcomponents/httpcore-osgi/4.4.12
     org.apache.httpcomponents/httpclient-osgi/4.5.10
@@ -96,14 +93,14 @@
     org.apache.sling/org.apache.sling.commons.mime/2.2.2
     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.engine/2.7.2
     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.0
+    org.apache.sling/org.apache.sling.installer.provider.jcr/3.2.2
     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.jackrabbit.vault/org.apache.jackrabbit.vault/3.4.4
+    org.apache.sling/org.apache.sling.installer.factory.packages/1.0.2
     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
diff --git a/builder/src/main/provisioning/standalone.txt b/builder/src/main/provisioning/standalone.txt
index de82de5..2bac8c2 100644
--- a/builder/src/main/provisioning/standalone.txt
+++ b/builder/src/main/provisioning/standalone.txt
@@ -23,4 +23,4 @@
 # Add a servlet implementation for the standalone case
 [artifacts startLevel=5 runModes=:standalone]
     org.apache.felix/org.apache.felix.http.servlet-api/1.1.2
-    org.apache.felix/org.apache.felix.http.jetty/4.0.14
+    org.apache.felix/org.apache.felix.http.jetty/4.0.18
diff --git a/builder/src/main/provisioning/webapp.txt b/builder/src/main/provisioning/webapp.txt
index bd35a39..0a1c7b6 100644
--- a/builder/src/main/provisioning/webapp.txt
+++ b/builder/src/main/provisioning/webapp.txt
@@ -22,4 +22,4 @@
 
 # Add the felix servlet bridge for the webapp case
 [artifacts runModes=:webapp]
-    org.apache.felix/org.apache.felix.http.bridge/4.0.10
+    org.apache.felix/org.apache.felix.http.bridge/4.0.12