karaf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbono...@apache.org
Subject git commit: [KARAF-2703] Upgrade to maven-assembly-plugin 2.4
Date Tue, 21 Jan 2014 21:53:33 GMT
Updated Branches:
  refs/heads/karaf-2.3.x 24903028a -> 2f3ef68c8


[KARAF-2703] Upgrade to maven-assembly-plugin 2.4


Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/2f3ef68c
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/2f3ef68c
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/2f3ef68c

Branch: refs/heads/karaf-2.3.x
Commit: 2f3ef68c834541113826084dfaf2b678d50dd39c
Parents: 2490302
Author: Jean-Baptiste Onofré <jbonofre@apache.org>
Authored: Tue Jan 21 22:53:06 2014 +0100
Committer: Jean-Baptiste Onofré <jbonofre@apache.org>
Committed: Tue Jan 21 22:53:06 2014 +0100

----------------------------------------------------------------------
 .../src/main/descriptors/unix-bin-release.xml   | 21 --------------------
 .../src/main/descriptors/unix-bin-snapshot.xml  | 21 --------------------
 .../descriptors/unix-minimal-bin-release.xml    | 19 ------------------
 .../descriptors/unix-minimal-bin-snapshot.xml   | 19 ------------------
 pom.xml                                         |  2 +-
 5 files changed, 1 insertion(+), 81 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/karaf/blob/2f3ef68c/assemblies/apache-karaf/src/main/descriptors/unix-bin-release.xml
----------------------------------------------------------------------
diff --git a/assemblies/apache-karaf/src/main/descriptors/unix-bin-release.xml b/assemblies/apache-karaf/src/main/descriptors/unix-bin-release.xml
index 44402f8..c0910f3 100644
--- a/assemblies/apache-karaf/src/main/descriptors/unix-bin-release.xml
+++ b/assemblies/apache-karaf/src/main/descriptors/unix-bin-release.xml
@@ -62,20 +62,17 @@
             <directory>target/classes/etc</directory>
             <outputDirectory>/etc/</outputDirectory>
             <lineEnding>unix</lineEnding>
-            <fileMode>0644</fileMode>
         </fileSet>
         <!-- Copy over the examples -->
         <fileSet>
             <directory>target/classes/demos</directory>
             <outputDirectory>/demos/</outputDirectory>
             <lineEnding>unix</lineEnding>
-            <fileMode>0644</fileMode>
         </fileSet>
         <fileSet>
             <directory>../../demos</directory>
             <outputDirectory>/demos/</outputDirectory>
             <lineEnding>unix</lineEnding>
-            <fileMode>0644</fileMode>
             <excludes>
                 <exclude>**/target/**</exclude>
                 <exclude>**/*.iml</exclude>
@@ -94,12 +91,10 @@
         <fileSet>
             <directory>target/dependencies</directory>
             <outputDirectory>/</outputDirectory>
-            <fileMode>0644</fileMode>
         </fileSet>
         <fileSet>
             <directory>target/features-repo</directory>
             <outputDirectory>system</outputDirectory>
-            <fileMode>0644</fileMode>
         </fileSet>
     </fileSets>
 
@@ -108,7 +103,6 @@
             <outputDirectory>/lib</outputDirectory>
             <unpack>false</unpack>
             <useProjectArtifact>false</useProjectArtifact>
-            <fileMode>0644</fileMode>
             <includes>
                 <include>org.apache.servicemix.specs:org.apache.servicemix.specs.activator</include>
                 <include>org.apache.servicemix.specs:org.apache.servicemix.specs.locator</include>
@@ -119,7 +113,6 @@
             <outputDirectory>/lib/endorsed</outputDirectory>
             <unpack>false</unpack>
             <useProjectArtifact>false</useProjectArtifact>
-            <fileMode>0644</fileMode>
             <includes>
                 <include>org.apache.karaf:org.apache.karaf.exception</include>
                 <include>org.apache.servicemix.specs:org.apache.servicemix.specs.jaxp-api-1.4</include>
@@ -136,7 +129,6 @@
             <outputDirectory>/system</outputDirectory>
             <unpack>false</unpack>
             <useProjectArtifact>false</useProjectArtifact>
-            <fileMode>0644</fileMode>
             <outputFileNameMapping>
                 org/apache/felix/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}
             </outputFileNameMapping>
