Author: olli
Date: Sun Jan 29 09:00:36 2017
New Revision: 1780770

URL: http://svn.apache.org/viewvc?rev=1780770&view=rev
Log:
use project version for features (KARAF-4105)

Modified:
    sling/trunk/karaf/org.apache.sling.karaf-features/pom.xml
    
sling/trunk/karaf/org.apache.sling.karaf-features/src/main/feature/feature.xml

Modified: sling/trunk/karaf/org.apache.sling.karaf-features/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/karaf/org.apache.sling.karaf-features/pom.xml?rev=1780770&r1=1780769&r2=1780770&view=diff
==============================================================================
--- sling/trunk/karaf/org.apache.sling.karaf-features/pom.xml (original)
+++ sling/trunk/karaf/org.apache.sling.karaf-features/pom.xml Sun Jan 29 
09:00:36 2017
@@ -40,7 +40,6 @@
     <org.apache.jackrabbit.version>2.14.0</org.apache.jackrabbit.version>
     
<org.apache.jackrabbit.oak.version>1.5.18</org.apache.jackrabbit.oak.version>
     <org.apache.tika.version>1.14</org.apache.tika.version>
-    <feature.version>0.1.1.SNAPSHOT</feature.version>
   </properties>
 
   <build>

Modified: 
sling/trunk/karaf/org.apache.sling.karaf-features/src/main/feature/feature.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/karaf/org.apache.sling.karaf-features/src/main/feature/feature.xml?rev=1780770&r1=1780769&r2=1780770&view=diff
==============================================================================
--- 
sling/trunk/karaf/org.apache.sling.karaf-features/src/main/feature/feature.xml 
(original)
+++ 
sling/trunk/karaf/org.apache.sling.karaf-features/src/main/feature/feature.xml 
Sun Jan 29 09:00:36 2017
@@ -17,9 +17,9 @@
     specific language governing permissions and limitations
     under the License.
 -->
-<features name="sling-${feature.version}" 
xmlns="http://karaf.apache.org/xmlns/features/v1.3.0";>
+<features name="sling-${project.version}" 
xmlns="http://karaf.apache.org/xmlns/features/v1.3.0";>
   <!-- Apache Sling -->
-  <feature name="sling" version="${feature.version}">
+  <feature name="sling" version="${project.version}">
     <configfile 
finalname="/etc/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-resourceresolver.config">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-resourceresolver</configfile>
     <bundle>mvn:org.apache.sling/org.apache.sling.api/2.16.2</bundle>
     <bundle>mvn:org.apache.sling/org.apache.sling.auth.core/1.3.22</bundle>
@@ -40,9 +40,9 @@
     <feature>management</feature>
     <feature>http</feature>
     <feature>http-whiteboard</feature>
-    <feature version="${feature.version}">sling-commons-classloader</feature>
-    <feature version="${feature.version}">sling-commons-scheduler</feature>
-    <feature version="${feature.version}">sling-commons-threads</feature>
+    <feature version="${project.version}">sling-commons-classloader</feature>
+    <feature version="${project.version}">sling-commons-scheduler</feature>
+    <feature version="${project.version}">sling-commons-threads</feature>
     <bundle dependency="true">mvn:javax.jcr/jcr/2.0</bundle>
     <bundle dependency="true">mvn:commons-codec/commons-codec/1.10</bundle>
     <bundle 
dependency="true">mvn:commons-collections/commons-collections/3.2.2</bundle>
@@ -54,259 +54,259 @@
     <bundle 
dependency="true">mvn:org.apache.geronimo.bundles/json/20090211_1</bundle>
   </feature>
   <!-- Apache Sling Auth -->
-  <feature name="sling-auth-form" version="${feature.version}">
+  <feature name="sling-auth-form" version="${project.version}">
     <bundle>mvn:org.apache.sling/org.apache.sling.auth.form/1.0.8</bundle>
     <!-- dependencies -->
-    <feature version="${feature.version}">sling</feature>
+    <feature version="${project.version}">sling</feature>
   </feature>
-  <feature name="sling-auth-openid" version="${feature.version}">
+  <feature name="sling-auth-openid" version="${project.version}">
     <bundle>mvn:org.apache.sling/org.apache.sling.auth.openid/1.0.4</bundle>
     <!-- dependencies -->
-    <feature version="${feature.version}">sling</feature>
+    <feature version="${project.version}">sling</feature>
   </feature>
-  <feature name="sling-auth-selector" version="${feature.version}">
+  <feature name="sling-auth-selector" version="${project.version}">
     <bundle>mvn:org.apache.sling/org.apache.sling.auth.selector/1.0.6</bundle>
     <!-- dependencies -->
-    <feature version="${feature.version}">sling-auth-form</feature>
-    <feature version="${feature.version}">sling-auth-openid</feature>
+    <feature version="${project.version}">sling-auth-form</feature>
+    <feature version="${project.version}">sling-auth-openid</feature>
   </feature>
   <!-- Apache Sling Commons -->
-  <feature name="sling-commons-compiler" version="${feature.version}">
+  <feature name="sling-commons-compiler" version="${project.version}">
     
<bundle>mvn:org.apache.sling/org.apache.sling.commons.compiler/2.3.0</bundle>
     <!-- dependencies -->
-    <feature version="${feature.version}">sling-commons-classloader</feature>
+    <feature version="${project.version}">sling-commons-classloader</feature>
   </feature>
-  <feature name="sling-commons-classloader" version="${feature.version}">
+  <feature name="sling-commons-classloader" version="${project.version}">
     
<bundle>mvn:org.apache.sling/org.apache.sling.commons.classloader/1.3.6</bundle>
   </feature>
