Author: tchemit Date: 2010-10-26 12:02:51 +0000 (Tue, 26 Oct 2010) New Revision: 710 Log: use mavenpom 2.4-SNAPSHOT use camelCase style for version properties use default libraries version from mavenpom Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-10-25 09:29:41 UTC (rev 709) +++ trunk/pom.xml 2010-10-26 12:02:51 UTC (rev 710) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4labs</artifactId> - <version>2.3.2</version> + <version>2.4-SNAPSHOT</version> </parent> <groupId>fr.ifremer</groupId> @@ -48,7 +48,7 @@ <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils</artifactId> - <version>${nuitonutils.version}</version> + <version>${nuitonUtilsVersion}</version> <scope>compile</scope> <exclusions> <exclusion> @@ -60,23 +60,23 @@ <dependency> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-tapestry-extra</artifactId> - <version>${nuitonweb.version}</version> + <version>${nuitonWebVersion}</version> </dependency> <!-- ToPIA --> <dependency> <groupId>org.nuiton.topia</groupId> <artifactId>topia-persistence</artifactId> - <version>${topia.version}</version> + <version>${topiaVersion}</version> </dependency> <dependency> <groupId>org.nuiton.topia</groupId> <artifactId>topia-service-migration</artifactId> - <version>${topia.version}</version> + <version>${topiaVersion}</version> </dependency> <dependency> <groupId>org.apache.tapestry</groupId> <artifactId>tapestry-core</artifactId> - <version>${tapestry.version}</version> + <version>${tapestryVersion}</version> <scope>compile</scope> <exclusions> <exclusion> @@ -88,7 +88,7 @@ <dependency> <groupId>org.apache.tapestry</groupId> <artifactId>tapestry-upload</artifactId> - <version>${tapestry.version}</version> + <version>${tapestryVersion}</version> </dependency> <dependency> <groupId>com.orientimport</groupId> @@ -109,7 +109,7 @@ <!-- <dependency> <groupId>org.apache.tapestry</groupId> <artifactId>tapestry-test</artifactId> - <version>${tapestry.version}</version> + <version>${tapestryVersion}</version> <scope>test</scope> </dependency>--> <dependency> @@ -305,12 +305,12 @@ <labs.id>154</labs.id> <!-- libraries version --> - <i18n.version>1.2.2</i18n.version> - <nuitonutils.version>1.4.2</nuitonutils.version> - <nuitonweb.version>0.1</nuitonweb.version> - <topia.version>2.4.3</topia.version> - <eugene.version>2.2</eugene.version> - <tapestry.version>5.1.0.5</tapestry.version> + <nuitonI18nVersion>1.2.2</nuitonI18nVersion> + <nuitonUtilsVersion>1.4.2</nuitonUtilsVersion> + <nuitonWebVersion>0.1</nuitonWebVersion> + <topiaVersion>2.4.3</topiaVersion> + <eugeneVersion>2.2</eugeneVersion> + <tapestryVersion>5.1.0.5</tapestryVersion> </properties> @@ -342,7 +342,7 @@ <dependency> <groupId>org.nuiton.jrst</groupId> <artifactId>doxia-module-jrst</artifactId> - <version>${jrst.version}</version> + <version>${jrstPluginVersion}</version> </dependency> </dependencies> </plugin> @@ -350,7 +350,7 @@ <plugin> <groupId>org.nuiton.eugene</groupId> <artifactId>maven-eugene-plugin</artifactId> - <version>${eugene.version}</version> + <version>${eugeneVersion}</version> <configuration> <inputs>zargo</inputs> <resolver>org.nuiton.util.FasterCachedResourceResolver</resolver> @@ -359,7 +359,7 @@ <dependency> <groupId>org.nuiton.topia</groupId> <artifactId>topia-persistence</artifactId> - <version>${topia.version}</version> + <version>${topiaVersion}</version> </dependency> </dependencies> </plugin> @@ -367,7 +367,7 @@ <plugin> <groupId>org.nuiton.i18n</groupId> <artifactId>maven-i18n-plugin</artifactId> - <version>${i18n.version}</version> + <version>${nuitonI18nVersion}</version> </plugin> </plugins>