remove use of project.version in dependencyManagement

use of project.version in dependencyManagement leads to build error in IT plugins with Maven 3.3
(in these plugins, project.version is 1.0-SNAPSHOT, in Maven 3.2 dependencies which version is declared ${project.version} in root pom.xml resolve to 5.2-SNAPSHOT but with Maven 3.3 they resolve to 1.0-SNAPSHOT, which causes errors)
This commit is contained in:
Sébastien Lesaint 2015-08-12 14:21:08 +02:00
parent 83e62d6b93
commit 75dbc1e0c5
2 changed files with 20 additions and 14 deletions

View File

@ -27,6 +27,7 @@
<properties>
<apiVersion>${project.parent.version}</apiVersion>
<sq.version>${project.parent.version}</sq.version>
</properties>
<modules>

33
pom.xml
View File

@ -62,6 +62,11 @@
</prerequisites>
<properties>
<!--used to define versions of dependencies in dependencyManagement-->
<!--${project.version} can not be used directly in dependencyManagement because it can resolve to a-->
<!--version different from the one of this pom if the current module's version is not the same as this pom-->
<!--(eg. in IT plugins where version is 1.0-SNAPSHOT)-->
<sq.version>${project.version}</sq.version>
<sonarUpdateCenter.version>1.13</sonarUpdateCenter.version>
<sonarJava.version>3.4</sonarJava.version>
<sonarGit.version>1.0</sonarGit.version>
@ -425,7 +430,7 @@
<configuration>
<archive>
<manifestEntries>
<Version>${project.version}</Version>
<Version>${sq.version}</Version>
<!-- ${buildNumber} is the Git revision. It's generated by the buildnumber-maven-plugin -->
<Implementation-Build>${buildNumber}</Implementation-Build>
<Build-Time>${timestamp}</Build-Time>
@ -583,47 +588,47 @@
<dependency>
<groupId>org.codehaus.sonar</groupId>
<artifactId>sonar-markdown</artifactId>
<version>${project.version}</version>
<version>${sq.version}</version>
</dependency>
<dependency>
<groupId>org.codehaus.sonar</groupId>
<artifactId>sonar-check-api</artifactId>
<version>${project.version}</version>
<version>${sq.version}</version>
</dependency>
<dependency>
<groupId>org.codehaus.sonar</groupId>
<artifactId>sonar-colorizer</artifactId>
<version>${project.version}</version>
<version>${sq.version}</version>
</dependency>
<dependency>
<groupId>org.codehaus.sonar</groupId>
<artifactId>sonar-core</artifactId>
<version>${project.version}</version>
<version>${sq.version}</version>
</dependency>
<dependency>
<groupId>org.codehaus.sonar</groupId>
<artifactId>sonar-db</artifactId>
<version>${project.version}</version>
<version>${sq.version}</version>
</dependency>
<dependency>
<groupId>org.codehaus.sonar</groupId>
<artifactId>sonar-batch-protocol</artifactId>
<version>${project.version}</version>
<version>${sq.version}</version>
</dependency>
<dependency>
<groupId>org.codehaus.sonar</groupId>
<artifactId>sonar-ws</artifactId>
<version>${project.version}</version>
<version>${sq.version}</version>
</dependency>
<dependency>
<groupId>org.codehaus.sonar</groupId>
<artifactId>sonar-duplications</artifactId>
<version>${project.version}</version>
<version>${sq.version}</version>
</dependency>
<dependency>
<groupId>org.codehaus.sonar</groupId>
<artifactId>sonar-home</artifactId>
<version>${project.version}</version>
<version>${sq.version}</version>
</dependency>
<dependency>
<groupId>org.codehaus.sonar</groupId>
@ -648,7 +653,7 @@
<dependency>
<groupId>org.codehaus.sonar</groupId>
<artifactId>sonar-plugin-api</artifactId>
<version>${project.version}</version>
<version>${sq.version}</version>
</dependency>
<dependency>
<groupId>org.codehaus.sonar</groupId>
@ -658,12 +663,12 @@
<dependency>
<groupId>org.codehaus.sonar</groupId>
<artifactId>sonar-server</artifactId>
<version>${project.version}</version>
<version>${sq.version}</version>
</dependency>
<dependency>
<groupId>org.codehaus.sonar.plugins</groupId>
<artifactId>sonar-xoo-plugin</artifactId>
<version>${project.version}</version>
<version>${sq.version}</version>
<scope>test</scope>
</dependency>
<dependency>
@ -681,7 +686,7 @@
<dependency>
<groupId>org.codehaus.sonar</groupId>
<artifactId>sonar-testing-harness</artifactId>
<version>${project.version}</version>
<version>${sq.version}</version>
</dependency>
<dependency>
<groupId>org.codehaus.sonar</groupId>