branch develop updated (5e02a5b -> c179306)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git from 5e02a5b Corrige une tipo new c179306 [jgitflow-maven-plugin]updating poms for 5.0-SNAPSHOT development 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 c179306cecc176c9670d9f45291b80ffa1fd6caf Author: Maven Release <maven-release@codelutin.com> Date: Mon Sep 5 14:01:12 2016 +0200 [jgitflow-maven-plugin]updating poms for 5.0-SNAPSHOT development Summary of changes: application-swing/pom.xml | 71 +++++++++++++++++------------------------------ pom.xml | 19 ++++++------- 2 files changed, 34 insertions(+), 56 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit c179306cecc176c9670d9f45291b80ffa1fd6caf Author: Maven Release <maven-release@codelutin.com> Date: Mon Sep 5 14:01:12 2016 +0200 [jgitflow-maven-plugin]updating poms for 5.0-SNAPSHOT development --- application-swing/pom.xml | 71 +++++++++++++++++------------------------------ pom.xml | 19 ++++++------- 2 files changed, 34 insertions(+), 56 deletions(-) diff --git a/application-swing/pom.xml b/application-swing/pom.xml index 827fb8d..83adead 100644 --- a/application-swing/pom.xml +++ b/application-swing/pom.xml @@ -20,8 +20,7 @@ <http://www.gnu.org/licenses/lgpl-3.0.html>. #L% --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> @@ -630,45 +629,36 @@ <resource>xwork.xml</resource> </transformer> - <transformer - implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer"> + <transformer implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer"> <resource>LICENSE.txt</resource> </transformer> - <transformer - implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer"> + <transformer implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer"> <resource>README.txt</resource> </transformer> - <transformer - implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer"> + <transformer implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer"> <resource>README.md</resource> </transformer> - <transformer - implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer"> + <transformer implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer"> <resource>THIRD-PARTY.txt</resource> </transformer> - <transformer - implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer"> + <transformer implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer"> <resource>HTTPS___.DSA</resource> </transformer> - <transformer - implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer"> + <transformer implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer"> <resource>DEPENDENCIES</resource> </transformer> - <transformer - implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer"> + <transformer implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer"> <resource>HTTPS___.SF</resource> </transformer> - <transformer - implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer"> + <transformer implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer"> <resource>README</resource> </transformer> - <transformer - implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer"> + <transformer implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer"> <resource>NOTICE</resource> </transformer> - <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/> - <!--<transformer implementation="org.apache.maven.plugins.shade.resource.ComponentsXmlResourceTransformer"/>--> - <!--<transformer implementation="org.apache.maven.plugins.shade.resource.PluginXmlResourceTransformer"/>--> + <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" /> + <!--<transformer implementation="org.apache.maven.plugins.shade.resource.ComponentsXmlResourceTransformer" />--> + <!--<transformer implementation="org.apache.maven.plugins.shade.resource.PluginXmlResourceTransformer" />--> <transformer implementation="org.apache.maven.plugins.shade.resource.IncludeResourceTransformer"> <file>README.md</file> @@ -734,7 +724,7 @@ <manifest> <useUniqueVersions>false</useUniqueVersions> <addClasspath>false</addClasspath> - <classpathPrefix/> + <classpathPrefix /> <mainClass>${maven.jar.main.class}</mainClass> </manifest> </archive> @@ -769,45 +759,36 @@ <resource>xwork.xml</resource> </transformer> - <transformer - implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer"> + <transformer implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer"> <resource>LICENSE.txt</resource> </transformer> - <transformer - implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer"> + <transformer implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer"> <resource>README.txt</resource> </transformer> - <transformer - implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer"> + <transformer implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer"> <resource>README.md</resource> </transformer> - <transformer - implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer"> + <transformer implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer"> <resource>THIRD-PARTY.txt</resource> </transformer> - <transformer - implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer"> + <transformer implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer"> <resource>HTTPS___.DSA</resource> </transformer> - <transformer - implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer"> + <transformer implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer"> <resource>DEPENDENCIES</resource> </transformer> - <transformer - implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer"> + <transformer implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer"> <resource>HTTPS___.SF</resource> </transformer> - <transformer - implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer"> + <transformer implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer"> <resource>README</resource> </transformer> - <transformer - implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer"> + <transformer implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer"> <resource>NOTICE</resource> </transformer> - <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/> - <!--<transformer implementation="org.apache.maven.plugins.shade.resource.ComponentsXmlResourceTransformer"/>--> - <!--<transformer implementation="org.apache.maven.plugins.shade.resource.PluginXmlResourceTransformer"/>--> + <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" /> + <!--<transformer implementation="org.apache.maven.plugins.shade.resource.ComponentsXmlResourceTransformer" />--> + <!--<transformer implementation="org.apache.maven.plugins.shade.resource.PluginXmlResourceTransformer" />--> <transformer implementation="org.apache.maven.plugins.shade.resource.IncludeResourceTransformer"> <file>README.md</file> diff --git a/pom.xml b/pom.xml index 06b0a48..8ec7351 100644 --- a/pom.xml +++ b/pom.xml @@ -22,8 +22,7 @@ <http://www.gnu.org/licenses/lgpl-3.0.html>. #L% --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> @@ -1145,27 +1144,25 @@ <target> <copy failonerror="true" overwrite="true" todir="${project.reporting.outputDirectory}/model"> <fileset dir="doc/modelisation"> - <include name="**/*.pdf"/> + <include name="**/*.pdf" /> </fileset> <fileset dir="entities/src/main/xmi"> - <include name="**/*.zargo"/> + <include name="**/*.zargo" /> </fileset> </copy> - <copy todir="${project.reporting.outputDirectory}/validation/service" failonerror="true" - overwrite="true"> + <copy todir="${project.reporting.outputDirectory}/validation/service" failonerror="true" overwrite="true"> <fileset dir="services-topia-validation/src/main/resources"> - <include name="**/*-validation.xml"/> + <include name="**/*-validation.xml" /> </fileset> </copy> - <copy todir="${project.reporting.outputDirectory}/validation/ui" failonerror="true" - overwrite="true"> + <copy todir="${project.reporting.outputDirectory}/validation/ui" failonerror="true" overwrite="true"> <fileset dir="application-swing-validation/src/main/resources"> - <include name="**/*-validation.xml"/> + <include name="**/*-validation.xml" /> </fileset> </copy> <copy todir="${project.reporting.outputDirectory}/validation" failonerror="true" overwrite="true"> <fileset dir="application-swing-configuration/src/main/resources"> - <include name="validators.xml"/> + <include name="validators.xml" /> </fileset> </copy> </target> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm