sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From k...@apache.org
Subject [sling-org-apache-sling-starter] 02/02: Merge branch 'master' of git@github.com:apache/sling-org-apache-sling-starter.git
Date Wed, 11 Apr 2018 10:59:12 GMT
This is an automated email from the ASF dual-hosted git repository.

kwin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-starter.git

commit 3683914573ecadbf1b746df4e1d7892b920faa24
Merge: 83da199 edc3b9e
Author: Konrad Windszus <konrad.windszus@netcentric.biz>
AuthorDate: Wed Apr 11 12:58:59 2018 +0200

    Merge branch 'master' of git@github.com:apache/sling-org-apache-sling-starter.git

 src/main/provisioning/boot.txt     |  2 +-
 src/main/provisioning/composum.txt |  2 +-
 src/main/provisioning/sling.txt    | 10 +++++-----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --cc src/main/provisioning/sling.txt
index 2209bb5,3adeb2c..8b0d403
--- a/src/main/provisioning/sling.txt
+++ b/src/main/provisioning/sling.txt
@@@ -54,13 -54,12 +54,12 @@@
      org.apache.sling/org.apache.sling.i18n/2.5.12
      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/1.0.0
 +    org.apache.sling/org.apache.sling.installer.hc/2.0.0
      org.apache.sling/org.apache.sling.jcr.contentloader/2.2.4
-     org.apache.sling/org.apache.sling.jcr.resource/3.0.8
-     org.apache.sling/org.apache.sling.launchpad.content/2.0.13-SNAPSHOT
+     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.resourceresolver/1.5.34
+     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

-- 
To stop receiving notification emails like this one, please contact
kwin@apache.org.

Mime
View raw message