Return-Path: 
 <commits-return-7645-apmail-manifoldcf-commits-archive=manifoldcf.apache.org@manifoldcf.apache.org>
X-Original-To: apmail-manifoldcf-commits-archive@www.apache.org
Delivered-To: apmail-manifoldcf-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 9C8DC10E2A
	for <apmail-manifoldcf-commits-archive@www.apache.org>;
 Mon,  9 Mar 2015 00:26:45 +0000 (UTC)
Received: (qmail 50420 invoked by uid 500); 9 Mar 2015 00:26:45 -0000
Delivered-To: apmail-manifoldcf-commits-archive@manifoldcf.apache.org
Received: (qmail 50373 invoked by uid 500); 9 Mar 2015 00:26:45 -0000
Mailing-List: contact commits-help@manifoldcf.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@manifoldcf.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@manifoldcf.apache.org>
List-Post: <mailto:commits@manifoldcf.apache.org>
List-Id: <commits.manifoldcf.apache.org>
Reply-To: dev@manifoldcf.apache.org
Delivered-To: mailing list commits@manifoldcf.apache.org
Received: (qmail 50364 invoked by uid 99); 9 Mar 2015 00:26:45 -0000
Received: from eris.apache.org (HELO hades.apache.org) (140.211.11.105)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 09 Mar 2015 00:26:45 +0000
Received: from hades.apache.org (localhost [127.0.0.1])
	by hades.apache.org (ASF Mail Server at hades.apache.org) with ESMTP id
 5E653AC02F6
	for <commits@manifoldcf.apache.org>; Mon,  9 Mar 2015 00:26:45 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1665102 - in
 /manifoldcf/integration/solr-5.x/branches/release-2.0-branch: ./
 src/main/assembly/bin.xml src/main/assembly/src.xml
Date: Mon, 09 Mar 2015 00:26:45 -0000
To: commits@manifoldcf.apache.org
From: kwright@apache.org
X-Mailer: svnmailer-1.0.9
Message-Id: <20150309002645.5E653AC02F6@hades.apache.org>

Author: kwright
Date: Mon Mar  9 00:26:44 2015
New Revision: 1665102

URL: http://svn.apache.org/r1665102
Log:
Pull up Ahmet's change

Modified:
    manifoldcf/integration/solr-5.x/branches/release-2.0-branch/   (props changed)
    manifoldcf/integration/solr-5.x/branches/release-2.0-branch/src/main/assembly/bin.xml
    manifoldcf/integration/solr-5.x/branches/release-2.0-branch/src/main/assembly/src.xml

Propchange: manifoldcf/integration/solr-5.x/branches/release-2.0-branch/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Mar  9 00:26:44 2015
@@ -9,4 +9,4 @@
 /lucene/dev/branches/realtime_search:953476-1097796
 /lucene/dev/branches/solr2452:1087601-1144716
 /manifoldcf/integration/solr-4.x/branches/CONNECTORS-914:1583544-1583849
-/manifoldcf/integration/solr-5.x/trunk:1665052
+/manifoldcf/integration/solr-5.x/trunk:1665052,1665095

Modified: manifoldcf/integration/solr-5.x/branches/release-2.0-branch/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/manifoldcf/integration/solr-5.x/branches/release-2.0-branch/src/main/assembly/bin.xml?rev=1665102&r1=1665101&r2=1665102&view=diff
==============================================================================
--- manifoldcf/integration/solr-5.x/branches/release-2.0-branch/src/main/assembly/bin.xml (original)
+++ manifoldcf/integration/solr-5.x/branches/release-2.0-branch/src/main/assembly/bin.xml Mon Mar  9 00:26:44 2015
@@ -30,7 +30,7 @@
             <fileMode>644</fileMode>
             <directoryMode>755</directoryMode>
             <includes>
-                <include>apache-manifoldcf-solr5x-plugin-${project.version}.jar</include>
+                <include>${project.artifactId}-${project.version}.jar</include>
             </includes>
         </fileSet>
         

Modified: manifoldcf/integration/solr-5.x/branches/release-2.0-branch/src/main/assembly/src.xml
URL: http://svn.apache.org/viewvc/manifoldcf/integration/solr-5.x/branches/release-2.0-branch/src/main/assembly/src.xml?rev=1665102&r1=1665101&r2=1665102&view=diff
==============================================================================
--- manifoldcf/integration/solr-5.x/branches/release-2.0-branch/src/main/assembly/src.xml (original)
+++ manifoldcf/integration/solr-5.x/branches/release-2.0-branch/src/main/assembly/src.xml Mon Mar  9 00:26:44 2015
@@ -33,6 +33,8 @@
                 <exclude>**/.*/**</exclude>
                 <exclude>**/*.iml/**</exclude>
                 <exclude>**/*.patch/**</exclude>
+                <exclude>**/*.sh/**</exclude>
+                <exclude>**/*.bat/**</exclude>
                 <exclude>**/target/**</exclude>
                 <exclude>**/lib/**</exclude>
                 <exclude>**/data/**</exclude>