branch release/5.0-RC-2 created (now d59f972)
This is an automated email from the git hooks/post-receive script. New change to branch release/5.0-RC-2 in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git at d59f972 [jgitflow-maven-plugin]updating poms for 5.0-RC-2 branch with snapshot versions This branch includes the following new commits: new d59f972 [jgitflow-maven-plugin]updating poms for 5.0-RC-2 branch with snapshot versions 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 d59f972daa9a7b18f7b8407de4e027656ab74633 Author: Maven Release <maven-release@codelutin.com> Date: Mon Sep 5 14:00:42 2016 +0200 [jgitflow-maven-plugin]updating poms for 5.0-RC-2 branch with snapshot versions -- 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 release/5.0-RC-2 in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit d59f972daa9a7b18f7b8407de4e027656ab74633 Author: Maven Release <maven-release@codelutin.com> Date: Mon Sep 5 14:00:42 2016 +0200 [jgitflow-maven-plugin]updating poms for 5.0-RC-2 branch with snapshot versions --- application-swing-configuration/pom.xml | 2 +- application-swing-decoration/pom.xml | 2 +- application-swing-validation/pom.xml | 2 +- application-swing-validators/pom.xml | 2 +- application-swing/pom.xml | 73 ++++++++++++--------------------- application-web-configuration/pom.xml | 2 +- application-web/pom.xml | 2 +- entities-migration/pom.xml | 2 +- entities/pom.xml | 2 +- pom.xml | 21 ++++------ services-api/pom.xml | 2 +- services-configuration-api/pom.xml | 2 +- services-configuration-rest/pom.xml | 2 +- services-configuration-topia/pom.xml | 2 +- services-model/pom.xml | 2 +- services-rest/pom.xml | 2 +- services-runner/pom.xml | 2 +- services-topia-validation/pom.xml | 2 +- services-topia-validators/pom.xml | 2 +- services-topia/pom.xml | 2 +- test/pom.xml | 2 +- toolbox-maven-plugin/pom.xml | 2 +- topia-extension/pom.xml | 2 +- topia-templates-extension/pom.xml | 2 +- 24 files changed, 58 insertions(+), 80 deletions(-) diff --git a/application-swing-configuration/pom.xml b/application-swing-configuration/pom.xml index b2a1940..0b34f48 100644 --- a/application-swing-configuration/pom.xml +++ b/application-swing-configuration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0-SNAPSHOT</version> + <version>5.0-RC-2-SNAPSHOT</version> </parent> <artifactId>application-swing-configuration</artifactId> diff --git a/application-swing-decoration/pom.xml b/application-swing-decoration/pom.xml index 0311684..cc41e30 100644 --- a/application-swing-decoration/pom.xml +++ b/application-swing-decoration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0-SNAPSHOT</version> + <version>5.0-RC-2-SNAPSHOT</version> </parent> <artifactId>application-swing-decoration</artifactId> diff --git a/application-swing-validation/pom.xml b/application-swing-validation/pom.xml index 418327f..de0ef51 100644 --- a/application-swing-validation/pom.xml +++ b/application-swing-validation/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0-SNAPSHOT</version> + <version>5.0-RC-2-SNAPSHOT</version> </parent> <artifactId>application-swing-validation</artifactId> diff --git a/application-swing-validators/pom.xml b/application-swing-validators/pom.xml index d46f5d8..d738b43 100644 --- a/application-swing-validators/pom.xml +++ b/application-swing-validators/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0-SNAPSHOT</version> + <version>5.0-RC-2-SNAPSHOT</version> </parent> <artifactId>application-swing-validators</artifactId> diff --git a/application-swing/pom.xml b/application-swing/pom.xml index 827fb8d..f7112a4 100644 --- a/application-swing/pom.xml +++ b/application-swing/pom.xml @@ -20,14 +20,13 @@ <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> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0-SNAPSHOT</version> + <version>5.0-RC-2-SNAPSHOT</version> </parent> <artifactId>application-swing</artifactId> @@ -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/application-web-configuration/pom.xml b/application-web-configuration/pom.xml index 844e9b2..34499bd 100644 --- a/application-web-configuration/pom.xml +++ b/application-web-configuration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0-SNAPSHOT</version> + <version>5.0-RC-2-SNAPSHOT</version> </parent> <artifactId>application-web-configuration</artifactId> diff --git a/application-web/pom.xml b/application-web/pom.xml index 0f3f5ff..64d09bb 100644 --- a/application-web/pom.xml +++ b/application-web/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0-SNAPSHOT</version> + <version>5.0-RC-2-SNAPSHOT</version> </parent> <artifactId>application-web</artifactId> diff --git a/entities-migration/pom.xml b/entities-migration/pom.xml index 384cd94..d5fbc03 100644 --- a/entities-migration/pom.xml +++ b/entities-migration/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0-SNAPSHOT</version> + <version>5.0-RC-2-SNAPSHOT</version> </parent> <artifactId>entities-migration</artifactId> diff --git a/entities/pom.xml b/entities/pom.xml index c8f7b3a..e01979e 100644 --- a/entities/pom.xml +++ b/entities/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0-SNAPSHOT</version> + <version>5.0-RC-2-SNAPSHOT</version> </parent> <artifactId>entities</artifactId> diff --git a/pom.xml b/pom.xml index 06b0a48..afea373 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> @@ -34,7 +33,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0-SNAPSHOT</version> + <version>5.0-RC-2-SNAPSHOT</version> <packaging>pom</packaging> <name>ObServe</name> @@ -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> diff --git a/services-api/pom.xml b/services-api/pom.xml index 8f6b06b..cc909a6 100644 --- a/services-api/pom.xml +++ b/services-api/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0-SNAPSHOT</version> + <version>5.0-RC-2-SNAPSHOT</version> </parent> <artifactId>services-api</artifactId> diff --git a/services-configuration-api/pom.xml b/services-configuration-api/pom.xml index ec345ca..b6c4d63 100644 --- a/services-configuration-api/pom.xml +++ b/services-configuration-api/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0-SNAPSHOT</version> + <version>5.0-RC-2-SNAPSHOT</version> </parent> <artifactId>services-configuration-api</artifactId> diff --git a/services-configuration-rest/pom.xml b/services-configuration-rest/pom.xml index 8df8f22..f74d0e5 100644 --- a/services-configuration-rest/pom.xml +++ b/services-configuration-rest/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0-SNAPSHOT</version> + <version>5.0-RC-2-SNAPSHOT</version> </parent> <artifactId>services-configuration-rest</artifactId> diff --git a/services-configuration-topia/pom.xml b/services-configuration-topia/pom.xml index 5791f6d..1b5cb51 100644 --- a/services-configuration-topia/pom.xml +++ b/services-configuration-topia/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0-SNAPSHOT</version> + <version>5.0-RC-2-SNAPSHOT</version> </parent> <artifactId>services-configuration-topia</artifactId> diff --git a/services-model/pom.xml b/services-model/pom.xml index aea7f25..921f16a 100644 --- a/services-model/pom.xml +++ b/services-model/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0-SNAPSHOT</version> + <version>5.0-RC-2-SNAPSHOT</version> </parent> <artifactId>services-model</artifactId> diff --git a/services-rest/pom.xml b/services-rest/pom.xml index da3b140..1921cd1 100644 --- a/services-rest/pom.xml +++ b/services-rest/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0-SNAPSHOT</version> + <version>5.0-RC-2-SNAPSHOT</version> </parent> <artifactId>services-rest</artifactId> diff --git a/services-runner/pom.xml b/services-runner/pom.xml index e16543e..1cf76bb 100644 --- a/services-runner/pom.xml +++ b/services-runner/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0-SNAPSHOT</version> + <version>5.0-RC-2-SNAPSHOT</version> </parent> <artifactId>services-runner</artifactId> diff --git a/services-topia-validation/pom.xml b/services-topia-validation/pom.xml index 1432eb0..7f12e55 100644 --- a/services-topia-validation/pom.xml +++ b/services-topia-validation/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0-SNAPSHOT</version> + <version>5.0-RC-2-SNAPSHOT</version> </parent> <artifactId>services-topia-validation</artifactId> diff --git a/services-topia-validators/pom.xml b/services-topia-validators/pom.xml index 2360a35..765badc 100644 --- a/services-topia-validators/pom.xml +++ b/services-topia-validators/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0-SNAPSHOT</version> + <version>5.0-RC-2-SNAPSHOT</version> </parent> <artifactId>services-topia-validators</artifactId> diff --git a/services-topia/pom.xml b/services-topia/pom.xml index 6038e77..9016540 100644 --- a/services-topia/pom.xml +++ b/services-topia/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0-SNAPSHOT</version> + <version>5.0-RC-2-SNAPSHOT</version> </parent> <artifactId>services-topia</artifactId> diff --git a/test/pom.xml b/test/pom.xml index 079e777..8644dcd 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0-SNAPSHOT</version> + <version>5.0-RC-2-SNAPSHOT</version> </parent> <artifactId>test</artifactId> diff --git a/toolbox-maven-plugin/pom.xml b/toolbox-maven-plugin/pom.xml index 3b31161..5dbe9dc 100644 --- a/toolbox-maven-plugin/pom.xml +++ b/toolbox-maven-plugin/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0-SNAPSHOT</version> + <version>5.0-RC-2-SNAPSHOT</version> </parent> <artifactId>toolbox-maven-plugin</artifactId> diff --git a/topia-extension/pom.xml b/topia-extension/pom.xml index 7e4be18..d253c40 100644 --- a/topia-extension/pom.xml +++ b/topia-extension/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0-SNAPSHOT</version> + <version>5.0-RC-2-SNAPSHOT</version> </parent> <artifactId>topia-extension</artifactId> diff --git a/topia-templates-extension/pom.xml b/topia-templates-extension/pom.xml index 5b26f0d..48a7f62 100644 --- a/topia-templates-extension/pom.xml +++ b/topia-templates-extension/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0-SNAPSHOT</version> + <version>5.0-RC-2-SNAPSHOT</version> </parent> <artifactId>topia-templates-extension</artifactId> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm