Author: veithen
Date: Mon Mar 14 21:19:51 2011
New Revision: 1081567
URL: http://svn.apache.org/viewvc?rev=1081567&view=rev
Log:
Merged r1081563 to the 1.6 branch.
Modified:
axis/axis2/java/core/branches/1_6/ (props changed)
axis/axis2/java/core/branches/1_6/modules/parent/pom.xml
Propchange: axis/axis2/java/core/branches/1_6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Mar 14 21:19:51 2011
@@ -1 +1 @@
-/axis/axis2/java/core/trunk:1070439,1072077,1072271,1072499,1072510,1078242
+/axis/axis2/java/core/trunk:1070439,1072077,1072271,1072499,1072510,1078242,1081563
Modified: axis/axis2/java/core/branches/1_6/modules/parent/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/parent/pom.xml?rev=1081567&r1=1081566&r2=1081567&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/parent/pom.xml (original)
+++ axis/axis2/java/core/branches/1_6/modules/parent/pom.xml Mon Mar 14
21:19:51 2011
@@ -963,6 +963,14 @@
the runOnlyAtExecutionRoot parameter which is not
supported in earlier
versions. -->
<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>
<plugin>
<artifactId>maven-clean-plugin</artifactId>
