From: Evgeny Mandrikov <mandrikov@gmail.com>
Date: Wed, 4 May 2011 20:14:41 +0000 (+0400)
Subject: Reduce duplication by moving part of configuration of maven-assembly-plugin to parent POM
X-Git-Tag: 2.8~49
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=032463ff157a28c586d1801b0516a55e1704827b;p=sonarqube.git

Reduce duplication by moving part of configuration of maven-assembly-plugin to parent POM
---

diff --git a/pom.xml b/pom.xml
index a77dfc29f7f..63566a08a17 100644
--- a/pom.xml
+++ b/pom.xml
@@ -130,6 +130,16 @@
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-assembly-plugin</artifactId>
           <version>2.2.1</version>
+          <configuration>
+            <archiverConfig>
+              <!-- Workaround for http://jira.codehaus.org/browse/MASSEMBLY-422 -->
+              <!-- 420(dec) = 644(oct) -->
+              <fileMode>420</fileMode>
+              <!-- 493(dec) = 755(oct) -->
+              <directoryMode>493</directoryMode>
+              <defaultDirectoryMode>493</defaultDirectoryMode>
+            </archiverConfig>
+          </configuration>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
diff --git a/samples/pom.xml b/samples/pom.xml
index 34f0baa72dc..a6069f570c9 100644
--- a/samples/pom.xml
+++ b/samples/pom.xml
@@ -41,19 +41,10 @@
               <descriptors>
                 <descriptor>assembly.xml</descriptor>
               </descriptors>
-              <archiverConfig>
-                <!-- Workaround for http://jira.codehaus.org/browse/MASSEMBLY-422 -->
-                <!-- 420(dec) = 644(oct) -->
-                <fileMode>420</fileMode>
-                <!-- 493(dec) = 755(oct) -->
-                <directoryMode>493</directoryMode>
-                <defaultDirectoryMode>493</defaultDirectoryMode>
-              </archiverConfig>
             </configuration>
           </execution>
         </executions>
       </plugin>
-
     </plugins>
   </build>
-</project>
\ No newline at end of file
+</project>
diff --git a/sonar-application/pom.xml b/sonar-application/pom.xml
index a2843995019..21245498e17 100644
--- a/sonar-application/pom.xml
+++ b/sonar-application/pom.xml
@@ -26,14 +26,6 @@
               <descriptors>
                 <descriptor>assembly.xml</descriptor>
               </descriptors>
-              <archiverConfig>
-                <!-- Workaround for http://jira.codehaus.org/browse/MASSEMBLY-422 -->
-                <!-- 420(dec) = 644(oct) -->
-                <fileMode>420</fileMode>
-                <!-- 493(dec) = 755(oct) -->
-                <directoryMode>493</directoryMode>
-                <defaultDirectoryMode>493</defaultDirectoryMode>
-              </archiverConfig>
             </configuration>
           </execution>
         </executions>