branch feature/7708 updated (1e84e3f -> 061e470)
This is an automated email from the git hooks/post-receive script. New change to branch feature/7708 in repository observe. See http://git.codelutin.com/observe.git from 1e84e3f ajouter le sablier pendant le test de la connexion (refs 7708) new 061e470 conflit entre le fitrage des ressources par le pom et les varibles de templates ftl (refs 7708) The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 061e47001fe827a20a33bae5ee2cfd8538e9497c 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) Summary of changes: observe-application-swing/pom.xml | 5 +++++ 1 file changed, 5 insertions(+) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
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 061e47001fe827a20a33bae5ee2cfd8538e9497c 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>.
participants (1)
-
codelutin.com scm