Author: veithen
Date: Mon Mar 14 21:33:23 2011
New Revision: 1081572
URL: http://svn.apache.org/viewvc?rev=1081572&view=rev
Log:
Merged r1081570 to the 1.6 branch.
Modified:
axis/axis2/java/sandesha/branches/1_6/ (props changed)
axis/axis2/java/sandesha/branches/1_6/modules/distribution/pom.xml
axis/axis2/java/sandesha/branches/1_6/pom.xml
Propchange: axis/axis2/java/sandesha/branches/1_6/
------------------------------------------------------------------------------
svn:mergeinfo = /axis/axis2/java/sandesha/trunk:1081570
Modified: axis/axis2/java/sandesha/branches/1_6/modules/distribution/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/sandesha/branches/1_6/modules/distribution/pom.xml?rev=1081572&r1=1081571&r2=1081572&view=diff
==============================================================================
--- axis/axis2/java/sandesha/branches/1_6/modules/distribution/pom.xml
(original)
+++ axis/axis2/java/sandesha/branches/1_6/modules/distribution/pom.xml Mon Mar
14 21:33:23 2011
@@ -140,7 +140,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.2-beta-5</version>
<executions>
<execution>
<id>distribution-package</id>
Modified: axis/axis2/java/sandesha/branches/1_6/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/sandesha/branches/1_6/pom.xml?rev=1081572&r1=1081571&r2=1081572&view=diff
==============================================================================
--- axis/axis2/java/sandesha/branches/1_6/pom.xml (original)
+++ axis/axis2/java/sandesha/branches/1_6/pom.xml Mon Mar 14 21:33:23 2011
@@ -189,6 +189,18 @@
<preparationGoals>clean install</preparationGoals>
</configuration>
</plugin>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.2-beta-5</version>
+ <configuration>
+ <!-- Workaround for MASSEMBLY-422 / MASSEMBLY-449 -->
+ <archiverConfig>
+ <fileMode>420</fileMode> <!-- 420(dec) = 644(oct)
-->
+ <directoryMode>493</directoryMode> <!-- 493(dec) =
755(oct) -->
+ <defaultDirectoryMode>493</defaultDirectoryMode>
+ </archiverConfig>
+ </configuration>
+ </plugin>
</plugins>
</pluginManagement>
</build>
