incubator-connectors-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kwri...@apache.org
Subject svn commit: r1308364 - in /incubator/lcf/trunk: CHANGES.txt build.xml
Date Mon, 02 Apr 2012 14:33:04 GMT
Author: kwright
Date: Mon Apr  2 14:33:03 2012
New Revision: 1308364

URL: http://svn.apache.org/viewvc?rev=1308364&view=rev
Log:
Fix for CONNECTORS-442.

Modified:
    incubator/lcf/trunk/CHANGES.txt
    incubator/lcf/trunk/build.xml

Modified: incubator/lcf/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/CHANGES.txt?rev=1308364&r1=1308363&r2=1308364&view=diff
==============================================================================
--- incubator/lcf/trunk/CHANGES.txt (original)
+++ incubator/lcf/trunk/CHANGES.txt Mon Apr  2 14:33:03 2012
@@ -3,6 +3,10 @@ $Id$
 
 ======================= 0.6-dev =====================
 
+CONNECTORS-442: Fix the binary exclusion rules to not include target
+or the xml build files.
+(Karl Wright)
+
 CONNECTORS-441: Refactor how integration packages are delivered for
 better consistency.
 (Karl Wright)

Modified: incubator/lcf/trunk/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/build.xml?rev=1308364&r1=1308363&r2=1308364&view=diff
==============================================================================
--- incubator/lcf/trunk/build.xml (original)
+++ incubator/lcf/trunk/build.xml Mon Apr  2 14:33:03 2012
@@ -2473,6 +2473,7 @@
       <zip destfile="apache-manifoldcf-${release-version}-bin.zip" update="false">
         <zipfileset dir="." prefix="apache-manifoldcf-${release-version}">
           <exclude name="/build/"/>
+          <exclude name="/target/"/>
           <exclude name="/lib/"/>
           <exclude name="/lib-proprietary/"/>
           <exclude name="/json/"/>
@@ -2481,10 +2482,10 @@
           <exclude name="/framework/"/>
           <exclude name="/tests/"/>
           <exclude name="/mod-authz-annotate/"/>
-          <exclude name="/mvn-bootstrap.*"/>
-          <exclude name="/build.xml"/>
-          <exclude name="/common-build.xml"/>
-          <exclude name="/pom.xml"/>
+          <exclude name="mvn-bootstrap.*"/>
+          <exclude name="build.xml"/>
+          <exclude name="common-build.xml"/>
+          <exclude name="pom.xml"/>
           <exclude name="/test-materials/"/>
           <exclude name="**/lib-proprietary/*.jar"/>
           <exclude name="**/test-materials-proprietary/*.jar"/>
@@ -2500,7 +2501,8 @@
           <exclude name="dist/example-proprietary/"/>
           <exclude name="dist/multiprocess-example-proprietary/"/>
           <exclude name="dist/web-proprietary/"/>
-          <exclude name="/apache-manifoldcf-*"/>
+          <exclude name="apache-manifoldcf-*"/>
+          <exclude name="*.xml"/>
         </zipfileset>
       </zip>
     </target>
@@ -2509,6 +2511,7 @@
       <tar destfile="apache-manifoldcf-${release-version}-bin.tar.gz" compression="gzip"
longfile="gnu">
         <tarfileset dir="." prefix="apache-manifoldcf-${release-version}">
           <exclude name="/build/"/>
+          <exclude name="/target/"/>
           <exclude name="/lib/"/>
           <exclude name="/lib-proprietary/"/>
           <exclude name="/json/"/>
@@ -2517,10 +2520,10 @@
           <exclude name="/framework/"/>
           <exclude name="/tests/"/>
           <exclude name="/mod-authz-annotate/"/>
-          <exclude name="/mvn-bootstrap.*"/>
-          <exclude name="/build.xml"/>
-          <exclude name="/common-build.xml"/>
-          <exclude name="/pom.xml"/>
+          <exclude name="mvn-bootstrap.*"/>
+          <exclude name="build.xml"/>
+          <exclude name="common-build.xml"/>
+          <exclude name="pom.xml"/>
           <exclude name="/test-materials/"/>
           <exclude name="**/lib-proprietary/*.jar"/>
           <exclude name="**/test-materials-proprietary/*.jar"/>
@@ -2536,7 +2539,7 @@
           <exclude name="dist/example-proprietary/"/>
           <exclude name="dist/multiprocess-example-proprietary/"/>
           <exclude name="dist/web-proprietary/"/>
-          <exclude name="/apache-manifoldcf-*"/>
+          <exclude name="apache-manifoldcf-*"/>
         </tarfileset>
       </tar>
     </target>



Mime
View raw message