Author: tchemit Date: 2010-10-26 14:12:30 +0200 (Tue, 26 Oct 2010) New Revision: 2116 Url: http://nuiton.org/repositories/revision/jaxx/2116 Log: use mavenpom 2.4-SNAPSHOT use camelCase style for version properties use default libraries version from mavenpom Modified: trunk/jaxx-demo/pom.xml trunk/jaxx-tutorial-config/pom.xml trunk/jaxx-tutorial/pom.xml trunk/pom.xml Modified: trunk/jaxx-demo/pom.xml =================================================================== --- trunk/jaxx-demo/pom.xml 2010-10-26 08:27:03 UTC (rev 2115) +++ trunk/jaxx-demo/pom.xml 2010-10-26 12:12:30 UTC (rev 2116) @@ -305,7 +305,7 @@ <plugin> <groupId>org.nuiton.thirdparty</groupId> <artifactId>webstart-maven-plugin</artifactId> - <version>${jnlp.version}</version> + <version>${webstartPluginVersion}</version> </plugin> </plugins> </reporting> Modified: trunk/jaxx-tutorial/pom.xml =================================================================== --- trunk/jaxx-tutorial/pom.xml 2010-10-26 08:27:03 UTC (rev 2115) +++ trunk/jaxx-tutorial/pom.xml 2010-10-26 12:12:30 UTC (rev 2116) @@ -227,7 +227,7 @@ <plugin> <groupId>org.nuiton.thirdparty</groupId> <artifactId>webstart-maven-plugin</artifactId> - <version>${jnlp.version}</version> + <version>${webstartPluginVersion}</version> </plugin> </plugins> </reporting> Modified: trunk/jaxx-tutorial-config/pom.xml =================================================================== --- trunk/jaxx-tutorial-config/pom.xml 2010-10-26 08:27:03 UTC (rev 2115) +++ trunk/jaxx-tutorial-config/pom.xml 2010-10-26 12:12:30 UTC (rev 2116) @@ -84,7 +84,7 @@ <!-- Jaxx version --> - <jaxx.version>${project.version}</jaxx.version> + <jaxxVersion>${project.version}</jaxxVersion> <!-- main class to run --> @@ -92,8 +92,8 @@ <!-- compiler configuration --> - <maven.compiler.source>1.5</maven.compiler.source> - <maven.compiler.source>1.5</maven.compiler.source> + <maven.compiler.source>1.6</maven.compiler.source> + <maven.compiler.source>1.6</maven.compiler.source> <!-- default encoding --> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-10-26 08:27:03 UTC (rev 2115) +++ trunk/pom.xml 2010-10-26 12:12:30 UTC (rev 2116) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>2.3.2</version> + <version>2.4-SNAPSHOT</version> </parent> <artifactId>jaxx</artifactId> @@ -95,13 +95,13 @@ <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils</artifactId> - <version>${lutinutil.version}</version> + <version>${nuitonUtilsVersion}</version> </dependency> <dependency> <groupId>org.nuiton</groupId> <artifactId>maven-helper-plugin</artifactId> - <version>${helper.version}</version> + <version>${helperPluginVersion}</version> <scope>compile</scope> <exclusions> <exclusion> @@ -174,7 +174,7 @@ <dependency> <groupId>org.nuiton</groupId> <artifactId>maven-helper-plugin</artifactId> - <version>${helper.version}</version> + <version>${helperPluginVersion}</version> <scope>test</scope> <classifier>tests</classifier> <exclusions> @@ -227,25 +227,21 @@ <dependency> <groupId>commons-jxpath</groupId> <artifactId>commons-jxpath</artifactId> - <version>1.3</version> </dependency> <dependency> <groupId>commons-lang</groupId> <artifactId>commons-lang</artifactId> - <version>2.4</version> </dependency> <dependency> <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> - <version>1.4</version> </dependency> <dependency> <groupId>commons-collections</groupId> <artifactId>commons-collections</artifactId> - <version>3.2.1</version> </dependency> <!-- sun dependencies --> @@ -261,7 +257,7 @@ <dependency> <groupId>javax.help</groupId> <artifactId>javahelp</artifactId> - <version>${javahelp.version}</version> + <version>${javaHelpVersion}</version> </dependency> <!-- maven dependencies --> @@ -269,14 +265,14 @@ <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-plugin-api</artifactId> - <version>${maven.version}</version> + <version>${mavenVersion}</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-project</artifactId> - <version>${maven.version}</version> + <version>${mavenVersion}</version> <scope>provided</scope> </dependency> @@ -306,7 +302,7 @@ <dependency> <groupId>org.swinglabs</groupId> <artifactId>jxlayer</artifactId> - <version>${jxlayer.version}</version> + <version>${jxLayerVersion}</version> </dependency> <dependency> @@ -325,7 +321,6 @@ <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> - <version>1.2.16</version> </dependency> <dependency> @@ -351,7 +346,6 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.8.1</version> <scope>test</scope> </dependency> @@ -394,7 +388,7 @@ <artifactId>maven-reporting-api</artifactId> </exclusion> - <!-- FIXME shoudl use the maven-ocre of maven.version... + <!-- FIXME shoudl use the maven-ocre of mavenVersion... <exclusion> <groupId>org.apache.maven</groupId> <artifactId>maven-core</artifactId> @@ -434,15 +428,13 @@ <!-- pour un muli module on doit fixer le projectId --> <projectId>jaxx</projectId> - <lutinutil.version>1.4.1</lutinutil.version> - - <i18n.version>1.2.2</i18n.version> + <nuitonUtilsVersion>1.4.1</nuitonUtilsVersion> + <nuitonI18nVersion>1.2.2</nuitonI18nVersion> - <jxlayer.version>3.0.3</jxlayer.version> + <jxLayerVersion>3.0.3</jxLayerVersion> - <javahelp.version>2.0.02</javahelp.version> - <jnlp.version>1.0-alpha-2-cl_20100511</jnlp.version> - + <javaHelpVersion>2.0.02</javaHelpVersion> + </properties> <build> @@ -454,13 +446,13 @@ <plugin> <groupId>org.nuiton.i18n</groupId> <artifactId>maven-i18n-plugin</artifactId> - <version>${i18n.version}</version> + <version>${nuitonI18nVersion}</version> </plugin> <plugin> <groupId>org.nuiton</groupId> <artifactId>maven-license-plugin</artifactId> - <version>${license.version}</version> + <version>${licensePluginVersion}</version> <configuration> <licenseMerges> <licenseMerge>The Apache Software License, Version 2.0|Apache License, Version 2.0</licenseMerge> @@ -475,7 +467,7 @@ <dependency> <groupId>org.nuiton.jrst</groupId> <artifactId>doxia-module-jrst</artifactId> - <version>${jrst.version}</version> + <version>${jrstPluginVersion}</version> </dependency> </dependencies> </plugin> @@ -483,7 +475,7 @@ <plugin> <groupId>org.nuiton.thirdparty</groupId> <artifactId>webstart-maven-plugin</artifactId> - <version>${jnlp.version}</version> + <version>${webstartPluginVersion}</version> <configuration> <jnlp> <mainClass>${maven.jar.main.class}</mainClass>