-  <feature name="sling-commons-fsclassloader" version="${feature.version}">
+  <feature name="sling-commons-fsclassloader" version="${project.version}">
     
<bundle>mvn:org.apache.sling/org.apache.sling.commons.fsclassloader/1.0.4</bundle>
     <!-- dependencies -->
     <feature>scr</feature>
     <feature>webconsole</feature>
-    <feature version="${feature.version}">sling-commons-classloader</feature>
+    <feature version="${project.version}">sling-commons-classloader</feature>
     <bundle dependency="true">mvn:commons-io/commons-io/2.5</bundle>
     <bundle dependency="true">mvn:org.apache.commons/commons-lang3/3.5</bundle>
   </feature>
-  <feature name="sling-commons-html" version="${feature.version}">
+  <feature name="sling-commons-html" version="${project.version}">
     <bundle>mvn:org.apache.sling/org.apache.sling.commons.html/1.0.0</bundle>
     <!-- dependencies -->
     <feature>scr</feature>
   </feature>
-  <feature name="sling-commons-messaging" version="${feature.version}">
+  <feature name="sling-commons-messaging" version="${project.version}">
     
<bundle>mvn:org.apache.sling/org.apache.sling.commons.messaging/0.0.1-SNAPSHOT</bundle>
   </feature>
-  <feature name="sling-commons-messaging-mail" version="${feature.version}">
+  <feature name="sling-commons-messaging-mail" version="${project.version}">
     
<bundle>mvn:org.apache.sling/org.apache.sling.commons.messaging.mail/0.0.1-SNAPSHOT</bundle>
     <!-- dependencies -->
     <feature>scr</feature>
-    <feature version="${feature.version}">sling-commons-messaging</feature>
-    <feature version="${feature.version}">sling-commons-threads</feature>
+    <feature version="${project.version}">sling-commons-messaging</feature>
+    <feature version="${project.version}">sling-commons-threads</feature>
     <bundle dependency="true">mvn:com.sun.mail/javax.mail/1.5.6</bundle>
     <bundle dependency="true">mvn:javax.mail/javax.mail-api/1.5.6</bundle>
     <bundle dependency="true">mvn:org.apache.commons/commons-email/1.4</bundle>
   </feature>
-  <feature name="sling-commons-metrics" version="${feature.version}">
+  <feature name="sling-commons-metrics" version="${project.version}">
     
<bundle>mvn:org.apache.sling/org.apache.sling.commons.metrics/1.2.0</bundle>
     <!-- dependencies -->
     <feature>scr</feature>
     <bundle 
dependency="true">mvn:io.dropwizard.metrics/metrics-core/3.1.2</bundle>
   </feature>
-  <feature name="sling-commons-scheduler" version="${feature.version}">
+  <feature name="sling-commons-scheduler" version="${project.version}">
     
<bundle>mvn:org.apache.sling/org.apache.sling.commons.scheduler/2.5.2</bundle>
     <!-- dependencies -->
     <feature>scr</feature>
-    <feature version="${feature.version}">sling-commons-threads</feature>
+    <feature version="${project.version}">sling-commons-threads</feature>
     <bundle 
dependency="true">mvn:javax.servlet/javax.servlet-api/3.1.0</bundle>
     <bundle 
dependency="true">mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/1.1.1</bundle>
   </feature>
-  <feature name="sling-commons-threads" version="${feature.version}">
+  <feature name="sling-commons-threads" version="${project.version}">
     
<bundle>mvn:org.apache.sling/org.apache.sling.commons.threads/3.2.6</bundle>
   </feature>
   <!-- Apache Sling Extensions -->
-  <feature name="sling-extension-adapter" version="${feature.version}">
+  <feature name="sling-extension-adapter" version="${project.version}">
     <bundle>mvn:org.apache.sling/org.apache.sling.adapter/2.1.8</bundle>
     <!-- dependencies -->
-    <feature version="${feature.version}">sling</feature>
+    <feature version="${project.version}">sling</feature>
   </feature>
-  <feature name="sling-extension-bundleresource" version="${feature.version}">
+  <feature name="sling-extension-bundleresource" version="${project.version}">
     
<bundle>mvn:org.apache.sling/org.apache.sling.bundleresource.impl/2.2.0</bundle>
     <!-- dependencies -->
-    <feature version="${feature.version}">sling</feature>
+    <feature version="${project.version}">sling</feature>
   </feature>
-  <feature name="sling-extension-discovery" version="${feature.version}">
+  <feature name="sling-extension-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/1.1.6</bundle>
     
<bundle>mvn:org.apache.sling/org.apache.sling.discovery.commons/1.0.18</bundle>
     
<bundle>mvn:org.apache.sling/org.apache.sling.discovery.support/1.0.0</bundle>
     <!-- dependencies -->
-    <feature version="${feature.version}">sling</feature>
+    <feature version="${project.version}">sling</feature>
     <bundle 
dependency="true">mvn:org.apache.httpcomponents/httpcore-osgi/4.4.6</bundle>
     <bundle 
dependency="true">mvn:org.apache.httpcomponents/httpclient-osgi/4.5.2</bundle>
   </feature>
-  <feature name="sling-extension-discovery-impl" version="${feature.version}">
+  <feature name="sling-extension-discovery-impl" version="${project.version}">
     
<bundle>mvn:org.apache.sling/org.apache.sling.discovery.impl/1.2.10</bundle>
     <!-- dependencies -->
     <feature>webconsole</feature>
-    <feature version="${feature.version}">sling-extension-discovery</feature>
+    <feature version="${project.version}">sling-extension-discovery</feature>
   </feature>
