branch develop updated (08b7d39 -> 91ab4c8)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository observe. See http://git.codelutin.com/observe.git from 08b7d39 Merge branch 'feature/7708' into develop new 91ab4c8 ajouter les template dans les ressources (refs #7715) 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 91ab4c8e352748f30d35da7b8d580fae94c549ab Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Thu Nov 12 16:24:19 2015 +0100 ajouter les template dans les ressources (refs #7715) Summary of changes: observe-application-swing/pom.xml | 9 +++++++++ 1 file changed, 9 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 develop in repository observe. See http://git.codelutin.com/observe.git commit 91ab4c8e352748f30d35da7b8d580fae94c549ab Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Thu Nov 12 16:24:19 2015 +0100 ajouter les template dans les ressources (refs #7715) --- observe-application-swing/pom.xml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/observe-application-swing/pom.xml b/observe-application-swing/pom.xml index 04909c6..1ccef4e 100644 --- a/observe-application-swing/pom.xml +++ b/observe-application-swing/pom.xml @@ -342,6 +342,15 @@ <exclude>ftl/*.ftl</exclude> </excludes> </resource> + <resource> + <directory>src/main/resources</directory> + <!-- 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 --> + <filtering>false</filtering> + <includes> + <include>ftl/*.ftl</include> + </includes> + </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