Try to fix error of maven-release-plugin

diff --git a/it/it-plugins/pom.xml b/it/it-plugins/pom.xml
index 984e022859ddebc6723eb8a911945c91de0b5c92..6a28942da14837d11f8239dc5b6755ebc094df78 100644 (file)
--- a/it/it-plugins/pom.xml
+++ b/it/it-plugins/pom.xml
@@ -27,7 +27,6 @@
 
   <properties>
     <apiVersion>${project.parent.version}</apiVersion>
-    <sq.version>${project.parent.version}</sq.version>
   </properties>
 
   <modules>

diff --git a/pom.xml b/pom.xml
index 8abc7eb112a25664a6e3e2e73c8d62b0c3c39d1d..e0eeb6ee8c77272129b182aa9a9d7e36b624229c 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -57,11 +57,6 @@
   </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.6</sonarJava.version>
     <sonarGit.version>1.0</sonarGit.version>
@@ -425,7 +420,7 @@
         <configuration>
           <archive>
             <manifestEntries>
-              <Version>${sq.version}</Version>
+              <Version>${pom.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>
@@ -588,47 +583,47 @@
       <dependency>
         <groupId>${project.groupId}</groupId>
         <artifactId>sonar-markdown</artifactId>
-        <version>${sq.version}</version>
+        <version>${pom.version}</version>
       </dependency>
       <dependency>
         <groupId>${project.groupId}</groupId>
         <artifactId>sonar-check-api</artifactId>
-        <version>${sq.version}</version>
+        <version>${pom.version}</version>
       </dependency>
       <dependency>
         <groupId>${project.groupId}</groupId>
         <artifactId>sonar-colorizer</artifactId>
-        <version>${sq.version}</version>
+        <version>${pom.version}</version>
       </dependency>
       <dependency>
         <groupId>${project.groupId}</groupId>
         <artifactId>sonar-core</artifactId>
-        <version>${sq.version}</version>
+        <version>${pom.version}</version>
       </dependency>
       <dependency>
         <groupId>${project.groupId}</groupId>
         <artifactId>sonar-db</artifactId>
-        <version>${sq.version}</version>
+        <version>${pom.version}</version>
       </dependency>
       <dependency>
         <groupId>${project.groupId}</groupId>
         <artifactId>sonar-batch-protocol</artifactId>
-        <version>${sq.version}</version>
+        <version>${pom.version}</version>
       </dependency>
       <dependency>
         <groupId>${project.groupId}</groupId>
         <artifactId>sonar-ws</artifactId>
-        <version>${sq.version}</version>
+        <version>${pom.version}</version>
       </dependency>
       <dependency>
         <groupId>${project.groupId}</groupId>
         <artifactId>sonar-duplications</artifactId>
-        <version>${sq.version}</version>
+        <version>${pom.version}</version>
       </dependency>
       <dependency>
         <groupId>${project.groupId}</groupId>
         <artifactId>sonar-home</artifactId>
-        <version>${sq.version}</version>
+        <version>${pom.version}</version>
       </dependency>
       <dependency>
         <groupId>org.codehaus.sonar</groupId>
@@ -653,7 +648,7 @@
       <dependency>
         <groupId>${project.groupId}</groupId>
         <artifactId>sonar-plugin-api</artifactId>
-        <version>${sq.version}</version>
+        <version>${pom.version}</version>
       </dependency>
       <dependency>
         <groupId>org.codehaus.sonar</groupId>
@@ -663,7 +658,7 @@
       <dependency>
         <groupId>${project.groupId}</groupId>
         <artifactId>sonar-server</artifactId>
-        <version>${sq.version}</version>
+        <version>${pom.version}</version>
       </dependency>
       <dependency>
         <groupId>org.codehaus.sonar</groupId>
@@ -683,7 +678,7 @@
       <dependency>
         <groupId>org.sonarsource.sonarqube</groupId>
         <artifactId>sonar-xoo-plugin</artifactId>
-        <version>${sq.version}</version>
+        <version>${pom.version}</version>
         <scope>test</scope>
       </dependency>
       <dependency>
@@ -701,7 +696,7 @@
       <dependency>
         <groupId>org.sonarsource.sonarqube</groupId>
         <artifactId>sonar-testing-harness</artifactId>
-        <version>${sq.version}</version>
+        <version>${pom.version}</version>
       </dependency>
       <dependency>
         <groupId>org.sonarsource.sonarqube</groupId>