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:16 UTC

[sling-org-apache-sling-karaf-features] branch master updated (dfbf51f -> 547b71b)

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-features.git.


    from dfbf51f  SLING-3027 Improve Launchpad Karaf Features
     new 5b51dee  SLING-7324 Remove suffix sling from supporting features
     new decaf04  SLING-7322 Provide Jackrabbit Vault feature
     new 8077cf2  SLING-3027 Improve Launchpad Karaf Features
     new b116423  SLING-7327 Remove launchpad from feature names
     new 547b71b  update README

The 5 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 ++
 src/main/feature/feature.xml | 89 ++++++++++++++++++++++++--------------------
 2 files changed, 53 insertions(+), 40 deletions(-)

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

[sling-org-apache-sling-karaf-features] 01/05: 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-features.git

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

    SLING-7324 Remove suffix sling from supporting features
---
 src/main/feature/feature.xml | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/main/feature/feature.xml b/src/main/feature/feature.xml
index 05fb4b0..ffa522f 100644
--- a/src/main/feature/feature.xml
+++ b/src/main/feature/feature.xml
@@ -250,7 +250,7 @@
     <bundle>mvn:org.apache.sling/org.apache.sling.pipes/1.1.0</bundle>
     <!-- dependencies -->
     <feature version="${project.version}">sling</feature>
-    <feature version="${project.version}">jackrabbit-sling</feature>
+    <feature version="${project.version}">jackrabbit</feature>
     <feature version="${project.version}">sling-extension-event</feature>
     <feature version="${project.version}">sling-extension-query</feature>
   </feature>
@@ -360,9 +360,9 @@
     <!-- dependencies -->
     <feature>webconsole</feature>
     <feature version="${project.version}">sling</feature>
-    <feature version="${project.version}">jackrabbit-sling</feature>
-    <feature version="${project.version}">jackrabbit-oak-sling</feature>
-    <feature version="${project.version}">tika-sling</feature>
+    <feature version="${project.version}">jackrabbit</feature>
+    <feature version="${project.version}">jackrabbit-oak</feature>
+    <feature version="${project.version}">tika</feature>
   </feature>
   <feature name="sling-jcr-compiler" version="${project.version}">
     <bundle>mvn:org.apache.sling/org.apache.sling.jcr.compiler/2.1.0</bundle>
@@ -557,7 +557,7 @@
     <feature version="${project.version}">sling-extension-xss</feature>
   </feature>
   <!-- Apache Jackrabbit -->
-  <feature name="jackrabbit-sling" version="${project.version}">
+  <feature name="jackrabbit" version="${project.version}">
     <bundle>mvn:org.apache.jackrabbit/jackrabbit-api/${org.apache.jackrabbit.version}</bundle>
     <bundle>mvn:org.apache.jackrabbit/jackrabbit-data/${org.apache.jackrabbit.version}</bundle>
     <bundle>mvn:org.apache.jackrabbit/jackrabbit-jcr-commons/${org.apache.jackrabbit.version}</bundle>
@@ -583,20 +583,20 @@
     <bundle dependency="true">mvn:org.apache.httpcomponents/httpcore-osgi/4.4.8</bundle>
     <bundle dependency="true">mvn:org.apache.httpcomponents/httpclient-osgi/4.5.4</bundle>
   </feature>
-  <feature name="jackrabbit-oak-sling" version="${project.version}">
+  <feature name="jackrabbit-oak" version="${project.version}">
     <bundle>mvn:org.apache.jackrabbit/oak-core/${org.apache.jackrabbit.oak.version}</bundle>
     <bundle>mvn:org.apache.jackrabbit/oak-commons/${org.apache.jackrabbit.oak.version}</bundle>
     <bundle>mvn:org.apache.jackrabbit/oak-blob/${org.apache.jackrabbit.oak.version}</bundle>
     <bundle>mvn:org.apache.jackrabbit/oak-jcr/${org.apache.jackrabbit.oak.version}</bundle>
     <!-- dependencies -->
     <feature>scr</feature>
-    <feature version="${project.version}">jackrabbit-sling</feature>
-    <feature version="${project.version}">tika-sling</feature>
+    <feature version="${project.version}">jackrabbit</feature>
+    <feature version="${project.version}">tika</feature>
     <bundle>mvn:com.google.guava/guava/15.0</bundle>
     <bundle>mvn:org.apache.felix/org.apache.felix.jaas/1.0.2</bundle>
   </feature>
   <!-- Apache Tika -->
-  <feature name="tika-sling" version="${project.version}">
+  <feature name="tika" version="${project.version}">
     <bundle>mvn:org.apache.tika/tika-core/${org.apache.tika.version}</bundle>
     <bundle>mvn:org.apache.tika/tika-bundle/${org.apache.tika.version}</bundle>
   </feature>
