branch develop updated (084b03b -> a087eae)
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 084b03b L'application web ne démarre pas sous tomcat 8 (Fixes #8548) new a087eae [jgitflow-maven-plugin]updating poms for 5.1-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 a087eae64e534c683717b99603826ea6dbe929af Author: Maven Release <maven-release@codelutin.com> Date: Wed Sep 21 14:32:25 2016 +0200 [jgitflow-maven-plugin]updating poms for 5.1-SNAPSHOT development Summary of changes: application-swing/pom.xml | 60 ++++++++++++++++------------------------------- pom.xml | 19 +++++++-------- 2 files changed, 28 insertions(+), 51 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 a087eae64e534c683717b99603826ea6dbe929af Author: Maven Release <maven-release@codelutin.com> Date: Wed Sep 21 14:32:25 2016 +0200 [jgitflow-maven-plugin]updating poms for 5.1-SNAPSHOT development --- application-swing/pom.xml | 60 ++++++++++++++++------------------------------- pom.xml | 19 +++++++-------- 2 files changed, 28 insertions(+), 51 deletions(-) diff --git a/application-swing/pom.xml b/application-swing/pom.xml index fb5bdc1..e0f0149 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> @@ -638,7 +637,7 @@ <manifest> <useUniqueVersions>false</useUniqueVersions> <addClasspath>false</addClasspath> - <classpathPrefix/> + <classpathPrefix /> <mainClass>${maven.jar.main.class}</mainClass> </manifest> </archive> @@ -673,67 +672,52 @@ <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>LICENSE</resource> </transformer> - <transformer - implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer"> + <transformer implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer"> <resource>hsqldb_lic.txt</resource> </transformer> - <transformer - implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer"> + <transformer implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer"> <resource>hypersonic_lic.txt</resource> </transformer> - <transformer - implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer"> + <transformer implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer"> <resource>info.xml</resource> </transformer> - <transformer - implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer"> + <transformer implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer"> <resource>jdom-info.xml</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.DontIncludeResourceTransformer"> + <transformer implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer"> <resource>NOTICE.txt</resource> </transformer> - <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/> + <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" />--> @@ -900,12 +884,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/license/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/license/META-INF/observe-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/license/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/license/META-INF/observe-CHANGELOG.txt" /> </target> </configuration> <goals> diff --git a/pom.xml b/pom.xml index e9a093b..87e3d81 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> @@ -1191,27 +1190,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