Author: tchemit Date: 2010-10-26 14:12:34 +0200 (Tue, 26 Oct 2010) New Revision: 278 Url: http://nuiton.org/repositories/revision/nuiton-matrix/278 Log: use mavenpom 2.4-SNAPSHOT use camelCase style for version properties use default libraries version from mavenpom Modified: branches/nuiton-matrix-2.1.x/pom.xml trunk/pom.xml Modified: branches/nuiton-matrix-2.1.x/pom.xml =================================================================== --- branches/nuiton-matrix-2.1.x/pom.xml 2010-10-17 01:38:34 UTC (rev 277) +++ branches/nuiton-matrix-2.1.x/pom.xml 2010-10-26 12:12:34 UTC (rev 278) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>2.3.2</version> + <version>2.4-SNAPSHOT</version> </parent> <artifactId>nuiton-matrix</artifactId> @@ -21,36 +21,30 @@ <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils</artifactId> - <version>${nuitonutils.version}</version> + <version>${nuitonUtilsVersion}</version> <scope>compile</scope> </dependency> <dependency> <groupId>commons-lang</groupId> <artifactId>commons-lang</artifactId> - <version>2.4</version> - <scope>compile</scope> </dependency> <dependency> <groupId>commons-beanutils</groupId> <artifactId>commons-beanutils</artifactId> - <version>1.8.0</version> - <scope>compile</scope> </dependency> <dependency> <groupId>commons-primitives</groupId> <artifactId>commons-primitives</artifactId> - <version>1.0</version> - <scope>compile</scope> </dependency> <!--Jaxx--> <dependency> <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-runtime</artifactId> - <version>${jaxx.version}</version> + <version>${jaxxVersion}</version> <scope>compile</scope> <exclusions> <exclusion> @@ -79,7 +73,6 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.8.1</version> <scope>test</scope> </dependency> @@ -103,9 +96,9 @@ <properties> - <nuitonutils.version>1.3.1</nuitonutils.version> - <jaxx.version>2.0.2</jaxx.version> - <i18n.version>1.2.2</i18n.version> + <jaxxVersion>2.0.2</jaxxVersion> + <nuitonUtilsVersion>1.3.1</nuitonUtilsVersion> + <nuitonI18nVersion>1.2.2</nuitonI18nVersion> <!-- extra files to include in release --> <redmine.releaseFiles>${redmine.libReleaseFiles}</redmine.releaseFiles> @@ -172,13 +165,13 @@ <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>${i18n.version}</version> + <version>${nuitonI18nVersion}</version> </plugin> <plugin> @@ -187,7 +180,7 @@ <dependency> <groupId>org.nuiton.jrst</groupId> <artifactId>doxia-module-jrst</artifactId> - <version>${jrst.version}</version> + <version>${jrstPluginVersion}</version> </dependency> </dependencies> </plugin> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-10-17 01:38:34 UTC (rev 277) +++ trunk/pom.xml 2010-10-26 12:12:34 UTC (rev 278) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>2.3.2</version> + <version>2.4-SNAPSHOT</version> </parent> <artifactId>nuiton-matrix</artifactId> @@ -21,36 +21,30 @@ <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils</artifactId> - <version>${nuitonutils.version}</version> + <version>${nuitonUtilsVersion}</version> <scope>compile</scope> </dependency> <dependency> <groupId>commons-lang</groupId> <artifactId>commons-lang</artifactId> - <version>2.4</version> - <scope>compile</scope> </dependency> <dependency> <groupId>commons-beanutils</groupId> <artifactId>commons-beanutils</artifactId> - <version>1.8.2</version> - <scope>compile</scope> </dependency> <dependency> <groupId>commons-primitives</groupId> <artifactId>commons-primitives</artifactId> - <version>1.0</version> - <scope>compile</scope> </dependency> <!--Jaxx--> <dependency> <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-runtime-swing</artifactId> - <version>${jaxx.version}</version> + <version>${jaxxVersion}</version> <scope>compile</scope> <exclusions> <exclusion> @@ -79,7 +73,6 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.8.1</version> <scope>test</scope> </dependency> @@ -103,9 +96,9 @@ <properties> - <nuitonutils.version>1.3.1</nuitonutils.version> - <jaxx.version>1.7.1</jaxx.version> - <i18n.version>1.2.2</i18n.version> + <jaxxVersion>1.7.1</jaxxVersion> + <nuitonUtilsVersion>1.3.1</nuitonUtilsVersion> + <nuitonI18nVersion>1.2.2</nuitonI18nVersion> <!-- extra files to include in release --> <redmine.releaseFiles>${redmine.libReleaseFiles}</redmine.releaseFiles> @@ -179,13 +172,13 @@ <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>${i18n.version}</version> + <version>${nuitonI18nVersion}</version> </plugin> <plugin> @@ -194,7 +187,7 @@ <dependency> <groupId>org.nuiton.jrst</groupId> <artifactId>doxia-module-jrst</artifactId> - <version>${jrst.version}</version> + <version>${jrstPluginVersion}</version> </dependency> </dependencies> </plugin>