-  <feature name="sling-extension-discovery-oak" version="${feature.version}">
+  <feature name="sling-extension-discovery-oak" version="${project.version}">
     <configfile 
finalname="/etc/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-discovery.config">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-discovery</configfile>
     <bundle>mvn:org.apache.sling/org.apache.sling.discovery.oak/1.2.16</bundle>
     <!-- dependencies -->
     <feature>webconsole</feature>
-    <feature version="${feature.version}">sling-extension-discovery</feature>
-    <feature version="${feature.version}">sling-extension-healthcheck</feature>
+    <feature version="${project.version}">sling-extension-discovery</feature>
+    <feature version="${project.version}">sling-extension-healthcheck</feature>
   </feature>
-  <feature name="sling-extension-discovery-standalone" 
version="${feature.version}">
+  <feature name="sling-extension-discovery-standalone" 
version="${project.version}">
     
<bundle>mvn:org.apache.sling/org.apache.sling.discovery.standalone/1.0.2</bundle>
     <!-- dependencies -->
-    <feature version="${feature.version}">sling-extension-discovery</feature>
+    <feature version="${project.version}">sling-extension-discovery</feature>
   </feature>
-  <feature name="sling-extension-distribution" version="${feature.version}">
+  <feature name="sling-extension-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.1.18</bundle>
     <!-- dependencies -->
-    <feature version="${feature.version}">sling</feature>
-    <feature version="${feature.version}">sling-jcr</feature>
-    <feature version="${feature.version}">sling-extension-event</feature>
-    <feature version="${feature.version}">sling-extension-healthcheck</feature>
+    <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>
     <bundle 
dependency="true">mvn:org.apache.httpcomponents/httpcore-osgi/4.4.5</bundle>
     <bundle 
dependency="true">mvn:org.apache.httpcomponents/httpclient-osgi/4.5.2</bundle>
     <bundle 
dependency="true">mvn:org.apache.jackrabbit.vault/org.apache.jackrabbit.vault/3.1.30</bundle>
   </feature>
-  <feature name="sling-extension-event" version="${feature.version}">
+  <feature name="sling-extension-event" version="${project.version}">
     <configfile 
finalname="/etc/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-event.config">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-event</configfile>
     <bundle>mvn:org.apache.sling/org.apache.sling.event/4.2.0</bundle>
     <bundle>mvn:org.apache.sling/org.apache.sling.event.dea/1.1.0</bundle>
     <!-- dependencies -->
-    <feature version="${feature.version}">sling</feature>
-    <feature version="${feature.version}">sling-extension-discovery</feature>
+    <feature version="${project.version}">sling</feature>
+    <feature version="${project.version}">sling-extension-discovery</feature>
     <bundle 
dependency="true">mvn:org.apache.felix/org.apache.felix.inventory/1.0.4</bundle>
   </feature>
-  <feature name="sling-extension-explorer" version="${feature.version}">
+  <feature name="sling-extension-explorer" version="${project.version}">
     
<bundle>mvn:org.apache.sling/org.apache.sling.extensions.explorer/1.0.4</bundle>
     <!-- dependencies -->
-    <feature version="${feature.version}">sling</feature>
-    <feature version="${feature.version}">sling-scripting-javascript</feature>
+    <feature version="${project.version}">sling</feature>
+    <feature version="${project.version}">sling-scripting-javascript</feature>
   </feature>
-  <feature name="sling-extension-featureflags" version="${feature.version}">
+  <feature name="sling-extension-featureflags" version="${project.version}">
     <bundle>mvn:org.apache.sling/org.apache.sling.featureflags/1.2.0</bundle>
     <!-- dependencies -->
-    <feature version="${feature.version}">sling</feature>
+    <feature version="${project.version}">sling</feature>
   </feature>
-  <feature name="sling-extension-fsresource" version="${feature.version}">
+  <feature name="sling-extension-fsresource" version="${project.version}">
     <bundle>mvn:org.apache.sling/org.apache.sling.fsresource/1.2.2</bundle>
     <!-- dependencies -->
-    <feature version="${feature.version}">sling</feature>
+    <feature version="${project.version}">sling</feature>
   </feature>
-  <feature name="sling-extension-healthcheck" version="${feature.version}">
+  <feature name="sling-extension-healthcheck" version="${project.version}">
     <!-- SLING-5624 Health Check Core 1.2.4 fails on Launchpad Karaf -->
     <bundle>mvn:org.apache.sling/org.apache.sling.hc.core/1.2.2</bundle>
     <bundle>mvn:org.apache.sling/org.apache.sling.hc.support/1.0.4</bundle>
     <bundle>mvn:org.apache.sling/org.apache.sling.hc.webconsole/1.1.2</bundle>
     <!-- dependencies -->
-    <feature version="${feature.version}">sling</feature>
-    <feature version="${feature.version}">sling-jcr</feature>
-    <feature version="${feature.version}">sling-scripting</feature>
+    <feature version="${project.version}">sling</feature>
+    <feature version="${project.version}">sling-jcr</feature>
+    <feature version="${project.version}">sling-scripting</feature>
   </feature>
-  <feature name="sling-extension-i18n" version="${feature.version}">
+  <feature name="sling-extension-i18n" version="${project.version}">
     <configfile 
finalname="/etc/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-i18n.config">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-i18n</configfile>
     <bundle>mvn:org.apache.sling/org.apache.sling.i18n/2.5.6</bundle>
     <!-- dependencies -->
-    <feature version="${feature.version}">sling</feature>
+    <feature version="${project.version}">sling</feature>
   </feature>
