From 2b07fb2a1fb437d8eee1e97ad3adcda88f190173 Mon Sep 17 00:00:00 2001
From: Julien HENRY <julien.henry@sonarsource.com>
Date: Tue, 18 Jun 2013 10:32:10 +0200
Subject: [PATCH] Fix Maven 3 warnings

---
 sonar-runner-api/pom.xml  | 20 +++++++-------------
 sonar-runner-dist/pom.xml | 14 +++++++-------
 sonar-runner-impl/pom.xml | 10 +++++-----
 3 files changed, 19 insertions(+), 25 deletions(-)

diff --git a/sonar-runner-api/pom.xml b/sonar-runner-api/pom.xml
index 3527bfa..f039fe5 100644
--- a/sonar-runner-api/pom.xml
+++ b/sonar-runner-api/pom.xml
@@ -12,9 +12,9 @@
   <dependencies>
     <!-- Dependencies with scope "compile" are shaded and removed from transitive dependencies-->
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>sonar-runner-impl</artifactId>
-      <version>${pom.version}</version>
+      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>com.google.code.findbugs</groupId>
@@ -58,6 +58,8 @@
         <artifactId>maven-jar-plugin</artifactId>
         <configuration>
           <archive>
+            <!-- Use the MANIFEST generated by maven-bundle-plugin -->
+            <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
             <manifest>
               <addClasspath>true</addClasspath>
             </manifest>
@@ -77,12 +79,12 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>${pom.groupId}</groupId>
+                  <groupId>${project.groupId}</groupId>
                   <artifactId>sonar-runner-impl</artifactId>
-                  <version>${pom.version}</version>
+                  <version>${project.version}</version>
                   <type>jar</type>
                   <overWrite>false</overWrite>
-                  <outputDirectory>${pom.build.outputDirectory}</outputDirectory>
+                  <outputDirectory>${project.build.outputDirectory}</outputDirectory>
                   <destFileName>sonar-runner-impl.jar</destFileName>
                 </artifactItem>
               </artifactItems>
@@ -130,14 +132,6 @@
           </execution>
         </executions>
       </plugin>
-      <plugin>
-        <artifactId>maven-jar-plugin</artifactId>
-        <configuration>
-          <archive>
-            <manifestFile>${pom.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
-          </archive>
-        </configuration>
-      </plugin>
     </plugins>
   </build>
 </project>
diff --git a/sonar-runner-dist/pom.xml b/sonar-runner-dist/pom.xml
index 2bce0c1..86eed28 100644
--- a/sonar-runner-dist/pom.xml
+++ b/sonar-runner-dist/pom.xml
@@ -12,14 +12,14 @@
 
   <dependencies>
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>sonar-runner-api</artifactId>
-      <version>${pom.version}</version>
+      <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>sonar-runner-impl</artifactId>
-      <version>${pom.version}</version>
+      <version>${project.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
@@ -88,11 +88,11 @@
               <goal>single</goal>
             </goals>
             <configuration>
-              <finalName>sonar-runner-${pom.version}</finalName>
+              <finalName>sonar-runner-${project.version}</finalName>
               <appendAssemblyId>false</appendAssemblyId>
               <escapeString>\</escapeString>
               <descriptors>
-                <descriptor>${pom.basedir}/assembly.xml</descriptor>
+                <descriptor>${project.basedir}/assembly.xml</descriptor>
               </descriptors>
             </configuration>
           </execution>
@@ -115,7 +115,7 @@
                   <minsize>280000</minsize>
                   <maxsize>310000</maxsize>
                   <files>
-                    <file>${pom.build.directory}/sonar-runner-${pom.version}.zip</file>
+                    <file>${project.build.directory}/sonar-runner-${project.version}.zip</file>
                   </files>
                 </requireFilesSize>
               </rules>
diff --git a/sonar-runner-impl/pom.xml b/sonar-runner-impl/pom.xml
index 4ae4cd6..b153bec 100644
--- a/sonar-runner-impl/pom.xml
+++ b/sonar-runner-impl/pom.xml
@@ -24,9 +24,9 @@
       <artifactId>sonar-home</artifactId>
     </dependency>
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>sonar-runner-batch</artifactId>
-      <version>${pom.version}</version>
+      <version>${project.version}</version>
       <scope>provided</scope>
     </dependency>
 
@@ -69,12 +69,12 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>${pom.groupId}</groupId>
+                  <groupId>${project.groupId}</groupId>
                   <artifactId>sonar-runner-batch</artifactId>
-                  <version>${pom.version}</version>
+                  <version>${project.version}</version>
                   <type>jar</type>
                   <overWrite>false</overWrite>
-                  <outputDirectory>${pom.build.outputDirectory}</outputDirectory>
+                  <outputDirectory>${project.build.outputDirectory}</outputDirectory>
                   <destFileName>sonar-runner-batch.jar</destFileName>
                 </artifactItem>
               </artifactItems>
-- 
2.39.5