Return-Path: <commits-return-2711-archive-asf-public=cust-asf.ponee.io@flume.apache.org>
X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io
Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io
Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183])
	by cust-asf2.ponee.io (Postfix) with ESMTP id 1B1A4200B9B
	for <archive-asf-public-internal@cust-asf2.ponee.io>; Wed, 12 Oct 2016 20:04:41 +0200 (CEST)
Received: by cust-asf.ponee.io (Postfix)
	id 19304160AD4; Wed, 12 Oct 2016 18:04:41 +0000 (UTC)
Delivered-To: archive-asf-public@cust-asf.ponee.io
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by cust-asf.ponee.io (Postfix) with SMTP id 602F5160ACA
	for <archive-asf-public@cust-asf.ponee.io>; Wed, 12 Oct 2016 20:04:40 +0200 (CEST)
Received: (qmail 98056 invoked by uid 500); 12 Oct 2016 18:04:39 -0000
Mailing-List: contact commits-help@flume.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@flume.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@flume.apache.org>
List-Post: <mailto:commits@flume.apache.org>
List-Id: <commits.flume.apache.org>
Reply-To: dev@flume.apache.org
Delivered-To: mailing list commits@flume.apache.org
Received: (qmail 98047 invoked by uid 99); 12 Oct 2016 18:04:39 -0000
Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 12 Oct 2016 18:04:39 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33)
	id 7B3AAE00DC; Wed, 12 Oct 2016 18:04:39 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
From: mpercy@apache.org
To: commits@flume.apache.org
Message-Id: <121437e907fe466c9087480e4fbbe83e@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: flume git commit: Remove test dependencies from binary release
 artifact
Date: Wed, 12 Oct 2016 18:04:39 +0000 (UTC)
archived-at: Wed, 12 Oct 2016 18:04:41 -0000

Repository: flume
Updated Branches:
  refs/heads/flume-1.7 a1b55d227 -> 511d86855


Remove test dependencies from binary release artifact

This patch removes some test-specific dependencies from the binary
release artifact. These were introduced by the new
flume-shared-kafka-test module that is intended for sharing test code.
Please see the new comment in bin.xml for more information.

Reviewers: Bessenyei Balázs Donát

Closes #70


Project: http://git-wip-us.apache.org/repos/asf/flume/repo
Commit: http://git-wip-us.apache.org/repos/asf/flume/commit/511d8685
Tree: http://git-wip-us.apache.org/repos/asf/flume/tree/511d8685
Diff: http://git-wip-us.apache.org/repos/asf/flume/diff/511d8685

Branch: refs/heads/flume-1.7
Commit: 511d868555dd4d16e6ce4fedc72c2d1454546707
Parents: a1b55d2
Author: Mike Percy <mpercy@apache.org>
Authored: Wed Oct 12 19:32:13 2016 +0200
Committer: Mike Percy <mpercy@apache.org>
Committed: Wed Oct 12 20:02:21 2016 +0200

----------------------------------------------------------------------
 flume-ng-dist/src/main/assembly/bin.xml | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flume/blob/511d8685/flume-ng-dist/src/main/assembly/bin.xml
----------------------------------------------------------------------
diff --git a/flume-ng-dist/src/main/assembly/bin.xml b/flume-ng-dist/src/main/assembly/bin.xml
index 185eac9..68296a0 100644
--- a/flume-ng-dist/src/main/assembly/bin.xml
+++ b/flume-ng-dist/src/main/assembly/bin.xml
@@ -38,6 +38,12 @@
       <useProjectArtifact>false</useProjectArtifact>
       <excludes>
         <exclude>org.apache.flume.flume-ng-clients:flume-ng-log4jappender:jar:jar-with-dependencies</exclude>
+        <!-- The below test classes get pulled in by flume-shared-kafka-test,
+             but we don't want them in the final release classpath. Maybe there
+             is a better way to exclude all of the dependencies of that module;
+             for now, specifically exclude these test deps. -->
+        <exclude>junit:junit</exclude>
+        <exclude>org.hamcrest:hamcrest-core</exclude>
       </excludes>
     </dependencySet>
     <dependencySet>
@@ -50,8 +56,7 @@
     </dependencySet>
   </dependencySets>
 
-
-   <fileSets>
+  <fileSets>
     <fileSet>
       <directory>../</directory>