Repository: karaf
Updated Branches:
  refs/heads/master e847a1094 -> dc607986e


[KARAF-4080] Don't filter demos resources


Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/dc607986
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/dc607986
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/dc607986

Branch: refs/heads/master
Commit: dc607986eeab5939db01d645457f29e20c95c71a
Parents: e847a10
Author: Jean-Baptiste Onofré <[email protected]>
Authored: Mon Nov 2 17:38:18 2015 +0100
Committer: Jean-Baptiste Onofré <[email protected]>
Committed: Mon Nov 2 17:38:18 2015 +0100

----------------------------------------------------------------------
 assemblies/apache-karaf/pom.xml                                    | 2 +-
 .../main/resources/org/apache/karaf/branding/branding.properties   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/karaf/blob/dc607986/assemblies/apache-karaf/pom.xml
----------------------------------------------------------------------
diff --git a/assemblies/apache-karaf/pom.xml b/assemblies/apache-karaf/pom.xml
index 3d78c5e..4e09b1d 100644
--- a/assemblies/apache-karaf/pom.xml
+++ b/assemblies/apache-karaf/pom.xml
@@ -85,7 +85,7 @@
             </resource>
             <resource>
                 <directory>${project.build.directory}/demos</directory>
-                <filtering>true</filtering>
+                <filtering>false</filtering>
                 <excludes>
                     <exclude>**/*.i??</exclude>
                     <exclude>**/.target</exclude>

http://git-wip-us.apache.org/repos/asf/karaf/blob/dc607986/demos/branding/src/main/resources/org/apache/karaf/branding/branding.properties
----------------------------------------------------------------------
diff --git 
a/demos/branding/src/main/resources/org/apache/karaf/branding/branding.properties
 
b/demos/branding/src/main/resources/org/apache/karaf/branding/branding.properties
index 04cbfc2..c49a09b 100644
--- 
a/demos/branding/src/main/resources/org/apache/karaf/branding/branding.properties
+++ 
b/demos/branding/src/main/resources/org/apache/karaf/branding/branding.properties
@@ -19,7 +19,7 @@
 
 welcome = \
 \n\
-\u001B[1m  Apache Karaf Re-Branding Demo\u001B[0m (${pom.version})\n\
+\u001B[1m  Apache Karaf Re-Branding Demo\u001B[0m (${project.version})\n\
 \n\
 Hit '\u001B[1m<tab>\u001B[0m' for a list of available commands\n\
    and '\u001B[1m[cmd] --help\u001B[0m' for help on a specific command.\n

Reply via email to