Author: tchemit Date: 2010-10-26 12:03:02 +0000 (Tue, 26 Oct 2010) New Revision: 3113 Log: use mavenpom 2.4-SNAPSHOT use camelCase style for version properties use default libraries version from mavenpom Modified: isis-fish/trunk/pom.xml Modified: isis-fish/trunk/pom.xml =================================================================== --- isis-fish/trunk/pom.xml 2010-10-17 01:43:09 UTC (rev 3112) +++ isis-fish/trunk/pom.xml 2010-10-26 12:03:02 UTC (rev 3113) @@ -1,3 +1,4 @@ +<?xml version="1.0" encoding="UTF-8"?> <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> @@ -5,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4labs</artifactId> - <version>2.3.2</version> + <version>2.4-SNAPSHOT</version> </parent> <groupId>fr.ifremer</groupId> @@ -19,21 +20,21 @@ <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils</artifactId> - <version>${nuiton-utils.version}</version> + <version>${nuitonUtilsVersion}</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.nuiton.topia</groupId> <artifactId>topia-persistence</artifactId> - <version>${topia.version}</version> + <version>${topiaVersion}</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.nuiton.topia</groupId> <artifactId>topia-service-migration</artifactId> - <version>${topia.version}</version> + <version>${topiaVersion}</version> <scope>compile</scope> </dependency> @@ -47,7 +48,7 @@ <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-widgets</artifactId> - <version>${nuiton-widgets.version}</version> + <version>${nuitonWidgetsVersion}</version> <scope>compile</scope> </dependency> @@ -55,21 +56,21 @@ <dependency> <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-runtime-swing</artifactId> - <version>${jaxx.version}</version> + <version>${jaxxVersion}</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-runtime-api</artifactId> - <version>${jaxx.version}</version> + <version>${jaxxVersion}</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-runtime-swing-widget</artifactId> - <version>${jaxx.version}</version> + <version>${jaxxVersion}</version> <scope>compile</scope> </dependency> @@ -225,19 +226,19 @@ <dependency> <groupId>aspectwerkz</groupId> <artifactId>aspectwerkz</artifactId> - <version>${aspectwerkz.version}</version> + <version>${aspectwerkzVersion}</version> <scope>compile</scope> </dependency> <dependency> <groupId>aspectwerkz</groupId> <artifactId>aspectwerkz-jdk5</artifactId> - <version>${aspectwerkz.version}</version> + <version>${aspectwerkzVersion}</version> <scope>compile</scope> </dependency> <dependency> <groupId>aspectwerkz</groupId> <artifactId>aspectwerkz-core</artifactId> - <version>${aspectwerkz.version}</version> + <version>${aspectwerkzVersion}</version> <scope>compile</scope> </dependency> @@ -448,21 +449,21 @@ <!-- Super pom properties --> <projectId>isis-fish</projectId> <labs.id>8</labs.id> - <javadoc.version>2.7</javadoc.version> + <javadocPluginVersion>2.7</javadocPluginVersion> <siteLocales>fr,en</siteLocales> <maven.jar.main.class>fr.ifremer.isisfish.IsisFish</maven.jar.main.class> <license.licenseName>gpl_v2</license.licenseName> <!-- Dependencies version --> - <jaxx.version>1.7.1</jaxx.version> - <eugene.version>2.0.1</eugene.version> - <topia.version>2.3.0-beta-6</topia.version> - <nuiton-utils.version>1.1.4</nuiton-utils.version> - <nuiton-i18n.version>1.2.2</nuiton-i18n.version> - <nuiton-widgets.version>1.0.1</nuiton-widgets.version> - <jrst.version>1.1.1</jrst.version> - <aspectwerkz.version>2.0</aspectwerkz.version> - <xmlrpc.version>3.1.2</xmlrpc.version> + <jaxxVersion>1.7.1</jaxxVersion> + <eugeneVersion>2.0.1</eugeneVersion> + <topiaVersion>2.3.0-beta-6</topiaVersion> + <nuitonUtilsVersion>1.1.4</nuitonUtilsVersion> + <nuitonI18nVersion>1.2.2</nuitonI18nVersion> + <nuitonWidgetsVersion>1.0.1</nuitonWidgetsVersion> + <jrstPluginVersion>1.1.1</jrstPluginVersion> + <aspectwerkzVersion>2.0</aspectwerkzVersion> + <xmlrpcVersion>3.1.2</xmlrpcVersion> <!-- jnlp (disabled until retested) <keystorepath>${codelutin.keystorepath}</keystorepath> @@ -480,19 +481,19 @@ <plugin> <groupId>org.nuiton.eugene</groupId> <artifactId>maven-eugene-plugin</artifactId> - <version>${eugene.version}</version> + <version>${eugeneVersion}</version> </plugin> <plugin> <groupId>org.nuiton.jaxx</groupId> <artifactId>maven-jaxx-plugin</artifactId> - <version>${jaxx.version}</version> + <version>${jaxxVersion}</version> </plugin> <plugin> <groupId>org.nuiton.i18n</groupId> <artifactId>maven-i18n-plugin</artifactId> - <version>${nuiton-i18n.version}</version> + <version>${nuitonI18nVersion}</version> </plugin> <!-- <plugin> <artifactId>maven-compiler-plugin</artifactId> @@ -545,7 +546,7 @@ <dependency> <groupId>org.nuiton.jrst</groupId> <artifactId>doxia-module-jrst</artifactId> - <version>${jrst.version}</version> + <version>${jrstPluginVersion}</version> </dependency> </dependencies> </plugin> @@ -591,7 +592,7 @@ <dependency> <groupId>org.nuiton.topia</groupId> <artifactId>topia-persistence</artifactId> - <version>${topia.version}</version> + <version>${topiaVersion}</version> <scope>runtime</scope> </dependency> </dependencies>