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/23 22:20:42 UTC
[sling-org-apache-sling-karaf-features] 02/02: SLING-7329 Remove
extension from feature names
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 e8774f1a397b1489236879936c1df1faad91c3a4
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Sat Dec 23 22:26:19 2017 +0100
SLING-7329 Remove extension from feature names
---
src/main/feature/feature.xml | 100 +++++++++++++++++++++----------------------
1 file changed, 50 insertions(+), 50 deletions(-)
diff --git a/src/main/feature/feature.xml b/src/main/feature/feature.xml
index f83056c..9033f09 100644
--- a/src/main/feature/feature.xml
+++ b/src/main/feature/feature.xml
@@ -127,17 +127,17 @@
<feature>config</feature>
</feature>
<!-- Apache Sling Extensions -->
- <feature name="sling-extension-adapter" version="${project.version}">
+ <feature name="sling-adapter" version="${project.version}">
<bundle>mvn:org.apache.sling/org.apache.sling.adapter/2.1.10</bundle>
<!-- dependencies -->
<feature version="${project.version}">sling</feature>
</feature>
- <feature name="sling-extension-bundleresource" version="${project.version}">
+ <feature name="sling-bundleresource" version="${project.version}">
<bundle>mvn:org.apache.sling/org.apache.sling.bundleresource.impl/2.3.0</bundle>
<!-- dependencies -->
<feature version="${project.version}">sling</feature>
</feature>
- <feature name="sling-extension-discovery" version="${project.version}">
+ <feature name="sling-discovery" version="${project.version}">
<bundle>mvn:org.apache.sling/org.apache.sling.discovery.api/1.0.4</bundle>
<bundle>mvn:org.apache.sling/org.apache.sling.discovery.base/2.0.4</bundle>
<bundle>mvn:org.apache.sling/org.apache.sling.discovery.commons/1.0.20</bundle>
@@ -148,54 +148,54 @@
<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="sling-extension-discovery-impl" version="${project.version}">
+ <feature name="sling-discovery-impl" version="${project.version}">
<bundle>mvn:org.apache.sling/org.apache.sling.discovery.impl/1.2.12</bundle>
<!-- dependencies -->
<feature>webconsole</feature>
- <feature version="${project.version}">sling-extension-discovery</feature>
+ <feature version="${project.version}">sling-discovery</feature>
</feature>
- <feature name="sling-extension-discovery-oak" version="${project.version}">
+ <feature name="sling-discovery-oak" version="${project.version}">
<config external="true" name="org.apache.sling.jcr.repoinit.RepositoryInitializer-sling_discovery">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.jcr.repoinit.RepositoryInitializer-sling_discovery</config>
<config external="true" name="org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-discovery">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-discovery</config>
<bundle>mvn:org.apache.sling/org.apache.sling.discovery.oak/1.2.22</bundle>
<!-- dependencies -->
<feature>webconsole</feature>
- <feature version="${project.version}">sling-extension-discovery</feature>
- <feature version="${project.version}">sling-extension-healthcheck</feature>
+ <feature version="${project.version}">sling-discovery</feature>
+ <feature version="${project.version}">sling-healthcheck</feature>
</feature>
- <feature name="sling-extension-discovery-standalone" version="${project.version}">
+ <feature name="sling-discovery-standalone" version="${project.version}">
<bundle>mvn:org.apache.sling/org.apache.sling.discovery.standalone/1.0.2</bundle>
<!-- dependencies -->
- <feature version="${project.version}">sling-extension-discovery</feature>
+ <feature version="${project.version}">sling-discovery</feature>
</feature>
- <feature name="sling-extension-distribution" version="${project.version}">
+ <feature name="sling-distribution" version="${project.version}">
<bundle>mvn:org.apache.sling/org.apache.sling.distribution.api/0.3.0</bundle>
<bundle>mvn:org.apache.sling/org.apache.sling.distribution.core/0.2.8</bundle>
<!-- dependencies -->
<feature version="${project.version}">sling</feature>
<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}">sling-event</feature>
+ <feature version="${project.version}">sling-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>
</feature>
- <feature name="sling-extension-event" version="${project.version}">
+ <feature name="sling-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>
<config external="true" name="org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-event">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-event</config>
<bundle>mvn:org.apache.sling/org.apache.sling.event/4.2.10</bundle>
<bundle>mvn:org.apache.sling/org.apache.sling.event.dea/1.1.2</bundle>
<!-- dependencies -->
<feature version="${project.version}">sling</feature>
- <feature version="${project.version}">sling-extension-discovery</feature>
+ <feature version="${project.version}">sling-discovery</feature>
<bundle dependency="true">mvn:org.apache.felix/org.apache.felix.inventory/1.0.6</bundle>
</feature>
- <feature name="sling-extension-featureflags" version="${project.version}">
+ <feature name="sling-featureflags" version="${project.version}">
<bundle>mvn:org.apache.sling/org.apache.sling.featureflags/1.2.2</bundle>
<!-- dependencies -->
<feature version="${project.version}">sling</feature>
</feature>
- <feature name="sling-extension-fsresource" version="${project.version}">
+ <feature name="sling-fsresource" version="${project.version}">
<bundle>mvn:org.apache.sling/org.apache.sling.fsresource/2.1.6</bundle>
<!-- dependencies -->
<feature version="${project.version}">sling</feature>
@@ -205,7 +205,7 @@
<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>
</feature>
- <feature name="sling-extension-healthcheck" version="${project.version}">
+ <feature name="sling-healthcheck" version="${project.version}">
<bundle>mvn:org.apache.sling/org.apache.sling.hc.api/1.0.2</bundle>
<bundle>mvn:org.apache.sling/org.apache.sling.hc.core/1.2.10</bundle>
<bundle>mvn:org.apache.sling/org.apache.sling.hc.support/1.0.4</bundle>
@@ -215,95 +215,95 @@
<feature version="${project.version}">sling-jcr</feature>
<feature version="${project.version}">sling-scripting</feature>
</feature>
- <feature name="sling-extension-i18n" version="${project.version}">
+ <feature name="sling-i18n" version="${project.version}">
<config external="true" name="org.apache.sling.jcr.repoinit.RepositoryInitializer-sling_i18n">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.jcr.repoinit.RepositoryInitializer-sling_i18n</config>
<config external="true" name="org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-i18n">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-i18n</config>
<bundle>mvn:org.apache.sling/org.apache.sling.i18n/2.5.10</bundle>
<!-- dependencies -->
<feature version="${project.version}">sling</feature>
</feature>
- <feature name="sling-extension-jmx-provider" version="${project.version}">
+ <feature name="sling-jmx-provider" version="${project.version}">
<bundle>mvn:org.apache.sling/org.apache.sling.jmx.provider/1.0.2</bundle>
<!-- dependencies -->
<feature version="${project.version}">sling</feature>
</feature>
- <feature name="sling-extension-models" version="${project.version}">
+ <feature name="sling-models" version="${project.version}">
<bundle>mvn:org.apache.sling/org.apache.sling.models.api/1.3.6</bundle>
<bundle>mvn:org.apache.sling/org.apache.sling.models.impl/1.4.6</bundle>
<!-- dependencies -->
<feature version="${project.version}">sling</feature>
<feature version="${project.version}">sling-scripting</feature>
</feature>
- <feature name="sling-extension-models-jacksonexporter" version="${project.version}">
+ <feature name="sling-models-jacksonexporter" version="${project.version}">
<bundle>mvn:org.apache.sling/org.apache.sling.models.jacksonexporter/1.0.8</bundle>
<!-- dependencies -->
- <feature version="${project.version}">sling-extension-models</feature>
+ <feature version="${project.version}">sling-models</feature>
<bundle dependency="true">mvn:com.fasterxml.jackson.core/jackson-annotations/2.9.3</bundle>
<bundle dependency="true">mvn:com.fasterxml.jackson.core/jackson-core/2.9.3</bundle>
<bundle dependency="true">mvn:com.fasterxml.jackson.core/jackson-databind/2.9.3</bundle>
</feature>
- <feature name="sling-extension-pipes" version="${project.version}">
+ <feature name="sling-pipes" version="${project.version}">
<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</feature>
- <feature version="${project.version}">sling-extension-event</feature>
- <feature version="${project.version}">sling-extension-query</feature>
+ <feature version="${project.version}">sling-event</feature>
+ <feature version="${project.version}">sling-query</feature>
</feature>
- <feature name="sling-extension-query" version="${project.version}">
+ <feature name="sling-query" version="${project.version}">
<bundle>mvn:org.apache.sling/org.apache.sling.query/3.0.0</bundle>
<!-- dependencies -->
<feature version="${project.version}">sling</feature>
<bundle dependency="true">mvn:javax.jcr/jcr/2.0</bundle>
</feature>
- <feature name="sling-extension-resource-inventory" version="${project.version}">
+ <feature name="sling-resource-inventory" version="${project.version}">
<bundle>mvn:org.apache.sling/org.apache.sling.resource.inventory/1.0.8</bundle>
<!-- dependencies -->
<feature version="${project.version}">sling</feature>
<bundle dependency="true">mvn:org.apache.felix/org.apache.felix.inventory/1.0.6</bundle>
</feature>
- <feature name="sling-extension-resource-presence" version="${project.version}">
+ <feature name="sling-resource-presence" version="${project.version}">
<config external="true" name="org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-resource_presence">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-resource_presence</config>
<bundle>mvn:org.apache.sling/org.apache.sling.resource.presence/0.0.2</bundle>
<!-- dependencies -->
<feature version="${project.version}">sling</feature>
</feature>
- <feature name="sling-extension-resourcemerger" version="${project.version}">
+ <feature name="sling-resourcemerger" version="${project.version}">
<bundle>mvn:org.apache.sling/org.apache.sling.resourcemerger/1.3.4</bundle>
<!-- dependencies -->
<feature version="${project.version}">sling</feature>
</feature>
- <feature name="sling-extension-rewriter" version="${project.version}">
+ <feature name="sling-rewriter" version="${project.version}">
<bundle>mvn:org.apache.sling/org.apache.sling.rewriter/1.2.2</bundle>
<!-- dependencies -->
<feature version="${project.version}">sling</feature>
<feature version="${project.version}">sling-commons-html</feature>
</feature>
- <feature name="sling-extension-security" version="${project.version}">
+ <feature name="sling-security" version="${project.version}">
<bundle>mvn:org.apache.sling/org.apache.sling.security/1.1.10</bundle>
<!-- dependencies -->
<feature version="${project.version}">sling</feature>
</feature>
- <feature name="sling-extension-threaddump" version="${project.version}">
+ <feature name="sling-extensions-threaddump" version="${project.version}">
<bundle>mvn:org.apache.sling/org.apache.sling.extensions.threaddump/0.2.2</bundle>
</feature>
- <feature name="sling-extension-urlrewriter" version="${project.version}">
+ <feature name="sling-urlrewriter" version="${project.version}">
<bundle>mvn:org.apache.sling/org.apache.sling.urlrewriter/0.0.2</bundle>
<!-- dependencies -->
<feature version="${project.version}">sling</feature>
<bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.urlrewritefilter/4.0.4_1</bundle>
</feature>
- <feature name="sling-extension-validation" version="${project.version}">
+ <feature name="sling-validation" version="${project.version}">
<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.4</bundle>
<!-- dependencies -->
<feature version="${project.version}">sling</feature>
- <feature version="${project.version}">sling-extension-i18n</feature>
+ <feature version="${project.version}">sling-i18n</feature>
<feature version="${project.version}">sling-servlets</feature>
</feature>
- <feature name="sling-extension-xss" version="${project.version}">
+ <feature name="sling-xss" version="${project.version}">
<config external="true" name="org.apache.sling.jcr.repoinit.RepositoryInitializer-sling_xss">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.jcr.repoinit.RepositoryInitializer-sling_xss</config>
<config external="true" name="org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-xss">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-xss</config>
<bundle>mvn:org.apache.sling/org.apache.sling.xss/2.0.0</bundle>
@@ -323,7 +323,7 @@
<bundle>mvn:org.apache.sling/org.apache.sling.installer.hc/1.0.0</bundle>
<!-- dependencies -->
<feature version="${project.version}">sling-installer</feature>
- <feature version="${project.version}">sling-extension-healthcheck</feature>
+ <feature version="${project.version}">sling-healthcheck</feature>
</feature>
<feature name="sling-installer-provider-file" version="${project.version}">
<bundle>mvn:org.apache.sling/org.apache.sling.installer.provider.file/1.1.0</bundle>
@@ -441,9 +441,9 @@
<feature version="${project.version}">sling-installer</feature>
<feature version="${project.version}">sling-jcr</feature>
<feature version="${project.version}">sling-jcr-repoinit</feature>
- <feature version="${project.version}">sling-extension-adapter</feature>
- <feature version="${project.version}">sling-extension-bundleresource</feature>
- <feature version="${project.version}">sling-extension-discovery-oak</feature>
+ <feature version="${project.version}">sling-adapter</feature>
+ <feature version="${project.version}">sling-bundleresource</feature>
+ <feature version="${project.version}">sling-discovery-oak</feature>
<bundle dependency="true">mvn:org.apache.felix/org.apache.felix.prefs/1.1.0</bundle>
<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>
@@ -524,9 +524,9 @@
<feature version="${project.version}">sling-jcr</feature>
<feature version="${project.version}">sling-scripting</feature>
<feature version="${project.version}">sling-scripting-javascript</feature>
- <feature version="${project.version}">sling-extension-i18n</feature>
- <feature version="${project.version}">sling-extension-models</feature>
- <feature version="${project.version}">sling-extension-xss</feature>
+ <feature version="${project.version}">sling-i18n</feature>
+ <feature version="${project.version}">sling-models</feature>
+ <feature version="${project.version}">sling-xss</feature>
<feature version="${project.version}">sling-commons-compiler</feature>
<feature version="${project.version}">sling-commons-fsclassloader</feature>
<bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.rhino/1.7.7.2_1</bundle>
@@ -537,7 +537,7 @@
<!-- dependencies -->
<feature version="${project.version}">sling</feature>
<feature version="${project.version}">sling-scripting</feature>
- <feature version="${project.version}">sling-extension-i18n</feature>
+ <feature version="${project.version}">sling-i18n</feature>
<bundle dependency="true">mvn:org.attoparser/attoparser/2.0.4.RELEASE</bundle>
<bundle dependency="true">mvn:org.unbescape/unbescape/1.1.5.RELEASE</bundle>
<bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ognl/3.2.3_1</bundle>
@@ -551,7 +551,7 @@
<bundle>mvn:org.apache.sling/org.apache.sling.servlets.resolver/2.4.22</bundle>
<!-- dependencies -->
<feature version="${project.version}">sling</feature>
- <feature version="${project.version}">sling-extension-xss</feature>
+ <feature version="${project.version}">sling-xss</feature>
</feature>
<!-- Apache Jackrabbit -->
<feature name="jackrabbit" version="${project.version}">
@@ -611,9 +611,9 @@
<feature version="${project.version}">sling-scripting-thymeleaf</feature>
<feature version="${project.version}">sling-commons-messaging</feature>
<feature version="${project.version}">sling-commons-messaging-mail</feature>
- <feature version="${project.version}">sling-extension-models</feature>
- <feature version="${project.version}">sling-extension-query</feature>
- <feature version="${project.version}">sling-extension-validation</feature>
+ <feature version="${project.version}">sling-models</feature>
+ <feature version="${project.version}">sling-query</feature>
+ <feature version="${project.version}">sling-validation</feature>
<feature version="${project.version}">sling-installer-provider-jcr</feature>
<feature version="${project.version}">sling-auth-form</feature>
</feature>
@@ -629,7 +629,7 @@
<feature version="${project.version}">sling</feature>
<feature version="${project.version}">sling-jcr</feature>
<feature version="${project.version}">sling-scripting-jsp</feature>
- <feature version="${project.version}">sling-extension-event</feature>
+ <feature version="${project.version}">sling-event</feature>
<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>.