Author: tchemit Date: 2010-10-26 14:14:17 +0200 (Tue, 26 Oct 2010) New Revision: 450 Url: http://nuiton.org/repositories/revision/wikitty/450 Log: use mavenpom 2.4-SNAPSHOT use camelCase style for version properties use default libraries version from mavenpom Modified: trunk/pom.xml trunk/wikitty-api/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-10-21 14:47:36 UTC (rev 449) +++ trunk/pom.xml 2010-10-26 12:14:17 UTC (rev 450) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.3.2</version> + <version>2.4-SNAPSHOT</version> </parent> <!-- ************************************************************* --> @@ -85,7 +85,7 @@ <dependency> <groupId>org.nuiton.eugene</groupId> <artifactId>eugene</artifactId> - <version>${eugene.version}</version> + <version>${eugeneVersion}</version> </dependency> <dependency> @@ -203,32 +203,32 @@ <dependency> <groupId>org.zkoss.zk</groupId> <artifactId>zk</artifactId> - <version>${zk.version}</version> + <version>${zkVersion}</version> </dependency> <dependency> <groupId>org.zkoss.zk</groupId> <artifactId>zkplus</artifactId> - <version>${zk.version}</version> + <version>${zkVersion}</version> </dependency> <dependency> <groupId>org.zkoss.zk</groupId> <artifactId>zul</artifactId> - <version>${zk.version}</version> + <version>${zkVersion}</version> </dependency> <dependency> <groupId>org.apache.hbase</groupId> <artifactId>hbase</artifactId> - <version>${hbase.version}</version> + <version>${hbaseVersion}</version> </dependency> <dependency> <groupId>org.apache.hbase</groupId> <artifactId>hbase</artifactId> <classifier>tests</classifier> - <version>${hbase.version}</version> + <version>${hbaseVersion}</version> <scope>test</scope> </dependency> @@ -250,47 +250,47 @@ <dependency> <groupId>org.mortbay.jetty</groupId> <artifactId>jetty</artifactId> - <version>${jetty.version}</version> + <version>${jettyVersion}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-test</artifactId> - <version>${spring.version}</version> + <version>${springVersion}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-beans</artifactId> - <version>${spring.version}</version> + <version>${springVersion}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-aop</artifactId> - <version>${spring.version}</version> + <version>${springVersion}</version> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-context</artifactId> - <version>${spring.version}</version> + <version>${springVersion}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-orm</artifactId> - <version>${spring.version}</version> + <version>${springVersion}</version> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-jdbc</artifactId> - <version>${spring.version}</version> + <version>${springVersion}</version> </dependency> <dependency> @@ -467,13 +467,13 @@ <projectId>wikitty</projectId> <!-- common versions used in sub-poms --> - <eugene.version>2.2</eugene.version> - <spring.version>3.0.1.RELEASE</spring.version> - <jetty.version>6.1.22</jetty.version> + <eugeneVersion>2.2</eugeneVersion> + <springVersion>3.0.1.RELEASE</springVersion> + <jettyVersion>6.1.22</jettyVersion> - <zk.version>5.0.2</zk.version> + <zkVersion>5.0.2</zkVersion> - <hbase.version>0.89.0-SNAPSHOT</hbase.version> + <hbaseVersion>0.89.0-SNAPSHOT</hbaseVersion> </properties> <!-- ************************************************************* --> @@ -490,7 +490,7 @@ <dependency> <groupId>org.nuiton.jrst</groupId> <artifactId>doxia-module-jrst</artifactId> - <version>${jrst.version}</version> + <version>${jrstPluginVersion}</version> </dependency> </dependencies> </plugin> Modified: trunk/wikitty-api/pom.xml =================================================================== --- trunk/wikitty-api/pom.xml 2010-10-21 14:47:36 UTC (rev 449) +++ trunk/wikitty-api/pom.xml 2010-10-26 12:14:17 UTC (rev 450) @@ -145,7 +145,7 @@ <plugin> <groupId>org.nuiton.eugene</groupId> <artifactId>maven-eugene-plugin</artifactId> - <version>${eugene.version}</version> + <version>${eugeneVersion}</version> <dependencies> <dependency> <groupId>org.nuiton.wikitty</groupId>