Author: dkulp
Date: Mon Nov 5 08:48:06 2007
New Revision: 592078
URL: http://svn.apache.org/viewvc?rev=592078&view=rev
Log:
Merged revisions 592074 via svnmerge from
https://svn.apache.org/repos/asf/incubator/cxf/trunk
........
r592074 | dkulp | 2007-11-05 11:38:56 -0500 (Mon, 05 Nov 2007) | 2 lines
Do not include the maven-build.xml thing created from the ant plugin
........
Modified:
incubator/cxf/branches/2.0.x-fixes/ (props changed)
incubator/cxf/branches/2.0.x-fixes/distribution/ (props changed)
incubator/cxf/branches/2.0.x-fixes/distribution/src/main/assembly/src.xml
Propchange: incubator/cxf/branches/2.0.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Propchange: incubator/cxf/branches/2.0.x-fixes/distribution/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Nov 5 08:48:06 2007
@@ -6,4 +6,4 @@
.classpath
.project
.wtpmodules
-
+maven-build.xml
Modified:
incubator/cxf/branches/2.0.x-fixes/distribution/src/main/assembly/src.xml
URL:
http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/distribution/src/main/assembly/src.xml?rev=592078&r1=592077&r2=592078&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/distribution/src/main/assembly/src.xml
(original)
+++ incubator/cxf/branches/2.0.x-fixes/distribution/src/main/assembly/src.xml
Mon Nov 5 08:48:06 2007
@@ -52,6 +52,7 @@
<excludes>
<exclude>build.xml</exclude>
<exclude>distribution/build.xml</exclude>
+ <exclude>distribution/maven-build.xml</exclude>
<exclude>benchmark</exclude>
<exclude>benchmark/**/*</exclude>
<exclude>**/target</exclude>
