This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository coselmar. See http://git.codelutin.com/coselmar.git commit 15ec2ea4f3f8fe3075e78326e07123331696dc3e Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Dec 3 14:40:37 2014 +0100 tidy poms --- coselmar-bundle/pom.xml | 8 ++++---- coselmar-persistence/pom.xml | 1 - coselmar-rest/pom.xml | 8 +------- coselmar-ui/pom.xml | 3 --- pom.xml | 49 ++------------------------------------------ 5 files changed, 7 insertions(+), 62 deletions(-) diff --git a/coselmar-bundle/pom.xml b/coselmar-bundle/pom.xml index 00d48e3..068ce00 100644 --- a/coselmar-bundle/pom.xml +++ b/coselmar-bundle/pom.xml @@ -46,7 +46,10 @@ ${project.build.directory}/${project.build.finalName}.war </redmine.releaseFiles> - <deployFiles>${project.build.directory}/${project.build.finalName}.war</deployFiles> + <deployFiles> + ${project.build.directory}/${project.build.finalName}.war + </deployFiles> + </properties> <dependencies> @@ -77,7 +80,6 @@ </dependencies> <build> - <pluginManagement> <plugins> <plugin> @@ -91,7 +93,6 @@ </plugins> </pluginManagement> - </build> <profiles> @@ -105,5 +106,4 @@ </profile> </profiles> - </project> diff --git a/coselmar-persistence/pom.xml b/coselmar-persistence/pom.xml index 33cc3a7..d841809 100644 --- a/coselmar-persistence/pom.xml +++ b/coselmar-persistence/pom.xml @@ -104,7 +104,6 @@ </includes> </testResource> </testResources> - <plugins> <!-- Plug in Topia --> diff --git a/coselmar-rest/pom.xml b/coselmar-rest/pom.xml index e91353f..ecbf7f3 100644 --- a/coselmar-rest/pom.xml +++ b/coselmar-rest/pom.xml @@ -32,17 +32,16 @@ <groupId>fr.ifremer.coselmar</groupId> <artifactId>coselmar-rest</artifactId> + <packaging>war</packaging> <name>Coselmar :: Rest Services</name> <description>Coselmar rest services module</description> - <packaging>war</packaging> <properties> <i18n.silent>true</i18n.silent> <i18n.bundleOutputName>coselmar-i18n</i18n.bundleOutputName> </properties> - <dependencies> <!-- internal --> @@ -216,7 +215,6 @@ </dependencies> <build> - <testResources> <testResource> <directory>src/test/resources</directory> @@ -226,7 +224,6 @@ <filtering>true</filtering> </testResource> </testResources> - <pluginManagement> <plugins> <plugin> @@ -243,7 +240,6 @@ </plugin> </plugins> </pluginManagement> - <plugins> <plugin> <groupId>org.nuiton.i18n</groupId> @@ -257,8 +253,6 @@ </executions> </plugin> </plugins> - </build> - </project> diff --git a/coselmar-ui/pom.xml b/coselmar-ui/pom.xml index 3b21d3e..0474493 100644 --- a/coselmar-ui/pom.xml +++ b/coselmar-ui/pom.xml @@ -82,7 +82,6 @@ </dependencies> <build> - <plugins> <plugin> <groupId>org.apache.tomcat.maven</groupId> @@ -119,8 +118,6 @@ </plugin> </plugins> - </build> - </project> diff --git a/pom.xml b/pom.xml index 7c7bdca..4d69b33 100644 --- a/pom.xml +++ b/pom.xml @@ -86,7 +86,6 @@ </site> </distributionManagement> - <properties> <projectId>coselmar</projectId> @@ -100,9 +99,6 @@ <signatureArtifactId>java17</signatureArtifactId> <signatureVersion>1.0</signatureVersion> - <!-- Last JRE version to use --> - <jreVersion>1.7.72</jreVersion> - <!-- libraries version --> <eugenePluginVersion>2.13</eugenePluginVersion> <topiaVersion>3.0-beta-14</topiaVersion> @@ -136,6 +132,7 @@ <nuitonUtilsVersion>3.0-rc-7</nuitonUtilsVersion> <nuitonConfigVersion>3.0-rc-1</nuitonConfigVersion> <nuitonCsvVersion>3.0-alpha-3</nuitonCsvVersion> + <nuitonDecoratorVersion>3.0-alpha-3</nuitonDecoratorVersion> <nuitonValidatorVersion>3.0-rc-1</nuitonValidatorVersion> <nuitonConvertorVersion>1.0</nuitonConvertorVersion> @@ -147,7 +144,6 @@ </properties> - <repositories> <repository> <id>coselmar-nexus-repository</id> @@ -162,7 +158,6 @@ </releases> </repository> </repositories> - <pluginRepositories> <pluginRepository> <id>coselmar-nexus-repository</id> @@ -195,7 +190,7 @@ <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-decorator</artifactId> - <version>3.0-alpha-3</version> + <version>${nuitonDecoratorVersion}</version> </dependency> <dependency> <groupId>org.nuiton</groupId> @@ -382,7 +377,6 @@ <scope>test</scope> </dependency> - <!-- for embedded test --> <dependency> <groupId>org.apache.tomcat.embed</groupId> @@ -511,45 +505,6 @@ </profile> <profile> - <id>check-release-profile</id> - <activation> - <property> - <name>performRelease</name> - <value>true</value> - </property> - </activation> - <build> - <plugins> - <plugin> - <artifactId>maven-enforcer-plugin</artifactId> - <executions> - <execution> - <id>check-release-properties</id> - <goals> - <goal>enforce</goal> - </goals> - <phase>initialize</phase> - <configuration> - <rules> - <requireProperty> - <property>jreVersion</property> - <message>You must set a jreVersion property!</message> - </requireProperty> - </rules> - <ignoreCache>true</ignoreCache> - <failFast>true</failFast> - <fail>true</fail> - - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - - </profile> - - <profile> <id>license-profile</id> <activation> <property> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.