-  <feature name="sling-extension-jmx-provider" version="${feature.version}">
+  <feature name="sling-extension-jmx-provider" version="${project.version}">
     <bundle>mvn:org.apache.sling/org.apache.sling.jmx.provider/1.0.2</bundle>
     <!-- dependencies -->
-    <feature version="${feature.version}">sling</feature>
+    <feature version="${project.version}">sling</feature>
   </feature>
-  <feature name="sling-extension-models" version="${feature.version}">
+  <feature name="sling-extension-models" version="${project.version}">
     <bundle>mvn:org.apache.sling/org.apache.sling.models.api/1.3.2</bundle>
     <bundle>mvn:org.apache.sling/org.apache.sling.models.impl/1.3.8</bundle>
     <!-- dependencies -->
-    <feature version="${feature.version}">sling</feature>
-    <feature version="${feature.version}">sling-scripting</feature>
+    <feature version="${project.version}">sling</feature>
+    <feature version="${project.version}">sling-scripting</feature>
   </feature>
-  <feature name="sling-extension-pipes" version="${feature.version}">
+  <feature name="sling-extension-pipes" version="${project.version}">
     <bundle>mvn:org.apache.sling/org.apache.sling.pipes/0.0.10</bundle>
     <!-- dependencies -->
-    <feature version="${feature.version}">sling</feature>
-    <feature version="${feature.version}">jackrabbit-sling</feature>
-    <feature version="${feature.version}">sling-extension-query</feature>
+    <feature version="${project.version}">sling</feature>
+    <feature version="${project.version}">jackrabbit-sling</feature>
+    <feature version="${project.version}">sling-extension-query</feature>
   </feature>
-  <feature name="sling-extension-query" version="${feature.version}">
+  <feature name="sling-extension-query" version="${project.version}">
     <bundle>mvn:org.apache.sling/org.apache.sling.query/3.0.0</bundle>
     <!-- dependencies -->
-    <feature version="${feature.version}">sling</feature>
+    <feature version="${project.version}">sling</feature>
   </feature>
-  <feature name="sling-extension-resource-inventory" 
version="${feature.version}">
+  <feature name="sling-extension-resource-inventory" 
version="${project.version}">
     
<bundle>mvn:org.apache.sling/org.apache.sling.resource.inventory/1.0.4</bundle>
     <!-- dependencies -->
-    <feature version="${feature.version}">sling</feature>
+    <feature version="${project.version}">sling</feature>
     <bundle 
dependency="true">mvn:org.apache.felix/org.apache.felix.inventory/1.0.4</bundle>
   </feature>
-  <feature name="sling-extension-resourcemerger" version="${feature.version}">
+  <feature name="sling-extension-resourcemerger" version="${project.version}">
     <bundle>mvn:org.apache.sling/org.apache.sling.resourcemerger/1.3.0</bundle>
     <!-- dependencies -->
-    <feature version="${feature.version}">sling</feature>
+    <feature version="${project.version}">sling</feature>
   </feature>
-  <feature name="sling-extension-rewriter" version="${feature.version}">
+  <feature name="sling-extension-rewriter" version="${project.version}">
     <bundle>mvn:org.apache.sling/org.apache.sling.rewriter/1.2.0</bundle>
     <!-- dependencies -->
-    <feature version="${feature.version}">sling</feature>
-    <feature version="${feature.version}">sling-commons-html</feature>
+    <feature version="${project.version}">sling</feature>
+    <feature version="${project.version}">sling-commons-html</feature>
   </feature>
-  <feature name="sling-extension-security" version="${feature.version}">
+  <feature name="sling-extension-security" version="${project.version}">
     <bundle>mvn:org.apache.sling/org.apache.sling.security/1.1.2</bundle>
     <!-- dependencies -->
-    <feature version="${feature.version}">sling</feature>
+    <feature version="${project.version}">sling</feature>
   </feature>
-  <feature name="sling-extension-threaddump" version="${feature.version}">
+  <feature name="sling-extension-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="${feature.version}">
+  <feature name="sling-extension-urlrewriter" version="${project.version}">
     <bundle>mvn:org.apache.sling/org.apache.sling.urlrewriter/0.0.2</bundle>
     <!-- dependencies -->
-    <feature version="${feature.version}">sling</feature>
+    <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="${feature.version}">
+  <feature name="sling-extension-validation" version="${project.version}">
     <configfile 
finalname="/etc/org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment-sling_validation.config">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment-sling_validation</configfile>
     
<bundle>mvn:org.apache.sling/org.apache.sling.validation.api/1.0.0-SNAPSHOT</bundle>
     
<bundle>mvn:org.apache.sling/org.apache.sling.validation.core/1.0.0-SNAPSHOT</bundle>
     <!-- dependencies -->
-    <feature version="${feature.version}">sling</feature>
+    <feature version="${project.version}">sling</feature>
   </feature>
-  <feature name="sling-extension-xss" version="${feature.version}">
+  <feature name="sling-extension-xss" version="${project.version}">
     <configfile 
finalname="/etc/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-xss.config">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-xss</configfile>
     <bundle>mvn:org.apache.sling/org.apache.sling.xss/1.0.16</bundle>
     <!-- dependencies -->
-    <feature version="${feature.version}">sling</feature>
+    <feature version="${project.version}">sling</feature>
     <bundle 
dependency="true">mvn:org.apache.geronimo.bundles/commons-httpclient/3.1_2</bundle>
   </feature>
   <!-- Apache Sling Installer -->
-  <feature name="sling-installer" version="${feature.version}">
+  <feature name="sling-installer" version="${project.version}">
     
