You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by an...@apache.org on 2009/05/18 18:02:07 UTC

svn commit: r775999 - in /tuscany/branches/sca-java-1.5/distribution/src/main/assembly: ./ bin.xml

Author: antelder
Date: Mon May 18 16:02:07 2009
New Revision: 775999

URL: http://svn.apache.org/viewvc?rev=775999&view=rev
Log:
Merge exclude typo fix from 1.x to 1.5

Modified:
    tuscany/branches/sca-java-1.5/distribution/src/main/assembly/   (props changed)
    tuscany/branches/sca-java-1.5/distribution/src/main/assembly/bin.xml

Propchange: tuscany/branches/sca-java-1.5/distribution/src/main/assembly/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 18 16:02:07 2009
@@ -1,3 +1,3 @@
 /tuscany/branches/sca-java-1.3/distribution/src/main/assembly:671193
 /tuscany/branches/sca-java-1.4/distribution/src/main/assembly:723286,723297,725042
-/tuscany/branches/sca-java-1.x/distribution/src/main/assembly:775819,775856,775917
+/tuscany/branches/sca-java-1.x/distribution/src/main/assembly:775819,775856,775917,775998

Modified: tuscany/branches/sca-java-1.5/distribution/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.5/distribution/src/main/assembly/bin.xml?rev=775999&r1=775998&r2=775999&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.5/distribution/src/main/assembly/bin.xml (original)
+++ tuscany/branches/sca-java-1.5/distribution/src/main/assembly/bin.xml Mon May 18 16:02:07 2009
@@ -66,7 +66,7 @@
                 <!-- General file/folders to exclude -->
                 <exclude>*/.classpath</exclude>
                 <exclude>*/.project</exclude>
-                <exclude>**/pom.transformed.xml</exclude>
+                <exclude>**/pom-transformed.xml</exclude>
                 <exclude>*/.settings</exclude>
                 <exclude>*/.settings/**/*</exclude>
                 <exclude>*/.externalToolBuilders</exclude>
@@ -387,6 +387,7 @@
             <unpack>false</unpack>
             <excludes>
                 <exclude>org.apache.tuscany.sca:*</exclude>
+                <exclude>bouncycastle:*</exclude>
             </excludes>
             <scope>runtime</scope>
         </dependencySet>