@@ -150,7 +142,6 @@
             <outputDirectory>/system</outputDirectory>
             <unpack>false</unpack>
             <useProjectArtifact>false</useProjectArtifact>
-            <fileMode>0644</fileMode>
             <outputFileNameMapping>
                 org/ops4j/pax/logging/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}
             </outputFileNameMapping>
@@ -163,7 +154,6 @@
             <outputDirectory>/system</outputDirectory>
             <unpack>false</unpack>
             <useProjectArtifact>false</useProjectArtifact>
-            <fileMode>0644</fileMode>
             <outputFileNameMapping>
                 org/ops4j/pax/url/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}
             </outputFileNameMapping>
@@ -176,7 +166,6 @@
             <outputDirectory>/system</outputDirectory>
             <unpack>false</unpack>
             <useProjectArtifact>false</useProjectArtifact>
-            <fileMode>0644</fileMode>
             <outputFileNameMapping>
                 org/apache/karaf/features/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}
             </outputFileNameMapping>
@@ -190,7 +179,6 @@
             <outputDirectory>/system</outputDirectory>
             <unpack>false</unpack>
             <useProjectArtifact>false</useProjectArtifact>
-            <fileMode>0644</fileMode>
             <outputFileNameMapping>
                 org/apache/karaf/diagnostic/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}
             </outputFileNameMapping>
@@ -205,7 +193,6 @@
             <outputDirectory>/system</outputDirectory>
             <unpack>false</unpack>
             <useProjectArtifact>false</useProjectArtifact>
-            <fileMode>0644</fileMode>
             <outputFileNameMapping>
                 org/apache/karaf/admin/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}
             </outputFileNameMapping>
@@ -219,7 +206,6 @@
             <outputDirectory>/system</outputDirectory>
             <unpack>false</unpack>
             <useProjectArtifact>false</useProjectArtifact>
-            <fileMode>0644</fileMode>
             <outputFileNameMapping>
                 org/apache/karaf/deployer/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}
             </outputFileNameMapping>
@@ -235,7 +221,6 @@
             <outputDirectory>/system</outputDirectory>
             <unpack>false</unpack>
             <useProjectArtifact>false</useProjectArtifact>
-            <fileMode>0644</fileMode>
             <outputFileNameMapping>
                 org/apache/karaf/shell/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}
             </outputFileNameMapping>
@@ -252,7 +237,6 @@
             <outputDirectory>/system</outputDirectory>
             <unpack>false</unpack>
             <useProjectArtifact>false</useProjectArtifact>
-            <fileMode>0644</fileMode>
             <outputFileNameMapping>
                 org/apache/karaf/jaas/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}
             </outputFileNameMapping>
@@ -266,7 +250,6 @@
             <outputDirectory>/system</outputDirectory>
             <unpack>false</unpack>
             <useProjectArtifact>false</useProjectArtifact>
-            <fileMode>0644</fileMode>
             <outputFileNameMapping>
                 org/eclipse/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}
             </outputFileNameMapping>
@@ -278,7 +261,6 @@
             <outputDirectory>/system</outputDirectory>
             <unpack>false</unpack>
             <useProjectArtifact>false</useProjectArtifact>
-            <fileMode>0644</fileMode>
             <outputFileNameMapping>
                 org/apache/aries/blueprint/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}
             </outputFileNameMapping>
@@ -292,7 +274,6 @@
             <outputDirectory>/system</outputDirectory>
             <unpack>false</unpack>
             <useProjectArtifact>false</useProjectArtifact>
-            <fileMode>0644</fileMode>
             <outputFileNameMapping>
                 org/apache/aries/proxy/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}
             </outputFileNameMapping>
@@ -305,7 +286,6 @@
             <outputDirectory>/system</outputDirectory>
             <unpack>false</unpack>
             <useProjectArtifact>false</useProjectArtifact>
-            <fileMode>0644</fileMode>
             <outputFileNameMapping>
                 org/apache/aries/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}
             </outputFileNameMapping>
@@ -317,7 +297,6 @@
             <outputDirectory>/system</outputDirectory>
             <unpack>false</unpack>
             <useProjectArtifact>false</useProjectArtifact>