<bundle>mvn:org.apache.sling/org.apache.sling.installer.console/1.0.2</bundle>
     <bundle>mvn:org.apache.sling/org.apache.sling.installer.core/3.8.0</bundle>
     
<bundle>mvn:org.apache.sling/org.apache.sling.installer.factory.configuration/1.1.2</bundle>
     <!-- dependencies -->
-    <feature version="${feature.version}">sling</feature>
+    <feature version="${project.version}">sling</feature>
   </feature>
-  <feature name="sling-installer-provider-file" version="${feature.version}">
+  <feature name="sling-installer-provider-file" version="${project.version}">
     
<bundle>mvn:org.apache.sling/org.apache.sling.installer.provider.file/1.1.0</bundle>
     <!-- dependencies -->
-    <feature version="${feature.version}">sling-installer</feature>
+    <feature version="${project.version}">sling-installer</feature>
   </feature>
-  <feature name="sling-installer-provider-jcr" version="${feature.version}">
+  <feature name="sling-installer-provider-jcr" version="${project.version}">
     <configfile 
finalname="/etc/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-installer_jcr.config">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-installer_jcr</configfile>
     
<bundle>mvn:org.apache.sling/org.apache.sling.installer.provider.jcr/3.1.22</bundle>
     <!-- dependencies -->
-    <feature version="${feature.version}">sling-installer</feature>
-    <feature version="${feature.version}">sling-jcr</feature>
+    <feature version="${project.version}">sling-installer</feature>
+    <feature version="${project.version}">sling-jcr</feature>
   </feature>
   <!-- Apache Sling JCR -->
-  <feature name="sling-jcr" version="${feature.version}">
+  <feature name="sling-jcr" version="${project.version}">
     <configfile 
finalname="/etc/org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment-sling.config">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment-sling</configfile>
     <configfile 
finalname="/etc/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-jcr_resource.config">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-jcr_resource</configfile>
     <bundle>mvn:org.apache.sling/org.apache.sling.jcr.api/2.4.0</bundle>
@@ -321,55 +321,55 @@
     <bundle>mvn:org.apache.sling/org.apache.sling.jcr.webdav/2.3.4</bundle>
     <!-- dependencies -->
     <feature>webconsole</feature>
-    <feature version="${feature.version}">sling</feature>
-    <feature version="${feature.version}">jackrabbit-sling</feature>
-    <feature version="${feature.version}">jackrabbit-oak-sling</feature>
-    <feature version="${feature.version}">tika-sling</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>
-  <feature name="sling-jcr-compiler" version="${feature.version}">
+  <feature name="sling-jcr-compiler" version="${project.version}">
     <bundle>mvn:org.apache.sling/org.apache.sling.jcr.compiler/2.1.0</bundle>
     <!-- dependencies -->
-    <feature version="${feature.version}">sling</feature>
-    <feature version="${feature.version}">sling-jcr</feature>
-    <feature version="${feature.version}">sling-commons-compiler</feature>
+    <feature version="${project.version}">sling</feature>
+    <feature version="${project.version}">sling-jcr</feature>
+    <feature version="${project.version}">sling-commons-compiler</feature>
   </feature>
-  <feature name="sling-jcr-jackrabbit-security" version="${feature.version}">
+  <feature name="sling-jcr-jackrabbit-security" version="${project.version}">
     
<bundle>mvn:org.apache.sling/org.apache.sling.jcr.jackrabbit.accessmanager/2.1.2</bundle>
     
<bundle>mvn:org.apache.sling/org.apache.sling.jcr.jackrabbit.usermanager/2.2.4</bundle>
     <!-- dependencies -->
-    <feature version="${feature.version}">sling-jcr</feature>
-    <feature version="${feature.version}">sling-servlets</feature>
+    <feature version="${project.version}">sling-jcr</feature>
+    <feature version="${project.version}">sling-servlets</feature>
   </feature>
-  <feature name="sling-jcr-repoinit" version="${feature.version}">
+  <feature name="sling-jcr-repoinit" version="${project.version}">
     <bundle>mvn:org.apache.sling/org.apache.sling.jcr.repoinit/1.1.2</bundle>
     <!-- dependencies -->
-    <feature version="${feature.version}">sling</feature>
-    <feature version="${feature.version}">sling-jcr</feature>
-    <feature 
version="${feature.version}">sling-jcr-jackrabbit-security</feature>
+    <feature version="${project.version}">sling</feature>
+    <feature version="${project.version}">sling-jcr</feature>
+    <feature 
version="${project.version}">sling-jcr-jackrabbit-security</feature>
     <bundle 
dependency="true">mvn:org.apache.sling/org.apache.sling.repoinit.parser/1.1.0</bundle>
     <bundle 
dependency="true">mvn:org.apache.sling/org.apache.sling.provisioning.model/1.8.0</bundle>
-    <feature version="${feature.version}">pax-url-classpath-sling</feature>
+    <feature version="${project.version}">pax-url-classpath-sling</feature>
   </feature>
   <!-- Apache Sling Launchpad -->
-  <feature name="sling-launchpad-content" version="${feature.version}">
+  <feature name="sling-launchpad-content" version="${project.version}">
     
<bundle>mvn:org.apache.sling/org.apache.sling.launchpad.content/2.0.8</bundle>
     <!-- dependencies -->
-    <feature version="${feature.version}">sling</feature>
-    <feature version="${feature.version}">sling-auth-form</feature>
-    <feature version="${feature.version}">sling-extension-explorer</feature>
+    <feature version="${project.version}">sling</feature>
+    <feature version="${project.version}">sling-auth-form</feature>
+    <feature version="${project.version}">sling-extension-explorer</feature>
   </feature>
