[sling-org-apache-sling-karaf-distribution] 22/42: filter resources (use versions from POM)

[ro...@apache.org]

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

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

commit d7131764bc9935fd8ab7eeda3d457fc305374dfa
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Fri Jan 13 07:51:32 2017 +0000

    filter resources (use versions from POM)
    
    git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1778502 13f79535-47bb-0310-9956-ffa450edef68
---
 pom.xml                                              | 6 ++++++
 src/main/resources/etc/org.apache.karaf.features.cfg | 6 +++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 2863595..3d79231 100644
--- a/pom.xml
+++ b/pom.xml
@@ -288,6 +288,12 @@
   </dependencies>
 
   <build>
+    <resources>
+      <resource>
+        <directory>src/main/resources</directory>
+        <filtering>true</filtering>
+      </resource>
+    </resources>
     <plugins>
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
diff --git a/src/main/resources/etc/org.apache.karaf.features.cfg b/src/main/resources/etc/org.apache.karaf.features.cfg
index bb7315c..564a4e5 100755
--- a/src/main/resources/etc/org.apache.karaf.features.cfg
+++ b/src/main/resources/etc/org.apache.karaf.features.cfg
@@ -21,9 +21,9 @@
 # Comma separated list of features repositories to register by default
 #
 featuresRepositories = \
-    mvn:org.apache.sling/org.apache.sling.karaf-features/0.1.1-SNAPSHOT/xml/features, \
-    mvn:org.apache.karaf.features/framework/4.0.7/xml/features, \
-    mvn:org.apache.karaf.features/standard/4.0.7/xml/features
+    mvn:org.apache.sling/org.apache.sling.karaf-features/${project.version}/xml/features, \
+    mvn:org.apache.karaf.features/framework/${org.apache.karaf.version}/xml/features, \
+    mvn:org.apache.karaf.features/standard/${org.apache.karaf.version}/xml/features
 
 #
 # Comma separated list of features to install at startup

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