-            <fileMode>0644</fileMode>
             <outputFileNameMapping>
                 org/ow2/asm/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}
             </outputFileNameMapping>

http://git-wip-us.apache.org/repos/asf/karaf/blob/2f3ef68c/assemblies/apache-karaf/src/main/descriptors/unix-bin-snapshot.xml
----------------------------------------------------------------------
diff --git a/assemblies/apache-karaf/src/main/descriptors/unix-bin-snapshot.xml b/assemblies/apache-karaf/src/main/descriptors/unix-bin-snapshot.xml
index b9f6996..341ddf8 100644
--- a/assemblies/apache-karaf/src/main/descriptors/unix-bin-snapshot.xml
+++ b/assemblies/apache-karaf/src/main/descriptors/unix-bin-snapshot.xml
@@ -62,20 +62,17 @@
             <directory>target/classes/etc</directory>
             <outputDirectory>/etc/</outputDirectory>
             <lineEnding>unix</lineEnding>
-            <fileMode>0644</fileMode>
         </fileSet>
         <!-- Copy over the examples -->
         <fileSet>
             <directory>target/classes/demos</directory>
             <outputDirectory>/demos/</outputDirectory>
             <lineEnding>unix</lineEnding>
-            <fileMode>0644</fileMode>
         </fileSet>
         <fileSet>
             <directory>../../demos</directory>
             <outputDirectory>/demos/</outputDirectory>
             <lineEnding>unix</lineEnding>
-            <fileMode>0644</fileMode>
             <excludes>
                 <exclude>**/target/**</exclude>
                 <exclude>**/*.iml</exclude>
@@ -94,12 +91,10 @@
         <fileSet>
             <directory>target/dependencies</directory>
             <outputDirectory>/</outputDirectory>
-            <fileMode>0644</fileMode>
         </fileSet>
         <fileSet>
             <directory>target/features-repo</directory>
             <outputDirectory>system</outputDirectory>
-            <fileMode>0644</fileMode>
         </fileSet>
     </fileSets>
 
@@ -108,7 +103,6 @@
             <outputDirectory>/lib</outputDirectory>
             <unpack>false</unpack>
             <useProjectArtifact>false</useProjectArtifact>
-            <fileMode>0644</fileMode>
             <includes>
                 <include>org.apache.servicemix.specs:org.apache.servicemix.specs.activator</include>
                 <include>org.apache.servicemix.specs:org.apache.servicemix.specs.locator</include>
@@ -119,7 +113,6 @@
             <outputDirectory>/lib/endorsed</outputDirectory>
             <unpack>false</unpack>
             <useProjectArtifact>false</useProjectArtifact>
-            <fileMode>0644</fileMode>
             <includes>
                 <include>org.apache.karaf:org.apache.karaf.exception</include>
                 <include>org.apache.servicemix.specs:org.apache.servicemix.specs.jaxp-api-1.4</include>
@@ -136,7 +129,6 @@
             <outputDirectory>/system</outputDirectory>
             <unpack>false</unpack>
             <useProjectArtifact>false</useProjectArtifact>
-            <fileMode>0644</fileMode>
             <outputFileNameMapping>
                 org/apache/felix/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}
             </outputFileNameMapping>
@@ -150,7 +142,6 @@
             <outputDirectory>/system</outputDirectory>
             <unpack>false</unpack>
             <useProjectArtifact>false</useProjectArtifact>
-            <fileMode>0644</fileMode>
             <outputFileNameMapping>
                 org/ops4j/pax/logging/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}
             </outputFileNameMapping>
@@ -163,7 +154,6 @@
             <outputDirectory>/system</outputDirectory>
             <unpack>false</unpack>
             <useProjectArtifact>false</useProjectArtifact>
-            <fileMode>0644</fileMode>
             <outputFileNameMapping>
                 org/ops4j/pax/url/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}
             </outputFileNameMapping>
@@ -176,7 +166,6 @@
             <outputDirectory>/system</outputDirectory>
             <unpack>false</unpack>
             <useProjectArtifact>false</useProjectArtifact>
-            <fileMode>0644</fileMode>
             <outputFileNameMapping>
                 org/apache/karaf/features/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}
             </outputFileNameMapping>
@@ -190,7 +179,6 @@
             <outputDirectory>/system</outputDirectory>
             <unpack>false</unpack>
             <useProjectArtifact>false</useProjectArtifact>