-  <feature name="sling-launchpad-nosql-couchbase" version="${feature.version}">
+  <feature name="sling-launchpad-nosql-couchbase" version="${project.version}">
     <configfile 
finalname="/etc/org.apache.sling.nosql.couchbase.resourceprovider.CouchbaseNoSqlResourceProviderFactory.factory.config-default.config">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.nosql.couchbase.resourceprovider.CouchbaseNoSqlResourceProviderFactory.factory.config-default</configfile>
     <configfile 
finalname="/etc/org.apache.sling.nosql.couchbase.client.CouchbaseClient.factory.config-default.config">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.nosql.couchbase.client.CouchbaseClient.factory.config-default</configfile>
     <!-- dependencies -->
-    <feature version="${feature.version}">sling-nosql-couchbase</feature>
+    <feature version="${project.version}">sling-nosql-couchbase</feature>
   </feature>
-  <feature name="sling-launchpad-nosql-mongodb" version="${feature.version}">
+  <feature name="sling-launchpad-nosql-mongodb" version="${project.version}">
     <configfile 
finalname="/etc/org.apache.sling.nosql.mongodb.resourceprovider.MongoDBNoSqlResourceProviderFactory.factory.config-default.config">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.nosql.mongodb.resourceprovider.MongoDBNoSqlResourceProviderFactory.factory.config-default</configfile>
     <!-- dependencies -->
-    <feature version="${feature.version}">sling-nosql-mongodb</feature>
+    <feature version="${project.version}">sling-nosql-mongodb</feature>
   </feature>
-  <feature name="sling-launchpad-oak" version="${feature.version}"><!-- 
hidden="true" -->
+  <feature name="sling-launchpad-oak" version="${project.version}"><!-- 
hidden="true" -->
     <!-- Sling with Oak Repository and Felix Web Console -->
     <configfile 
finalname="/etc/org.apache.sling.jcr.repoinit.impl.RepositoryInitializer.config">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.jcr.repoinit.impl.RepositoryInitializer</configfile>
     <!-- http://jackrabbit.apache.org/oak/docs/osgi_config.html -->
@@ -385,95 +385,95 @@
     
<bundle>mvn:org.apache.sling/org.apache.sling.karaf-repoinit/${project.version}</bundle>
     <!-- dependencies -->
     <feature>webconsole</feature>
-    <feature version="${feature.version}">sling</feature>
-    <feature version="${feature.version}">sling-servlets</feature>
+    <feature version="${project.version}">sling</feature>
+    <feature version="${project.version}">sling-servlets</feature>
     <!-- ... -->
-    <feature version="${feature.version}">sling-installer</feature>
-    <feature version="${feature.version}">sling-jcr</feature>
-    <feature version="${feature.version}">sling-jcr-repoinit</feature>
-    <feature version="${feature.version}">sling-extension-adapter</feature>
-    <feature 
version="${feature.version}">sling-extension-bundleresource</feature>
-    <feature 
version="${feature.version}">sling-extension-discovery-oak</feature>
+    <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>
     <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.2</bundle>
   </feature>
-  <feature name="sling-launchpad-oak-tar" version="${feature.version}">
+  <feature name="sling-launchpad-oak-tar" version="${project.version}">
     <configfile 
finalname="/etc/org.apache.jackrabbit.oak.plugins.segment.SegmentNodeStoreService.config">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.jackrabbit.oak.plugins.segment.SegmentNodeStoreService</configfile>
-    <feature version="${feature.version}">sling-launchpad-oak</feature>
+    <feature version="${project.version}">sling-launchpad-oak</feature>
     
<bundle>mvn:org.apache.jackrabbit/oak-segment/${org.apache.jackrabbit.oak.version}</bundle>
     
<bundle>mvn:org.apache.sling/org.apache.sling.jcr.oak.server/1.1.3-SNAPSHOT</bundle>
   </feature>
-  <feature name="sling-launchpad-oak-mongo" version="${feature.version}">
+  <feature name="sling-launchpad-oak-mongo" version="${project.version}">
     <configfile 
finalname="/etc/org.apache.jackrabbit.oak.plugins.document.DocumentNodeStoreService.config">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.jackrabbit.oak.plugins.document.DocumentNodeStoreService</configfile>
-    <feature version="${feature.version}">sling-launchpad-oak</feature>
+    <feature version="${project.version}">sling-launchpad-oak</feature>
     <bundle>mvn:org.mongodb/mongo-java-driver/3.4.1</bundle>
     <bundle>mvn:com.h2database/h2-mvstore/1.4.193</bundle>
     
<bundle>mvn:org.apache.sling/org.apache.sling.jcr.oak.server/1.1.3-SNAPSHOT</bundle>
   </feature>
   <!-- Apache Sling NoSQL -->
-  <feature name="sling-nosql-generic" version="${feature.version}">
+  <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="${feature.version}">sling</feature>
+    <feature version="${project.version}">sling</feature>
   </feature>
-  <feature name="sling-nosql-couchbase" version="${feature.version}">
+  <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="${feature.version}">sling-nosql-generic</feature>
+    <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="${feature.version}">
+  <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="${feature.version}">sling-nosql-generic</feature>
+    <feature version="${project.version}">sling-nosql-generic</feature>
     <bundle dependency="true">mvn:org.mongodb/mongo-java-driver/3.4.1</bundle>
   </feature>
   <!-- Apache Sling Scripting -->
-  <feature name="sling-scripting" version="${feature.version}">
+  <feature name="sling-scripting" version="${project.version}">
     <configfile 
