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 2019/05/28 20:28:52 UTC
[sling-org-apache-sling-app-cms] branch master updated: 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
The following commit(s) were added to refs/heads/master by this push:
new ce0cf6a Updating dependencies
ce0cf6a is described below
commit ce0cf6a68ed68de5e4a8c1b151e62032ca5fa05d
Author: Dan Klco <dk...@apache.org>
AuthorDate: Tue May 28 15:28:45 2019 -0500
Updating dependencies
---
builder/src/main/provisioning/boot.txt | 2 +
builder/src/main/provisioning/cms.txt | 3 +-
builder/src/main/provisioning/composum.txt | 2 +-
builder/src/main/provisioning/healthcheck.txt | 18 ++++-
builder/src/main/provisioning/sling.txt | 94 +++++++++++++--------------
pom.xml | 2 -
6 files changed, 67 insertions(+), 54 deletions(-)
diff --git a/builder/src/main/provisioning/boot.txt b/builder/src/main/provisioning/boot.txt
index 570e350..b5b48db 100644
--- a/builder/src/main/provisioning/boot.txt
+++ b/builder/src/main/provisioning/boot.txt
@@ -59,3 +59,5 @@
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.8.1
+
diff --git a/builder/src/main/provisioning/cms.txt b/builder/src/main/provisioning/cms.txt
index b0b7960..7b16e0f 100644
--- a/builder/src/main/provisioning/cms.txt
+++ b/builder/src/main/provisioning/cms.txt
@@ -21,7 +21,7 @@
org.apache.cocoon/cocoon-serializers-charsets/1.0.0
org.jsoup/jsoup/1.11.3
com.vladsch.flexmark/flexmark-osgi/0.34.22
- org.apache.sling/org.apache.sling.fileoptim/0.9.2
+ org.apache.sling/org.apache.sling.fileoptim/0.9.3-SNAPSHOT
org.apache.sling/org.apache.sling.resourcemerger/1.3.6
org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlbeans/3.0.2_1
org.apache.commons/commons-math3/3.6.1
@@ -33,6 +33,7 @@
org.apache.sling/org.apache.sling.cms.core/${cms.version}
org.apache.sling/org.apache.sling.cms.ui/${cms.version}
org.apache.sling/org.apache.sling.cms.reference/${cms.version}
+ org.apache.sling/org.apache.sling.cms.transformer/${cms.version}
org.apache.tika/tika-bundle/1.19.1
[artifacts startLevel=25]
diff --git a/builder/src/main/provisioning/composum.txt b/builder/src/main/provisioning/composum.txt
index ad66ab4..afde593 100644
--- a/builder/src/main/provisioning/composum.txt
+++ b/builder/src/main/provisioning/composum.txt
@@ -17,7 +17,7 @@
# under the License.
[feature name=composum-console]
[variables]
- composum.version=1.9.2
+ composum.version=1.9.4
[artifacts startLevel=20]
diff --git a/builder/src/main/provisioning/healthcheck.txt b/builder/src/main/provisioning/healthcheck.txt
index d70fc35..69e4329 100644
--- a/builder/src/main/provisioning/healthcheck.txt
+++ b/builder/src/main/provisioning/healthcheck.txt
@@ -20,9 +20,9 @@
# startlevel 5 together with jetty (to allow use during startup)
[artifacts startLevel=5]
- org.apache.felix/org.apache.felix.healthcheck.api/2.0.0
- org.apache.felix/org.apache.felix.healthcheck.core/2.0.2
- org.apache.felix/org.apache.felix.healthcheck.generalchecks/2.0.2
+ org.apache.felix/org.apache.felix.healthcheck.api/2.0.2
+ org.apache.felix/org.apache.felix.healthcheck.core/2.0.6
+ org.apache.felix/org.apache.felix.healthcheck.generalchecks/2.0.4
org.apache.felix/org.apache.felix.healthcheck.webconsoleplugin/2.0.0
# sling health check bundles at startlevel 20
@@ -53,6 +53,7 @@
"javax.script.ScriptEngineManager",
]
+
## bundles
org.apache.felix.hc.generalchecks.BundlesStartedCheck
@@ -81,3 +82,14 @@
user.mapping=[
"org.apache.sling.hc.support\=sling-readall"
]
+
+ ## Service Unavailable Filter for startup-shutdown
+ org.apache.felix.hc.core.impl.filter.ServiceUnavailableFilter-startupandshutdown
+ tags=["systemalive"]
+ service.ranking=I"2147483647"
+ osgi.http.whiteboard.context.select="(osgi.http.whiteboard.context.name\=*)"
+ osgi.http.whiteboard.filter.regex="(?!/system/).*"
+ responseTextFor503="classpath:org.apache.sling.starter.content:content/content/startup/index.html"
+ includeExecutionResult=B"false"
+ autoDisableFilter=B"true"
+ avoid404DuringStartup=B"true"
diff --git a/builder/src/main/provisioning/sling.txt b/builder/src/main/provisioning/sling.txt
index 1a8f312..9db646b 100644
--- a/builder/src/main/provisioning/sling.txt
+++ b/builder/src/main/provisioning/sling.txt
@@ -22,50 +22,12 @@
[variables]
jackrabbit.version=2.16.3
-[artifacts]
- commons-collections/commons-collections/3.2.2
- org.apache.commons/commons-collections4/4.2
- commons-codec/commons-codec/1.11
- commons-lang/commons-lang/2.6
- org.apache.commons/commons-lang3/3.8.1
- org.apache.commons/commons-math/2.2
- org.apache.httpcomponents/httpcore-osgi/4.4.10
- org.apache.httpcomponents/httpclient-osgi/4.5.6
- org.apache.sling/org.apache.sling.adapter/2.1.10
- org.apache.sling/org.apache.sling.api/2.20.0
- org.apache.sling/org.apache.sling.auth.core/1.4.2
- org.apache.sling/org.apache.sling.auth.form/1.0.12
- org.apache.sling/org.apache.sling.bundleresource.impl/2.3.2
- 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.10
- org.apache.sling/org.apache.sling.commons.mime/2.2.0
- org.apache.sling/org.apache.sling.commons.osgi/2.4.0
- org.apache.sling/org.apache.sling.commons.scheduler/2.7.2
- org.apache.sling/org.apache.sling.commons.threads/3.2.18
- org.apache.sling/org.apache.sling.engine/2.6.18
- org.apache.sling/org.apache.sling.fsresource/2.1.14
- 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.provider.jcr/3.1.26
- org.apache.sling/org.apache.sling.installer.hc/2.0.0
- org.apache.sling/org.apache.sling.jcr.contentloader/2.3.0
- org.apache.sling/org.apache.sling.jcr.resource/3.0.18
- org.apache.sling/org.apache.sling.models.api/1.3.8
- org.apache.sling/org.apache.sling.models.impl/1.4.10
- org.apache.sling/org.apache.sling.resourceresolver/1.6.8
- org.apache.sling/org.apache.sling.serviceusermapper/1.4.4
- org.apache.sling/org.apache.sling.serviceuser.webconsole/1.0.0
- org.apache.sling/org.apache.sling.servlets.get/2.1.40
- org.apache.sling/org.apache.sling.servlets.post/2.3.28
- org.apache.sling/org.apache.sling.servlets.resolver/2.5.2
- org.apache.sling/org.apache.sling.xss/2.1.0
- javax.mail/mail/1.5.0-b01
- org.apache.geronimo.bundles/jstl/1.2_1
- org.apache.felix/org.apache.felix.http.whiteboard/4.0.0
+[artifacts startLevel=4]
+ org.apache.felix/org.apache.felix.scr/2.1.16
+ org.apache.felix/org.apache.felix.metatype/1.2.2
[artifacts startLevel=5]
- org.apache.sling/org.apache.sling.starter.startup/1.0.6
+ org.apache.felix/org.apache.felix.http.whiteboard/4.0.0
org.apache.sling/org.apache.sling.extensions.webconsolebranding/1.0.2
org.apache.sling/org.apache.sling.extensions.webconsolesecurityprovider/1.2.0
org.apache.felix/org.apache.felix.inventory/1.0.6
@@ -85,16 +47,16 @@
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.20.0
+ org.apache.sling/org.apache.sling.auth.core/1.4.2
+
[artifacts startLevel=10]
org.apache.felix/org.apache.felix.http.sslfilter/1.2.6
- org.apache.felix/org.apache.felix.scr/2.1.16
- org.apache.felix/org.apache.felix.metatype/1.2.2
org.apache.pdfbox/pdfbox/2.0.12
org.apache.pdfbox/fontbox/2.0.12
org.apache.pdfbox/jempbox/1.8.16
- org.apache.tika/tika-core/1.19.1
- org.apache.tika/tika-parsers/1.19.1
+ org.apache.tika/tika-core/1.21
+ org.apache.tika/tika-parsers/1.21
[artifacts startLevel=15]
org.apache.sling/org.apache.sling.jcr.jcr-wrapper/2.0.0
@@ -117,6 +79,43 @@
org.apache.sling/org.apache.sling.commons.metrics/1.2.6
com.google.guava/guava/15.0
+[artifacts]
+ commons-collections/commons-collections/3.2.2
+ org.apache.commons/commons-collections4/4.2
+ commons-codec/commons-codec/1.11
+ org.apache.commons/commons-math/2.2
+ org.apache.httpcomponents/httpcore-osgi/4.4.10
+ org.apache.httpcomponents/httpclient-osgi/4.5.6
+ org.apache.sling/org.apache.sling.adapter/2.1.10
+ org.apache.sling/org.apache.sling.auth.form/1.0.14
+ org.apache.sling/org.apache.sling.bundleresource.impl/2.3.2
+ 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.10
+ org.apache.sling/org.apache.sling.commons.mime/2.2.0
+ org.apache.sling/org.apache.sling.commons.osgi/2.4.0
+ org.apache.sling/org.apache.sling.commons.scheduler/2.7.2
+ org.apache.sling/org.apache.sling.commons.threads/3.2.18
+ org.apache.sling/org.apache.sling.engine/2.6.18
+ org.apache.sling/org.apache.sling.fsresource/2.1.14
+ 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.provider.jcr/3.1.26
+ org.apache.sling/org.apache.sling.installer.hc/2.0.2
+ org.apache.sling/org.apache.sling.jcr.contentloader/2.3.0
+ org.apache.sling/org.apache.sling.jcr.resource/3.0.18
+ org.apache.sling/org.apache.sling.models.api/1.3.8
+ org.apache.sling/org.apache.sling.models.impl/1.4.10
+ org.apache.sling/org.apache.sling.resourceresolver/1.6.8
+ org.apache.sling/org.apache.sling.serviceusermapper/1.4.4
+ org.apache.sling/org.apache.sling.serviceuser.webconsole/1.0.0
+ org.apache.sling/org.apache.sling.servlets.get/2.1.40
+ org.apache.sling/org.apache.sling.servlets.post/2.3.30
+ org.apache.sling/org.apache.sling.servlets.resolver/2.5.2
+ org.apache.sling/org.apache.sling.xss/2.1.8
+ javax.mail/mail/1.5.0-b01
+ org.apache.geronimo.bundles/jstl/1.2_1
+
[configurations]
org.apache.sling.engine.impl.log.RequestLogger
access.log.enabled=B"true"
@@ -214,3 +213,4 @@
user.mapping=[
"org.apache.sling.jcr.resource:validation\=sling-readall"
]
+
diff --git a/pom.xml b/pom.xml
index b67165b..2c9c068 100644
--- a/pom.xml
+++ b/pom.xml
@@ -54,8 +54,6 @@
<dependencyManagement>
<dependencies>
-
-
<!-- Other Apache Dependencies -->
<dependency>
<groupId>org.apache.cocoon</groupId>