rombert closed pull request #3: Upgrade sling dependencies - minor bumps
URL: https://github.com/apache/sling-org-apache-sling-starter/pull/3
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/src/main/provisioning/composum.txt
b/src/main/provisioning/composum.txt
index 334eb68..f4c14e8 100644
--- a/src/main/provisioning/composum.txt
+++ b/src/main/provisioning/composum.txt
@@ -27,4 +27,4 @@
com.composum.sling.core/composum-sling-core-jslibs/${composum.version}
com.composum.sling.core/composum-sling-user-management/${composum.version}
com.composum.sling.core/composum-sling-package-manager/${composum.version}
- org.apache.jackrabbit.vault/org.apache.jackrabbit.vault/3.1.42
+ org.apache.jackrabbit.vault/org.apache.jackrabbit.vault/3.1.44
diff --git a/src/main/provisioning/repoinit.txt
b/src/main/provisioning/repoinit.txt
index 9e1227b..b254a62 100644
--- a/src/main/provisioning/repoinit.txt
+++ b/src/main/provisioning/repoinit.txt
@@ -19,8 +19,8 @@
[feature name=repoinit]
[artifacts]
- org.apache.sling/org.apache.sling.repoinit.parser/1.2.0
- org.apache.sling/org.apache.sling.jcr.repoinit/1.1.6
+ org.apache.sling/org.apache.sling.repoinit.parser/1.2.2
+ org.apache.sling/org.apache.sling.jcr.repoinit/1.1.8
org.apache.sling/org.apache.sling.provisioning.model/1.8.4
[:repoinit]
diff --git a/src/main/provisioning/scripting.txt
b/src/main/provisioning/scripting.txt
index 1945358..434c664 100644
--- a/src/main/provisioning/scripting.txt
+++ b/src/main/provisioning/scripting.txt
@@ -27,13 +27,13 @@
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.sightly/1.0.46
- org.apache.sling/org.apache.sling.scripting.sightly.compiler/1.0.16
- org.apache.sling/org.apache.sling.scripting.sightly.compiler.java/1.0.18
+ org.apache.sling/org.apache.sling.scripting.sightly/1.0.52-1.3.1
+ org.apache.sling/org.apache.sling.scripting.sightly.compiler/1.0.20-1.3.1
+
org.apache.sling/org.apache.sling.scripting.sightly.compiler.java/1.0.22-1.3.1
org.apache.sling/org.apache.sling.scripting.sightly.js.provider/1.0.26
org.apache.sling/org.apache.sling.scripting.sightly.models.provider/1.0.6
org.apache.sling/org.apache.sling.scripting.sightly.repl/1.0.4
- org.apache.servicemix.bundles/org.apache.servicemix.bundles.rhino/1.7.7.2_1
+ org.apache.servicemix.bundles/org.apache.servicemix.bundles.rhino/1.7.9_1
[:repoinit]
#<<< SLING-5848 - Define service user and ACLs for Scripting
diff --git a/src/main/provisioning/sling-caconfig.txt
b/src/main/provisioning/sling-caconfig.txt
index 95ed2ca..18b418a 100644
--- a/src/main/provisioning/sling-caconfig.txt
+++ b/src/main/provisioning/sling-caconfig.txt
@@ -22,7 +22,7 @@
[artifacts]
org.apache.sling/org.apache.sling.caconfig.api/1.1.0
org.apache.sling/org.apache.sling.caconfig.spi/1.3.2
- org.apache.sling/org.apache.sling.caconfig.impl/1.4.10
+ org.apache.sling/org.apache.sling.caconfig.impl/1.4.12
[:repoinit]
create path (sling:Folder) /conf
diff --git a/src/main/provisioning/sling-models-jacksonexporter.txt
b/src/main/provisioning/sling-models-jacksonexporter.txt
index d544940..56a2355 100644
--- a/src/main/provisioning/sling-models-jacksonexporter.txt
+++ b/src/main/provisioning/sling-models-jacksonexporter.txt
@@ -17,9 +17,11 @@
# under the License.
#
[feature name=models-jacksonexporter]
+[variables]
+ jackson.version=2.9.5
[artifacts]
org.apache.sling/org.apache.sling.models.jacksonexporter/1.0.8
- com.fasterxml.jackson.core/jackson-annotations/2.9.3
- com.fasterxml.jackson.core/jackson-core/2.9.3
- com.fasterxml.jackson.core/jackson-databind/2.9.3
+ com.fasterxml.jackson.core/jackson-annotations/${jackson.version}
+ com.fasterxml.jackson.core/jackson-core/${jackson.version}
+ com.fasterxml.jackson.core/jackson-databind/${jackson.version}
diff --git a/src/main/provisioning/sling.txt b/src/main/provisioning/sling.txt
index 49de475..6526d5b 100644
--- a/src/main/provisioning/sling.txt
+++ b/src/main/provisioning/sling.txt
@@ -33,7 +33,7 @@
org.apache.commons/commons-math/2.2
org.apache.geronimo.bundles/commons-httpclient/3.1_2
org.apache.httpcomponents/httpcore-osgi/4.4.9
- org.apache.httpcomponents/httpclient-osgi/4.5.4
+ org.apache.httpcomponents/httpclient-osgi/4.5.5
org.apache.sling/org.apache.sling.adapter/2.1.10
org.apache.sling/org.apache.sling.api/2.18.0
org.apache.sling/org.apache.sling.auth.core/1.4.2
@@ -47,7 +47,7 @@
org.apache.sling/org.apache.sling.commons.scheduler/2.7.2
org.apache.sling/org.apache.sling.commons.threads/3.2.16
org.apache.sling/org.apache.sling.engine/2.6.12
- org.apache.sling/org.apache.sling.fsresource/2.1.10
+ org.apache.sling/org.apache.sling.fsresource/2.1.12
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
@@ -58,14 +58,14 @@
org.apache.sling/org.apache.sling.jcr.contentloader/2.2.4
org.apache.sling/org.apache.sling.jcr.resource/3.0.10
org.apache.sling/org.apache.sling.models.api/1.3.6
- org.apache.sling/org.apache.sling.models.impl/1.4.6
+ org.apache.sling/org.apache.sling.models.impl/1.4.8
org.apache.sling/org.apache.sling.resourceresolver/1.6.0
org.apache.sling/org.apache.sling.serviceusermapper/1.4.0
org.apache.sling/org.apache.sling.serviceuser.webconsole/1.0.0
org.apache.sling/org.apache.sling.servlets.get/2.1.30
org.apache.sling/org.apache.sling.servlets.post/2.3.26
org.apache.sling/org.apache.sling.servlets.resolver/2.4.22
- org.apache.sling/org.apache.sling.xss/2.0.4
+ org.apache.sling/org.apache.sling.xss/2.0.6
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
@@ -82,7 +82,7 @@
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.6
+ org.apache.felix/org.apache.felix.webconsole.plugins.memoryusage/1.0.8
org.apache.sling/org.apache.sling.commons.johnzon/1.1.0
org.apache.felix/org.apache.felix.bundlerepository/2.0.10
org.apache.sling/org.apache.sling.extensions.threaddump/0.2.2
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
