You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ol...@apache.org on 2017/12/22 15:20:22 UTC

[sling-org-apache-sling-karaf-distribution] branch master updated (f72a413 -> 3f7d02c)

This is an automated email from the ASF dual-hosted git repository.

olli pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-karaf-distribution.git.


    from f72a413  SLING-7253 Upgrade Karaf to 4.2
     new ae3274b  SLING-7324 Remove suffix sling from supporting features
     new 85b3268  SLING-7322 Provide Jackrabbit Vault feature
     new f7560e2  SLING-7327 Remove launchpad from feature names
     new 3f7d02c  update README

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:
 README.md |  4 ++++
 pom.xml   | 20 +++++++++++---------
 2 files changed, 15 insertions(+), 9 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
['"commits@sling.apache.org" <co...@sling.apache.org>'].

[sling-org-apache-sling-karaf-distribution] 02/04: SLING-7322 Provide Jackrabbit Vault feature

Posted by ol...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit 85b32684fd30e7d152c7a8548e9209468e104356
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Fri Dec 22 11:36:41 2017 +0100

    SLING-7322 Provide Jackrabbit Vault feature
---
 pom.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pom.xml b/pom.xml
index 0e804f0..819bd7f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -480,6 +480,7 @@
             <!-- Apache Jackrabbit -->
             <feature>jackrabbit</feature>
             <feature>jackrabbit-oak</feature>
+            <feature>jackrabbit-vault</feature>
             <!-- Apache Tika -->
             <feature>tika</feature>
             <!-- Apache Sling Samples -->

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.

[sling-org-apache-sling-karaf-distribution] 04/04: update README

Posted by ol...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit 3f7d02c1685fa15b1a7d147cb7deee54b0759d34
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Fri Dec 22 15:48:41 2017 +0100

    update README
---
 README.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/README.md b/README.md
index 32d2aa2..a802004 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,7 @@
 # Apache Sling - Karaf Distribution
 
 This module is part of the [Apache Sling](https://sling.apache.org) project.
+
+A [distribution](https://karaf.apache.org/manual/latest/#_custom_distributions) of [Apache Sling](https://sling.apache.org) based on [Apache Karaf](https://karaf.apache.org) ([Sling's Karaf Features](https://sling.apache.org/documentation/karaf.html#sling-karaf-features) and artifacts in a single archive).
+
+See [Running Apache Sling on Apache Karaf](http://sling.apache.org/documentation/karaf.html) also.

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.

[sling-org-apache-sling-karaf-distribution] 01/04: SLING-7324 Remove suffix sling from supporting features

Posted by ol...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit ae3274b9764076b1f1bd2c471f472092a2d1ab16
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Fri Dec 22 11:33:53 2017 +0100

    SLING-7324 Remove suffix sling from supporting features
---
 pom.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 642f1da..0e804f0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -478,14 +478,14 @@
             <!-- Apache Sling Servlets -->
             <feature>sling-servlets</feature>
             <!-- Apache Jackrabbit -->
-            <feature>jackrabbit-sling</feature>
-            <feature>jackrabbit-oak-sling</feature>
+            <feature>jackrabbit</feature>
+            <feature>jackrabbit-oak</feature>
             <!-- Apache Tika -->
-            <feature>tika-sling</feature>
+            <feature>tika</feature>
             <!-- Apache Sling Samples -->
             <feature>sling-samples-fling</feature>
             <!-- Composum -->
-            <feature>composum-sling</feature>
+            <feature>composum</feature>
           </installedFeatures>
           <startupFeatures>
           </startupFeatures>

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.

[sling-org-apache-sling-karaf-distribution] 03/04: SLING-7327 Remove launchpad from feature names

Posted by ol...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit f7560e2d1269ab61ba081f0a2bffb1dce291fd9c
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Fri Dec 22 15:06:52 2017 +0100

    SLING-7327 Remove launchpad from feature names
---
 pom.xml | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index 819bd7f..2d640f8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -457,15 +457,16 @@
             <feature>sling-jcr-repoinit</feature>
             <!-- Apache Sling Launchpad -->
             <feature>sling-launchpad-content</feature>
-            <feature>sling-launchpad-nosql-couchbase</feature>
-            <feature>sling-launchpad-nosql-mongodb</feature>
-            <feature>sling-launchpad-oak</feature>
-            <feature>sling-launchpad-oak-mongo</feature>
-            <feature>sling-launchpad-oak-tar</feature>
             <!-- Apache Sling NoSQL -->
             <feature>sling-nosql-couchbase</feature>
             <feature>sling-nosql-generic</feature>
             <feature>sling-nosql-mongodb</feature>
+            <!-- Apache Sling Quickstart -->
+            <feature>sling-quickstart-nosql-couchbase</feature>
+            <feature>sling-quickstart-nosql-mongodb</feature>
+            <feature>sling-quickstart-oak</feature>
+            <feature>sling-quickstart-oak-mongo</feature>
+            <feature>sling-quickstart-oak-tar</feature>
             <!-- Apache Sling Scripting -->
             <feature>sling-scripting</feature>
             <feature>sling-scripting-freemarker</feature>

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.