Author: tchemit Date: 2010-10-26 12:03:06 +0000 (Tue, 26 Oct 2010) New Revision: 1606 Log: use mavenpom 2.4-SNAPSHOT use camelCase style for version properties use default libraries version from mavenpom Modified: trunk/simexplorer-is/pom.xml trunk/simexplorer-is/simexplorer-is-swing/pom.xml Modified: trunk/simexplorer-is/pom.xml =================================================================== --- trunk/simexplorer-is/pom.xml 2010-10-17 01:40:38 UTC (rev 1605) +++ trunk/simexplorer-is/pom.xml 2010-10-26 12:03:06 UTC (rev 1606) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4labs</artifactId> - <version>2.3.2</version> + <version>2.4-SNAPSHOT</version> </parent> <groupId>simexplorer-is</groupId> @@ -34,14 +34,14 @@ <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils</artifactId> - <version>${lutinutil.version}</version> + <version>${nuitonUtilsVersion}</version> </dependency> <!-- librairie Jaxx --> <dependency> <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-runtime</artifactId> - <version>${jaxx.version}</version> + <version>${jaxxVersion}</version> <scope>compile</scope> <exclusions> <exclusion> @@ -66,7 +66,7 @@ <dependency> <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-widgets</artifactId> - <version>${jaxx.version}</version> + <version>${jaxxVersion}</version> <exclusions> <exclusion> <groupId>javax.help</groupId> @@ -92,7 +92,7 @@ <dependency> <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-swing-action</artifactId> - <version>${jaxx.version}</version> + <version>${jaxxVersion}</version> <scope>compile</scope> </dependency> @@ -100,19 +100,19 @@ <dependency> <groupId>org.codelutin.commandline</groupId> <artifactId>commandline-core</artifactId> - <version>${commandline.version}</version> + <version>${commandlineVersion}</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.codelutin.commandline</groupId> <artifactId>commandline-ui</artifactId> - <version>${commandline.version}</version> + <version>${commandlineVersion}</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.codelutin.commandline</groupId> <artifactId>commandline-ui-action</artifactId> - <version>${commandline.version}</version> + <version>${commandlineVersion}</version> <scope>compile</scope> </dependency> @@ -120,19 +120,19 @@ <dependency> <groupId>jboss</groupId> <artifactId>jbossall-client</artifactId> - <version>${jboss.version}</version> + <version>${jbossVersion}</version> <scope>provided</scope> </dependency> <dependency> <groupId>jboss</groupId> <artifactId>jboss-ejb3x</artifactId> - <version>${jboss.version}</version> + <version>${jbossVersion}</version> <scope>provided</scope> </dependency> <dependency> <groupId>jboss</groupId> <artifactId>jboss-annotations-ejb3</artifactId> - <version>${jboss.version}</version> + <version>${jbossVersion}</version> <scope>provided</scope> </dependency> @@ -146,22 +146,22 @@ <dependency> <groupId>tapestry5-treegrid</groupId> <artifactId>tapestry5-treegrid</artifactId> - <version>${tapestry.grid.version}</version> + <version>${tapestryGridVersion}</version> </dependency> <dependency> <groupId>org.apache.tapestry</groupId> <artifactId>tapestry-upload</artifactId> - <version>${tapestry.version}</version> + <version>${tapestryVersion}</version> </dependency> <dependency> <groupId>org.apache.tapestry</groupId> <artifactId>tapestry-core</artifactId> - <version>${tapestry.version}</version> + <version>${tapestryVersion}</version> </dependency> <dependency> <groupId>org.apache.tapestry</groupId> <artifactId>tapestry-ioc</artifactId> - <version>${tapestry.version}</version> + <version>${tapestryVersion}</version> </dependency> <dependency> <groupId>org.apache.tapestry</groupId> @@ -175,21 +175,17 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.7</version> <scope>test</scope> </dependency> <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> - <version>1.1.1</version> - <scope>compile</scope> </dependency> <dependency> <groupId>commons-lang</groupId> <artifactId>commons-lang</artifactId> - <version>2.3</version> </dependency> <dependency> @@ -294,14 +290,14 @@ <!--labs.project>simexplorer-si</labs.project--> <!-- customized libs --> - <jaxx.version>2.0.0-beta-4</jaxx.version> - <commandline.version>1.0</commandline.version> - <lutinutil.version>1.1.2</lutinutil.version> - <i18n.version>1.0.1</i18n.version> + <jaxxVersion>2.0.0-beta-4</jaxxVersion> + <commandlineVersion>1.0</commandlineVersion> + <nuitonUtilsVersion>1.1.2</nuitonUtilsVersion> + <nuitonI18nVersion>1.0.1</nuitonI18nVersion> - <tapestry.version>5.0.11</tapestry.version> - <tapestry.grid.version>5.0.11.1</tapestry.grid.version> - <jboss.version>4.2.2.GA</jboss.version> + <tapestryVersion>5.0.11</tapestryVersion> + <tapestryGridVersion>5.0.11.1</tapestryGridVersion> + <jbossVersion>4.2.2.GA</jbossVersion> </properties> @@ -313,7 +309,7 @@ <plugin> <groupId>org.nuiton.i18n</groupId> <artifactId>maven-i18n-plugin</artifactId> - <version>${i18n.version}</version> + <version>${nuitonI18nVersion}</version> <configuration> <bundles>fr_FR</bundles> </configuration> @@ -322,7 +318,7 @@ <plugin> <groupId>org.nuiton.jaxx</groupId> <artifactId>maven-jaxx-plugin</artifactId> - <version>${jaxx.version}</version> + <version>${jaxxVersion}</version> </plugin> <plugin> @@ -339,7 +335,7 @@ <dependency> <groupId>org.nuiton.jrst</groupId> <artifactId>doxia-module-jrst</artifactId> - <version>${jrst.version}</version> + <version>${jrstPluginVersion}</version> </dependency> </dependencies> </plugin> Modified: trunk/simexplorer-is/simexplorer-is-swing/pom.xml =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/pom.xml 2010-10-17 01:40:38 UTC (rev 1605) +++ trunk/simexplorer-is/simexplorer-is-swing/pom.xml 2010-10-26 12:03:06 UTC (rev 1606) @@ -148,7 +148,7 @@ <!--<plugin> <groupId>org.codelutin.commandline</groupId> <artifactId>maven-commandline-plugin</artifactId> - <version>${commandline.version}</version> + <version>${commandlineVersion}</version> <configuration> <prefix>SimExplorer</prefix> <packageName>fr.cemagref.simexplorer.is.ui.swing.commandline</packageName> @@ -194,7 +194,7 @@ <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils</artifactId> - <version>${lutinutil.version}</version> + <version>${nuitonUtilsVersion}</version> </dependency> </dependencies> </plugin>-->