-            <fileMode>0644</fileMode>
             <outputFileNameMapping>
                 org/apache/karaf/diagnostic/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}
             </outputFileNameMapping>
@@ -205,7 +193,6 @@
             <outputDirectory>/system</outputDirectory>
             <unpack>false</unpack>
             <useProjectArtifact>false</useProjectArtifact>
-            <fileMode>0644</fileMode>
             <outputFileNameMapping>
                 org/apache/karaf/admin/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}
             </outputFileNameMapping>
@@ -219,7 +206,6 @@
             <outputDirectory>/system</outputDirectory>
             <unpack>false</unpack>
             <useProjectArtifact>false</useProjectArtifact>
-            <fileMode>0644</fileMode>
             <outputFileNameMapping>
                 org/apache/karaf/deployer/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}
             </outputFileNameMapping>
@@ -235,7 +221,6 @@
             <outputDirectory>/system</outputDirectory>
             <unpack>false</unpack>
             <useProjectArtifact>false</useProjectArtifact>
-            <fileMode>0644</fileMode>
             <outputFileNameMapping>
                 org/apache/karaf/shell/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}
             </outputFileNameMapping>
@@ -252,7 +237,6 @@
             <outputDirectory>/system</outputDirectory>
             <unpack>false</unpack>
             <useProjectArtifact>false</useProjectArtifact>
-            <fileMode>0644</fileMode>
             <outputFileNameMapping>
                 org/apache/karaf/jaas/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}
             </outputFileNameMapping>
@@ -266,7 +250,6 @@
             <outputDirectory>/system</outputDirectory>
             <unpack>false</unpack>
             <useProjectArtifact>false</useProjectArtifact>
-            <fileMode>0644</fileMode>
             <outputFileNameMapping>
                 org/eclipse/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}
             </outputFileNameMapping>
@@ -278,7 +261,6 @@
             <outputDirectory>/system</outputDirectory>
             <unpack>false</unpack>
             <useProjectArtifact>false</useProjectArtifact>
-            <fileMode>0644</fileMode>
             <outputFileNameMapping>
                 org/apache/aries/blueprint/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}
             </outputFileNameMapping>
@@ -292,7 +274,6 @@
             <outputDirectory>/system</outputDirectory>
             <unpack>false</unpack>
             <useProjectArtifact>false</useProjectArtifact>
-            <fileMode>0644</fileMode>
             <outputFileNameMapping>
                 org/apache/aries/proxy/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}
             </outputFileNameMapping>
@@ -305,7 +286,6 @@
             <outputDirectory>/system</outputDirectory>
             <unpack>false</unpack>
             <useProjectArtifact>false</useProjectArtifact>
-            <fileMode>0644</fileMode>
             <outputFileNameMapping>
                 org/apache/aries/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}
             </outputFileNameMapping>
@@ -317,7 +297,6 @@
             <outputDirectory>/system</outputDirectory>
             <unpack>false</unpack>
             <useProjectArtifact>false</useProjectArtifact>
-            <fileMode>0644</fileMode>
             <outputFileNameMapping>
                 org/ow2/asm/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}
             </outputFileNameMapping>

http://git-wip-us.apache.org/repos/asf/karaf/blob/2f3ef68c/assemblies/apache-karaf/src/main/descriptors/unix-minimal-bin-release.xml
----------------------------------------------------------------------
diff --git a/assemblies/apache-karaf/src/main/descriptors/unix-minimal-bin-release.xml b/assemblies/apache-karaf/src/main/descriptors/unix-minimal-bin-release.xml
index f10bc9f..ffc98c8 100644
--- a/assemblies/apache-karaf/src/main/descriptors/unix-minimal-bin-release.xml
+++ b/assemblies/apache-karaf/src/main/descriptors/unix-minimal-bin-release.xml
@@ -64,14 +64,12 @@
             </excludes>
             <outputDirectory>/etc/</outputDirectory>
             <lineEnding>unix</lineEnding>
-            <fileMode>0664</fileMode>
         </fileSet>
 
         <fileSet>
             <directory>target/classes/minimal</directory>
             <outputDirectory>/etc/</outputDirectory>
             <lineEnding>unix</lineEnding>