finalname="/etc/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-scripting.config">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-scripting</configfile>
     <bundle>mvn:org.apache.sling/org.apache.sling.scripting.api/2.1.12</bundle>
     
<bundle>mvn:org.apache.sling/org.apache.sling.scripting.core/2.0.44</bundle>
     <!-- dependencies -->
-    <feature version="${feature.version}">sling</feature>
+    <feature version="${project.version}">sling</feature>
     <feature>webconsole</feature>
   </feature>
-  <feature name="sling-scripting-freemarker" version="${feature.version}">
+  <feature name="sling-scripting-freemarker" version="${project.version}">
     
<bundle>mvn:org.apache.sling/org.apache.sling.scripting.freemarker/1.0.0-SNAPSHOT</bundle>
     <!-- dependencies -->
-    <feature version="${feature.version}">sling</feature>
-    <feature version="${feature.version}">sling-scripting</feature>
+    <feature version="${project.version}">sling</feature>
+    <feature version="${project.version}">sling-scripting</feature>
   </feature>
-  <feature name="sling-scripting-groovy" version="${feature.version}">
+  <feature name="sling-scripting-groovy" version="${project.version}">
     
<bundle>mvn:org.apache.sling/org.apache.sling.scripting.groovy/1.0.2</bundle>
     <!-- dependencies -->
-    <feature version="${feature.version}">sling</feature>
-    <feature version="${feature.version}">sling-scripting</feature>
+    <feature version="${project.version}">sling</feature>
+    <feature version="${project.version}">sling-scripting</feature>
     <bundle dependency="true">mvn:org.codehaus.groovy/groovy/2.4.7</bundle>
     <bundle 
dependency="true">mvn:org.codehaus.groovy/groovy-json/2.4.7</bundle>
     <bundle 
dependency="true">mvn:org.codehaus.groovy/groovy-templates/2.4.7</bundle>
   </feature>
-  <feature name="sling-scripting-java" version="${feature.version}">
+  <feature name="sling-scripting-java" version="${project.version}">
     <bundle>mvn:org.apache.sling/org.apache.sling.scripting.java/2.1.2</bundle>
     <!-- dependencies -->
-    <feature version="${feature.version}">sling</feature>
-    <feature version="${feature.version}">sling-scripting</feature>
-    <feature version="${feature.version}">sling-commons-compiler</feature>
+    <feature version="${project.version}">sling</feature>
+    <feature version="${project.version}">sling-scripting</feature>
+    <feature version="${project.version}">sling-commons-compiler</feature>
   </feature>
-  <feature name="sling-scripting-javascript" version="${feature.version}">
+  <feature name="sling-scripting-javascript" version="${project.version}">
     
<bundle>mvn:org.apache.sling/org.apache.sling.scripting.javascript/2.0.30</bundle>
     <!-- dependencies -->
-    <feature version="${feature.version}">sling-scripting</feature>
+    <feature version="${project.version}">sling-scripting</feature>
   </feature>
-  <feature name="sling-scripting-jsp" version="${feature.version}">
+  <feature name="sling-scripting-jsp" version="${project.version}">
     <bundle>mvn:org.apache.sling/org.apache.sling.scripting.jsp/2.2.4</bundle>
     
<bundle>mvn:org.apache.sling/org.apache.sling.scripting.jsp.taglib/2.2.6</bundle>
     <!-- dependencies -->
-    <feature version="${feature.version}">sling-scripting</feature>
-    <feature version="${feature.version}">sling-commons-compiler</feature>
+    <feature version="${project.version}">sling-scripting</feature>
+    <feature version="${project.version}">sling-commons-compiler</feature>
   </feature>
-  <feature name="sling-scripting-sightly" version="${feature.version}">
+  <feature name="sling-scripting-sightly" version="${project.version}">
     <configfile 
finalname="/etc/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-scripting_sightly.config">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-scripting_sightly</configfile>
     
<bundle>mvn:org.apache.sling/org.apache.sling.scripting.sightly/1.0.28</bundle>
     
<bundle>mvn:org.apache.sling/org.apache.sling.scripting.sightly.compiler/1.0.4</bundle>
@@ -481,37 +481,37 @@
     
<bundle>mvn:org.apache.sling/org.apache.sling.scripting.sightly.js.provider/1.0.18</bundle>
     
<bundle>mvn:org.apache.sling/org.apache.sling.scripting.sightly.models.provider/1.0.6</bundle>
     <!-- dependencies -->
-    <feature version="${feature.version}">sling</feature>
-    <feature version="${feature.version}">sling-jcr</feature>
-    <feature version="${feature.version}">sling-scripting</feature>
-    <feature version="${feature.version}">sling-extension-i18n</feature>
-    <feature version="${feature.version}">sling-extension-models</feature>
-    <feature version="${feature.version}">sling-extension-xss</feature>
-    <feature version="${feature.version}">sling-commons-compiler</feature>
-    <feature version="${feature.version}">sling-commons-fsclassloader</feature>
+    <feature version="${project.version}">sling</feature>
+    <feature version="${project.version}">sling-jcr</feature>
+    <feature version="${project.version}">sling-scripting</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-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.1_1</bundle>
   </feature>
-  <feature name="sling-scripting-thymeleaf" version="${feature.version}">
+  <feature name="sling-scripting-thymeleaf" version="${project.version}">
     <configfile 
finalname="/etc/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-scripting_thymeleaf.config">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-scripting_thymeleaf</configfile>
     
<bundle>mvn:org.apache.sling/org.apache.sling.scripting.thymeleaf/1.0.0</bundle>
     <!-- dependencies -->
