incubator-connectors-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kwri...@apache.org
Subject svn commit: r1309008 - in /incubator/lcf/branches/release-0.5-incubating-branch: ./ CHANGES.txt build.xml
Date Tue, 03 Apr 2012 16:06:15 GMT
Author: kwright
Date: Tue Apr  3 16:06:15 2012
New Revision: 1309008

URL: http://svn.apache.org/viewvc?rev=1309008&view=rev
Log:
Pull up change for CONNECTORS-442 to release branch.

Modified:
    incubator/lcf/branches/release-0.5-incubating-branch/   (props changed)
    incubator/lcf/branches/release-0.5-incubating-branch/CHANGES.txt
    incubator/lcf/branches/release-0.5-incubating-branch/build.xml

Propchange: incubator/lcf/branches/release-0.5-incubating-branch/
------------------------------------------------------------------------------
  Merged /incubator/lcf/trunk:r1308364

Modified: incubator/lcf/branches/release-0.5-incubating-branch/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/release-0.5-incubating-branch/CHANGES.txt?rev=1309008&r1=1309007&r2=1309008&view=diff
==============================================================================
--- incubator/lcf/branches/release-0.5-incubating-branch/CHANGES.txt (original)
+++ incubator/lcf/branches/release-0.5-incubating-branch/CHANGES.txt Tue Apr  3 16:06:15 2012
@@ -7,6 +7,10 @@ CONNECTORS-443: Build all patched jars w
 for any binaries.
 (Karl Wright)
 
+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/branches/release-0.5-incubating-branch/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/release-0.5-incubating-branch/build.xml?rev=1309008&r1=1309007&r2=1309008&view=diff
==============================================================================
--- incubator/lcf/branches/release-0.5-incubating-branch/build.xml (original)
+++ incubator/lcf/branches/release-0.5-incubating-branch/build.xml Tue Apr  3 16:06:15 2012
@@ -2495,6 +2495,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/"/>
@@ -2503,10 +2504,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"/>
@@ -2522,7 +2523,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>
@@ -2531,6 +2533,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/"/>
@@ -2539,10 +2542,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"/>
@@ -2558,7 +2561,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