-            <fileMode>0664</fileMode>
         </fileSet>
 
         <!-- Copy over the files that need unix line endings and also chmod to 755 -->
@@ -90,7 +88,6 @@
                 <exclude>*.pdf</exclude>
             </excludes>
             <outputDirectory>/</outputDirectory>
-            <fileMode>0664</fileMode>
         </fileSet>
         <fileSet>
             <directory>target/features-repo</directory>
@@ -98,7 +95,6 @@
             	<include>**/*.xml</include>
             </includes>
             <outputDirectory>system</outputDirectory>
-            <fileMode>0664</fileMode>
         </fileSet>
 
     </fileSets>
@@ -108,7 +104,6 @@
             <outputDirectory>/lib/endorsed</outputDirectory>
             <unpack>false</unpack>
             <useProjectArtifact>false</useProjectArtifact>
-            <fileMode>0664</fileMode>
             <includes>
                 <include>org.apache.karaf:org.apache.karaf.exception</include>
                 <include>org.apache.servicemix.specs:org.apache.servicemix.specs.jaxp-api-1.4</include>
@@ -120,7 +115,6 @@
             <outputDirectory>/system</outputDirectory>
             <unpack>false</unpack>
             <useProjectArtifact>false</useProjectArtifact>
-            <fileMode>0664</fileMode>
             <outputFileNameMapping>
                 org/apache/felix/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}
             </outputFileNameMapping>
@@ -134,7 +128,6 @@
             <outputDirectory>/system</outputDirectory>
             <unpack>false</unpack>
             <useProjectArtifact>false</useProjectArtifact>
-            <fileMode>0664</fileMode>
             <outputFileNameMapping>
                 org/ops4j/pax/logging/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}
             </outputFileNameMapping>
@@ -147,7 +140,6 @@
             <outputDirectory>/system</outputDirectory>
             <unpack>false</unpack>
             <useProjectArtifact>false</useProjectArtifact>
-            <fileMode>0664</fileMode>
             <outputFileNameMapping>
                 org/ops4j/pax/url/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}
             </outputFileNameMapping>
@@ -160,7 +152,6 @@
             <outputDirectory>/system</outputDirectory>
             <unpack>false</unpack>
             <useProjectArtifact>false</useProjectArtifact>
-            <fileMode>0664</fileMode>
             <outputFileNameMapping>
                 org/apache/karaf/management/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}
             </outputFileNameMapping>
@@ -172,7 +163,6 @@
             <outputDirectory>/system</outputDirectory>
             <unpack>false</unpack>
             <useProjectArtifact>false</useProjectArtifact>
-            <fileMode>0664</fileMode>
             <outputFileNameMapping>
                 org/apache/karaf/features/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}
             </outputFileNameMapping>
@@ -186,7 +176,6 @@
             <outputDirectory>/system</outputDirectory>
             <unpack>false</unpack>
             <useProjectArtifact>false</useProjectArtifact>
-            <fileMode>0664</fileMode>
             <outputFileNameMapping>
                 org/apache/karaf/shell/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}
             </outputFileNameMapping>
@@ -204,7 +193,6 @@
             <outputDirectory>/system</outputDirectory>
             <unpack>false</unpack>
             <useProjectArtifact>false</useProjectArtifact>
-            <fileMode>0664</fileMode>
             <outputFileNameMapping>
                 org/apache/karaf/diagnostic/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}
             </outputFileNameMapping>
@@ -219,7 +207,6 @@
             <outputDirectory>/system</outputDirectory>
             <unpack>false</unpack>
             <useProjectArtifact>false</useProjectArtifact>
-            <fileMode>0664</fileMode>
             <outputFileNameMapping>
                 org/apache/karaf/jaas/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}
             </outputFileNameMapping>
@@ -233,7 +220,6 @@
             <outputDirectory>/system</outputDirectory>
             <unpack>false</unpack>
             <useProjectArtifact>false</useProjectArtifact>
-            <fileMode>0664</fileMode>
             <outputFileNameMapping>
                 org/eclipse/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}
             </outputFileNameMapping>
@@ -245,7 +231,6 @@
             <outputDirectory>/system</outputDirectory>
             <unpack>false</unpack>
             <useProjectArtifact>false</useProjectArtifact>
-            <fileMode>0664</fileMode>
             <outputFileNameMapping>
                 org/apache/aries/blueprint/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}
             </outputFileNameMapping>
@@ -259,7 +244,6 @@
             <outputDirectory>/system</outputDirectory>
             <unpack>false</unpack>
             <useProjectArtifact>false</useProjectArtifact>
-            <fileMode>0664</fileMode>
             <outputFileNameMapping>
                 org/apache/aries/proxy/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}
             </outputFileNameMapping>
@@ -272,7 +256,6 @@
             <outputDirectory>/system</outputDirectory>
             <unpack>false</unpack>
             <useProjectArtifact>false</useProjectArtifact>
-            <fileMode>0664</fileMode>
             <outputFileNameMapping>
                 org/apache/aries/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}
             </outputFileNameMapping>
@@ -284,7 +267,6 @@
             <outputDirectory>/system</outputDirectory>
             <unpack>false</unpack>
             <useProjectArtifact>false</useProjectArtifact>
-            <fileMode>0664</fileMode>
             <outputFileNameMapping>
                 org/ow2/asm/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}
             </outputFileNameMapping>
@@ -296,7 +278,6 @@
             <outputDirectory>/system</outputDirectory>
             <unpack>false</unpack>
             <useProjectArtifact>false</useProjectArtifact>
-            <fileMode>0664</fileMode>
             <outputFileNameMapping>
                 org/apache/aries/jmx/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}
             </outputFileNameMapping>

http://git-wip-us.apache.org/repos/asf/karaf/blob/2f3ef68c/assemblies/apache-karaf/src/main/descriptors/unix-minimal-bin-snapshot.xml
----------------------------------------------------------------------
diff --git a/assemblies/apache-karaf/src/main/descriptors/unix-minimal-bin-snapshot.xml b/assemblies/apache-karaf/src/main/descriptors/unix-minimal-bin-snapshot.xml
index d89b728..a9a15b9 100644
--- a/assemblies/apache-karaf/src/main/descriptors/unix-minimal-bin-snapshot.xml
+++ b/assemblies/apache-karaf/src/main/descriptors/unix-minimal-bin-snapshot.xml
@@ -64,14 +64,12 @@
             </excludes>
             <outputDirectory>/etc/</outputDirectory>
             <lineEnding>unix</lineEnding>
-            <fileMode>0664</fileMode>
         </fileSet>
 
         <fileSet>
             <directory>target/classes/minimal</directory>
             <outputDirectory>/etc/</outputDirectory>
             <lineEnding>unix</lineEnding>
-            <fileMode>0664</fileMode>
         </fileSet>
 
         <!-- Copy over the files that need unix line endings and also chmod to 755 -->
@@ -90,7 +88,6 @@
                 <exclude>*.pdf</exclude>
             </excludes>
             <outputDirectory>/</outputDirectory>
-            <fileMode>0664</fileMode>
         </fileSet>
         <fileSet>
             <directory>target/features-repo</directory>
@@ -98,7 +95,6 @@
             	<include>**/*.xml</include>
             </includes>
             <outputDirectory>system</outputDirectory>
