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/04/16 20:34:57 UTC
[sling-org-apache-sling-app-cms] branch master updated: Updating
versions to the current 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
The following commit(s) were added to refs/heads/master by this push:
new eb9dc60 Updating versions to the current starter
eb9dc60 is described below
commit eb9dc6032cbd72a6758c47f0c6f5957492f86741
Author: Dan Klco <dk...@apache.org>
AuthorDate: Tue Apr 16 16:34:46 2019 -0400
Updating versions to the current starter
---
builder/src/main/provisioning/boot.txt | 6 +-
builder/src/main/provisioning/healthcheck.txt | 83 +++++++++++++++++++++++++++
builder/src/main/provisioning/launchpad.txt | 2 +-
builder/src/main/provisioning/repoinit.txt | 4 +-
builder/src/main/provisioning/scripting.txt | 10 ++--
builder/src/main/provisioning/sling.txt | 16 +++---
builder/src/main/provisioning/standalone.txt | 2 +-
builder/src/main/provisioning/webapp.txt | 2 +-
8 files changed, 103 insertions(+), 22 deletions(-)
diff --git a/builder/src/main/provisioning/boot.txt b/builder/src/main/provisioning/boot.txt
index 80e7957..570e350 100644
--- a/builder/src/main/provisioning/boot.txt
+++ b/builder/src/main/provisioning/boot.txt
@@ -33,6 +33,8 @@
slf4j.version=1.7.25
[artifacts]
+ org.osgi/org.osgi.util.function/1.1.0
+ org.osgi/org.osgi.util.promise/1.1.0
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
@@ -51,8 +53,8 @@
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.0
- org.apache.felix/org.apache.felix.configadmin/1.9.10
+ org.apache.sling/org.apache.sling.installer.factory.configuration/1.2.2
+ org.apache.felix/org.apache.felix.configadmin/1.9.14
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)
diff --git a/builder/src/main/provisioning/healthcheck.txt b/builder/src/main/provisioning/healthcheck.txt
new file mode 100644
index 0000000..d70fc35
--- /dev/null
+++ b/builder/src/main/provisioning/healthcheck.txt
@@ -0,0 +1,83 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+##
+[feature name=healthcheck]
+
+# 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.webconsoleplugin/2.0.0
+
+# sling health check bundles at startlevel 20
+[artifacts startLevel=20]
+ org.apache.sling/org.apache.sling.hc.api/1.0.4
+ org.apache.sling/org.apache.sling.hc.support/1.0.6
+
+[configurations]
+
+ ## servlet
+
+ org.apache.felix.hc.core.impl.servlet.HealthCheckExecutorServlet-default
+ servletPath="/system/health"
+
+ ## systemalive checks
+
+ org.apache.felix.hc.generalchecks.FrameworkStartCheck
+ hc.tags=["systemalive"]
+ targetStartLevel=I"30"
+
+ org.apache.felix.hc.generalchecks.ServicesCheck
+ hc.tags=["systemalive"]
+ services.list=[
+ "org.apache.sling.jcr.api.SlingRepository",
+ "org.apache.sling.engine.auth.Authenticator",
+ "org.apache.sling.api.resource.ResourceResolverFactory",
+ "org.apache.sling.api.servlets.ServletResolver",
+ "javax.script.ScriptEngineManager",
+ ]
+
+ ## bundles
+
+ org.apache.felix.hc.generalchecks.BundlesStartedCheck
+ hc.tags=["bundles"]
+
+ ## system resources
+
+ org.apache.felix.hc.generalchecks.ThreadUsageCheck
+ hc.tags=["threads", "cpu", "system-resources"]
+
+ org.apache.felix.hc.generalchecks.CpuCheck
+ hc.tags=["cpu", "system-resources"]
+ cpuPercentageThresholdWarn=L"95"
+
+ org.apache.felix.hc.generalchecks.DiskSpaceCheck
+ hc.tags=["diskspace", "system-resources"]
+ diskPaths=["."]
+
+ org.apache.felix.hc.generalchecks.MemoryCheck
+ hc.tags=["memory", "system-resources"]
+ heapUsedPercentageThresholdWarn=L"95"
+ heapUsedPercentageThresholdCritical=L"100"
+
+ ## service user for scripted health check (to make it easy to use jcr:/path/to/script urls)
+ org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-hc-support
+ user.mapping=[
+ "org.apache.sling.hc.support\=sling-readall"
+ ]
diff --git a/builder/src/main/provisioning/launchpad.txt b/builder/src/main/provisioning/launchpad.txt
index 9ec722d..3cdef89 100644
--- a/builder/src/main/provisioning/launchpad.txt
+++ b/builder/src/main/provisioning/launchpad.txt
@@ -20,7 +20,7 @@
# Only a single artifact is allowed within this feature.
#
[feature name=:launchpad]
- org.apache.sling/org.apache.sling.launchpad.base/6.0.1-2.6.32
+ org.apache.sling/org.apache.sling.launchpad.base/6.0.2-2.6.36
[settings]
org.osgi.framework.system.packages=org.osgi.framework;version="1.9",org.osgi.framework.dto;version="1.8";uses:="org.osgi.dto",org.osgi.framework.hooks.bundle;version="1.1";uses:="org.osgi.framework",org.osgi.framework.hooks.resolver;version="1.0";uses:="org.osgi.framework.wiring",org.osgi.framework.hooks.service;version="1.1";uses:="org.osgi.framework",org.osgi.framework.hooks.weaving;version="1.1";uses:="org.osgi.framework.wiring",org.osgi.framework.launch;version="1.2";uses:="org.osg [...]
diff --git a/builder/src/main/provisioning/repoinit.txt b/builder/src/main/provisioning/repoinit.txt
index c31efac..61aaa84 100644
--- a/builder/src/main/provisioning/repoinit.txt
+++ b/builder/src/main/provisioning/repoinit.txt
@@ -47,12 +47,10 @@
# sling-xss
create service user sling-xss
- create path (sling:Folder) /libs/sling/xss
create path (sling:Folder) /apps/sling/xss
set ACL for sling-xss
- deny jcr:all on /
- allow jcr:read on /libs/sling/xss,/apps/sling/xss
+ allow jcr:read on /apps/sling/xss
end
# sling-i18n
diff --git a/builder/src/main/provisioning/scripting.txt b/builder/src/main/provisioning/scripting.txt
index 2be7b1e..dd73d84 100644
--- a/builder/src/main/provisioning/scripting.txt
+++ b/builder/src/main/provisioning/scripting.txt
@@ -26,12 +26,12 @@
org.apache.sling/org.apache.sling.scripting.jsp/2.3.4
org.apache.sling/org.apache.sling.scripting.jsp-api/1.0.0
org.apache.sling/org.apache.sling.scripting.el-api/1.0.0
- org.apache.sling/org.apache.sling.scripting.jsp.taglib/2.3.0
+ org.apache.sling/org.apache.sling.scripting.jsp.taglib/2.4.0
org.antlr/antlr4-runtime/4.7.1
- org.apache.sling/org.apache.sling.scripting.sightly.runtime/1.0.0-1.4.0
- org.apache.sling/org.apache.sling.scripting.sightly.compiler/1.1.0-1.4.0
- org.apache.sling/org.apache.sling.scripting.sightly.compiler.java/1.1.0-1.4.0
- org.apache.sling/org.apache.sling.scripting.sightly/1.1.0-1.4.0
+ org.apache.sling/org.apache.sling.scripting.sightly.runtime/1.1.0-1.4.0
+ org.apache.sling/org.apache.sling.scripting.sightly.compiler/1.1.2-1.4.0
+ org.apache.sling/org.apache.sling.scripting.sightly.compiler.java/1.1.2-1.4.0
+ org.apache.sling/org.apache.sling.scripting.sightly/1.1.2-1.4.0
org.apache.sling/org.apache.sling.scripting.sightly.js.provider/1.0.28
org.apache.sling/org.apache.sling.scripting.sightly.models.provider/1.0.8
org.apache.sling/org.apache.sling.scripting.sightly.repl/1.0.6
diff --git a/builder/src/main/provisioning/sling.txt b/builder/src/main/provisioning/sling.txt
index 8f69325..dad9dd2 100644
--- a/builder/src/main/provisioning/sling.txt
+++ b/builder/src/main/provisioning/sling.txt
@@ -37,33 +37,30 @@
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.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.8
+ 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.hc.api/1.0.2
- org.apache.sling/org.apache.sling.hc.core/1.2.10
- org.apache.sling/org.apache.sling.hc.webconsole/1.1.2
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.16
+ 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.26
+ 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.0.12
+ 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
@@ -92,12 +89,13 @@
[artifacts startLevel=10]
org.apache.felix/org.apache.felix.http.sslfilter/1.2.6
- org.apache.felix/org.apache.felix.scr/2.1.14
+ 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
[artifacts startLevel=15]
org.apache.sling/org.apache.sling.jcr.jcr-wrapper/2.0.0
diff --git a/builder/src/main/provisioning/standalone.txt b/builder/src/main/provisioning/standalone.txt
index 3942fa8..d94cb76 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.6
+ org.apache.felix/org.apache.felix.http.jetty/4.0.8
diff --git a/builder/src/main/provisioning/webapp.txt b/builder/src/main/provisioning/webapp.txt
index 608dc37..50b82bc 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.4
+ org.apache.felix/org.apache.felix.http.bridge/4.0.6