@@ -615,7 +615,7 @@
     <feature version="${project.version}">sling-auth-form</feature>
   </feature>
   <!-- Composum -->
-  <feature name="composum-sling" version="${project.version}">
+  <feature name="composum" version="${project.version}">
     <config external="true" name="org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment-composum">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment-composum</config>
     <bundle>mvn:com.composum.sling.core/composum-sling-core-commons/1.8.2</bundle>
     <bundle>mvn:com.composum.sling.core/composum-sling-core-console/1.8.2</bundle>

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

[sling-org-apache-sling-karaf-features] 05/05: 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-features.git

commit 547b71b315aa5b6631cd13939b21a6294dcf09a6
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Fri Dec 22 15:48:30 2017 +0100

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

diff --git a/README.md b/README.md
index b05aa8d..58feb4b 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,7 @@
 # Apache Sling - Karaf Features
 
 This module is part of the [Apache Sling](https://sling.apache.org) project.
+
+A features repository for easy deployment of [Apache Sling](https://sling.apache.org) on [Apache Karaf](https://karaf.apache.org) (see [Provisioning](https://karaf.apache.org/manual/latest/#_provisioning) for details).
+
+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-features] 04/05: 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-features.git

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

    SLING-7327 Remove launchpad from feature names
---
 src/main/feature/feature.xml | 53 ++++++++++++++++++++++----------------------
 1 file changed, 27 insertions(+), 26 deletions(-)

diff --git a/src/main/feature/feature.xml b/src/main/feature/feature.xml
index fee0f84..9640e3a 100644
--- a/src/main/feature/feature.xml
+++ b/src/main/feature/feature.xml
@@ -397,18 +397,38 @@
     <feature version="${project.version}">sling-auth-form</feature>
     <feature version="${project.version}">sling-extension-explorer</feature>
   </feature>
-  <feature name="sling-launchpad-nosql-couchbase" version="${project.version}">
+  <!-- Apache Sling NoSQL -->
+  <feature name="sling-nosql-generic" version="${project.version}">
+    <bundle>mvn:org.apache.sling/org.apache.sling.nosql.generic/1.1.0</bundle>
+    <!-- dependencies -->
+    <feature version="${project.version}">sling</feature>
+  </feature>
+  <feature name="sling-nosql-couchbase" version="${project.version}">
+    <bundle>mvn:org.apache.sling/org.apache.sling.nosql.couchbase-client/1.0.2</bundle>
+    <bundle>mvn:org.apache.sling/org.apache.sling.nosql.couchbase-resourceprovider/1.1.0</bundle>
+    <!-- dependencies -->
+    <feature version="${project.version}">sling-nosql-generic</feature>
+    <bundle dependency="true">mvn:io.wcm.osgi.wrapper/io.wcm.osgi.wrapper.rxjava/1.0.14-0000</bundle>
+  </feature>
+  <feature name="sling-nosql-mongodb" version="${project.version}">
+    <bundle>mvn:org.apache.sling/org.apache.sling.nosql.mongodb-resourceprovider/1.1.0</bundle>
+    <!-- dependencies -->
+    <feature version="${project.version}">sling-nosql-generic</feature>
+    <bundle dependency="true">mvn:org.mongodb/mongo-java-driver/3.6.0</bundle>
+  </feature>
+  <!-- Apache Sling Quickstart -->
+  <feature name="sling-quickstart-nosql-couchbase" version="${project.version}">
     <config external="true" name="org.apache.sling.nosql.couchbase.resourceprovider.CouchbaseNoSqlResourceProviderFactory.factory.config-default">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.nosql.couchbase.resourceprovider.CouchbaseNoSqlResourceProviderFactory.factory.config-default</config>
     <config external="true" name="org.apache.sling.nosql.couchbase.client.CouchbaseClient.factory.config-default">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.nosql.couchbase.client.CouchbaseClient.factory.config-default</config>
     <!-- dependencies -->
     <feature version="${project.version}">sling-nosql-couchbase</feature>
   </feature>
-  <feature name="sling-launchpad-nosql-mongodb" version="${project.version}">
+  <feature name="sling-quickstart-nosql-mongodb" version="${project.version}">
     <config external="true" name="org.apache.sling.nosql.mongodb.resourceprovider.MongoDBNoSqlResourceProviderFactory.factory.config-default">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.nosql.mongodb.resourceprovider.MongoDBNoSqlResourceProviderFactory.factory.config-default</config>
     <!-- dependencies -->
     <feature version="${project.version}">sling-nosql-mongodb</feature>
   </feature>
-  <feature name="sling-launchpad-oak" version="${project.version}"><!-- hidden="true" -->
+  <feature name="sling-quickstart-oak" version="${project.version}"><!-- hidden="true" -->
     <!-- Sling with Oak Repository and Felix Web Console -->
     <!-- http://jackrabbit.apache.org/oak/docs/osgi_config.html -->
     <config external="true" name="org.apache.felix.jaas.Configuration.factory-GuestLoginModule">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.felix.jaas.Configuration.factory-GuestLoginModule</config>
@@ -434,42 +454,23 @@
     <bundle>mvn:org.apache.felix/org.apache.felix.webconsole.plugins.memoryusage/1.0.6</bundle>
     <bundle>mvn:org.apache.felix/org.apache.felix.webconsole.plugins.packageadmin/1.0.4</bundle>
   </feature>
-  <feature name="sling-launchpad-oak-tar" version="${project.version}">
+  <feature name="sling-quickstart-oak-tar" version="${project.version}">
     <config external="true" name="org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexProviderService">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexProviderService</config>
     <config external="true" name="org.apache.jackrabbit.oak.segment.SegmentNodeStoreService">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.jackrabbit.oak.segment.SegmentNodeStoreService</config>
-    <feature version="${project.version}">sling-launchpad-oak</feature>
+    <feature version="${project.version}">sling-quickstart-oak</feature>
     <bundle>mvn:org.apache.jackrabbit/oak-lucene/${org.apache.jackrabbit.oak.version}</bundle>
     <bundle>mvn:org.apache.jackrabbit/oak-segment-tar/${org.apache.jackrabbit.oak.version}</bundle>
     <bundle>mvn:org.apache.sling/org.apache.sling.jcr.oak.server/1.1.4</bundle>
   </feature>
-  <feature name="sling-launchpad-oak-mongo" version="${project.version}">
+  <feature name="sling-quickstart-oak-mongo" version="${project.version}">
     <config external="true" name="org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexProviderService">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexProviderService</config>
     <config external="true" name="org.apache.jackrabbit.oak.plugins.document.DocumentNodeStoreService">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.jackrabbit.oak.plugins.document.DocumentNodeStoreService</config>
-    <feature version="${project.version}">sling-launchpad-oak</feature>
+    <feature version="${project.version}">sling-quickstart-oak</feature>
     <bundle>mvn:org.apache.jackrabbit/oak-lucene/${org.apache.jackrabbit.oak.version}</bundle>
     <bundle>mvn:org.mongodb/mongo-java-driver/3.6.0</bundle>
     <bundle>mvn:com.h2database/h2-mvstore/1.4.196</bundle>
     <bundle>mvn:org.apache.sling/org.apache.sling.jcr.oak.server/1.1.4</bundle>
   </feature>
-  <!-- Apache Sling NoSQL -->
-  <feature name="sling-nosql-generic" version="${project.version}">
-    <bundle>mvn:org.apache.sling/org.apache.sling.nosql.generic/1.1.0</bundle>
-    <!-- dependencies -->
-    <feature version="${project.version}">sling</feature>
-  </feature>
-  <feature name="sling-nosql-couchbase" version="${project.version}">
-    <bundle>mvn:org.apache.sling/org.apache.sling.nosql.couchbase-client/1.0.2</bundle>
-    <bundle>mvn:org.apache.sling/org.apache.sling.nosql.couchbase-resourceprovider/1.1.0</bundle>
-    <!-- dependencies -->
-    <feature version="${project.version}">sling-nosql-generic</feature>
-    <bundle dependency="true">mvn:io.wcm.osgi.wrapper/io.wcm.osgi.wrapper.rxjava/1.0.14-0000</bundle>
-  </feature>
-  <feature name="sling-nosql-mongodb" version="${project.version}">
-    <bundle>mvn:org.apache.sling/org.apache.sling.nosql.mongodb-resourceprovider/1.1.0</bundle>
-    <!-- dependencies -->
-    <feature version="${project.version}">sling-nosql-generic</feature>
-    <bundle dependency="true">mvn:org.mongodb/mongo-java-driver/3.6.0</bundle>
-  </feature>
   <!-- Apache Sling Scripting -->
   <feature name="sling-scripting" version="${project.version}">
     <config external="true" name="org.apache.sling.jcr.repoinit.RepositoryInitializer-sling_scripting">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.jcr.repoinit.RepositoryInitializer-sling_scripting</config>

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

[sling-org-apache-sling-karaf-features] 02/05: 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-features.git

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

    SLING-7322 Provide Jackrabbit Vault feature
---
 src/main/feature/feature.xml | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/main/feature/feature.xml b/src/main/feature/feature.xml
index ffa522f..e820915 100644
--- a/src/main/feature/feature.xml
+++ b/src/main/feature/feature.xml
@@ -174,9 +174,9 @@
     <feature version="${project.version}">sling-jcr</feature>
     <feature version="${project.version}">sling-extension-event</feature>
     <feature version="${project.version}">sling-extension-healthcheck</feature>
+    <feature version="${project.version}">jackrabbit-vault</feature>
     <bundle dependency="true">mvn:org.apache.httpcomponents/httpcore-osgi/4.4.8</bundle>
     <bundle dependency="true">mvn:org.apache.httpcomponents/httpclient-osgi/4.5.4</bundle>
-    <bundle dependency="true">mvn:org.apache.jackrabbit.vault/org.apache.jackrabbit.vault/3.1.42</bundle>
   </feature>
   <feature name="sling-extension-event" version="${project.version}">
     <config external="true" name="org.apache.sling.jcr.repoinit.RepositoryInitializer-sling_event">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.jcr.repoinit.RepositoryInitializer-sling_event</config>
@@ -203,11 +203,11 @@
     <bundle>mvn:org.apache.sling/org.apache.sling.fsresource/2.1.6</bundle>
     <!-- dependencies -->
     <feature version="${project.version}">sling</feature>
+    <feature version="${project.version}">jackrabbit-vault</feature>
     <bundle dependency="true">mvn:javax.jcr/jcr/2.0</bundle>
     <bundle dependency="true">mvn:org.apache.jackrabbit/jackrabbit-api/${org.apache.jackrabbit.version}</bundle>
     <bundle dependency="true">mvn:org.apache.jackrabbit/jackrabbit-jcr-commons/${org.apache.jackrabbit.version}</bundle>
     <bundle dependency="true">mvn:com.google.guava/guava/15.0</bundle>
-    <bundle dependency="true">mvn:org.apache.jackrabbit.vault/org.apache.jackrabbit.vault/3.1.42</bundle>
   </feature>
   <feature name="sling-extension-healthcheck" version="${project.version}">
     <bundle>mvn:org.apache.sling/org.apache.sling.hc.api/1.0.2</bundle>
@@ -595,6 +595,12 @@
     <bundle>mvn:com.google.guava/guava/15.0</bundle>
     <bundle>mvn:org.apache.felix/org.apache.felix.jaas/1.0.2</bundle>
   </feature>
+  <feature name="jackrabbit-vault" version="${project.version}">
+    <bundle>mvn:org.apache.jackrabbit.vault/org.apache.jackrabbit.vault/3.1.42</bundle>
+    <!-- dependencies -->
+    <feature>scr</feature>
+    <feature version="${project.version}">jackrabbit</feature>
+  </feature>
   <!-- Apache Tika -->
   <feature name="tika" version="${project.version}">
     <bundle>mvn:org.apache.tika/tika-core/${org.apache.tika.version}</bundle>
@@ -627,6 +633,6 @@
     <feature version="${project.version}">sling-jcr</feature>
     <feature version="${project.version}">sling-scripting-jsp</feature>
     <feature version="${project.version}">sling-extension-event</feature>
-    <bundle dependency="true">mvn:org.apache.jackrabbit.vault/org.apache.jackrabbit.vault/3.1.42</bundle>
+    <feature version="${project.version}">jackrabbit-vault</feature>
   </feature>
 </features>

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

[sling-org-apache-sling-karaf-features] 03/05: SLING-3027 Improve Launchpad Karaf 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-features.git

commit 8077cf247cb570d907f6b403a7e18484ab529f28
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Fri Dec 22 11:39:45 2017 +0100

    SLING-3027 Improve Launchpad Karaf Features
    
    * use latest release
    * add missing feature dependency
---
 src/main/feature/feature.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/main/feature/feature.xml b/src/main/feature/feature.xml
index e820915..fee0f84 100644
--- a/src/main/feature/feature.xml
+++ b/src/main/feature/feature.xml
@@ -123,6 +123,8 @@
   </feature>
   <feature name="sling-commons-threads" version="${project.version}">
     <bundle>mvn:org.apache.sling/org.apache.sling.commons.threads/3.2.10</bundle>
+    <!-- dependencies -->
+    <feature>config</feature>
   </feature>
   <!-- Apache Sling Extensions -->
   <feature name="sling-extension-adapter" version="${project.version}">
@@ -301,7 +303,7 @@
     <config external="true" name="org.apache.sling.jcr.repoinit.RepositoryInitializer-sling_validation">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.jcr.repoinit.RepositoryInitializer-sling_validation</config>
     <config external="true" name="org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-validation">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-validation</config>
     <bundle>mvn:org.apache.sling/org.apache.sling.validation.api/1.0.0</bundle>
-    <bundle>mvn:org.apache.sling/org.apache.sling.validation.core/1.0.0</bundle>
+    <bundle>mvn:org.apache.sling/org.apache.sling.validation.core/1.0.4</bundle>
     <!-- dependencies -->
     <feature version="${project.version}">sling</feature>
     <feature version="${project.version}">sling-extension-i18n</feature>

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