This is an automated email from the git hooks/post-receive script. New commit to branch develop-5.x in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit 42daadfa7f9ca7b272c59946e3e5aca5eb5772ed Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Dec 16 15:10:24 2016 +0100 L'écran A propos ne fonctionne pas (Fixes #8892) --- application-swing/pom.xml | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/application-swing/pom.xml b/application-swing/pom.xml index 2248522..84fd38a 100644 --- a/application-swing/pom.xml +++ b/application-swing/pom.xml @@ -723,6 +723,9 @@ <transformer implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer"> <resource>NOTICE.txt</resource> </transformer> + <transformer implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer"> + <resource>META-INF/CHANGELOG.txt</resource> + </transformer> <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" /> <!--<templates implementation="org.apache.maven.plugins.shade.resource.ComponentsXmlResourceTransformer" />--> <!--<templates implementation="org.apache.maven.plugins.shade.resource.PluginXmlResourceTransformer" />--> @@ -744,6 +747,11 @@ <resource>META-INF/${applicationName}-LICENSE.txt</resource> </transformer> + <transformer implementation="org.apache.maven.plugins.shade.resource.IncludeResourceTransformer"> + <file>${project.build.directory}/generated-sources/licenses/META-INF/${applicationName}-CHANGELOG.txt</file> + <resource>META-INF/${applicationName}-CHANGELOG.txt</resource> + </transformer> + </transformers> <!--minimizeJar>true</minimizeJar> <filters> @@ -855,7 +863,7 @@ <resource> <directory>${project.build.directory}/generated-sources/license</directory> <includes> - <include>*.txt</include> + <include>**/*.txt</include> </includes> </resource> </resources> @@ -897,8 +905,8 @@ <phase>process-resources</phase> <configuration> <target> - <copy failonerror="true" overwrite="true" file="${project.build.directory}/changelog/${project.parent.artifactId}-${project.version}-changelog.pom" tofile="${project.build.directory}/generated-sources/resources/CHANGELOG.txt" /> - <copy failonerror="true" overwrite="true" file="${project.build.directory}/changelog/${project.parent.artifactId}-${project.version}-changelog.pom" tofile="${project.build.directory}/generated-sources/resources/META-INF/${applicationName}-CHANGELOG.txt" /> + <copy failonerror="true" overwrite="true" file="${project.build.directory}/changelog/${project.parent.artifactId}-${project.version}-changelog.pom" tofile="${project.build.directory}/generated-sources/licenses/CHANGELOG.txt" /> + <copy failonerror="true" overwrite="true" file="${project.build.directory}/changelog/${project.parent.artifactId}-${project.version}-changelog.pom" tofile="${project.build.directory}/generated-sources/licenses/META-INF/${applicationName}-CHANGELOG.txt" /> </target> </configuration> <goals> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.