This is an automated email from the git hooks/post-receive script. New commit to branch feature/7708 in repository observe. See http://git.codelutin.com/observe.git commit 3aadb10e11413e8dd0602cf39f66a441e9e662ff Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Thu Nov 12 15:28:07 2015 +0100 conflit entre le fitrage des ressources par le pom et les varibles de templates ftl (refs 7708) --- observe-application-swing/pom.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/observe-application-swing/pom.xml b/observe-application-swing/pom.xml index 8bc4dd2..04909c6 100644 --- a/observe-application-swing/pom.xml +++ b/observe-application-swing/pom.xml @@ -336,6 +336,11 @@ <includes> <include>**/*</include> </includes> + <!-- on ne filtre pas les fichiers template de generation de text pour éviter + les conflit entre les varibles du pom et les variable du model du template --> + <excludes> + <exclude>ftl/*.ftl</exclude> + </excludes> </resource> </resources> <pluginManagement> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.