-            <fileMode>0664</fileMode>
         </fileSet>
 
     </fileSets>
@@ -108,7 +104,6 @@
             <outputDirectory>/lib/endorsed</outputDirectory>
             <unpack>false</unpack>
             <useProjectArtifact>false</useProjectArtifact>
-            <fileMode>0664</fileMode>
             <includes>
                 <include>org.apache.karaf:org.apache.karaf.exception</include>
                 <include>org.apache.servicemix.specs:org.apache.servicemix.specs.jaxp-api-1.4</include>
@@ -120,7 +115,6 @@
             <outputDirectory>/system</outputDirectory>
             <unpack>false</unpack>
             <useProjectArtifact>false</useProjectArtifact>
-            <fileMode>0664</fileMode>
             <outputFileNameMapping>
                 org/apache/felix/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}
             </outputFileNameMapping>
@@ -134,7 +128,6 @@
             <outputDirectory>/system</outputDirectory>
             <unpack>false</unpack>
             <useProjectArtifact>false</useProjectArtifact>
-            <fileMode>0664</fileMode>
             <outputFileNameMapping>
                 org/ops4j/pax/logging/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}
             </outputFileNameMapping>
@@ -147,7 +140,6 @@
             <outputDirectory>/system</outputDirectory>
             <unpack>false</unpack>
             <useProjectArtifact>false</useProjectArtifact>
