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

diff --git a/pom.xml b/pom.xml
index a77dfc29f7fe4b723e85af3934b1d1607fe0b7c4..63566a08a17a9d27e73dff41079fd374b048aba0 100644 (file)
--- 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 34f0baa72dcf10703d597871a10581026a4b3233..a6069f570c9a880309b9830319654d4293b68773 100644 (file)
--- 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 a2843995019a682860a1b1267f4582ca0e874acb..21245498e175a2b1f8eafa0167aad1acd27eaae3 100644 (file)
--- 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>