Author: tchemit Date: 2010-10-26 14:12:28 +0200 (Tue, 26 Oct 2010) New Revision: 169 Url: http://nuiton.org/repositories/revision/jredmine/169 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-17 01:38:07 UTC (rev 168) +++ trunk/pom.xml 2010-10-26 12:12:28 UTC (rev 169) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>2.3.2</version> + <version>2.4-SNAPSHOT</version> </parent> <artifactId>jredmine</artifactId> @@ -58,7 +58,7 @@ <dependency> <groupId>org.nuiton</groupId> <artifactId>maven-helper-plugin</artifactId> - <version>${helper.version}</version> + <version>${helperPluginVersion}</version> <scope>compile</scope> <exclusions> <exclusion> @@ -151,28 +151,28 @@ <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-project</artifactId> - <version>${maven.version}</version> + <version>${mavenVersion}</version> <scope>provided</scope> </dependency> <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-settings</artifactId> - <version>${maven.version}</version> + <version>${mavenVersion}</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-core</artifactId> - <version>${maven.version}</version> + <version>${mavenVersion}</version> <scope>provided</scope> <exclusions> <exclusion> @@ -273,7 +273,6 @@ <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> - <version>1.2.16</version> <scope>runtime</scope> </dependency> @@ -282,7 +281,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> @@ -356,7 +355,6 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.8.1</version> <scope>test</scope> </dependency> @@ -400,11 +398,8 @@ <projectId>jredmine</projectId> <!-- must be on a fixed version, not on the snapshot to make possible release --> - <jredmine.version>1.1.4</jredmine.version> + <jredminePluginVersion>1.1.4</jredminePluginVersion> - <!-- remove this when using mavenpom > 2.3 --> - <helper.version>1.2.8</helper.version> - <!-- documentation is in apt --> <siteSourcesType>apt</siteSourcesType> @@ -467,7 +462,7 @@ <plugin> <groupId>org.nuiton.jredmine</groupId> <artifactId>maven-jredmine-plugin</artifactId> - <version>${jredmine.version}</version> + <version>${jredminePluginVersion}</version> <!-- TC-20100106 Due to cyclic dependency problem between modules, we do not propagate maven-jredmine-plugin to child modules --> <inherited>false</inherited> @@ -520,7 +515,7 @@ </activation> <properties> <!-- always use this version to perform the profile (to use last improvements) --> - <jredmine.version>${project.version}</jredmine.version> + <jredminePluginVersion>${project.version}</jredminePluginVersion> </properties> @@ -538,7 +533,7 @@ <properties> <!-- always use this version to perform the profile (to use last improvements) --> - <jredmine.version>${project.version}</jredmine.version> + <jredminePluginVersion>${project.version}</jredminePluginVersion> </properties> </profile>