-    <feature version="${feature.version}">sling</feature>
-    <feature version="${feature.version}">sling-scripting</feature>
-    <feature version="${feature.version}">sling-extension-i18n</feature>
+    <feature version="${project.version}">sling</feature>
+    <feature version="${project.version}">sling-scripting</feature>
+    <feature version="${project.version}">sling-extension-i18n</feature>
     <bundle dependency="true">mvn:org.javassist/javassist/3.20.0-GA</bundle>
   </feature>
   <!-- Apache Sling Servlets -->
-  <feature name="sling-servlets" version="${feature.version}">
+  <feature name="sling-servlets" version="${project.version}">
     <configfile 
finalname="/etc/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-servlets.config">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-servlets</configfile>
     <bundle>mvn:org.apache.sling/org.apache.sling.servlets.get/2.1.18</bundle>
     <bundle>mvn:org.apache.sling/org.apache.sling.servlets.post/2.3.14</bundle>
     
<bundle>mvn:org.apache.sling/org.apache.sling.servlets.resolver/2.4.10</bundle>
     <!-- dependencies -->
-    <feature version="${feature.version}">sling</feature>
-    <feature version="${feature.version}">sling-jcr</feature>
+    <feature version="${project.version}">sling</feature>
+    <feature version="${project.version}">sling-jcr</feature>
   </feature>
   <!-- Apache Jackrabbit -->
-  <feature name="jackrabbit-sling" version="${feature.version}">
+  <feature name="jackrabbit-sling" 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>
@@ -537,7 +537,7 @@
     <bundle 
dependency="true">mvn:org.apache.httpcomponents/httpcore-osgi/4.4.6</bundle>
     <bundle 
dependency="true">mvn:org.apache.httpcomponents/httpclient-osgi/4.5.2</bundle>
   </feature>
-  <feature name="jackrabbit-oak-sling" version="${feature.version}">
+  <feature name="jackrabbit-oak-sling" 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>
@@ -545,32 +545,32 @@
     
<bundle>mvn:org.apache.jackrabbit/oak-lucene/${org.apache.jackrabbit.oak.version}</bundle>
     <!-- dependencies -->
     <feature>scr</feature>
-    <feature version="${feature.version}">jackrabbit-sling</feature>
-    <feature version="${feature.version}">tika-sling</feature>
+    <feature version="${project.version}">jackrabbit-sling</feature>
+    <feature version="${project.version}">tika-sling</feature>
     <bundle>mvn:com.google.guava/guava/15.0</bundle>
     <bundle>mvn:org.apache.felix/org.apache.felix.jaas/0.0.4</bundle>
   </feature>
   <!-- Apache Tika -->
-  <feature name="tika-sling" version="${feature.version}">
+  <feature name="tika-sling" 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>
   <!-- Apache Sling Samples -->
-  <feature name="sling-samples-fling" version="${feature.version}">
+  <feature name="sling-samples-fling" version="${project.version}">
     
<bundle>mvn:org.apache.sling.samples/org.apache.sling.samples.fling/0.0.1-SNAPSHOT</bundle>
     <!-- dependencies -->
-    <feature version="${feature.version}">sling</feature>
-    <feature version="${feature.version}">sling-scripting-thymeleaf</feature>
-    <feature version="${feature.version}">sling-commons-messaging</feature>
-    <feature 
version="${feature.version}">sling-commons-messaging-mail</feature>
-    <feature version="${feature.version}">sling-extension-models</feature>
-    <feature version="${feature.version}">sling-extension-query</feature>
-    <feature version="${feature.version}">sling-extension-validation</feature>
-    <feature 
version="${feature.version}">sling-installer-provider-jcr</feature>
-    <feature version="${feature.version}">sling-auth-form</feature>
+    <feature version="${project.version}">sling</feature>
+    <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-installer-provider-jcr</feature>
+    <feature version="${project.version}">sling-auth-form</feature>
   </feature>
   <!-- Composum -->
-  <feature name="composum-sling" version="${feature.version}">
+  <feature name="composum-sling" version="${project.version}">
     <configfile 
finalname="/etc/org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment-composum.config">mvn:org.apache.sling/org.apache.sling.karaf-configs/${project.version}/config/org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment-composum</configfile>
     
<bundle>mvn:com.composum.sling.core/composum-sling-core-commons/1.7.0</bundle>
     
<bundle>mvn:com.composum.sling.core/composum-sling-core-console/1.7.0</bundle>
@@ -579,14 +579,14 @@
     
<bundle>mvn:com.composum.sling.core/composum-sling-user-management/1.7.0</bundle>
     
<bundle>mvn:com.composum.sling.core/composum-sling-package-manager/1.7.0</bundle>
     <!-- dependencies -->
-    <feature version="${feature.version}">sling</feature>
-    <feature version="${feature.version}">sling-jcr</feature>
-    <feature version="${feature.version}">sling-scripting-jsp</feature>
-    <feature version="${feature.version}">sling-extension-event</feature>
+    <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>
     <bundle 
dependency="true">mvn:org.apache.jackrabbit.vault/org.apache.jackrabbit.vault/3.1.30</bundle>
   </feature>
   <!-- Pax URL (KARAF-4707) -->
-  <feature name="pax-url-classpath-sling" version="${feature.version}">
+  <feature name="pax-url-classpath-sling" version="${project.version}">
     <bundle>mvn:org.ops4j.pax.url/pax-url-commons/2.5.2</bundle>
     <bundle>mvn:org.ops4j.base/ops4j-base-lang/1.5.0</bundle>
     <bundle>mvn:org.ops4j.base/ops4j-base-util-property/1.5.0</bundle>


Reply via email to