You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ro...@apache.org on 2019/09/27 08:48:37 UTC
[sling-org-apache-sling-starter] branch master updated (379c22e ->
15c6e2f)
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-starter.git.
from 379c22e Updae to o.a.s.starter.content 1.0.8
new 9c10d86 Update to latest Sling releases (and new dependencies)
new 5360bdf Update to the latest versions of (some) third-party dependencies
new b018124 Update test dependencies
new 15c6e2f Remove the clean includes specific to old Jackrabbit
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
pom.xml | 7 ++-----
src/main/provisioning/boot.txt | 12 ++++++-----
src/main/provisioning/composum.txt | 4 ++--
src/main/provisioning/repoinit.txt | 4 ++--
src/main/provisioning/scripting.txt | 14 ++++++-------
src/main/provisioning/sling-caconfig.txt | 4 ++--
src/main/provisioning/sling.txt | 36 ++++++++++++++++----------------
src/main/provisioning/standalone.txt | 2 +-
src/main/provisioning/webapp.txt | 2 +-
9 files changed, 42 insertions(+), 43 deletions(-)
[sling-org-apache-sling-starter] 01/04: Update to latest Sling
releases (and new dependencies)
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-starter.git
commit 9c10d8626273ffe45bb3be46fb4d6233775a57b3
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Fri Sep 27 10:33:29 2019 +0200
Update to latest Sling releases (and new dependencies)
---
src/main/provisioning/boot.txt | 6 ++++--
src/main/provisioning/repoinit.txt | 4 ++--
src/main/provisioning/scripting.txt | 12 ++++++------
src/main/provisioning/sling-caconfig.txt | 4 ++--
src/main/provisioning/sling.txt | 22 +++++++++++-----------
5 files changed, 25 insertions(+), 23 deletions(-)
diff --git a/src/main/provisioning/boot.txt b/src/main/provisioning/boot.txt
index b5b48db..2148747 100644
--- a/src/main/provisioning/boot.txt
+++ b/src/main/provisioning/boot.txt
@@ -35,6 +35,8 @@
[artifacts]
org.osgi/org.osgi.util.function/1.1.0
org.osgi/org.osgi.util.promise/1.1.0
+ org.osgi/org.osgi.util.pushstream/1.0.1
+ org.osgi/org.osgi.service.log/1.4.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
@@ -46,14 +48,14 @@
org.apache.servicemix.bundles/org.apache.servicemix.bundles.jaxb-impl/2.2.11_1
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.0.6
+ org.apache.sling/org.apache.sling.commons.logservice/1.1.0
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.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.2
+ org.apache.sling/org.apache.sling.installer.factory.configuration/1.2.4
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
diff --git a/src/main/provisioning/repoinit.txt b/src/main/provisioning/repoinit.txt
index 7250cd1..9a9bf9a 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.4
- org.apache.sling/org.apache.sling.jcr.repoinit/1.1.10
+ org.apache.sling/org.apache.sling.repoinit.parser/1.2.6
+ org.apache.sling/org.apache.sling.jcr.repoinit/1.1.12
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 4f95180..b08c6f6 100644
--- a/src/main/provisioning/scripting.txt
+++ b/src/main/provisioning/scripting.txt
@@ -28,12 +28,12 @@
org.apache.sling/org.apache.sling.scripting.el-api/1.0.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.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.runtime/1.1.2-1.4.0
+ org.apache.sling/org.apache.sling.scripting.sightly.compiler/1.2.0-1.4.0
+ org.apache.sling/org.apache.sling.scripting.sightly.compiler.java/1.1.4-1.4.0
+ org.apache.sling/org.apache.sling.scripting.sightly/1.2.0-1.4.0
+ org.apache.sling/org.apache.sling.scripting.sightly.js.provider/1.0.30
+ org.apache.sling/org.apache.sling.scripting.sightly.models.provider/1.0.10
org.apache.sling/org.apache.sling.scripting.sightly.repl/1.0.6
org.apache.servicemix.bundles/org.apache.servicemix.bundles.rhino/1.7.10_1
diff --git a/src/main/provisioning/sling-caconfig.txt b/src/main/provisioning/sling-caconfig.txt
index e76bb34..aa36b0c 100644
--- a/src/main/provisioning/sling-caconfig.txt
+++ b/src/main/provisioning/sling-caconfig.txt
@@ -20,9 +20,9 @@
[feature name=sling-caconfig]
[artifacts]
- org.apache.sling/org.apache.sling.caconfig.api/1.1.2
+ org.apache.sling/org.apache.sling.caconfig.api/1.2.0
org.apache.sling/org.apache.sling.caconfig.spi/1.3.4
- org.apache.sling/org.apache.sling.caconfig.impl/1.4.14
+ org.apache.sling/org.apache.sling.caconfig.impl/1.5.0
[:repoinit]
create path (sling:Folder) /conf
diff --git a/src/main/provisioning/sling.txt b/src/main/provisioning/sling.txt
index d63b055..17698d9 100644
--- a/src/main/provisioning/sling.txt
+++ b/src/main/provisioning/sling.txt
@@ -29,7 +29,7 @@
[artifacts startLevel=5]
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.2
+ 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.8
@@ -48,7 +48,7 @@
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
+ org.apache.sling/org.apache.sling.auth.core/1.4.4
[artifacts startLevel=10]
org.apache.felix/org.apache.felix.http.sslfilter/1.2.6
@@ -61,7 +61,7 @@
[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.0.6
+ 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}
@@ -97,13 +97,13 @@
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.fsclassloader/1.0.12
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.scheduler/2.7.4
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.engine/2.6.20
+ 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.provider.jcr/3.1.26
@@ -112,12 +112,12 @@
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.resourceresolver/1.6.12
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.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.30
- org.apache.sling/org.apache.sling.servlets.resolver/2.5.2
+ org.apache.sling/org.apache.sling.servlets.post/2.3.32
+ org.apache.sling/org.apache.sling.servlets.resolver/2.5.6
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
[sling-org-apache-sling-starter] 04/04: Remove the clean includes
specific to old Jackrabbit
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-starter.git
commit 15c6e2fe011f15a57b39836f723a7efc8eb85b89
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Fri Sep 27 10:42:50 2019 +0200
Remove the clean includes specific to old Jackrabbit
---
pom.xml | 3 ---
1 file changed, 3 deletions(-)
diff --git a/pom.xml b/pom.xml
index 0f48d38..79c026a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -61,10 +61,7 @@
<fileset>
<directory>${basedir}</directory>
<includes>
- <include>derby.log</include>
- <include>cachedir/**</include>
<include>sling/**</include>
- <include>jackrabbit/**</include>
<include>coverage.ec</include>
</includes>
</fileset>
[sling-org-apache-sling-starter] 03/04: Update test dependencies
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-starter.git
commit b0181245ac075a21fa80c5d14a323fdc01894a39
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Fri Sep 27 10:42:21 2019 +0200
Update test dependencies
---
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index 5795a37..0f48d38 100644
--- a/pom.xml
+++ b/pom.xml
@@ -162,13 +162,13 @@
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
- <version>4.5.6</version>
+ <version>4.5.10</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.utils</artifactId>
- <version>1.11.0</version>
+ <version>1.11.2</version>
<scope>test</scope>
</dependency>
</dependencies>
[sling-org-apache-sling-starter] 02/04: Update to the latest
versions of (some) third-party dependencies
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-starter.git
commit 5360bdf04a4ac0b0027ebcc5fd3a2bc70b61ad01
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Fri Sep 27 10:41:07 2019 +0200
Update to the latest versions of (some) third-party dependencies
---
src/main/provisioning/boot.txt | 6 +++---
src/main/provisioning/composum.txt | 4 ++--
src/main/provisioning/scripting.txt | 2 +-
src/main/provisioning/sling.txt | 14 +++++++-------
src/main/provisioning/standalone.txt | 2 +-
src/main/provisioning/webapp.txt | 2 +-
6 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/src/main/provisioning/boot.txt b/src/main/provisioning/boot.txt
index 2148747..4659de7 100644
--- a/src/main/provisioning/boot.txt
+++ b/src/main/provisioning/boot.txt
@@ -34,7 +34,7 @@
[artifacts]
org.osgi/org.osgi.util.function/1.1.0
- org.osgi/org.osgi.util.promise/1.1.0
+ 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.apache.sling/org.apache.sling.javax.activation/0.1.0
@@ -56,10 +56,10 @@
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.felix/org.apache.felix.configadmin/1.9.14
+ 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.8.1
+ org.apache.commons/commons-lang3/3.9
diff --git a/src/main/provisioning/composum.txt b/src/main/provisioning/composum.txt
index 56e6a43..bcafb5e 100644
--- a/src/main/provisioning/composum.txt
+++ b/src/main/provisioning/composum.txt
@@ -17,7 +17,7 @@
# under the License.
[feature name=composum-nodes]
[variables]
- composum.nodes.version=1.11.3
+ composum.nodes.version=1.11.5
[artifacts startLevel=20]
@@ -27,7 +27,7 @@
com.composum.sling.core/composum-sling-user-management/${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.2.8
+ org.apache.jackrabbit.vault/org.apache.jackrabbit.vault/3.4.0
[configurations]
diff --git a/src/main/provisioning/scripting.txt b/src/main/provisioning/scripting.txt
index b08c6f6..75bd30a 100644
--- a/src/main/provisioning/scripting.txt
+++ b/src/main/provisioning/scripting.txt
@@ -27,7 +27,7 @@
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.4.0
- org.antlr/antlr4-runtime/4.7.1
+ org.antlr/antlr4-runtime/4.7.2
org.apache.sling/org.apache.sling.scripting.sightly.runtime/1.1.2-1.4.0
org.apache.sling/org.apache.sling.scripting.sightly.compiler/1.2.0-1.4.0
org.apache.sling/org.apache.sling.scripting.sightly.compiler.java/1.1.4-1.4.0
diff --git a/src/main/provisioning/sling.txt b/src/main/provisioning/sling.txt
index 17698d9..d8f5254 100644
--- a/src/main/provisioning/sling.txt
+++ b/src/main/provisioning/sling.txt
@@ -32,12 +32,12 @@
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.8
+ org.apache.felix/org.apache.felix.webconsole/4.3.16
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.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.felix/org.apache.felix.bundlerepository/2.0.10
org.apache.sling/org.apache.sling.extensions.threaddump/0.2.2
@@ -52,8 +52,8 @@
[artifacts startLevel=10]
org.apache.felix/org.apache.felix.http.sslfilter/1.2.6
- org.apache.pdfbox/pdfbox/2.0.16
- org.apache.pdfbox/fontbox/2.0.16
+ 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-parsers/1.22
@@ -87,11 +87,11 @@
# Adjust responseTextFor503 in healthcheck.txt to "classpath:org.apache.sling.starter.content:startup/index.html" when updating org.apache.sling.starter.content, see SLING-8721
org.apache.sling/org.apache.sling.starter.content/1.0.8
commons-collections/commons-collections/3.2.2
- org.apache.commons/commons-collections4/4.2
+ org.apache.commons/commons-collections4/4.4
commons-codec/commons-codec/1.13
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.httpcomponents/httpcore-osgi/4.4.12
+ org.apache.httpcomponents/httpclient-osgi/4.5.10
org.apache.sling/org.apache.sling.adapter/2.1.10
org.apache.sling/org.apache.sling.auth.form/1.0.16
org.apache.sling/org.apache.sling.bundleresource.impl/2.3.2
diff --git a/src/main/provisioning/standalone.txt b/src/main/provisioning/standalone.txt
index d94cb76..de82de5 100644
--- a/src/main/provisioning/standalone.txt
+++ b/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.8
+ org.apache.felix/org.apache.felix.http.jetty/4.0.14
diff --git a/src/main/provisioning/webapp.txt b/src/main/provisioning/webapp.txt
index 50b82bc..bd35a39 100644
--- a/src/main/provisioning/webapp.txt
+++ b/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.6
+ org.apache.felix/org.apache.felix.http.bridge/4.0.10