Repository: karaf Updated Branches: refs/heads/karaf-3.0.x 2a28db21f -> acccd833e
[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/acccd833 Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/acccd833 Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/acccd833 Branch: refs/heads/karaf-3.0.x Commit: acccd833ef42522f438b7079ae0db007090828d0 Parents: 2a28db2 Author: Jean-Baptiste Onofré <[email protected]> Authored: Mon Nov 2 17:30:42 2015 +0100 Committer: Jean-Baptiste Onofré <[email protected]> Committed: Mon Nov 2 17:30:42 2015 +0100 ---------------------------------------------------------------------- assemblies/apache-karaf/pom.xml | 2 +- demos/branding/README.txt | 2 +- .../main/resources/org/apache/karaf/branding/branding.properties | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/acccd833/assemblies/apache-karaf/pom.xml ---------------------------------------------------------------------- diff --git a/assemblies/apache-karaf/pom.xml b/assemblies/apache-karaf/pom.xml index 1798c49..53c5e0b 100644 --- a/assemblies/apache-karaf/pom.xml +++ b/assemblies/apache-karaf/pom.xml @@ -86,7 +86,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/acccd833/demos/branding/README.txt ---------------------------------------------------------------------- diff --git a/demos/branding/README.txt b/demos/branding/README.txt index f8fceb7..7df118a 100644 --- a/demos/branding/README.txt +++ b/demos/branding/README.txt @@ -27,7 +27,7 @@ Prerequisites for Running this Example -------------------------------------- You must have the following installed on your machine: - - JDK 1.6 or higher. + - JDK 1.7 or higher. - Apache Maven 3.0.3 or higher. http://git-wip-us.apache.org/repos/asf/karaf/blob/acccd833/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