-            <fileMode>0664</fileMode>
             <outputFileNameMapping>
                 org/ops4j/pax/url/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}
             </outputFileNameMapping>
@@ -160,7 +152,6 @@
             <outputDirectory>/system</outputDirectory>
             <unpack>false</unpack>
             <useProjectArtifact>false</useProjectArtifact>
-            <fileMode>0664</fileMode>
             <outputFileNameMapping>
                 org/apache/karaf/management/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}
             </outputFileNameMapping>
@@ -172,7 +163,6 @@
             <outputDirectory>/system</outputDirectory>
             <unpack>false</unpack>
             <useProjectArtifact>false</useProjectArtifact>
-            <fileMode>0664</fileMode>
             <outputFileNameMapping>
                 org/apache/karaf/features/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}
             </outputFileNameMapping>
@@ -186,7 +176,6 @@
             <outputDirectory>/system</outputDirectory>
             <unpack>false</unpack>
             <useProjectArtifact>false</useProjectArtifact>
-            <fileMode>0664</fileMode>
             <outputFileNameMapping>
                 org/apache/karaf/shell/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}
             </outputFileNameMapping>
@@ -204,7 +193,6 @@
             <outputDirectory>/system</outputDirectory>
             <unpack>false</unpack>
             <useProjectArtifact>false</useProjectArtifact>
-            <fileMode>0664</fileMode>
             <outputFileNameMapping>
                 org/apache/karaf/diagnostic/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}
             </outputFileNameMapping>
@@ -219,7 +207,6 @@
             <outputDirectory>/system</outputDirectory>
             <unpack>false</unpack>
             <useProjectArtifact>false</useProjectArtifact>
-            <fileMode>0664</fileMode>
             <outputFileNameMapping>
                 org/apache/karaf/jaas/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}
             </outputFileNameMapping>
@@ -233,7 +220,6 @@
             <outputDirectory>/system</outputDirectory>
             <unpack>false</unpack>
             <useProjectArtifact>false</useProjectArtifact>
-            <fileMode>0664</fileMode>
             <outputFileNameMapping>
                 org/eclipse/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}
             </outputFileNameMapping>
@@ -245,7 +231,6 @@
             <outputDirectory>/system</outputDirectory>
             <unpack>false</unpack>
             <useProjectArtifact>false</useProjectArtifact>
-            <fileMode>0664</fileMode>
             <outputFileNameMapping>
                 org/apache/aries/blueprint/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}
             </outputFileNameMapping>
@@ -259,7 +244,6 @@
             <outputDirectory>/system</outputDirectory>
             <unpack>false</unpack>
             <useProjectArtifact>false</useProjectArtifact>
-            <fileMode>0664</fileMode>
             <outputFileNameMapping>
                 org/apache/aries/proxy/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}
             </outputFileNameMapping>
@@ -272,7 +256,6 @@
             <outputDirectory>/system</outputDirectory>
             <unpack>false</unpack>
             <useProjectArtifact>false</useProjectArtifact>
-            <fileMode>0664</fileMode>
             <outputFileNameMapping>
                 org/apache/aries/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}
             </outputFileNameMapping>
@@ -284,7 +267,6 @@
             <outputDirectory>/system</outputDirectory>
             <unpack>false</unpack>
             <useProjectArtifact>false</useProjectArtifact>
-            <fileMode>0664</fileMode>
             <outputFileNameMapping>
                 org/ow2/asm/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}
             </outputFileNameMapping>
@@ -296,7 +278,6 @@
             <outputDirectory>/system</outputDirectory>
             <unpack>false</unpack>
             <useProjectArtifact>false</useProjectArtifact>
-            <fileMode>0664</fileMode>
             <outputFileNameMapping>
                 org/apache/aries/jmx/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}
             </outputFileNameMapping>

http://git-wip-us.apache.org/repos/asf/karaf/blob/2f3ef68c/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index d125f19..7a5f6d3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1372,7 +1372,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-assembly-plugin</artifactId>
-                    <version>2.2.1</version>
+                    <version>2.4</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>


Mime
View raw message